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

Core: Make EditorManager::reloadSettings available for tests

Browse Source 
Needed for a test in ClangCodeModel in order to avoid a blocking pop-up
dialog.

Change-Id: I5a337cfcbf514052681f1941845a995d2a5856ac
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2015-05-13 16:12:45 +02:00
parent 7e41b40c91
commit 7050f78b8d
5 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/documentmanager.cpp
View File

@@ -915,7 +915,7 @@ void DocumentManager::checkForReload()
d->m_blockActivated = true;
IDocument::ReloadSetting defaultBehavior = EditorManagerPrivate::reloadSetting();
IDocument::ReloadSetting defaultBehavior = EditorManager::reloadSetting();
ReloadPromptAnswer previousReloadAnswer = ReloadCurrent;
FileDeletedPromptAnswer previousDeletedAnswer = FileDeletedSave;

20
src/plugins/coreplugin/editormanager/editormanager.cpp
View File

@@ -975,16 +975,6 @@ void EditorManagerPrivate::readSettings()
updateAutoSave();
}
void EditorManagerPrivate::setReloadSetting(IDocument::ReloadSetting behavior)
{
d->m_reloadSetting = behavior;
}
IDocument::ReloadSetting EditorManagerPrivate::reloadSetting()
{
return d->m_reloadSetting;
}
void EditorManagerPrivate::setAutoSaveEnabled(bool enabled)
{
d->m_autoSaveEnabled = enabled;
@@ -2176,6 +2166,16 @@ void EditorManager::populateOpenWithMenu(QMenu *menu, const QString &fileName)
menu->setEnabled(anyMatches);
}
IDocument::ReloadSetting EditorManager::reloadSetting()
{
return d->m_reloadSetting;
}
void EditorManager::setReloadSetting(IDocument::ReloadSetting behavior)
{
d->m_reloadSetting = behavior;
}
void EditorManager::saveDocument()
{
EditorManagerPrivate::saveDocument(currentDocument());

5
src/plugins/coreplugin/editormanager/editormanager.h
View File

@@ -32,6 +32,7 @@
#define EDITORMANAGER_H
#include "../core_global.h"
#include "../idocument.h"
#include "documentmodel.h"
@@ -171,6 +172,10 @@ public:
static void addNativeDirAndOpenWithActions(QMenu *contextMenu, DocumentModel::Entry *entry);
static void populateOpenWithMenu(QMenu *menu, const QString &fileName);
public: // for tests
static IDocument::ReloadSetting reloadSetting();
static void setReloadSetting(IDocument::ReloadSetting behavior);
signals:
void currentEditorChanged(Core::IEditor *editor);
void currentDocumentStateChanged();

2
src/plugins/coreplugin/editormanager/editormanager_p.h
View File

@@ -107,8 +107,6 @@ public:
static void saveSettings();
static void readSettings();
static void setReloadSetting(IDocument::ReloadSetting behavior);
static IDocument::ReloadSetting reloadSetting();
static void setAutoSaveEnabled(bool enabled);
static bool autoSaveEnabled();
static void setAutoSaveInterval(int interval);

4
src/plugins/coreplugin/generalsettings.cpp
View File

@@ -114,7 +114,7 @@ QWidget *GeneralSettings::widget()
fillLanguageBox();
m_page->colorButton->setColor(StyleHelper::requestedBaseColor());
m_page->reloadBehavior->setCurrentIndex(EditorManagerPrivate::reloadSetting());
m_page->reloadBehavior->setCurrentIndex(EditorManager::reloadSetting());
if (HostOsInfo::isAnyUnixHost()) {
const QStringList availableTerminals = ConsoleProcess::availableTerminalEmulators();
const QString currentTerminal = ConsoleProcess::terminalEmulator(ICore::settings(), false);
@@ -176,7 +176,7 @@ void GeneralSettings::apply()
setLanguage(m_page->languageBox->itemData(currentIndex, Qt::UserRole).toString());
// Apply the new base color if accepted
StyleHelper::setBaseColor(m_page->colorButton->color());
EditorManagerPrivate::setReloadSetting(IDocument::ReloadSetting(m_page->reloadBehavior->currentIndex()));
EditorManager::setReloadSetting(IDocument::ReloadSetting(m_page->reloadBehavior->currentIndex()));
if (HostOsInfo::isAnyUnixHost()) {
ConsoleProcess::setTerminalEmulator(ICore::settings(),
m_page->terminalComboBox->lineEdit()->text());