From 1630577e0418bdbe59b7b1e441d38e6f51ec16f7 Mon Sep 17 00:00:00 2001 From: Chozabu Date: Wed, 2 Sep 2015 01:09:39 +0100 Subject: [PATCH] dont set tooltip if enabling updates, set tooltip on save incase of update between click and save --- retroshare-gui/src/gui/MainWindow.cpp | 1 + retroshare-gui/src/gui/settings/AppearancePage.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index 593df8248..e3b975843 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -678,6 +678,7 @@ void MainWindow::updateTrayCombine() } void MainWindow::toggleStatusToolTip(bool toggle){ + if(!toggle)return; QString tray = "RetroShare\n"; tray += "\n" + nameAndLocation; trayIcon->setToolTip(tray); diff --git a/retroshare-gui/src/gui/settings/AppearancePage.cpp b/retroshare-gui/src/gui/settings/AppearancePage.cpp index f132d43c2..0d431e996 100755 --- a/retroshare-gui/src/gui/settings/AppearancePage.cpp +++ b/retroshare-gui/src/gui/settings/AppearancePage.cpp @@ -144,6 +144,7 @@ bool AppearancePage::save(QString &errmsg) Settings->setValueToGroup("StatusBar", "HideToaster", QVariant(ui.checkBoxHideToasterDisable->isChecked())); Settings->setValueToGroup("StatusBar", "ShowSysTrayOnStatusBar", QVariant(ui.checkBoxShowSystrayOnStatus->isChecked())); Settings->setValueToGroup("StatusBar", "DisableSysTrayToolTip", QVariant(ui.checkBoxDisableSysTrayToolTip->isChecked())); + MainWindow::getInstance()->toggleStatusToolTip(ui.checkBoxDisableSysTrayToolTip->isChecked()); return true; }