From: Konrad Rosenbaum <konrad@silmor.de>
Date: Sun, 22 May 2016 20:36:06 +0000 (+0200)
Subject: restore window size on next login
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=3b762e26dff0191b19fa161d223b663a61b999fc;p=web%2Fkonrad%2Fsmoke.git

restore window size on next login
---

diff --git a/src/dialogs/login.cpp b/src/dialogs/login.cpp
index c07d9fb..b72330b 100644
--- a/src/dialogs/login.cpp
+++ b/src/dialogs/login.cpp
@@ -148,7 +148,7 @@ void MLogin::startLogin()
                                             pd.setLabelText(txt);
                                     }
                                 );
-	mo->showMaximized();
+	mo->showRestored();
 	
 	//make sure the application exits (only) after everything is cleaned up
 	qApp->setQuitOnLastWindowClosed(false);
diff --git a/src/mwin/overview.cpp b/src/mwin/overview.cpp
index 41231cd..3fa34c1 100644
--- a/src/mwin/overview.cpp
+++ b/src/mwin/overview.cpp
@@ -202,14 +202,31 @@ void MOverview::runStartupScript()
 	engine.evalFile("startup.js");
 }
 
+#define GEOGROUP "magicSmokeClient/MainWindow/state"
+
 void MOverview::closeEvent(QCloseEvent*ce)
 {
 	//make sure session is deleted
 	req->logout();
+	//store geometry
+	QSettings set;
+	set.beginGroup(GEOGROUP);
+	set.setValue("geometry",saveGeometry());
+	set.setValue("state",saveState());
 	//actually close window
 	QMainWindow::closeEvent(ce);
 }
 
+void MOverview::showRestored()
+{
+	QSettings set;
+	set.beginGroup(GEOGROUP);
+	if(!restoreGeometry(set.value("geometry").toByteArray())||!restoreState(set.value("state").toByteArray()))
+		showMaximized();
+	else
+		show();
+}
+
 MOverview::~MOverview()
 {
 	qDebug()<<"destructing overview"<<hex<<(long)this;
diff --git a/src/mwin/overview.h b/src/mwin/overview.h
index 9628d32..f845e2b 100644
--- a/src/mwin/overview.h
+++ b/src/mwin/overview.h
@@ -53,7 +53,7 @@ class MOverview:public MTabWin
 		~MOverview();
 	protected:
 		/**handle closing the window: close the session too*/
-		void closeEvent(QCloseEvent*);
+		void closeEvent(QCloseEvent*) override;
 		
 	private slots:
 		/**try to log in again*/
@@ -97,6 +97,9 @@ class MOverview:public MTabWin
 		void userAudit();
 		
 	public slots:
+		///restore the window
+		void showRestored();
+
 		/**manage customers*/
 		void customerMgmt();