Changeset 99142 in vbox for trunk/src/VBox

Timestamp:

Mar 23, 2023 12:50:41 PM (22 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10322: Runtime UI: Rework for UIMachine prepare/cleanup cascade; Initialize branding and guest screen data last, these update procedures can be reused after VM restart.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachine.cpp (modified) (7 diffs)
• UIMachine.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp

@@ -1470 +1470 @@
 
     /* Prepare VM related stuff: */
-    prepareBranding();
     prepareActions();
     prepareHostScreenData();
-    prepareGuestScreenData();
     prepareKeyboard();
     prepareClose();
     prepareVisualState();
+
+    /* Update VM related stuff: */
+    updateBranding();
+    updateGuestScreenData();
     enterInitialVisualState();
 
@@ -1563 +1565 @@
 }
 
-void UIMachine::prepareBranding()
-{
-    /* Create the icon dynamically: */
-    m_pMachineWindowIcon = new QIcon;
-    acquireUserMachineIcon(*m_pMachineWindowIcon);
-
-#ifndef VBOX_WS_MAC
-    /* Load user's machine-window name postfix: */
-    const QUuid uMachineID = uiCommon().managedVMUuid();
-    m_strMachineWindowNamePostfix = gEDataManager->machineWindowNamePostfix(uMachineID);
-#endif /* !VBOX_WS_MAC */
-}
-
 void UIMachine::prepareActions()
 {
@@ -1684 +1673 @@
 }
 
-void UIMachine::prepareGuestScreenData()
+void UIMachine::prepareKeyboard()
+{
+#if defined(VBOX_WS_MAC) || defined(VBOX_WS_WIN)
+    /* Load extra-data value: */
+    m_fIsHidLedsSyncEnabled = gEDataManager->hidLedsSyncState(uiCommon().managedVMUuid());
+    /* Connect to extra-data changes to be able to enable/disable feature dynamically: */
+    connect(gEDataManager, &UIExtraDataManager::sigHidLedsSyncStateChange,
+            this, &UIMachine::sltHidLedsSyncStateChanged);
+#endif /* VBOX_WS_MAC || VBOX_WS_WIN */
+}
+
+void UIMachine::prepareClose()
+{
+    /* What is the default close action and the restricted are? */
+    const QUuid uMachineID = uiCommon().managedVMUuid();
+    m_defaultCloseAction = gEDataManager->defaultMachineCloseAction(uMachineID);
+    m_restrictedCloseActions = gEDataManager->restrictedMachineCloseActions(uMachineID);
+}
+
+void UIMachine::prepareVisualState()
+{
+    /* Prepare async visual state type change handler: */
+    qRegisterMetaType<UIVisualStateType>();
+    connect(this, &UIMachine::sigRequestAsyncVisualStateChange,
+            this, &UIMachine::sltChangeVisualState,
+            Qt::QueuedConnection);
+
+    /* Load restricted visual states: */
+    UIVisualStateType enmRestrictedVisualStates = gEDataManager->restrictedVisualStates(uiCommon().managedVMUuid());
+    /* Acquire allowed visual states: */
+    m_enmAllowedVisualStates = static_cast<UIVisualStateType>(UIVisualStateType_All ^ enmRestrictedVisualStates);
+
+    /* Load requested visual state, it can override initial one: */
+    m_enmRequestedVisualState = gEDataManager->requestedVisualState(uiCommon().managedVMUuid());
+    /* Check if requested visual state is allowed: */
+    if (isVisualStateAllowed(m_enmRequestedVisualState))
+    {
+        switch (m_enmRequestedVisualState)
+        {
+            /* Direct transition allowed to scale/fullscreen modes only: */
+            case UIVisualStateType_Scale:
+            case UIVisualStateType_Fullscreen:
+                m_enmInitialVisualState = m_enmRequestedVisualState;
+                break;
+            default:
+                break;
+        }
+    }
+}
+
+void UIMachine::updateBranding()
+{
+    /* Create the icon dynamically: */
+    delete m_pMachineWindowIcon;
+    m_pMachineWindowIcon = new QIcon;
+    acquireUserMachineIcon(*m_pMachineWindowIcon);
+
+#ifndef VBOX_WS_MAC
+    /* Load user's machine-window name postfix: */
+    const QUuid uMachineID = uiCommon().managedVMUuid();
+    m_strMachineWindowNamePostfix = gEDataManager->machineWindowNamePostfix(uMachineID);
+#endif /* !VBOX_WS_MAC */
+}
+
+void UIMachine::updateGuestScreenData()
 {
     /* Accquire guest-screen count: */
@@ -1740 +1793 @@
 }
 
