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

11
src/plugins/texteditor/basetextdocument.cpp
View File

@@ -31,6 +31,7 @@
#include "basetexteditor.h"
#include "storagesettings.h"
#include <QtCore/QFile>
#include <QtCore/QFileInfo>
#include <QtCore/QTextStream>
@@ -42,6 +43,7 @@
#ifndef TEXTEDITOR_STANDALONE
#include <utils/reloadpromptutils.h>
#include <coreplugin/icore.h>
#include <coreplugin/editormanager/editormanager.h>
#endif
#include <utils/qtcassert.h>
@@ -256,6 +258,12 @@ void BaseTextDocument::modified(Core::IFile::ReloadBehavior *behavior)
switch (*behavior) {
case Core::IFile::ReloadNone:
return;
case Core::IFile::ReloadUnmodified:
if (!isModified()) {
reload();
return;
}
break;
case Core::IFile::ReloadAll:
reload();
return;
@@ -267,7 +275,8 @@ void BaseTextDocument::modified(Core::IFile::ReloadBehavior *behavior)
}
#ifndef TEXTEDITOR_STANDALONE
switch (Core::Utils::reloadPrompt(m_fileName, QApplication::activeWindow())) {
switch (Core::Utils::reloadPrompt(m_fileName, isModified(), QApplication::activeWindow())) {
case Core::Utils::ReloadCurrent:
reload();
break;