From 6e1832d55d00bbe83323ea6c1b2513090b7d7e33 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Tue, 8 Dec 2009 18:29:44 +0100
Subject: [PATCH] Update tool tip text for "Show / Hide Sidebar" wrt current
state.
---
src/plugins/coreplugin/mainwindow.cpp | 1 +
src/plugins/coreplugin/navigationwidget.cpp | 10 ++++++++++
src/plugins/coreplugin/navigationwidget.h | 1 +
3 files changed, 12 insertions(+)
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index a00d29ac0a6..6943d7a6cf0 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -716,6 +716,7 @@ void MainWindow::registerDefaultActions()
tr("Show Sidebar"), this);
m_toggleSideBarAction->setCheckable(true);
cmd = am->registerAction(m_toggleSideBarAction, Constants::TOGGLE_SIDEBAR, m_globalContext);
+ cmd->setAttribute(Command::CA_UpdateText);
#ifdef Q_WS_MAC
cmd->setDefaultKeySequence(QKeySequence("Ctrl+0"));
#else
diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp
index ffa00654214..9c43df4eb8d 100644
--- a/src/plugins/coreplugin/navigationwidget.cpp
+++ b/src/plugins/coreplugin/navigationwidget.cpp
@@ -163,10 +163,19 @@ int NavigationWidget::storedWidth()
return m_width;
}
+void NavigationWidget::updateToggleText()
+{
+ if (isShown())
+ m_toggleSideBarAction->setText(tr("Hide Sidebar"));
+ else
+ m_toggleSideBarAction->setText(tr("Show Sidebar"));
+}
+
void NavigationWidget::placeHolderChanged(NavigationWidgetPlaceHolder *holder)
{
m_toggleSideBarAction->setEnabled(holder);
m_toggleSideBarAction->setChecked(holder && isShown());
+ updateToggleText();
}
void NavigationWidget::resizeEvent(QResizeEvent *re)
@@ -307,6 +316,7 @@ void NavigationWidget::setShown(bool b)
} else {
m_toggleSideBarAction->setChecked(false);
}
+ updateToggleText();
}
bool NavigationWidget::isShown() const
diff --git a/src/plugins/coreplugin/navigationwidget.h b/src/plugins/coreplugin/navigationwidget.h
index 61dbc3dacbe..7620c544554 100644
--- a/src/plugins/coreplugin/navigationwidget.h
+++ b/src/plugins/coreplugin/navigationwidget.h
@@ -107,6 +107,7 @@ private slots:
void closeSubWidget();
private:
+ void updateToggleText();
NavigationSubWidget *insertSubItem(int position);
QList<NavigationSubWidget *> m_subWidgets;
QHash<QShortcut *, QString> m_shortcutMap;
--
GitLab