-void UIMachine::prepareKeyboard()
-{
-#if defined(VBOX_WS_MAC) || defined(VBOX_WS_WIN)
-    /* Load extra-data value: */
-    m_fIsHidLedsSyncEnabled = gEDataManager->hidLedsSyncState(uiCommon().managedVMUuid());
-    /* Connect to extra-data changes to be able to enable/disable feature dynamically: */
-    connect(gEDataManager, &UIExtraDataManager::sigHidLedsSyncStateChange,
-            this, &UIMachine::sltHidLedsSyncStateChanged);
-#endif /* VBOX_WS_MAC || VBOX_WS_WIN */
-}
-
-void UIMachine::prepareClose()
-{
-    /* What is the default close action and the restricted are? */
-    const QUuid uMachineID = uiCommon().managedVMUuid();
-    m_defaultCloseAction = gEDataManager->defaultMachineCloseAction(uMachineID);
-    m_restrictedCloseActions = gEDataManager->restrictedMachineCloseActions(uMachineID);
-}
-
-void UIMachine::prepareVisualState()
-{
-    /* Prepare async visual state type change handler: */
-    qRegisterMetaType<UIVisualStateType>();
-    connect(this, &UIMachine::sigRequestAsyncVisualStateChange,
-            this, &UIMachine::sltChangeVisualState,
-            Qt::QueuedConnection);
-
-    /* Load restricted visual states: */
-    UIVisualStateType enmRestrictedVisualStates = gEDataManager->restrictedVisualStates(uiCommon().managedVMUuid());
-    /* Acquire allowed visual states: */
-    m_enmAllowedVisualStates = static_cast<UIVisualStateType>(UIVisualStateType_All ^ enmRestrictedVisualStates);
-
-    /* Load requested visual state, it can override initial one: */
-    m_enmRequestedVisualState = gEDataManager->requestedVisualState(uiCommon().managedVMUuid());
-    /* Check if requested visual state is allowed: */
-    if (isVisualStateAllowed(m_enmRequestedVisualState))
-    {
-        switch (m_enmRequestedVisualState)
-        {
-            /* Direct transition allowed to scale/fullscreen modes only: */
-            case UIVisualStateType_Scale:
-            case UIVisualStateType_Fullscreen:
-                m_enmInitialVisualState = m_enmRequestedVisualState;
-                break;
-            default:
-                break;
-        }
-    }
-}
-
 void UIMachine::enterInitialVisualState()
 {
@@ -1799 +1802 @@
     /* Delete machine-logic if any: */
     UIMachineLogic::destroy(m_pMachineLogic);
+}
+
+void UIMachine::cleanupBranding()
+{
+    /* Cleanup machine-window icon: */
+    delete m_pMachineWindowIcon;
+    m_pMachineWindowIcon = 0;
 }
 
@@ -1822 +1832 @@
 }
 
-void UIMachine::cleanupBranding()
-{
-    /* Cleanup machine-window icon: */
-    delete m_pMachineWindowIcon;
-    m_pMachineWindowIcon = 0;
-}
-
 void UIMachine::cleanupSession()
 {
@@ -1848 +1851 @@
     /* Cleanup stuff: */
     cleanupMachineLogic();
+    cleanupBranding();
     cleanupHostScreenData();
     cleanupActions();
-    cleanupBranding();
     cleanupSession();
     cleanupNotificationCenter();

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.h

@@ -846 +846 @@
     /** Prepare routine: Session stuff. */
     bool prepareSession();
-    /** Prepare routine: Branding. */
-    void prepareBranding();
     /** Prepare routine: Actions stuff. */
     void prepareActions();
     /** Prepare routine: Host-screen data stuff. */
     void prepareHostScreenData();
-    /** Prepare routine: Guest-screen data stuff. */
-    void prepareGuestScreenData();
     /** Prepare routine: Keyboard stuff. */
     void prepareKeyboard();
@@ -861 +857 @@
     void prepareVisualState();
 
+    /** Update routine: Branding. */
+    void updateBranding();
+    /** Update routine: Guest screen data stuff. */
+    void updateGuestScreenData();
+
     /** Moves VM to initial state. */
     void enterInitialVisualState();
@@ -866 +867 @@
     /** Cleanup routine: Machine-logic stuff. */
     void cleanupMachineLogic();
+    /** Cleanup routine: Branding. */
+    void cleanupBranding();
     /** Cleanup routine: Host-screen data stuff. */
     void cleanupHostScreenData();
     /** Cleanup routine: Actions stuff. */
     void cleanupActions();
-    /** Cleanup routine: Branding. */
-    void cleanupBranding();
     /** Cleanup routine: Session stuff. */
     void cleanupSession();