summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kamm <christian.d.kamm@nokia.com>2010-06-18 12:50:37 +0200
committerChristian Kamm <christian.d.kamm@nokia.com>2010-06-18 12:52:29 +0200
commit78cc3cb32d142d0d543690f8865aaee6e9b7924a (patch)
treed40fb93339cf55f22044c2c4e136042092459125
parent4f026c63b72053ada1d8bfefad02aa99456bb094 (diff)
Set a tooltip for advanced buttons in toolboxes, expose it for pages.
-rw-r--r--library/remotecontrolwidget.cpp12
-rw-r--r--library/remotecontrolwidget.h2
-rw-r--r--library/toolbox.cpp1
3 files changed, 12 insertions, 3 deletions
diff --git a/library/remotecontrolwidget.cpp b/library/remotecontrolwidget.cpp
index d08cdff..ae6646f 100644
--- a/library/remotecontrolwidget.cpp
+++ b/library/remotecontrolwidget.cpp
@@ -218,11 +218,10 @@ void PageWidget::setHideable(bool hideable)
void PageWidget::setHasAdvancedButton(bool hasButton)
{
if (!mAdvancedButton) {
- mAdvancedButton = new QToolButton();
+ mAdvancedButton = new QToolButton;
mAdvancedButton->setToolButtonStyle(Qt::ToolButtonIconOnly);
mAdvancedButton->setIcon(QIcon(":/style/images/advanced_light.png"));
mAdvancedButton->setStyle(style());
- mAdvancedButton->hide();
mHeaderLayout->addWidget(mAdvancedButton);
connect(mAdvancedButton, SIGNAL(clicked()), SIGNAL(advancedButtonClicked()));
}
@@ -268,10 +267,17 @@ bool PageWidget::isHideable() const
bool PageWidget::hasAdvancedButton() const
{
- return (mAdvancedButton && mAdvancedButton->isVisible());
+ return (mAdvancedButton && !mAdvancedButton->isHidden());
}
bool PageWidget::isContentVisible() const
{
return mContent->isVisible();
}
+
+QToolButton *PageWidget::advancedButton() const
+{
+ if (hasAdvancedButton())
+ return mAdvancedButton;
+ return 0;
+}
diff --git a/library/remotecontrolwidget.h b/library/remotecontrolwidget.h
index 7e0b617..06358c0 100644
--- a/library/remotecontrolwidget.h
+++ b/library/remotecontrolwidget.h
@@ -65,6 +65,8 @@ public:
bool hasAdvancedButton() const;
bool isContentVisible() const;
+ QToolButton *advancedButton() const;
+
public slots:
void showContent();
void hideContent();
diff --git a/library/toolbox.cpp b/library/toolbox.cpp
index f155f3d..5f883e0 100644
--- a/library/toolbox.cpp
+++ b/library/toolbox.cpp
@@ -310,6 +310,7 @@ void ToolBoxPage::addAdvancedButtonToHeader()
advancedButton->setCheckable(true);
advancedButton->setIcon(QIcon(":/style/images/advanced.png"));
advancedButton->setStyle(style());
+ advancedButton->setToolTip(tr("Show advanced options"));
mHeaderLayout->addWidget(advancedButton);
connect(advancedButton, SIGNAL(toggled(bool)), SLOT(setAdvanced(bool)));
}