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

Better naming.

Browse Source
This commit is contained in:
kh1
2010-08-25 16:18:52 +02:00
parent 1b7a92925d
commit ffdd1765ca
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -632,7 +632,7 @@ void HelpPlugin::showHideSidebar()
void HelpPlugin::showExternalWindow() void HelpPlugin::showExternalWindow()
{ {
bool firstTime = m_firstModeChange; bool firstTime = m_firstModeChange;
setup(); doSetupIfNeeded();
m_externalHelpBar->setVisible(true); m_externalHelpBar->setVisible(true);
m_internalHelpBar->setVisible(false); m_internalHelpBar->setVisible(false);
m_externalWindow->show(); m_externalWindow->show();
@@ -647,7 +647,7 @@ void HelpPlugin::modeChanged(Core::IMode *mode, Core::IMode *old)
if (mode == m_mode) { if (mode == m_mode) {
m_oldMode = old; m_oldMode = old;
qApp->setOverrideCursor(Qt::WaitCursor); qApp->setOverrideCursor(Qt::WaitCursor);
setup(); doSetupIfNeeded();
qApp->restoreOverrideCursor(); qApp->restoreOverrideCursor();
} }
} }
@@ -702,7 +702,7 @@ QStackedLayout * layoutForWidget(QWidget *parent, QWidget *widget)
void HelpPlugin::contextHelpOptionChanged() void HelpPlugin::contextHelpOptionChanged()
{ {
setup(); doSetupIfNeeded();
QWidget *modeWidget = m_mode->widget(); QWidget *modeWidget = m_mode->widget();
if (modeWidget == m_splitter if (modeWidget == m_splitter
&& contextHelpOption() == Help::Constants::ExternalHelpAlways) { && contextHelpOption() == Help::Constants::ExternalHelpAlways) {
@@ -1103,7 +1103,7 @@ void HelpPlugin::slotOpenActionUrl(QAction *action)
} }
} }
void HelpPlugin::setup() void HelpPlugin::doSetupIfNeeded()
{ {
m_helpManager->setupGuiHelpEngine(); m_helpManager->setupGuiHelpEngine();
if (m_firstModeChange) { if (m_firstModeChange) {

2
src/plugins/help/helpplugin.h
View File

@@ -119,7 +119,7 @@ private:
HelpViewer* viewerForContextMode(); HelpViewer* viewerForContextMode();
void createRightPaneContextViewer(); void createRightPaneContextViewer();
void setup(); void doSetupIfNeeded();
int contextHelpOption() const; int contextHelpOption() const;
void connectExternalHelpWindow(); void connectExternalHelpWindow();
void setupNavigationMenus(QAction *back, QAction *next, QWidget *parent); void setupNavigationMenus(QAction *back, QAction *next, QWidget *parent);