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

Make use of the core engine in the general settings page.

Browse Source 
Reviewed-by: ck
This commit is contained in:
kh1
2010-03-16 14:47:27 +01:00
parent 24c36c172e
commit 3cd98b3387
4 changed files with 94 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/help/helpplugin.cpp
View File

@@ -400,11 +400,11 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
advancedMenu->addAction(cmd, Core::Constants::G_EDIT_FONT);
}
GeneralSettingsPage *generalSettings = new GeneralSettingsPage(m_helpEngine,
m_centralWidget, m_bookmarkManager);
addAutoReleasedObject(generalSettings);
connect(generalSettings, SIGNAL(fontChanged()), this, SLOT(fontChanged()));
generalSettingsPage = new GeneralSettingsPage(m_bookmarkManager);
addAutoReleasedObject(generalSettingsPage);
connect(generalSettingsPage, SIGNAL(fontChanged()), this, SLOT(fontChanged()));
connect(generalSettingsPage, SIGNAL(dialogAccepted()), this,
SLOT(checkForGeneralChanges()));
return true;
}
@@ -980,6 +980,12 @@ void HelpPlugin::checkForHelpChanges()
m_helpEngine->setupData();
}
void HelpPlugin::checkForGeneralChanges()
{
if (generalSettingsPage->applyChanges())
m_helpEngine->setupData();
}
void HelpPlugin::filterDocumentation(const QString &customFilter)
{
m_helpEngine->setCurrentFilter(customFilter);