Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #678 from PhenomRetroShare/Fix_DisableSysTrayToolTipOption

Browse Source 
Fix DisableSysTrayToolTip Option
This commit is contained in:
csoler 2017-02-06 23:57:50 +01:00 committed by GitHub
commit 32b2cdaa99
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
retroshare-gui/src/gui/MainWindow.cpp
View File

@ -679,8 +679,6 @@ void MainWindow::updateStatus()
// This call is essential to remove locks due to QEventLoop re-entrance while asking gpg passwds. Dont' remove it!
if(RsAutoUpdatePage::eventsLocked())
return;
if(Settings->valueFromGroup("StatusBar", "DisableSysTrayToolTip", QVariant(false)).toBool())
return;
float downKb = 0;
float upKb = 0;
rsConfig->GetCurrentDataRates(downKb, upKb);
@ -698,6 +696,8 @@ void MainWindow::updateStatus()
discstatus->update();
}
if(!Settings->valueFromGroup("StatusBar", "DisableSysTrayToolTip", QVariant(false)).toBool()) {
QString tray = "RetroShare\n" + tr("Down: %1 (kB/s)").arg(downKb, 0, 'f', 2) + " | " + tr("Up: %1 (kB/s)").arg(upKb, 0, 'f', 2) + "\n";
if (onlineCount == 1) {
@ -713,6 +713,7 @@ void MainWindow::updateStatus()
tray += notifyToolTip;
}
trayIcon->setToolTip(tray);
}
}
void MainWindow::updateFriends()