Mercurial > trustbridge
changeset 965:013ca910589a
Open main window in case of error message.
Show tray icon always when the mainwindow is invisible.
author | Andre Heinecke <andre.heinecke@intevation.de> |
---|---|
date | Thu, 28 Aug 2014 12:56:02 +0200 |
parents | 706405a2f3e8 |
children | 9783e32e215f |
files | ui/mainwindow.cpp |
diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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();