feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Add option to select behavior on externally changed files.

Browse Source 
Merge-request: 840
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
This commit is contained in:
Henrik Abelsson
2009-07-13 15:00:20 +02:00
committed by Thorbjørn Lindeijer
parent e38cec518b
commit 0a94100508
13 changed files with 132 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/designer/formwindowfile.cpp
View File

@@ -31,6 +31,7 @@
#include "designerconstants.h"
#include <coreplugin/icore.h>
#include <coreplugin/editormanager/editormanager.h>
#include <utils/reloadpromptutils.h>
#include <QtDesigner/QDesignerFormWindowInterface>
@@ -117,6 +118,12 @@ void FormWindowFile::modified(Core::IFile::ReloadBehavior *behavior)
switch (*behavior) {
case Core::IFile::ReloadNone:
return;
case Core::IFile::ReloadUnmodified:
if (!isModified()) {
reload(m_fileName);
return;
}
break;
case Core::IFile::ReloadAll:
emit reload(m_fileName);
return;
@@ -127,7 +134,7 @@ void FormWindowFile::modified(Core::IFile::ReloadBehavior *behavior)
break;
}
switch (Core::Utils::reloadPrompt(m_fileName, Core::ICore::instance()->mainWindow())) {
switch (Core::Utils::reloadPrompt(m_fileName, isModified(), Core::ICore::instance()->mainWindow())) {
case Core::Utils::ReloadCurrent:
emit reload(m_fileName);
break;