Changeset 92884 in vbox for trunk/src/VBox/Frontends

Timestamp:

Dec 13, 2021 1:46:35 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

148835

Message:

FE/Qt: bugref:9371. More session management stuff for file manager.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl

Files:

• UIFileManagerGuestTable.cpp (modified) (11 diffs)
• UIFileManagerGuestTable.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.cpp

@@ -247 +247 @@
     m_fMarkedForError = fMarkForError;
 
-        if (m_pUserNameEdit)
-        {
-            QPalette mPalette = m_pUserNameEdit->palette();
-            if (m_fMarkedForError)
-                mPalette.setColor(QPalette::Base, m_errorBaseColor);
-            else
-                mPalette.setColor(QPalette::Base, m_defaultBaseColor);
-            m_pUserNameEdit->setPalette(mPalette);
-        }
-        if (m_pPasswordEdit)
-        {
-            QPalette mPalette = m_pPasswordEdit->palette();
-            if (m_fMarkedForError)
-                mPalette.setColor(QPalette::Base, m_errorBaseColor);
-            else
-                mPalette.setColor(QPalette::Base, m_defaultBaseColor);
-            m_pPasswordEdit->setPalette(mPalette);
-        }
+    if (m_pUserNameEdit)
+    {
+        QPalette mPalette = m_pUserNameEdit->palette();
+        if (m_fMarkedForError)
+            mPalette.setColor(QPalette::Base, m_errorBaseColor);
+        else
+            mPalette.setColor(QPalette::Base, m_defaultBaseColor);
+        m_pUserNameEdit->setPalette(mPalette);
+    }
+    if (m_pPasswordEdit)
+    {
+        QPalette mPalette = m_pPasswordEdit->palette();
+        if (m_fMarkedForError)
+            mPalette.setColor(QPalette::Base, m_errorBaseColor);
+        else
+            mPalette.setColor(QPalette::Base, m_defaultBaseColor);
+        m_pPasswordEdit->setPalette(mPalette);
+    }
 }
 
@@ -1204 +1204 @@
 }
 
-void UIFileManagerGuestTable::postGuestSessionCreated()
-{
-    if (m_pGuestSessionPanel)
-        m_pGuestSessionPanel->switchSessionCloseMode();
-}
-
-void UIFileManagerGuestTable::postGuestSessionClosed()
-{
-    if (m_pGuestSessionPanel)
-        m_pGuestSessionPanel->switchSessionCreateMode();
-}
-
 void UIFileManagerGuestTable::prepareListener(ComObjPtr<UIMainEventListenerImpl> &QtListener,
                                               CEventListener &comEventListener,
@@ -1258 +1246 @@
     {
         m_comGuestSession.detach();
-        postGuestSessionClosed();
         emit sigLogOutput("Guest session unregistered", m_strTableName, FileManagerLogType_Info);
     }
@@ -1279 +1266 @@
     if (m_comGuestSession.isOk())
     {
+        emit sigLogOutput(QString("%1: %2").arg("Guest session status has changed").arg(gpConverter->toString(m_comGuestSession.GetStatus())),
+                  m_strTableName, FileManagerLogType_Info);
+
         if (m_comGuestSession.GetStatus() == KGuestSessionStatus_Started)
             initFileTable();
-        emit sigLogOutput(QString("%1: %2").arg("Guest session status has changed").arg(gpConverter->toString(m_comGuestSession.GetStatus())),
-                  m_strTableName, FileManagerLogType_Info);
+        else
+        {
+            cleanupGuestSessionListener();
+            closeGuestSession();
+        }
     }
     else
         emit sigLogOutput("Guest session is not valid", m_strTableName, FileManagerLogType_Error);
-    postGuestSessionCreated();
     setStateAndEnableWidgets();
 }
@@ -1337 +1329 @@
 void UIFileManagerGuestTable::sltHandleCloseSessionRequest()
 {
+    cleanupGuestSessionListener();
     closeGuestSession();
 }
@@ -1362 +1355 @@
             m_pWarningLabel->setVisible(true);
             m_pGuestSessionPanel->setEnabled(false);
+            if (m_pGuestSessionPanel)
+                m_pGuestSessionPanel->switchSessionCreateMode();
             break;
         case State_SessionPossible:
@@ -1367 +1362 @@
             m_pWarningLabel->setVisible(true);
             m_pGuestSessionPanel->setEnabled(true);
+            if (m_pGuestSessionPanel)
+                m_pGuestSessionPanel->switchSessionCreateMode();
             break;
         case State_SessionRunning:
@@ -1372 +1369 @@
             m_pWarningLabel->setVisible(false);
             m_pGuestSessionPanel->setEnabled(true);
+            if (m_pGuestSessionPanel)
+                m_pGuestSessionPanel->switchSessionCloseMode();
             break;
         default:
@@ -1389 +1388 @@
     {
         emit sigLogOutput("Could not find Guest Additions", m_strTableName, FileManagerLogType_Error);
-        postGuestSessionClosed();
         if (m_pGuestSessionPanel)
             m_pGuestSessionPanel->markForError(true);
@@ -1415 +1413 @@
             this, &UIFileManagerGuestTable::sltGuestSessionStateChanged);
 
+    if (m_comGuestSession.GetStatus() != KGuestSessionStatus_Started ||
+        m_comGuestSession.GetStatus() != KGuestSessionStatus_Starting)
+        return false;
     return true;
 }
@@ -1420 +1421 @@
 void UIFileManagerGuestTable::closeGuestSession()
 {
-    cleanupGuestSessionListener();
     if (!m_comGuestSession.isNull())
+    {
         m_comGuestSession.Close();
-    // if (!m_comGuestSession.isNull())
-    // {
-    //     m_comGuestSession.Close();
-    //     m_comGuestSession.detach();
-    //     emit sigLogOutput("Guest session is closed", m_strTableName, FileManagerLogType_Info);
-    // }
-    // reset();
-    // postGuestSessionClosed();
+        m_comGuestSession.detach();
+        emit sigLogOutput("Guest session is closed", m_strTableName, FileManagerLogType_Info);
+    }
+    reset();
 }
 
 void UIFileManagerGuestTable::cleanAll()
 {
-    printf("UIFileManagerGuestTable::cleanAll()\n");
-
     cleanupConsoleListener();
     cleanupGuestListener();

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.h

@@ -140 +140 @@
     void setStateAndEnableWidgets();
 
-    /** @name Perform operations needed after creating/ending a guest control session
-      * @{ */
-        void postGuestSessionCreated();
-        void postGuestSessionClosed();
-    /** @} */
-
     void initFileTable();
     void cleanAll();