Changeset 53050 in vbox for trunk

Timestamp:

Oct 13, 2014 6:10:56 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI rework/cleanup for 7115 (part #20): Indicator-pool: Fixing few other assertions on machine power-off.

Location:

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

Files:

• UIIndicatorsPool.cpp (modified) (6 diffs)
• UIMachineDefs.h (modified) (1 diff)
• UIMachineWindow.cpp (modified) (1 diff)
• normal/UIMachineWindowNormal.cpp (modified) (2 diffs)

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

@@ -315 +315 @@
 
     /** Constructor, passes @a session to the UISessionStateStatusBarIndicator constructor. */
-    UIIndicatorNetwork(CSession &session)
-        : UISessionStateStatusBarIndicator(session)
+    UIIndicatorNetwork(UISession *pSession)
+        : UISessionStateStatusBarIndicator(pSession->session())
+        , m_pSession(pSession)
         , m_pTimerAutoUpdate(0)
     {
@@ -324 +325 @@
         setStateIcon(KDeviceActivity_Writing, UIIconPool::iconSet(":/nw_write_16px.png"));
         setStateIcon(KDeviceActivity_Null,    UIIconPool::iconSet(":/nw_disabled_16px.png"));
+        /* Configure machine state-change listener: */
+        connect(m_pSession, SIGNAL(sigMachineStateChange()),
+                this, SLOT(sltHandleMachineStateChange()));
         /* Create auto-update timer: */
         m_pTimerAutoUpdate = new QTimer(this);
@@ -330 +334 @@
             /* Configure auto-update timer: */
             connect(m_pTimerAutoUpdate, SIGNAL(timeout()), SLOT(sltUpdateNetworkIPs()));
-            m_pTimerAutoUpdate->start(5000);
+            /* Start timer immediately if machine is running: */
+            sltHandleMachineStateChange();
         }
         /* Translate finally: */
@@ -337 +342 @@
 
 private slots:
+
+    /** Updates auto-update timer depending on machine state. */
+    void sltHandleMachineStateChange()
+    {
+        if (m_pSession->machineState() == KMachineState_Running)
+        {
+            /* Start auto-update timer otherwise: */
+            m_pTimerAutoUpdate->start(5000);
+            return;
+        }
+        /* Stop auto-update timer otherwise: */
+        m_pTimerAutoUpdate->stop();
+    }
 
     /** Updates network IP addresses. */
@@ -425 +443 @@
     }
 
+    /** Holds the session UI reference. */
+    UISession *m_pSession;
     /** Holds the auto-update timer instance. */
     QTimer *m_pTimerAutoUpdate;
@@ -1228 +1248 @@
                 case IndicatorType_OpticalDisks:      m_pool[indicatorType] = new UIIndicatorOpticalDisks(m_session);  break;
                 case IndicatorType_FloppyDisks:       m_pool[indicatorType] = new UIIndicatorFloppyDisks(m_session);   break;
-                case IndicatorType_Network:           m_pool[indicatorType] = new UIIndicatorNetwork(m_session);       break;
+                case IndicatorType_Network:           m_pool[indicatorType] = new UIIndicatorNetwork(m_pSession);       break;
                 case IndicatorType_USB:               m_pool[indicatorType] = new UIIndicatorUSB(m_session);           break;
                 case IndicatorType_SharedFolders:     m_pool[indicatorType] = new UIIndicatorSharedFolders(m_session); break;

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

@@ -26 +26 @@
     UIVisualElement_WindowTitle           = RT_BIT(0),
     UIVisualElement_MouseIntegrationStuff = RT_BIT(1),
-    UIVisualElement_PauseStuff            = RT_BIT(2),
+    UIVisualElement_IndicatorPoolStuff    = RT_BIT(2),
     UIVisualElement_HDStuff               = RT_BIT(3),
     UIVisualElement_CDStuff               = RT_BIT(4),

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

@@ -271 +271 @@
     pEvent->ignore();
 
-    /* If VM process is running separately, then leave it alone and close UI: */
-    if (vboxGlobal().isSeparateProcess())
-    {
-        uisession()->closeRuntimeUI();
-        return;
-    }
-
     /* Make sure machine is in one of the allowed states: */
     if (!uisession()->isRunning() && !uisession()->isPaused() && !uisession()->isStuck())

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

@@ -68 +68 @@
     UIMachineWindow::sltMachineStateChanged();
 
-    /* Update pause and virtualization stuff: */
-    updateAppearanceOf(UIVisualElement_PauseStuff | UIVisualElement_FeaturesStuff);
+    /* Update indicator-pool and virtualization stuff: */
+    updateAppearanceOf(UIVisualElement_IndicatorPoolStuff | UIVisualElement_FeaturesStuff);
 }
 
@@ -507 +507 @@
 
     /* Update machine window content: */
-    if (iElement & UIVisualElement_PauseStuff)
-    {
-        if (!statusBar()->isHidden())
-        {
-            if (uisession()->isPaused())
-                m_pIndicatorsPool->setAutoUpdateIndicatorStates(false);
-            else if (uisession()->isRunning())
-                m_pIndicatorsPool->setAutoUpdateIndicatorStates(statusBar()->isVisible());
-        }
-    }
+    if (iElement & UIVisualElement_IndicatorPoolStuff)
+        m_pIndicatorsPool->setAutoUpdateIndicatorStates(statusBar()->isVisible() && uisession()->isRunning());
     if (iElement & UIVisualElement_HDStuff)
         m_pIndicatorsPool->updateAppearance(IndicatorType_HardDisks);