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

Help: Get rid of separate find support for central widget

Browse Source 
There is no reason to not just add the support to the individual pages
when they are created.

Change-Id: I0e45577d054a420f406c44cdcbb4968ff05fcc7c
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
This commit is contained in:
Eike Ziller
2014-06-17 16:46:48 +02:00
parent 2b0954ca7d
commit 46cdd91024
3 changed files with 6 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -303,10 +303,6 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
SLOT(gotoNextPage()));
}
Aggregation::Aggregate *agg = new Aggregation::Aggregate;
agg->add(m_centralWidget);
agg->add(new HelpFindSupport(m_centralWidget));
QWidget *toolBarWidget = new QWidget;
QHBoxLayout *toolBarLayout = new QHBoxLayout(toolBarWidget);
toolBarLayout->setMargin(0);
@@ -571,10 +567,6 @@ void HelpPlugin::createRightPaneContextViewer()
rightPaneLayout->addWidget(fth);
m_rightPaneSideBarWidget->setFocusProxy(m_helpViewerForSideBar);
Aggregation::Aggregate *agg = new Aggregation::Aggregate();
agg->add(m_helpViewerForSideBar);
agg->add(new HelpViewerFindSupport(m_helpViewerForSideBar));
Context context(Constants::C_HELP_SIDEBAR);
IContext *icontext = new IContext(this);
icontext->setContext(context);
@@ -663,6 +655,12 @@ HelpViewer *HelpPlugin::createHelpViewer(qreal zoom)
QVariant fontSetting = LocalHelpManager::engineFontSettings();
if (fontSetting.isValid())
viewer->setViewerFont(fontSetting.value<QFont>());
// add find support
Aggregation::Aggregate *agg = new Aggregation::Aggregate();
agg->add(viewer);
agg->add(new HelpViewerFindSupport(viewer));
return viewer;
}