Fixed FormMain::display() method + some testing of lastWindowClosed behavior.

src/gui/formmain.cpp

@@ -45,8 +45,9 @@ void FormMain::quit() {
 
 void FormMain::display() {
   setWindowState(windowState() & ~Qt::WindowMinimized);
-  raise();
+  show();
   activateWindow();
+  raise();
   QtSingleApplication::alert(this);
 }
 
@@ -100,6 +101,5 @@ void FormMain::closeEvent(QCloseEvent *event) {
 }
 
 void FormMain::showSettings() {
-  FormSettings form_settings(this);
+  FormSettings(this).exec();
-  form_settings.exec();
 }

src/gui/formsettings.cpp

@@ -1,6 +1,7 @@
 #include "gui/formsettings.h"
 #include "gui/themefactory.h"
 #include "gui/systemtrayicon.h"
+#include "gui/formmain.h"
 #include "core/settings.h"
 #include "core/defs.h"
 
@@ -96,6 +97,7 @@ void FormSettings::saveInterface() {
       SystemTrayIcon::getInstance()->show();
     }
     else {
+      FormMain::getInstance()->display();
       SystemTrayIcon::deleteInstance();
     }
   }

src/gui/systemtrayicon.cpp

@@ -3,6 +3,7 @@
 
 #include "gui/systemtrayicon.h"
 #include "gui/formmain.h"
+#include "gui/formsettings.h"
 #include "core/settings.h"
 #include "core/defs.h"
 

src/main.cpp

@@ -77,6 +77,7 @@ int main(int argc, char *argv[]) {
   }
 
   // Display main window.
+  // TODO: Switchable "start minimized" function.
   window.show();
 
   // Display tray icon if it is enabled and available.