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

Show main window with click on system icon when the main window is minimized.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4688 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2011-11-25 11:07:54 +00:00
parent 379927a846
commit a124c928d5
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1209,16 +1209,16 @@ void MainWindow::closeEvent(QCloseEvent *e)
void MainWindow::updateMenu() void MainWindow::updateMenu()
{ {
toggleVisibilityAction->setText(isVisible() ? tr("Hide") : tr("Show")); toggleVisibilityAction->setText(isVisible() && !isMinimized() ? tr("Hide") : tr("Show"));
} }
void MainWindow::toggleVisibility(QSystemTrayIcon::ActivationReason e) void MainWindow::toggleVisibility(QSystemTrayIcon::ActivationReason e)
{ {
if(e == QSystemTrayIcon::Trigger || e == QSystemTrayIcon::DoubleClick){ if (e == QSystemTrayIcon::Trigger || e == QSystemTrayIcon::DoubleClick) {
if(isHidden()){ if (isHidden() || isMinimized()) {
show(); show();
if(isMinimized()){ if (isMinimized()) {
if(isMaximized()){ if (isMaximized()) {
showMaximized(); showMaximized();
}else{ }else{
showNormal(); showNormal();
@ -1226,7 +1226,7 @@ void MainWindow::toggleVisibility(QSystemTrayIcon::ActivationReason e)
} }
raise(); raise();
activateWindow(); activateWindow();
}else{ } else {
hide(); hide();
} }
} }
@ -1277,7 +1277,7 @@ void MainWindow::trayIconTransfersClicked(QSystemTrayIcon::ActivationReason e)
void MainWindow::toggleVisibilitycontextmenu() void MainWindow::toggleVisibilitycontextmenu()
{ {
if (isVisible()) if (isVisible() && !isMinimized())
hide(); hide();
else else
show(); show();