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

Timestamp:

Sep 27, 2017 10:13:19 AM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Indicators pool: Video Capture indicator: Make sure rotating animation is paused when the VM is paused.

Location:

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

Files:

• UIIndicatorsPool.cpp (modified) (5 diffs)
• normal/UIMachineWindowNormal.cpp (modified) (2 diffs)

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

@@ -815 +815 @@
     {
         UIIndicatorStateVideoCapture_Disabled = 0,
-        UIIndicatorStateVideoCapture_Enabled  = 1
+        UIIndicatorStateVideoCapture_Enabled  = 1,
+        UIIndicatorStateVideoCapture_Paused   = 2
     };
 
@@ -829 +830 @@
         setStateIcon(UIIndicatorStateVideoCapture_Disabled, UIIconPool::iconSet(":/video_capture_16px.png"));
         setStateIcon(UIIndicatorStateVideoCapture_Enabled,  UIIconPool::iconSet(":/movie_reel_16px.png"));
+        setStateIcon(UIIndicatorStateVideoCapture_Paused,   UIIconPool::iconSet(":/movie_reel_16px.png"));
         /* Create *enabled* state animation: */
         m_pAnimation = UIAnimationLoop::installAnimationLoop(this, "rotationAngle",
@@ -851 +853 @@
             case UIIndicatorStateVideoCapture_Enabled:
                 m_pAnimation->start();
+                break;
+            case UIIndicatorStateVideoCapture_Paused:
+                m_pAnimation->stop();
                 break;
             default:
@@ -888 +893 @@
         /* Get machine: */
         const CMachine machine = m_pSession->machine();
+        const bool fMachinePaused = m_pSession->isPaused();
 
         /* Update indicator state early: */
-        setState(machine.GetVideoCaptureEnabled());
+        if (!machine.GetVideoCaptureEnabled())
+            setState(UIIndicatorStateVideoCapture_Disabled);
+        else if (!fMachinePaused)
+            setState(UIIndicatorStateVideoCapture_Enabled);
+        else
+            setState(UIIndicatorStateVideoCapture_Paused);
 
         /* Prepare tool-tip: */
@@ -906 +917 @@
             }
             case UIIndicatorStateVideoCapture_Enabled:
+            case UIIndicatorStateVideoCapture_Paused:
             {
                 strFullData += s_strTableRow2

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

@@ -71 +71 @@
 
     /* Update indicator-pool and virtualization stuff: */
-    updateAppearanceOf(UIVisualElement_IndicatorPoolStuff | UIVisualElement_FeaturesStuff);
+    updateAppearanceOf(UIVisualElement_IndicatorPoolStuff | UIVisualElement_VideoCapture | UIVisualElement_FeaturesStuff);
 }
 
@@ -611 +611 @@
     if (iElement & UIVisualElement_IndicatorPoolStuff)
         m_pIndicatorsPool->setAutoUpdateIndicatorStates(statusBar()->isVisible() && uisession()->isRunning());
-    /* Update status-bar indicator-pool appearance only when status-bar is visible and VM is running: */
-    if (statusBar()->isVisible() && uisession()->isRunning())
-    {
-        if (iElement & UIVisualElement_HDStuff)
-            m_pIndicatorsPool->updateAppearance(IndicatorType_HardDisks);
-        if (iElement & UIVisualElement_CDStuff)
-            m_pIndicatorsPool->updateAppearance(IndicatorType_OpticalDisks);
-        if (iElement & UIVisualElement_FDStuff)
-            m_pIndicatorsPool->updateAppearance(IndicatorType_FloppyDisks);
-        if (iElement & UIVisualElement_AudioStuff)
-            m_pIndicatorsPool->updateAppearance(IndicatorType_Audio);
-        if (iElement & UIVisualElement_NetworkStuff)
-            m_pIndicatorsPool->updateAppearance(IndicatorType_Network);
-        if (iElement & UIVisualElement_USBStuff)
-            m_pIndicatorsPool->updateAppearance(IndicatorType_USB);
-        if (iElement & UIVisualElement_SharedFolderStuff)
-            m_pIndicatorsPool->updateAppearance(IndicatorType_SharedFolders);
-        if (iElement & UIVisualElement_Display)
-            m_pIndicatorsPool->updateAppearance(IndicatorType_Display);
-        if (iElement & UIVisualElement_VideoCapture)
-            m_pIndicatorsPool->updateAppearance(IndicatorType_VideoCapture);
-        if (iElement & UIVisualElement_FeaturesStuff)
-            m_pIndicatorsPool->updateAppearance(IndicatorType_Features);
+    /* Update status-bar indicator-pool appearance only when status-bar is visible: */
+    if (statusBar()->isVisible())
+    {
+        /* If VM is running: */
+        if (uisession()->isRunning())
+        {
+            if (iElement & UIVisualElement_HDStuff)
+                m_pIndicatorsPool->updateAppearance(IndicatorType_HardDisks);
+            if (iElement & UIVisualElement_CDStuff)
+                m_pIndicatorsPool->updateAppearance(IndicatorType_OpticalDisks);
+            if (iElement & UIVisualElement_FDStuff)
+                m_pIndicatorsPool->updateAppearance(IndicatorType_FloppyDisks);
+            if (iElement & UIVisualElement_AudioStuff)
+                m_pIndicatorsPool->updateAppearance(IndicatorType_Audio);
+            if (iElement & UIVisualElement_NetworkStuff)
+                m_pIndicatorsPool->updateAppearance(IndicatorType_Network);
+            if (iElement & UIVisualElement_USBStuff)
+                m_pIndicatorsPool->updateAppearance(IndicatorType_USB);
+            if (iElement & UIVisualElement_SharedFolderStuff)
+                m_pIndicatorsPool->updateAppearance(IndicatorType_SharedFolders);
+            if (iElement & UIVisualElement_Display)
+                m_pIndicatorsPool->updateAppearance(IndicatorType_Display);
+            if (iElement & UIVisualElement_FeaturesStuff)
+                m_pIndicatorsPool->updateAppearance(IndicatorType_Features);
+        }
+        /* If VM is running or paused: */
+        if (uisession()->isRunning() || uisession()->isPaused())
+        {
+            if (iElement & UIVisualElement_VideoCapture)
+                m_pIndicatorsPool->updateAppearance(IndicatorType_VideoCapture);
+        }
     }
 }