From 0a941005089847565a5203ded3f4b8f589be541c Mon Sep 17 00:00:00 2001 From: Henrik Abelsson Date: Mon, 13 Jul 2009 15:00:20 +0200 Subject: Add option to select behavior on externally changed files. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merge-request: 840 Reviewed-by: Thorbjørn Lindeijer --- src/libs/utils/reloadpromptutils.cpp | 13 +++-- src/libs/utils/reloadpromptutils.h | 2 +- src/plugins/bineditor/bineditorplugin.cpp | 8 ++- .../coreplugin/editormanager/editormanager.cpp | 19 ++++++- .../coreplugin/editormanager/editormanager.h | 2 + src/plugins/coreplugin/filemanager.cpp | 3 +- src/plugins/coreplugin/generalsettings.cpp | 2 + src/plugins/coreplugin/generalsettings.ui | 58 ++++++++++++++++++++-- src/plugins/coreplugin/ifile.h | 10 +++- src/plugins/designer/formwindowfile.cpp | 9 +++- src/plugins/resourceeditor/resourceeditorw.cpp | 11 +++- src/plugins/texteditor/basetextdocument.cpp | 11 +++- src/plugins/texteditor/basetexteditor.cpp | 1 - 13 files changed, 132 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/libs/utils/reloadpromptutils.cpp b/src/libs/utils/reloadpromptutils.cpp index 14cb1e4115..3aea436fd1 100644 --- a/src/libs/utils/reloadpromptutils.cpp +++ b/src/libs/utils/reloadpromptutils.cpp @@ -36,11 +36,18 @@ using namespace Core; using namespace Core::Utils; QTCREATOR_UTILS_EXPORT Core::Utils::ReloadPromptAnswer - Core::Utils::reloadPrompt(const QString &fileName, QWidget *parent) + Core::Utils::reloadPrompt(const QString &fileName, bool modified, QWidget *parent) { + const QString title = QCoreApplication::translate("Core::Utils::reloadPrompt", "File Changed"); - const QString msg = QCoreApplication::translate("Core::Utils::reloadPrompt", - "The file %1 has changed outside Qt Creator. Do you want to reload it?").arg(fileName); + QString msg; + + if (modified) + msg = QCoreApplication::translate("Core::Utils::reloadPrompt", + "The unsaved file %1 has been changed outside Qt Creator. Do you want to reload it and discard your changes?").arg(fileName); + else + msg = QCoreApplication::translate("Core::Utils::reloadPrompt", + "The file %1 has changed outside Qt Creator. Do you want to reload it?").arg(fileName); return reloadPrompt(title, msg, parent); } diff --git a/src/libs/utils/reloadpromptutils.h b/src/libs/utils/reloadpromptutils.h index 919ad92b8c..f48b0fe57a 100644 --- a/src/libs/utils/reloadpromptutils.h +++ b/src/libs/utils/reloadpromptutils.h @@ -42,7 +42,7 @@ namespace Utils { enum ReloadPromptAnswer { ReloadCurrent, ReloadAll, ReloadSkipCurrent, ReloadNone }; -QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &fileName, QWidget *parent); +QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &fileName, bool modified, QWidget *parent); QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &title, const QString &prompt, QWidget *parent); } // namespace Utils diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp index 99a1b28681..d08d95829a 100644 --- a/src/plugins/bineditor/bineditorplugin.cpp +++ b/src/plugins/bineditor/bineditorplugin.cpp @@ -196,6 +196,12 @@ public: switch (*behavior) { case Core::IFile::ReloadNone: return; + case Core::IFile::ReloadUnmodified: + if (!isModified()) { + open(fileName); + return; + } + break; case Core::IFile::ReloadAll: open(fileName); return; @@ -206,7 +212,7 @@ public: break; } - switch (Core::Utils::reloadPrompt(fileName, Core::ICore::instance()->mainWindow())) { + switch (Core::Utils::reloadPrompt(fileName, isModified(), Core::ICore::instance()->mainWindow())) { case Core::Utils::ReloadCurrent: open(fileName); break; diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index 1908936ec1..73943eb29b 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -186,6 +186,8 @@ struct EditorManagerPrivate { OpenEditorsModel *m_editorModel; QString m_externalEditor; + + IFile::ReloadBehavior m_reloadBehavior; }; } @@ -206,7 +208,8 @@ EditorManagerPrivate::EditorManagerPrivate(ICore *core, QWidget *parent) : m_openInExternalEditorAction(new QAction(EditorManager::tr("Open in External Editor"), parent)), currentNavigationHistoryPosition(0), m_windowPopup(0), - m_coreListener(0) + m_coreListener(0), + m_reloadBehavior(IFile::AskForReload) { m_editorModel = new OpenEditorsModel(parent); } @@ -1717,12 +1720,14 @@ bool EditorManager::restoreState(const QByteArray &state) static const char * const documentStatesKey = "EditorManager/DocumentStates"; static const char * const externalEditorKey = "EditorManager/ExternalEditorCommand"; +static const char * const reloadBehaviorKey = "EditorManager/ReloadBehavior"; void EditorManager::saveSettings() { SettingsDatabase *settings = m_d->m_core->settingsDatabase(); settings->setValue(QLatin1String(documentStatesKey), m_d->m_editorStates); settings->setValue(QLatin1String(externalEditorKey), m_d->m_externalEditor); + settings->setValue(QLatin1String(reloadBehaviorKey), m_d->m_reloadBehavior); } void EditorManager::readSettings() @@ -1745,6 +1750,9 @@ void EditorManager::readSettings() .value >(); if (settings->contains(QLatin1String(externalEditorKey))) m_d->m_externalEditor = settings->value(QLatin1String(externalEditorKey)).toString(); + + if (settings->contains(QLatin1String(reloadBehaviorKey))) + m_d->m_reloadBehavior = (IFile::ReloadBehavior)settings->value(QLatin1String(reloadBehaviorKey)).toInt(); } @@ -1913,6 +1921,15 @@ QString EditorManager::externalEditor() const return m_d->m_externalEditor; } +void EditorManager::setReloadBehavior(IFile::ReloadBehavior behavior) +{ + m_d->m_reloadBehavior = behavior; +} + +IFile::ReloadBehavior EditorManager::reloadBehavior() const +{ + return m_d->m_reloadBehavior; +} Core::IEditor *EditorManager::duplicateEditor(Core::IEditor *editor) { diff --git a/src/plugins/coreplugin/editormanager/editormanager.h b/src/plugins/coreplugin/editormanager/editormanager.h index 5faae2a127..8bb8d0439a 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.h +++ b/src/plugins/coreplugin/editormanager/editormanager.h @@ -177,6 +177,8 @@ public: QString defaultExternalEditor() const; QString externalEditorHelpText() const; + void setReloadBehavior(IFile::ReloadBehavior behavior); + IFile::ReloadBehavior reloadBehavior() const; // Helper to display a message dialog when encountering a read-only // file, prompting the user about how to make it writeable. diff --git a/src/plugins/coreplugin/filemanager.cpp b/src/plugins/coreplugin/filemanager.cpp index e0525edbc8..c59d23c293 100644 --- a/src/plugins/coreplugin/filemanager.cpp +++ b/src/plugins/coreplugin/filemanager.cpp @@ -484,8 +484,7 @@ void FileManager::checkForReload() m_blockActivated = true; const QList > changed = m_changedFiles; m_changedFiles.clear(); - IFile::ReloadBehavior behavior = - IFile::AskForReload; + IFile::ReloadBehavior behavior = EditorManager::instance()->reloadBehavior(); foreach (IFile *f, changed) { if (!f) continue; diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp index 53b880f9e5..5a75f4f9df 100644 --- a/src/plugins/coreplugin/generalsettings.cpp +++ b/src/plugins/coreplugin/generalsettings.cpp @@ -74,6 +74,7 @@ QWidget *GeneralSettings::createPage(QWidget *parent) m_page->colorButton->setColor(StyleHelper::baseColor()); m_page->externalEditorEdit->setText(EditorManager::instance()->externalEditor()); + m_page->reloadBehavior->setCurrentIndex(EditorManager::instance()->reloadBehavior()); #ifdef Q_OS_UNIX m_page->terminalEdit->setText(ConsoleProcess::terminalEmulator(Core::ICore::instance()->settings())); #else @@ -101,6 +102,7 @@ void GeneralSettings::apply() // Apply the new base color if accepted StyleHelper::setBaseColor(m_page->colorButton->color()); EditorManager::instance()->setExternalEditor(m_page->externalEditorEdit->text()); + EditorManager::instance()->setReloadBehavior(IFile::ReloadBehavior(m_page->reloadBehavior->currentIndex())); #ifdef Q_OS_UNIX ConsoleProcess::setTerminalEmulator(Core::ICore::instance()->settings(), m_page->terminalEdit->text()); diff --git a/src/plugins/coreplugin/generalsettings.ui b/src/plugins/coreplugin/generalsettings.ui index a863709ac0..e2b84b7322 100644 --- a/src/plugins/coreplugin/generalsettings.ui +++ b/src/plugins/coreplugin/generalsettings.ui @@ -6,8 +6,8 @@ 0 0 - 540 - 236 + 536 + 233 @@ -59,7 +59,7 @@ 0 - + false @@ -156,6 +156,58 @@ + + + + + + When files are externally modified: + + + + + + + + 0 + 0 + + + + 0 + + + + Always ask + + + + + Reload all unmodified files + + + + + Ignore modifications + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + diff --git a/src/plugins/coreplugin/ifile.h b/src/plugins/coreplugin/ifile.h index edd4eb04ec..4093d39a0f 100644 --- a/src/plugins/coreplugin/ifile.h +++ b/src/plugins/coreplugin/ifile.h @@ -42,7 +42,15 @@ class CORE_EXPORT IFile : public QObject Q_OBJECT public: - enum ReloadBehavior { AskForReload, ReloadAll, ReloadPermissions, ReloadNone }; + // This enum must match the indexes of the reloadBehavior widget + // in generalsettings.ui + enum ReloadBehavior { + AskForReload = 0, + ReloadUnmodified = 1, + ReloadNone = 2, + ReloadAll, + ReloadPermissions + }; IFile(QObject *parent = 0) : QObject(parent) {} virtual ~IFile() {} diff --git a/src/plugins/designer/formwindowfile.cpp b/src/plugins/designer/formwindowfile.cpp index fe459d9a15..52441d3345 100644 --- a/src/plugins/designer/formwindowfile.cpp +++ b/src/plugins/designer/formwindowfile.cpp @@ -31,6 +31,7 @@ #include "designerconstants.h" #include +#include #include #include @@ -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; diff --git a/src/plugins/resourceeditor/resourceeditorw.cpp b/src/plugins/resourceeditor/resourceeditorw.cpp index 416e9c9038..ae5925e65b 100644 --- a/src/plugins/resourceeditor/resourceeditorw.cpp +++ b/src/plugins/resourceeditor/resourceeditorw.cpp @@ -34,6 +34,7 @@ #include #include +#include #include #include @@ -189,8 +190,14 @@ void ResourceEditorFile::modified(Core::IFile::ReloadBehavior *behavior) const QString fileName = m_parent->m_resourceEditor->fileName(); switch (*behavior) { - case Core::IFile::ReloadNone: + case Core::IFile::ReloadNone: return; + case Core::IFile::ReloadUnmodified: + if (!isModified()) { + m_parent->open(fileName); + return; + } + break; case Core::IFile::ReloadAll: m_parent->open(fileName); return; @@ -201,7 +208,7 @@ void ResourceEditorFile::modified(Core::IFile::ReloadBehavior *behavior) break; } - switch (Core::Utils::reloadPrompt(fileName, Core::ICore::instance()->mainWindow())) { + switch (Core::Utils::reloadPrompt(fileName, isModified(), Core::ICore::instance()->mainWindow())) { case Core::Utils::ReloadCurrent: m_parent->open(fileName); break; diff --git a/src/plugins/texteditor/basetextdocument.cpp b/src/plugins/texteditor/basetextdocument.cpp index a51c584eec..d40d43f538 100644 --- a/src/plugins/texteditor/basetextdocument.cpp +++ b/src/plugins/texteditor/basetextdocument.cpp @@ -31,6 +31,7 @@ #include "basetexteditor.h" #include "storagesettings.h" + #include #include #include @@ -42,6 +43,7 @@ #ifndef TEXTEDITOR_STANDALONE #include #include +#include #endif #include @@ -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; diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index a86c65dd8d..6419f553b7 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -46,7 +46,6 @@ #include #include -#include #include #endif #include -- cgit v1.2.1