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

Small refactoring.

Browse Source
This commit is contained in:
kh1
2010-08-25 17:34:36 +02:00
parent 0cf36e2dc0
commit fc6c2aa998
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -310,7 +310,6 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
toolBarLayout->setSpacing(0); toolBarLayout->setSpacing(0);
toolBarLayout->addWidget(m_externalHelpBar = createIconToolBar(true)); toolBarLayout->addWidget(m_externalHelpBar = createIconToolBar(true));
toolBarLayout->addWidget(m_internalHelpBar = createIconToolBar(false)); toolBarLayout->addWidget(m_internalHelpBar = createIconToolBar(false));
m_externalHelpBar->setVisible(false);
toolBarLayout->addWidget(createWidgetToolBar()); toolBarLayout->addWidget(createWidgetToolBar());
QWidget *mainWidget = new QWidget; QWidget *mainWidget = new QWidget;
@@ -344,10 +343,12 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
if (contextHelpOption() == Help::Constants::ExternalHelpAlways) { if (contextHelpOption() == Help::Constants::ExternalHelpAlways) {
m_mode = new HelpMode(new QWidget); m_mode = new HelpMode(new QWidget);
m_mode->setEnabled(false); m_mode->setEnabled(false);
m_externalHelpBar->setVisible(true);
m_externalWindow->setCentralWidget(m_splitter); m_externalWindow->setCentralWidget(m_splitter);
QTimer::singleShot(0, this, SLOT(showExternalWindow())); QTimer::singleShot(0, this, SLOT(showExternalWindow()));
} else { } else {
m_mode = new HelpMode(m_splitter); m_mode = new HelpMode(m_splitter);
m_internalHelpBar->setVisible(true);
} }
addAutoReleasedObject(m_mode); addAutoReleasedObject(m_mode);
m_mode->setContext(modecontext); m_mode->setContext(modecontext);
@@ -633,8 +634,8 @@ void HelpPlugin::showExternalWindow()
{ {
bool firstTime = m_firstModeChange; bool firstTime = m_firstModeChange;
doSetupIfNeeded(); doSetupIfNeeded();
m_externalHelpBar->setVisible(true); //m_externalHelpBar->setVisible(true);
m_internalHelpBar->setVisible(false); //m_internalHelpBar->setVisible(false);
m_externalWindow->show(); m_externalWindow->show();
connectExternalHelpWindow(); connectExternalHelpWindow();
m_externalWindow->activateWindow(); m_externalWindow->activateWindow();
@@ -956,6 +957,7 @@ QToolBar *HelpPlugin::createIconToolBar(bool external)
toolBar->addAction(bookmark); toolBar->addAction(bookmark);
toolBar->setMovable(false); toolBar->setMovable(false);
toolBar->addSeparator(); toolBar->addSeparator();
toolBar->setVisible(false);
return toolBar; return toolBar;
} }