From 21a64a827058d663f28b5be55a797aa314ce54ed Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Mon, 17 Mar 2014 12:43:58 +0100 Subject: [PATCH] Statusbar fullscreen button is now checkable. --- src/gui/formmain.cpp | 6 ++++-- src/gui/statusbar.cpp | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/gui/formmain.cpp b/src/gui/formmain.cpp index 64fde220b..d9beb1b62 100755 --- a/src/gui/formmain.cpp +++ b/src/gui/formmain.cpp @@ -362,8 +362,10 @@ void FormMain::saveSize() { void FormMain::createConnections() { // Status bar connections. - connect(m_statusBar->fullscreenSwitcher(), SIGNAL(clicked()), - m_ui->m_actionFullscreen, SLOT(trigger())); + connect(m_statusBar->fullscreenSwitcher(), SIGNAL(toggled(bool)), + m_ui->m_actionFullscreen, SLOT(setChecked(bool))); + connect(m_ui->m_actionFullscreen, SIGNAL(toggled(bool)), + m_statusBar->fullscreenSwitcher(), SLOT(setChecked(bool))); // Core connections. connect(qApp, SIGNAL(commitDataRequest(QSessionManager&)), diff --git a/src/gui/statusbar.cpp b/src/gui/statusbar.cpp index 1d6b55a34..657c4871e 100644 --- a/src/gui/statusbar.cpp +++ b/src/gui/statusbar.cpp @@ -31,6 +31,7 @@ StatusBar::StatusBar(QWidget *parent) : QStatusBar(parent) { // Initializations of widgets for status bar. m_fullscreenSwitcher = new QToolButton(this); m_fullscreenSwitcher->setAutoRaise(true); + m_fullscreenSwitcher->setCheckable(true); m_fullscreenSwitcher->setIcon(IconThemeFactory::instance()->fromTheme("view-fullscreen")); m_fullscreenSwitcher->setText(tr("Fullscreen mode")); m_fullscreenSwitcher->setToolTip(tr("Switch application between fulscreen/normal states right from this status bar icon.")); @@ -54,8 +55,6 @@ StatusBar::~StatusBar() { qDebug("Destroying StatusBar instance."); } - - void StatusBar::showProgress(int progress, const QString &label) { m_progressLabel->setVisible(true); m_progressBar->setVisible(true);