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

Help: Fix state of "Show Sidebar" action

Browse Source 
It was enabled when the side bar was hidden.

Change-Id: I580071ab792396d727d6f712f603e1b7a12b4c24
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
This commit is contained in:
Eike Ziller
2014-06-23 13:38:52 +02:00
parent b89a208b8d
commit 0e0d70191f
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -466,7 +466,8 @@ void HelpPlugin::setupUi()
m_toggleSideBarAction = new QAction(QIcon(QLatin1String(Core::Constants::ICON_TOGGLE_SIDEBAR)), m_toggleSideBarAction = new QAction(QIcon(QLatin1String(Core::Constants::ICON_TOGGLE_SIDEBAR)),
tr("Show Sidebar"), this); tr("Show Sidebar"), this);
m_toggleSideBarAction->setCheckable(true); m_toggleSideBarAction->setCheckable(true);
connect(m_toggleSideBarAction, SIGNAL(triggered(bool)), this, SLOT(showHideSidebar())); m_toggleSideBarAction->setChecked(m_isSidebarVisible);
connect(m_toggleSideBarAction, SIGNAL(triggered(bool)), this, SLOT(setSideBarVisible(bool)));
cmd = ActionManager::registerAction(m_toggleSideBarAction, Core::Constants::TOGGLE_SIDEBAR, modecontext); cmd = ActionManager::registerAction(m_toggleSideBarAction, Core::Constants::TOGGLE_SIDEBAR, modecontext);
} }
@@ -606,9 +607,11 @@ void HelpPlugin::slotHideRightPane()
RightPaneWidget::instance()->setShown(false); RightPaneWidget::instance()->setShown(false);
} }
void HelpPlugin::showHideSidebar() void HelpPlugin::setSideBarVisible(bool visible)
{ {
m_sideBar->setVisible(!m_sideBar->isVisible()); if (visible == m_sideBar->isVisible())
return;
m_sideBar->setVisible(visible);
onSideBarVisibilityChanged(); onSideBarVisibilityChanged();
} }
@@ -1004,6 +1007,7 @@ void HelpPlugin::slotReportBug()
void HelpPlugin::onSideBarVisibilityChanged() void HelpPlugin::onSideBarVisibilityChanged()
{ {
m_isSidebarVisible = m_sideBar->isVisible(); m_isSidebarVisible = m_sideBar->isVisible();
m_toggleSideBarAction->setChecked(m_isSidebarVisible);
m_toggleSideBarAction->setToolTip(m_isSidebarVisible ? tr("Hide Sidebar") : tr("Show Sidebar")); m_toggleSideBarAction->setToolTip(m_isSidebarVisible ? tr("Hide Sidebar") : tr("Show Sidebar"));
} }

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

@@ -103,7 +103,7 @@ private slots:
void saveExternalWindowSettings(); void saveExternalWindowSettings();
void switchToHelpMode(const QUrl &source); void switchToHelpMode(const QUrl &source);
void slotHideRightPane(); void slotHideRightPane();
void showHideSidebar(); void setSideBarVisible(bool visible);
void updateSideBarSource(); void updateSideBarSource();
void updateSideBarSource(const QUrl &newUrl); void updateSideBarSource(const QUrl &newUrl);