Changeset 98653 in vbox

Timestamp:

Feb 20, 2023 1:36:19 PM (2 years ago)

Author:

vboxsync

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

155953

Message:

FE/Qt: bugref:10322: Runtime UI: Reworking CConsole wrapper usage step-by-step; VM reset stuff this time.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -1053 +1053 @@
         QApplication::translate("UIMessageCenter", "Can't shutdown machine ..."),
         QApplication::translate("UIMessageCenter", "Failed to send the ACPI Power Button press event to the virtual machine "
+                                                   "<b>%1</b>.").arg(CConsole(comConsole).GetMachine().GetName()) +
+        UIErrorString::formatErrorInfo(comConsole));
+}
+
+/* static */
+void UINotificationMessage::cannotResetMachine(const CConsole &comConsole)
+{
+    createMessage(
+        QApplication::translate("UIMessageCenter", "Can't reset machine ..."),
+        QApplication::translate("UIMessageCenter", "Failed to reset the virtual machine "
                                                    "<b>%1</b>.").arg(CConsole(comConsole).GetMachine().GetName()) +
         UIErrorString::formatErrorInfo(comConsole));

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

@@ -425 +425 @@
           * @param  comConsole  Brings console trying to shutdown machine. */
         static void cannotACPIShutdownMachine(const CConsole &comConsole);
+        /** Notifies about inability to reset machine.
+          * @param  comConsole  Brings console trying to reset machine. */
+        static void cannotResetMachine(const CConsole &comConsole);
     /** @} */
 

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

@@ -324 +324 @@
 {
     return uisession()->isGuestScreenUnDrawable();
+}
+
+bool UIMachine::reset()
+{
+    return uisession()->reset();
 }
 

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

@@ -233 +233 @@
         bool isGuestScreenUnDrawable() const;
 
+        /** Resets VM. */
+        bool reset();
         /** Performes VM pausing. */
         bool pause();

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

@@ -3202 +3202 @@
 void UIMachineLogic::reset(bool fShowConfirmation)
 {
-    if (fShowConfirmation)
-    {
-        /* Confirm/Reset current console: */
-        if (msgCenter().confirmResetMachine(machineName()))
-            console().Reset();
-    }
-    else
-        console().Reset();
-
-    /* TODO_NEW_CORE: On reset the additional screens didn't get a display
-       update. Emulate this for now until it get fixed. */
-    ulong uMonitorCount = machine().GetGraphicsAdapter().GetMonitorCount();
-    for (ulong uScreenId = 1; uScreenId < uMonitorCount; ++uScreenId)
-        machineWindows().at(uScreenId)->update();
-}
+    if (   !fShowConfirmation
+        || msgCenter().confirmResetMachine(machineName()))
+    {
+        const bool fSuccess = uimachine()->reset();
+        if (fSuccess)
+        {
+            // WORKAROUND:
+            // On reset the additional screens didn't get a display
+            // update. Emulate this for now until it get fixed. */
+            const ulong uMonitorCount = machine().GetGraphicsAdapter().GetMonitorCount();
+            for (ulong uScreenId = 1; uScreenId < uMonitorCount; ++uScreenId)
+                machineWindows().at(uScreenId)->update();
+        }
+    }
+}

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

@@ -257 +257 @@
 {
     return mainMachineWindow() ? mainMachineWindow()->winId() : 0;
+}
+
+bool UISession::reset()
+{
+    CConsole comConsole = console();
+    comConsole.Reset();
+    const bool fSuccess = comConsole.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotResetMachine(comConsole);
+    return fSuccess;
 }
 

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

@@ -230 +230 @@
                                                       || machineState() == KMachineState_Saving; }
 
+        /** Resets VM. */
+        bool reset();
         /** Performes VM pausing. */
         bool pause() { return setPause(true); }