Changeset 93476 in vbox for trunk/src

Timestamp:

Jan 28, 2022 2:16:22 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9371. Disable enable guest session dependent actions in th file manager menu.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPool.cpp (modified) (1 diff)
• guestctrl/UIFileManager.cpp (modified) (1 diff)
• guestctrl/UIFileManagerGuestTable.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp

@@ -3560 +3560 @@
     addAction(pMenu, action(UIActionIndex_M_FileManager_T_Operations));
     addAction(pMenu, action(UIActionIndex_M_FileManager_T_Log));
-    addAction(pMenu, action(UIActionIndex_M_FileManager_T_GuestSession));
 
     addAction(pMenu, action(UIActionIndex_M_FileManager_M_HostSubmenu));

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

@@ -488 +488 @@
         pTable->setIsCurrent(pTable == pCurrentGuestTable);
     }
+    /* Disable host file table if guest session is not running: */
     if (m_pHostFileTable)
         m_pHostFileTable->setEnabled(pCurrentGuestTable->isGuestSessionRunning());
+    /* Disable/enable file table submenus of the menu: */
+    UIMenu *pGuestSubmenu = m_pActionPool->action(UIActionIndex_M_FileManager_M_GuestSubmenu)->menu();
+    if (pGuestSubmenu)
+        pGuestSubmenu->setEnabled(pCurrentGuestTable->isGuestSessionRunning());
+    UIMenu *pHostSubmenu = m_pActionPool->action(UIActionIndex_M_FileManager_M_HostSubmenu)->menu();
+    if (pHostSubmenu)
+        pHostSubmenu->setEnabled(pCurrentGuestTable->isGuestSessionRunning());
 }
 

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

@@ -1391 +1391 @@
 void UIFileManagerGuestTable::setSessionDependentWidgetsEnabled()
 {
-    switch (m_enmState)
-    {
-        case State_InvalidMachineReference:
-        case State_MachineNotRunning:
-        case State_NoGuestAdditions:
-            setSessionWidgetsEnabled(false);
-            m_pWarningLabelContainer->setVisible(true);
-            if (m_pGuestSessionPanel)
-            {
-                m_pGuestSessionPanel->setEnabled(false);
-                m_pGuestSessionPanel->switchSessionCreateMode();
-            }
-            break;
-        case State_SessionPossible:
-            setSessionWidgetsEnabled(false);
-            m_pWarningLabelContainer->setVisible(true);
-            if (m_pGuestSessionPanel)
-            {
-                m_pGuestSessionPanel->setEnabled(true);
-                m_pGuestSessionPanel->switchSessionCreateMode();
-            }
-            break;
-        case State_SessionRunning:
-            setSessionWidgetsEnabled(true);
-            m_pWarningLabelContainer->setVisible(false);
-            if (m_pGuestSessionPanel)
-            {
-                m_pGuestSessionPanel->switchSessionCloseMode();
-                m_pGuestSessionPanel->setEnabled(true);
-            }
-            break;
-        default:
-            break;
-    }
+    /* Disable menu actions if guest session is not running: */
+    UIMenu *pGuestSubmenu = m_pActionPool->action(UIActionIndex_M_FileManager_M_GuestSubmenu)->menu();
+    if (pGuestSubmenu)
+        pGuestSubmenu->setEnabled(m_enmState == State_SessionRunning);
+    UIMenu *pHostSubmenu = m_pActionPool->action(UIActionIndex_M_FileManager_M_HostSubmenu)->menu();
+    if (pHostSubmenu)
+        pHostSubmenu->setEnabled(m_enmState == State_SessionRunning);
+
+    /*Manage the guest session (login) widget: */
+    if (m_pGuestSessionPanel)
+    {
+        m_pGuestSessionPanel->setEnabled(m_enmState == State_SessionPossible || m_enmState == State_SessionRunning);
+        if (m_enmState == State_SessionRunning)
+            m_pGuestSessionPanel->switchSessionCreateMode();
+        else
+            m_pGuestSessionPanel->switchSessionCloseMode();
+    }
+    /* Call to parent: */
+    setSessionWidgetsEnabled(m_enmState == State_SessionRunning);
+
+    if (m_pWarningLabelContainer)
+        m_pWarningLabelContainer->setVisible(m_enmState != State_SessionRunning);
+
     emit sigStateChanged(m_enmState == State_SessionRunning);
 }