Changeset 26938 in vbox for trunk/src/VBox

Timestamp:

Mar 2, 2010 11:47:45 AM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: new core: this stuff has do be done from all modes

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineLogic.cpp (modified) (2 diffs)
• UIMachineLogic.h (modified) (1 diff)
• fullscreen/UIMachineLogicFullscreen.cpp (modified) (2 diffs)
• normal/UIMachineLogicNormal.cpp (modified) (2 diffs)

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

@@ -37 +37 @@
 #include "VBoxVMSettingsNetwork.h"
 #include "VBoxVMSettingsSF.h"
+#include "UIFirstRunWzd.h"
+
 //#include "VBoxDownloaderWgt.h"
 
@@ -601 +603 @@
     if (isPreventAutoStart())
         QTimer::singleShot(0, uisession(), SLOT(sltCloseVirtualSession()));
+}
+
+void UIMachineLogic::prepareConsolePowerUp()
+{
+    /* Notify user about mouse&keyboard auto-capturing: */
+    if (vboxGlobal().settings().autoCapture())
+        vboxProblem().remindAboutAutoCapture();
+
+    /* Shows first run wizard if necessary: */
+    if (uisession()->isFirstTimeStarted())
+    {
+        UIFirstRunWzd wzd(defaultMachineWindow()->machineWindow(), session().GetMachine());
+        wzd.exec();
+    }
 }
 

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

@@ -96 +96 @@
     virtual void prepareActionConnections();
     virtual void prepareRequiredFeatures();
+    virtual void prepareConsolePowerUp();
 
     /* Cleanup helpers: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp

@@ -30 +30 @@
 #include "VBoxGlobal.h"
 #include "VBoxProblemReporter.h"
-
-#include "UIFirstRunWzd.h"
 
 #include "UISession.h"
@@ -174 +172 @@
     if (!uisession()->isRunning() && !uisession()->isPaused())
     {
+        prepareConsolePowerUp();
+
         /* Get current machine/console: */
         CMachine machine = session().GetMachine();
         CConsole console = session().GetConsole();
-
-        /* Notify user about mouse&keyboard auto-capturing: */
-        if (vboxGlobal().settings().autoCapture())
-            vboxProblem().remindAboutAutoCapture();
-
-        /* Shows first run wizard if necessary: */
-        if (uisession()->isFirstTimeStarted())
-        {
-            UIFirstRunWzd wzd(defaultMachineWindow()->machineWindow(), machine);
-            wzd.exec();
-        }
 
         /* Start VM: */

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

@@ -30 +30 @@
 #include "VBoxProblemReporter.h"
 
-#include "UIFirstRunWzd.h"
-
 #include "UISession.h"
 #include "UIActionsPool.h"
@@ -143 +141 @@
     if (!uisession()->isRunning() && !uisession()->isPaused())
     {
+        prepareConsolePowerUp();
+
         /* Get current machine/console: */
         CMachine machine = session().GetMachine();
         CConsole console = session().GetConsole();
-
-        /* Notify user about mouse&keyboard auto-capturing: */
-        if (vboxGlobal().settings().autoCapture())
-            vboxProblem().remindAboutAutoCapture();
-
-        /* Shows first run wizard if necessary: */
-        if (uisession()->isFirstTimeStarted())
-        {
-            UIFirstRunWzd wzd(defaultMachineWindow()->machineWindow(), machine);
-            wzd.exec();
-        }
 
         /* Start VM: */