Changeset 46586 in vbox for trunk

Timestamp:

Jun 17, 2013 12:52:13 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Check for VRDE server enable/disable API errors; Make sure corresponding action is synchronized with actual server state on API errors.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (2 diffs)
• 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

@@ -62 +62 @@
 #include "CExtPackFile.h"
 #include "CHostNetworkInterface.h"
+#include "CVRDEServer.h"
 #ifdef VBOX_WITH_DRAG_AND_DROP
 # include "CGuest.h"
@@ -1978 +1979 @@
              .arg(strDevice, strMachineName),
           formatErrorInfo(errorInfo));
+}
+
+void UIMessageCenter::cannotToggleVRDEServer(const CVRDEServer &server, const QString &strMachineName, bool fEnable)
+{
+    error(0, MessageType_Error,
+          fEnable ?
+              tr("Failed to enable the remote desktop server for the virtual machine <b>%1</b>.").arg(strMachineName) :
+              tr("Failed to disable the remote desktop server for the virtual machine <b>%1</b>.").arg(strMachineName),
+          formatErrorInfo(server));
 }
 

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

@@ -298 +298 @@
     void cannotDetachUSBDevice(const CConsole &console, const QString &strDevice) const;
     void cannotDetachUSBDevice(const CVirtualBoxErrorInfo &errorInfo, const QString &strDevice, const QString &strMachineName) const;
+    void cannotToggleVRDEServer(const CVRDEServer &server, const QString &strMachineName, bool fEnable);
     void remindAboutGuestAdditionsAreNotActive() const;
 

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

@@ -1892 +1892 @@
 void UIMachineLogic::sltSwitchVrde(bool fOn)
 {
-    /* Enable VRDE server if possible: */
-    CVRDEServer server = session().GetMachine().GetVRDEServer();
+    /* Prepare variables: */
+    CMachine machine = session().GetMachine();
+    CVRDEServer server = machine.GetVRDEServer();
     AssertMsg(!server.isNull(), ("VRDE server should not be null!\n"));
+
+    /* Toggle VRDE server state: */
     server.SetEnabled(fOn);
+    if (!server.isOk())
+    {
+        /* Notify about the error: */
+        msgCenter().cannotToggleVRDEServer(server, machine.GetName(), fOn);
+        /* Make sure action is updated! */
+        uisession()->updateStatusVRDE();
+    }
 }
 

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

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