Changeset 98489 in vbox

Timestamp:

Feb 7, 2023 11:45:36 AM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10322: Runtime UI: Reworking UIIndicatorsPool recording indicator to move COM related logic to UISession; Including small build fix for r155754.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIDetailsGenerator.cpp (modified) (1 diff)
• globals/UIDetailsGenerator.h (modified) (1 diff)
• runtime/UIIndicatorsPool.cpp (modified) (6 diffs)
• runtime/UIMachine.cpp (modified) (1 diff)
• runtime/UIMachine.h (modified) (1 diff)
• runtime/UISession.cpp (modified) (1 diff)
• runtime/UISession.h (modified) (1 diff)

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

@@ -1420 +1420 @@
     }
 }
+
+void UIDetailsGenerator::acquireRecordingStatusInfo(CMachine &comMachine, QString &strInfo,
+                                                    bool &fRecordingEnabled)
+{
+    /* Get recording settings: */
+    CRecordingSettings comRecordingSettings = comMachine.GetRecordingSettings();
+    fRecordingEnabled = comRecordingSettings.GetEnabled();
+    if (fRecordingEnabled)
+    {
+        /* For now all screens have the same config: */
+        CRecordingScreenSettings comRecordingScreen0Settings = comRecordingSettings.GetScreenSettings(0);
+        const bool fVideoEnabled = comRecordingScreen0Settings.IsFeatureEnabled(KRecordingFeature_Video);
+        const bool fAudioEnabled = comRecordingScreen0Settings.IsFeatureEnabled(KRecordingFeature_Audio);
+
+        /* Compose tool-tip: */
+        QString strToolTip;
+        if (fVideoEnabled && fAudioEnabled)
+            strToolTip = QApplication::translate("UIIndicatorsPool", "Video/audio recording file", "Recording tooltip");
+        else if (fAudioEnabled)
+            strToolTip = QApplication::translate("UIIndicatorsPool", "Audio recording file", "Recording tooltip");
+        else if (fVideoEnabled)
+            strToolTip = QApplication::translate("UIIndicatorsPool", "Video recording file", "Recording tooltip");
+        strInfo += e_strTableRow2
+            .arg(strToolTip)
+            .arg(comRecordingScreen0Settings.GetFilename());
+    }
+    /* Handle 'no-recording' case: */
+    else
+    {
+        strInfo += e_strTableRow1
+            .arg(QApplication::translate("UIIndicatorsPool", "Recording disabled", "Recording tooltip"));
+    }
+}

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDetailsGenerator.h

@@ -108 +108 @@
                                                        bool &fAcceleration3D);
 
+    SHARED_LIBRARY_STUFF void acquireRecordingStatusInfo(CMachine &comMachine, QString &strInfo,
+                                                         bool &fRecordingEnabled);
+
     /** Holds the table row format 1. */
     extern const QString e_strTableRow1;

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

@@ -30 +30 @@
 #include <QHBoxLayout>
 #include <QPainter>
+#include <QStyle>
 #include <QTimer>
 
@@ -46 +47 @@
 
 /* COM includes: */
-#include "CRecordingSettings.h"
-#include "CRecordingScreenSettings.h"
 #include "CMachine.h"
 #include "CMachineDebugger.h"
@@ -567 +566 @@
     };
 
-    /** Recording modes. */
-    enum UIIndicatorStateRecordingMode
-    {
-        UIIndicatorStateRecordingMode_None  = RT_BIT(0),
-        UIIndicatorStateRecordingMode_Video = RT_BIT(1),
-        UIIndicatorStateRecordingMode_Audio = RT_BIT(2)
-    };
-
-public:
-
-    /** Constructor, passes @a pSession to the UISessionStateStatusBarIndicator constructor. */
+public:
+
+    /** Constructs indicator passing @a pMachine to the base-class. */
     UIIndicatorRecording(UIMachine *pMachine, UISession *pSession)
         : UISessionStateStatusBarIndicator(IndicatorType_Recording, pMachine, pSession)
         , m_pAnimation(0)
         , m_dRotationAngle(0)
