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

Timestamp:

Jun 26, 2013 6:42:59 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Video Capture LED: More precise enable/disable Main API errors handling.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIMessageCenter.h (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (1 diff)
• runtime/UISession.h (modified) (1 diff)

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

@@ -1988 +1988 @@
               tr("Failed to disable the remote desktop server for the virtual machine <b>%1</b>.").arg(strMachineName),
           formatErrorInfo(server));
+}
+
+void UIMessageCenter::cannotToggleVideoCapture(const CMachine &machine, bool fEnable)
+{
+    /* Get machine-name preserving error-info: */
+    QString strMachineName(CMachine(machine).GetName());
+    error(0, MessageType_Error,
+          fEnable ?
+              tr("Failed to enable the video capture for the virtual machine <b>%1</b>.").arg(strMachineName) :
+              tr("Failed to disable the video capture for the virtual machine <b>%1</b>.").arg(strMachineName),
+          formatErrorInfo(machine));
 }
 

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

@@ -299 +299 @@
     void cannotDetachUSBDevice(const CVirtualBoxErrorInfo &errorInfo, const QString &strDevice, const QString &strMachineName) const;
     void cannotToggleVRDEServer(const CVRDEServer &server, const QString &strMachineName, bool fEnable);
+    void cannotToggleVideoCapture(const CMachine &machine, bool fEnable);
     void remindAboutGuestAdditionsAreNotActive() const;
 

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

@@ -1946 +1946 @@
         return;
 
+    /* Access machine: */
+    CMachine machine = session().GetMachine();
+    AssertMsg(!machine.isNull(), ("Machine should NOT be null!\n"));
+    if (machine.isNull())
+        return;
+
     /* Make sure something had changed: */
-    CMachine machine = session().GetMachine();
     if (machine.GetVideoCaptureEnabled() == static_cast<BOOL>(fEnabled))
         return;
 
+    /* Update Video Capture state: */
+    AssertMsg(machine.isOk(), ("Machine should be OK!\n"));
+    machine.SetVideoCaptureEnabled(fEnabled);
+    /* Machine is not OK? */
+    if (!machine.isOk())
+    {
+        /* Notify about the error: */
+        msgCenter().cannotToggleVideoCapture(machine, fEnabled);
+        /* Make sure action is updated! */
+        uisession()->updateStatusVideoCapture();
+    }
     /* Machine is OK? */
-    if (machine.isOk())
-    {
-        /* Update Video Capture state: */
-        machine.SetVideoCaptureEnabled(fEnabled);
-        /* Machine still OK? */
-        if (machine.isOk())
-        {
-            /* Save machine-settings: */
-            machine.SaveSettings();
-        }
-    }
-    /* Machine had failed on one of steps? */
-    if (!machine.isOk())
-        msgCenter().cannotSaveMachineSettings(machine);
+    else
+    {
+        /* Save machine-settings: */
+        machine.SaveSettings();
+        /* Machine is not OK? */
+        if (!machine.isOk())
+        {
+            /* Notify about the error: */
+            msgCenter().cannotSaveMachineSettings(machine);
+            /* Make sure action is updated! */
+            uisession()->updateStatusVideoCapture();
+        }
+    }
 }
 

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

@@ -168 +168 @@
     void setFrameBuffer(ulong uScreenId, UIFrameBuffer* pFrameBuffer);
 
-    /* Temporary API: VRDE stuff: */
+    /* Temporary API: */
     void updateStatusVRDE() { sltVRDEChange(); }
+    void updateStatusVideoCapture() { sltVideoCaptureChange(); }
 
 signals: