X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=487be1d3ef6e08e9011c2e88243a1dc1c9823bf7;hp=f137ebe7b1f981d87d051011af9b774935a8c5ae;hb=419782afd8deeccb1fcd456fcdda2691aa11e406;hpb=e04d897d69a62d0b6062d788812ca12d6d85b75d

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index f137ebe7..487be1d3 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -135,8 +135,6 @@ MainWin::MainWin(QWidget *parent)
   installEventFilter(new JumpKeyHandler(this));
 
   QtUiApplication* app = qobject_cast<QtUiApplication*> qApp;
-  connect(app, SIGNAL(saveStateToSession(const QString&)), SLOT(saveStateToSession(const QString&)));
-  connect(app, SIGNAL(saveStateToSessionSettings(SessionSettings&)), SLOT(saveStateToSessionSettings(SessionSettings&)));
   connect(app, SIGNAL(aboutToQuit()), SLOT(aboutToQuit()));
 }
 
@@ -218,11 +216,14 @@ void MainWin::saveStateToSettings(UiSettings &s) {
 }
 
 void MainWin::restoreStateFromSettings(UiSettings &s) {
+  _normalSize = s.value("MainWinSize", size()).toSize();
+  _normalPos = s.value("MainWinPos", pos()).toPoint();
+
   restoreGeometry(s.value("MainWinGeometry").toByteArray());
   if(isMaximized()) {
     // restoreGeometry() fails if the windows was maximized, so we resize and position explicitly
-    resize(s.value("MainWinSize", QSize(800, 500)).toSize());
-    move(s.value("MainWinPos").toPoint());
+    resize(_normalSize);
+    move(_normalPos);
   }
 
   restoreState(s.value("MainWinState").toByteArray());
@@ -826,22 +827,22 @@ void MainWin::moveEvent(QMoveEvent *event) {
   if(!(windowState() & Qt::WindowMaximized))
     _normalPos = event->pos();
 
-  event->ignore();
+  QMainWindow::moveEvent(event);
 }
 
 void MainWin::resizeEvent(QResizeEvent *event) {
   if(!(windowState() & Qt::WindowMaximized))
     _normalSize = event->size();
 
-  event->ignore();
+  QMainWindow::resizeEvent(event);
 }
 
 void MainWin::closeEvent(QCloseEvent *event) {
   QtUiSettings s;
   QtUiApplication* app = qobject_cast<QtUiApplication*> qApp;
   Q_ASSERT(app);
-  if(!app->aboutToQuit() && s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnClose").toBool()) {
-    toggleMinimizedToTray();
+  if(!app->isAboutToQuit() && s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnClose").toBool()) {
+    hideToTray();
     event->ignore();
   } else {
     event->accept();
@@ -1062,24 +1063,6 @@ void MainWin::on_actionDebugLog_triggered() {
   logWidget->show();
 }
 
-// FIXME
-void MainWin::saveStateToSession(const QString &sessionId) {
-  return;
-  SessionSettings s(sessionId);
-
-  s.setValue("MainWinSize", size());
-  s.setValue("MainWinPos", pos());
-  s.setValue("MainWinState", saveState());
-}
-
-// FIXME
-void MainWin::saveStateToSessionSettings(SessionSettings & s)
-{
-  s.setValue("MainWinSize", size());
-  s.setValue("MainWinPos", pos());
-  s.setValue("MainWinState", saveState());
-}
-
 void MainWin::showStatusBarMessage(const QString &message) {
   statusBar()->showMessage(message, 10000);
 }