-        , m_enmRecordingMode(UIIndicatorStateRecordingMode_None)
     {
         /* Assign state-icons: */
@@ -648 +638 @@
     void updateAppearance()
     {
-        /* Get machine: */
-        const CMachine comMachine = m_pSession->machine();
-        const bool fMachinePaused = m_pSession->isPaused();
-
-        /* Update indicator state early: */
-        CRecordingSettings comRecordingSettings = comMachine.GetRecordingSettings();
-        Assert(comRecordingSettings.isOk());
-        if (!comRecordingSettings.GetEnabled())
+        QString strFullData;
+        bool fRecordingEnabled = false;
+        bool fMachinePaused = false;
+        m_pMachine->acquireRecordingStatusInfo(strFullData, fRecordingEnabled, fMachinePaused);
+
+        /* Update tool-tip: */
+        setToolTip(s_strTable.arg(strFullData));
+        /* Set initial indicator state: */
+        if (!fRecordingEnabled)
             setState(UIIndicatorStateRecording_Disabled);
         else if (!fMachinePaused)
@@ -661 +652 @@
         else
             setState(UIIndicatorStateRecording_Paused);
-
-        updateRecordingMode();
-
-        /* Prepare tool-tip: */
-        QString strFullData;
-        switch (state())
-        {
-            case UIIndicatorStateRecording_Disabled:
-            {
-                strFullData += s_strTableRow1
-                    .arg(QApplication::translate("UIIndicatorsPool", "Recording disabled", "Recording tooltip"));
-                break;
-            }
-            case UIIndicatorStateRecording_Enabled:
-            case UIIndicatorStateRecording_Paused:
-            {
-                QString strToolTip;
-                if (   m_enmRecordingMode & UIIndicatorStateRecordingMode_Audio
-                    && m_enmRecordingMode & UIIndicatorStateRecordingMode_Video)
-                    strToolTip = QApplication::translate("UIIndicatorsPool", "Video/audio recording file", "Recording tooltip");
-                else if (m_enmRecordingMode & UIIndicatorStateRecordingMode_Audio)
-                    strToolTip = QApplication::translate("UIIndicatorsPool", "Audio recording file", "Recording tooltip");
-                else if (m_enmRecordingMode & UIIndicatorStateRecordingMode_Video)
-                    strToolTip = QApplication::translate("UIIndicatorsPool", "Video recording file", "Recording tooltip");
-
-                /* For now all screens have the same config: */
-                CRecordingScreenSettings comRecordingScreen0Settings = comRecordingSettings.GetScreenSettings(0);
-                Assert(comRecordingScreen0Settings.isOk());
-
-                strFullData += s_strTableRow2
-                    .arg(strToolTip)
-                    .arg(comRecordingScreen0Settings.GetFilename());
-                break;
-            }
-            default:
-                break;
-        }
-
-        /* Update tool-tip: */
-        setToolTip(s_strTable.arg(strFullData));
     }
 
@@ -712 +663 @@
     void setRotationAngle(double dRotationAngle) { m_dRotationAngle = dRotationAngle; update(); }
 
-    /* Parses RecordScreenSettings::Options and updates m_enmRecordingMode accordingly. */
-    void updateRecordingMode()
-    {
-        m_enmRecordingMode = UIIndicatorStateRecordingMode_None;
-
-        /* Get machine: */
-        if (!m_pSession)
-            return;
-        const CMachine comMachine = m_pSession->machine();
-        if (comMachine.isNull())
-            return;
-
-        CRecordingSettings comRecordingSettings = comMachine.GetRecordingSettings();
-        /* For now all screens have the same config: */
-        CRecordingScreenSettings recordingScreen0Settings = comRecordingSettings.GetScreenSettings(0);
-        if (recordingScreen0Settings.IsFeatureEnabled(KRecordingFeature_Video))
-            m_enmRecordingMode = (UIIndicatorStateRecordingMode)((int)m_enmRecordingMode | (int)UIIndicatorStateRecordingMode_Video);
-
-        if (recordingScreen0Settings.IsFeatureEnabled(KRecordingFeature_Audio))
-            m_enmRecordingMode = (UIIndicatorStateRecordingMode)((int)m_enmRecordingMode | (int)UIIndicatorStateRecordingMode_Audio);
-    }
-
     /** Holds the rotation animation instance. */
     UIAnimationLoop *m_pAnimation;
     /** Holds current rotation angle. */
-    double m_dRotationAngle;
-
-    /** Holds the recording mode. */
-    UIIndicatorStateRecordingMode m_enmRecordingMode;
+    double  m_dRotationAngle;
 };
 

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

@@ -486 +486 @@
 {
     uisession()->acquireDisplayStatusInfo(strInfo, fAcceleration3D);
+}
+
+void UIMachine::acquireRecordingStatusInfo(QString &strInfo, bool &fRecordingEnabled, bool &fMachinePaused)
+{
+    uisession()->acquireRecordingStatusInfo(strInfo, fRecordingEnabled, fMachinePaused);
 }
 

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

@@ -395 +395 @@
         /** Acquires status info for Display indicator. */
         void acquireDisplayStatusInfo(QString &strInfo, bool &fAcceleration3D);
+        /** Acquires status info for Recording indicator. */
+        void acquireRecordingStatusInfo(QString &strInfo, bool &fRecordingEnabled, bool &fMachinePaused);
     /** @} */
 

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

@@ -365 +365 @@
     CMachine comMachine = machine();
     UIDetailsGenerator::acquireDisplayStatusInfo(comMachine, strInfo, fAcceleration3D);
+}
+
+void UISession::acquireRecordingStatusInfo(QString &strInfo, bool &fRecordingEnabled, bool &fMachinePaused)
+{
+    CMachine comMachine = machine();
+    fMachinePaused = isPaused();
+    UIDetailsGenerator::acquireRecordingStatusInfo(comMachine, strInfo, fRecordingEnabled);
 }
 

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

@@ -281 +281 @@
         /** Acquires status info for Display indicator. */
         void acquireDisplayStatusInfo(QString &strInfo, bool &fAcceleration3D);
+        /** Acquires status info for Recording indicator. */
+        void acquireRecordingStatusInfo(QString &strInfo, bool &fRecordingEnabled, bool &fMachinePaused);
     /** @} */