[PATCH 3 of 6] Open main window in case of error message

Wald Commits scm-commit at wald.intevation.org
Thu Aug 28 12:57:41 CEST 2014


# HG changeset patch
# User Andre Heinecke <andre.heinecke at intevation.de>
# Date 1409223362 -7200
# Node ID 013ca910589a8e3959475281224bfa00b9371dfd
# Parent  706405a2f3e8989b299c0066c17cef3598ff4e29
Open main window in case of error message.
Show tray icon always when the mainwindow is invisible.

diff -r 706405a2f3e8 -r 013ca910589a ui/mainwindow.cpp
--- a/ui/mainwindow.cpp	Thu Aug 28 12:55:19 2014 +0200
+++ b/ui/mainwindow.cpp	Thu Aug 28 12:56:02 2014 +0200
@@ -134,10 +134,6 @@
 
 void MainWindow::messageClicked()
 {
-    if (mCurState == NewListAvailable) {
-        show();
-    }
-
     if (mCurState == NewSoftwareAvailable) {
         hide();
         verifySWData();
@@ -149,6 +145,8 @@
         }
         installNewSW(swFileName,
                 mSettings.value("Software/availableDate").toDateTime());
+    } else {
+        show();
     }
 }
 
@@ -1379,6 +1377,7 @@
     if (getState() == NewListAvailable) {
         /* Only minimize to tray if there is a new list */
         QMainWindow::closeEvent(event);
+        mTrayIcon->show();
         return;
     }
     return closeApp();


More information about the Trustbridge-commits mailing list