Changeset 26815 in vbox for trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp

Timestamp:

Feb 26, 2010 2:43:37 AM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: New running VM core: cumulative patch to let uimachine to restore mouse/keyboard states when switching modes.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp (modified) (10 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp

@@ -27 +27 @@
 
 /* Local includes */
+#include "COMDefs.h"
 #include "VBoxGlobal.h"
 #include "VBoxProblemReporter.h"
@@ -55 +56 @@
     prepareRequiredFeatures();
 
-    /* Load common logic settings: */
-    loadLogicSettings();
-
     /* Prepare normal machine window: */
     prepareMachineWindow();
+
+    /* Initialization: */
+    sltMachineStateChanged();
+    sltAdditionsStateChanged();
+    sltMouseCapabilityChanged();
 }
 
@@ -66 +69 @@
     /* Cleanup normal machine window: */
     cleanupMachineWindow();
-
-    /* Save common logic settings: */
-    saveLogicSettings();
 }
 
@@ -97 +97 @@
 void UIMachineLogicNormal::prepareActionConnections()
 {
-    /* Base-class connections: */
+    /* Base class connections: */
     UIMachineLogic::prepareActionConnections();
 
@@ -124 +124 @@
     setMachineWindowWrapper(UIMachineWindow::create(this, visualStateType()));
 
-    bool bIsSaved = machineState() == KMachineState_Saved;
-    bool bIsRunning = machineState() == KMachineState_Running ||
-                      machineState() == KMachineState_Teleporting ||
-                      machineState() == KMachineState_LiveSnapshotting;
-    bool bIsRunningOrPaused = bIsRunning ||
-                              machineState() == KMachineState_Paused;
-
     /* If we are not started yet: */
-    if (!bIsRunningOrPaused)
+    if (!uisession()->isRunning() && !uisession()->isPaused())
     {
         /* Get current machine/console: */
@@ -143 +136 @@
 
         /* Shows first run wizard if necessary: */
-        if (isFirstTimeStarted())
+        if (uisession()->isFirstTimeStarted())
         {
             UIFirstRunWzd wzd(machineWindowWrapper()->machineWindow(), machine);
@@ -160 +153 @@
         }
 
-        /* Disable auto closure because we want to have a chance to show the error dialog on startup failure: */
+        /* Disable auto-closure because we want to have a chance to show the error dialog on startup failure: */
         setPreventAutoClose(true);
 
         /* Show "Starting/Restoring" progress dialog: */
-        if (bIsSaved)
+        if (uisession()->isSaved())
             vboxProblem().showModalProgressDialog(progress, machine.GetName(), machineWindowWrapper()->machineWindow(), 0);
         else
@@ -180 +173 @@
         qApp->processEvents();
 
-        /* Enable auto closure again: */
+        /* Enable auto-closure again: */
         setPreventAutoClose(false);
 
         /* Check if we missed a really quick termination after successful startup, and process it if we did: */
-        if (machineState() == KMachineState_PoweredOff || machineState() == KMachineState_Saved ||
-            machineState() == KMachineState_Teleported || machineState() == KMachineState_Aborted)
+        if (uisession()->isTurnedOff())
         {
             machineWindowWrapper()->machineWindow()->close();
@@ -216 +208 @@
 #ifdef VBOX_WITH_UPDATE_REQUEST
         /* Check for updates if necessary: */
-        vboxGlobal().showUpdateDialog(false /* aForce */);
+        vboxGlobal().showUpdateDialog(false /* force request? */);
 #endif
     }
@@ -227 +219 @@
         return;
 
-    /* Cleanup machine window: */
+    /* Cleanup normal machine window: */
     UIMachineWindow::destroy(machineWindowWrapper());
     setMachineWindowWrapper(0);