Commit c9203d53 authored by Eike Ziller's avatar Eike Ziller Committed by hjk

Fix saving search and locator settings after recent refactoring

Change-Id: Id14b14fb553ab9828950994e9069499ac7604757
Reviewed-by: default avatarhjk <hjk121@nokiamail.com>
parent 2fa38ad1
......@@ -144,6 +144,7 @@ void CorePlugin::fileOpenRequest(const QString &f)
ExtensionSystem::IPlugin::ShutdownFlag CorePlugin::aboutToShutdown()
{
m_findPlugin->aboutToShutdown();
m_mainWindow->aboutToShutdown();
return SynchronousShutdown;
}
......
......@@ -132,6 +132,7 @@ void FindPlugin::initialize(const QStringList &, QString *)
d->m_findDialog = new Internal::FindToolWindow(this);
d->m_searchResultWindow = new SearchResultWindow(d->m_findDialog);
ExtensionSystem::PluginManager::addObject(d->m_searchResultWindow);
connect(ICore::instance(), SIGNAL(saveSettingsRequested()), this, SLOT(writeSettings()));
}
void FindPlugin::extensionsInitialized()
......@@ -145,7 +146,6 @@ void FindPlugin::aboutToShutdown()
d->m_findToolBar->setVisible(false);
d->m_findToolBar->setParent(0);
d->m_currentDocumentFind->removeConnections();
writeSettings();
}
void FindPlugin::filterChanged()
......
......@@ -90,13 +90,13 @@ signals:
private slots:
void filterChanged();
void openFindFilter();
void writeSettings();
private:
void setFindFlag(Core::FindFlag flag, bool enabled);
void updateCompletion(const QString &text, QStringList &completions, QStringListModel *model);
void setupMenu();
void setupFilterMenuItems();
void writeSettings();
void readSettings();
//variables
......
......@@ -127,6 +127,8 @@ void Locator::initialize(CorePlugin *corePlugin, const QStringList &, QString *)
m_corePlugin->addObject(m_executeFilter);
m_corePlugin->addAutoReleasedObject(new LocatorFiltersFilter(this, m_locatorWidget));
connect(ICore::instance(), SIGNAL(saveSettingsRequested()), this, SLOT(saveSettings()));
}
void Locator::updatePlaceholderText(Command *command)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment