[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/krdc
From:       Urs Wolfer <uwolfer () kde ! org>
Date:       2012-12-30 15:51:24
Message-ID: 20121230155124.B4F77AC80E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1330196 by uwolfer:

properly handle open connections when quitting

 M  +17 -10    mainwindow.cpp  
 M  +2 -1      mainwindow.h  


--- trunk/KDE/kdenetwork/krdc/mainwindow.cpp #1330195:1330196
@@ -347,8 +347,6 @@
         return;
     }
 
-    saveHostPrefs();
-
     view->showDotCursor(prefs->showLocalCursor() ? RemoteView::CursorOn : RemoteView::CursorOff);
     view->setViewOnly(prefs->viewOnly());
     if (! switchFullscreenWhenConnected) view->enableScaling(prefs->windowedScale());
@@ -766,7 +764,7 @@
     RemoteView* view = m_remoteViewList.at(m_currentRemoteView);
     view->showDotCursor(showLocalCursor ? RemoteView::CursorOn : RemoteView::CursorOff);
     view->hostPreferences()->setShowLocalCursor(showLocalCursor);
-    saveHostPrefs();
+    saveHostPrefs(view);
 }
 
 void MainWindow::viewOnly(bool viewOnly)
@@ -776,7 +774,7 @@
     RemoteView* view = m_remoteViewList.at(m_currentRemoteView);
     view->setViewOnly(viewOnly);
     view->hostPreferences()->setViewOnly(viewOnly);
-    saveHostPrefs();
+    saveHostPrefs(view);
 }
 
 void MainWindow::grabAllKeys(bool grabAllKeys)
@@ -786,7 +784,7 @@
     RemoteView* view = m_remoteViewList.at(m_currentRemoteView);
     view->setGrabAllKeys(grabAllKeys);
     view->hostPreferences()->setGrabAllKeys(grabAllKeys);
-    saveHostPrefs();
+    saveHostPrefs(view);
 }
 
 void MainWindow::scale(bool scale)
@@ -800,7 +798,7 @@
     else
         view->hostPreferences()->setWindowedScale(scale);
 
-    saveHostPrefs();
+    saveHostPrefs(view);
 }
 
 void MainWindow::showRemoteViewToolbar()
@@ -977,6 +975,10 @@
 
         saveHostPrefs();
 
+        for (int i = 0; i < m_remoteViewList.count(); ++i) {
+            m_remoteViewList.at(i)->startQuitting();
+        }
+
         Settings::self()->writeConfig();
 
         qApp->quit();
@@ -1039,12 +1041,17 @@
     saveHostPrefs();
 }
 
+
+void MainWindow::saveHostPrefs()
+{
+    for (int i = 0; i < m_remoteViewList.count(); ++i) {
+        saveHostPrefs(m_remoteViewList.at(i));
+        m_remoteViewList.at(i)->startQuitting();
+    }
+}
+
 void MainWindow::saveHostPrefs(RemoteView* view)
 {
-    // Save default window size for currently active view
-    if (!view)
-        view = m_currentRemoteView >= 0 ? m_remoteViewList.at(m_currentRemoteView) : 0;
-
     // should saving this be a user option?
     if (view && view->scaling()) {
         QSize viewSize = m_tabWidget->currentWidget()->size();
--- trunk/KDE/kdenetwork/krdc/mainwindow.h #1330195:1330196
@@ -71,7 +71,8 @@
     virtual void closeEvent(QCloseEvent *event);
     bool eventFilter(QObject *obj, QEvent *event); // checks for close events on fs window
     virtual void saveProperties(KConfigGroup &group);
-    void saveHostPrefs(RemoteView *view = 0);
+    void saveHostPrefs();
+    void saveHostPrefs(RemoteView *view);
 
 private slots:
     void restoreOpenSessions();
[prev in list] [next in list] [prev in thread] [next in thread]