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

Fix saving search and locator settings after recent refactoring

Browse Source 
Change-Id: Id14b14fb553ab9828950994e9069499ac7604757
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Eike Ziller
2014-02-13 17:13:13 +01:00
committed by hjk
parent 2fa38ad182
commit c9203d53a8
4 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/coreplugin/coreplugin.cpp
View File

@@ -144,6 +144,7 @@ void CorePlugin::fileOpenRequest(const QString &f)
ExtensionSystem::IPlugin::ShutdownFlag CorePlugin::aboutToShutdown() ExtensionSystem::IPlugin::ShutdownFlag CorePlugin::aboutToShutdown()
{ {
m_findPlugin->aboutToShutdown();
m_mainWindow->aboutToShutdown(); m_mainWindow->aboutToShutdown();
return SynchronousShutdown; return SynchronousShutdown;
} }

2
src/plugins/coreplugin/find/findplugin.cpp
View File

@@ -132,6 +132,7 @@ void FindPlugin::initialize(const QStringList &, QString *)
d->m_findDialog = new Internal::FindToolWindow(this); d->m_findDialog = new Internal::FindToolWindow(this);
d->m_searchResultWindow = new SearchResultWindow(d->m_findDialog); d->m_searchResultWindow = new SearchResultWindow(d->m_findDialog);
ExtensionSystem::PluginManager::addObject(d->m_searchResultWindow); ExtensionSystem::PluginManager::addObject(d->m_searchResultWindow);
connect(ICore::instance(), SIGNAL(saveSettingsRequested()), this, SLOT(writeSettings()));
} }
void FindPlugin::extensionsInitialized() void FindPlugin::extensionsInitialized()
@@ -145,7 +146,6 @@ void FindPlugin::aboutToShutdown()
d->m_findToolBar->setVisible(false); d->m_findToolBar->setVisible(false);
d->m_findToolBar->setParent(0); d->m_findToolBar->setParent(0);
d->m_currentDocumentFind->removeConnections(); d->m_currentDocumentFind->removeConnections();
writeSettings();
} }
void FindPlugin::filterChanged() void FindPlugin::filterChanged()

2
src/plugins/coreplugin/find/findplugin.h
View File

@@ -90,13 +90,13 @@ signals:
private slots: private slots:
void filterChanged(); void filterChanged();
void openFindFilter(); void openFindFilter();
void writeSettings();
private: private:
void setFindFlag(Core::FindFlag flag, bool enabled); void setFindFlag(Core::FindFlag flag, bool enabled);
void updateCompletion(const QString &text, QStringList &completions, QStringListModel *model); void updateCompletion(const QString &text, QStringList &completions, QStringListModel *model);
void setupMenu(); void setupMenu();
void setupFilterMenuItems(); void setupFilterMenuItems();
void writeSettings();
void readSettings(); void readSettings();
//variables //variables

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

@@ -127,6 +127,8 @@ void Locator::initialize(CorePlugin *corePlugin, const QStringList &, QString *)
m_corePlugin->addObject(m_executeFilter); m_corePlugin->addObject(m_executeFilter);
m_corePlugin->addAutoReleasedObject(new LocatorFiltersFilter(this, m_locatorWidget)); m_corePlugin->addAutoReleasedObject(new LocatorFiltersFilter(this, m_locatorWidget));
connect(ICore::instance(), SIGNAL(saveSettingsRequested()), this, SLOT(saveSettings()));
} }
void Locator::updatePlaceholderText(Command *command) void Locator::updatePlaceholderText(Command *command)