summaryrefslogtreecommitdiff
path: root/src/plugins/projectexplorer
diff options
context:
space:
mode:
authordt_ <qtc-committer@nokia.com>2011-04-27 15:52:24 +0200
committerdt_ <qtc-committer@nokia.com>2011-04-27 15:58:54 +0200
commit060778ddf4821b80f09b55462ca0db179f8ceddf (patch)
treed570007b93f433f50d1d5fd82d03e3b1abcae041 /src/plugins/projectexplorer
parent2224eb70bb012fbbb575d73f9fe2a5292b534b59 (diff)
downloadqt-creator-060778ddf4821b80f09b55462ca0db179f8ceddf.tar.gz
Handle internally triggered deletes more gracefull
If the user has enabled "Reload unmodified" then on remove the unmodified editors are closed. Otherwise the user is asked as before. Also modify the message to indicate if the change was triggred externally.
Diffstat (limited to 'src/plugins/projectexplorer')
-rw-r--r--src/plugins/projectexplorer/projectexplorer.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index eee65b4920..148a5ce250 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -2435,6 +2435,7 @@ void ProjectExplorerPlugin::deleteFile()
projectNode->deleteFiles(fileNode->fileType(), QStringList(filePath));
+ core->fileManager()->expectFileChange(fileNode->path());
if (Core::IVersionControl *vc =
core->vcsManager()->findVersionControlForDirectory(QFileInfo(filePath).absolutePath())) {
vc->vcsDelete(filePath);
@@ -2445,6 +2446,7 @@ void ProjectExplorerPlugin::deleteFile()
QMessageBox::warning(core->mainWindow(), tr("Deleting File Failed"),
tr("Could not delete file %1.").arg(filePath));
}
+ core->fileManager()->unexpectFileChange(fileNode->path());
}
void ProjectExplorerPlugin::renameFile()