diff main/main.cpp @ 625:763b1fbeb31c with-dependencies

Merge from the default branch

--- a/main/main.cpp	Mon Sep 16 17:40:41 2013 +0100
+++ b/main/main.cpp	Tue Sep 24 11:06:29 2013 +0100
@@ -363,14 +363,21 @@
     if (width > height * 2) width = height * 2;
 
     settings.beginGroup("MainWindow");
+
     QSize size = settings.value("size", QSize(width, height)).toSize();
     gui->resizeConstrained(size);
+
     if (settings.contains("position")) {
         QRect prevrect(settings.value("position").toPoint(), size);
         if (!(available & prevrect).isEmpty()) {
             gui->move(prevrect.topLeft());
         }
     }
+
+    if (settings.value("maximised", false).toBool()) {
+        gui->setWindowState(Qt::WindowMaximized);
+    }
+
     settings.endGroup();
     
     gui->show();