Changeset 98726 in vbox

Timestamp:

Feb 24, 2023 3:12:29 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

156027

Message:

FE/Qt: bugref:10322: Runtime UI: Reworking CMachine wrapper usage step-by-step; VRDE server stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• notificationcenter/UINotificationObjects.cpp (modified) (1 diff)
• notificationcenter/UINotificationObjects.h (modified) (1 diff)
• runtime/UIMachine.cpp (modified) (3 diffs)
• runtime/UIMachine.h (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (1 diff)
• runtime/UISession.cpp (modified) (2 diffs)
• runtime/UISession.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.cpp

@@ -776 +776 @@
         QApplication::translate("UIMessageCenter", "Failed to acquire emulated USB parameter.") +
         UIErrorString::formatErrorInfo(comDispatcher));
+}
+
+/* static */
+void UINotificationMessage::cannotAcquireVRDEServerParameter(const CVRDEServer &comServer)
+{
+    createMessage(
+        QApplication::translate("UIMessageCenter", "VRDE server failure ..."),
+        QApplication::translate("UIMessageCenter", "Failed to acquire VRDE server parameter.") +
+        UIErrorString::formatErrorInfo(comServer));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.h

@@ -332 +332 @@
           * @param  comDispatcher  Brings the object parameter get acquired from. */
         static void cannotAcquireEmulatedUSBParameter(const CEmulatedUSB &comDispatcher);
+        /** Notifies about inability to acquire IVRDEServer parameter.
+          * @param  comServer  Brings the object parameter get acquired from. */
+        static void cannotAcquireVRDEServerParameter(const CVRDEServer &comServer);
         /** Notifies about inability to acquire IVirtualSystemDescription parameter.
           * @param  comVsd  Brings the object parameter get acquired from. */

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

@@ -281 +281 @@
 {
     /* Make sure VRDE server present: */
-    const CVRDEServer comServer = uisession()->machine().GetVRDEServer();
-    AssertMsgReturnVoid(uisession()->machine().isOk() && comServer.isNotNull(),
+    bool fServerPresent = false;
+    acquireWhetherVRDEServerPresent(fServerPresent);
+    AssertMsgReturnVoid(fServerPresent,
                         ("VRDE server can't be null!\n"));
 
     /* Check/Uncheck VRDE Server action depending on feature status: */
+    bool fServerEnabled = false;
+    acquireWhetherVRDEServerEnabled(fServerEnabled);
     actionPool()->action(UIActionIndexRT_M_View_T_VRDEServer)->blockSignals(true);
-    actionPool()->action(UIActionIndexRT_M_View_T_VRDEServer)->setChecked(comServer.GetEnabled());
+    actionPool()->action(UIActionIndexRT_M_View_T_VRDEServer)->setChecked(fServerEnabled);
     actionPool()->action(UIActionIndexRT_M_View_T_VRDEServer)->blockSignals(false);
 }
@@ -562 +565 @@
 {
     return uisession()->invalidateAndUpdateScreen(uScreenId);
+}
+
+bool UIMachine::acquireWhetherVRDEServerPresent(bool &fPresent)
+{
+    return uisession()->acquireWhetherVRDEServerPresent(fPresent);
+}
+
+bool UIMachine::acquireWhetherVRDEServerEnabled(bool &fEnabled)
+{
+    return uisession()->acquireWhetherVRDEServerEnabled(fEnabled);
+}
+
+bool UIMachine::setVRDEServerEnabled(bool fEnabled)
+{
+    return uisession()->setVRDEServerEnabled(fEnabled);
 }
 
@@ -1597 +1615 @@
     {
         /* Initialize 'View' menu: */
-        const CVRDEServer comServer = uisession()->machine().GetVRDEServer();
-        if (comServer.isNull())
+        bool fServerPresent = false;
+        acquireWhetherVRDEServerPresent(fServerPresent);
+        if (!fServerPresent)
             restrictionForView = (UIExtraDataMetaDefs::RuntimeMenuViewActionType)
                                  (restrictionForView | UIExtraDataMetaDefs::RuntimeMenuViewActionType_VRDEServer);

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

@@ -342 +342 @@
         /** Notifies display about screen with passed uScreenId was invalidated. */
         bool invalidateAndUpdateScreen(ulong uScreenId);
+
+        /** Acquires whether VRDE server is present. */
+        bool acquireWhetherVRDEServerPresent(bool &fPresent);
+        /** Acquires whether VRDE server is enabled. */
+        bool acquireWhetherVRDEServerEnabled(bool &fEnabled);
+        /** Defines whether VRDE server is enabled. */
+        bool setVRDEServerEnabled(bool fEnabled);
     /** @} */
 

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

@@ -1991 +1991 @@
         return;
 
-    /* Access VRDE server: */
-    CVRDEServer server = machine().GetVRDEServer();
-    AssertMsgReturnVoid(machine().isOk() && !server.isNull(),
+    /* Make sure VRDE server present: */
+    bool fServerPresent = false;
+    uimachine()->acquireWhetherVRDEServerPresent(fServerPresent);
+    AssertMsgReturnVoid(fServerPresent,
                         ("VRDE server should NOT be null!\n"));
 
     /* Make sure something had changed: */
-    if (server.GetEnabled() == static_cast<BOOL>(fEnabled))
-        return;
-
-    /* Update VRDE server state: */
-    server.SetEnabled(fEnabled);
-    if (!server.isOk())
-    {
-        /* Make sure action is updated: */
-        uimachine()->updateStateVRDEServerAction();
-        /* Notify about the error: */
-        return UINotificationMessage::cannotToggleVRDEServer(server, machineName(), fEnabled);
-    }
-
-    /* Save machine-settings, make sure action is updated in case of failure: */
-    if (!uimachine()->saveSettings())
+    bool fServerEnabled = false;
+    uimachine()->acquireWhetherVRDEServerEnabled(fServerEnabled);
+    if (fServerEnabled == fEnabled)
+        return;
+
+    /* Update and save VRDE server state,
+     * make sure action is updated in case of failure: */
+    if (   !uimachine()->setVRDEServerEnabled(fEnabled)
+        || !uimachine()->saveSettings())
         return uimachine()->updateStateVRDEServerAction();
 }

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

@@ -71 +71 @@
 #include "CUSBDeviceFilter.h"
 #include "CUSBDeviceFilters.h"
+#include "CVRDEServer.h"
 #ifdef VBOX_WITH_NETFLT
 # include "CNetworkAdapter.h"
@@ -980 +981 @@
 }
 
+bool UISession::acquireWhetherVRDEServerPresent(bool &fPresent)
+{
+    CMachine comMachine = machine();
+    CVRDEServer comServer = comMachine.GetVRDEServer();
+    fPresent = comMachine.isOk() && comServer.isNotNull();
+    return true;
+}
+
+bool UISession::acquireWhetherVRDEServerEnabled(bool &fEnabled)
+{
+    CMachine comMachine = machine();
+    CVRDEServer comServer = comMachine.GetVRDEServer();
+    bool fSuccess = comMachine.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotAcquireMachineParameter(comMachine);
+    else
+    {
+        const BOOL fServerEnabled = comServer.GetEnabled();
+        fSuccess = comServer.isOk();
+        if (!fSuccess)
+            UINotificationMessage::cannotAcquireVRDEServerParameter(comServer);
+        else
+            fEnabled = fServerEnabled == TRUE;
+    }
+    return fSuccess;
+}
+
+bool UISession::setVRDEServerEnabled(bool fEnabled)
+{
+    CMachine comMachine = machine();
+    CVRDEServer comServer = comMachine.GetVRDEServer();
+    bool fSuccess = comMachine.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotAcquireMachineParameter(comMachine);
+    else
+    {
+        comServer.SetEnabled(fEnabled);
+        fSuccess = comServer.isOk();
+        if (!fSuccess)
+            UINotificationMessage::cannotToggleVRDEServer(comServer, machineName(), fEnabled);
+    }
+    return fSuccess;
+}
+
 bool UISession::acquireDeviceActivity(const QVector<KDeviceType> &deviceTypes, QVector<KDeviceActivity> &states)
 {

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

@@ -394 +394 @@
         /** Notifies display about screen with passed uScreenId was invalidated. */
         bool invalidateAndUpdateScreen(ulong uScreenId);
+
+        /** Acquires whether VRDE server is present. */
+        bool acquireWhetherVRDEServerPresent(bool &fPresent);
+        /** Acquires whether VRDE server is enabled. */
+        bool acquireWhetherVRDEServerEnabled(bool &fEnabled);
+        /** Defines whether VRDE server is enabled. */
+        bool setVRDEServerEnabled(bool fEnabled);
     /** @} */