儲存庫 vbox 的更動 30936

時間撮記:

2010-7-20 下午04:59:35 (14 年 以前)

作者:

vboxsync

訊息:

FE/Qt4: enable debug command line again

位置:

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

檔案:

• UIMachineLogic.cpp (修改) (1 筆差異)
• UIMachineLogic.h (修改) (1 筆差異)
• UISession.cpp (修改) (1 筆差異)
• fullscreen/UIMachineLogicFullscreen.cpp (修改) (1 筆差異)
• normal/UIMachineLogicNormal.cpp (修改) (1 筆差異)
• scale/UIMachineLogicScale.cpp (修改) (1 筆差異)
• seamless/UIMachineLogicSeamless.cpp (修改) (1 筆差異)

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

@@ -657 +657 @@
 #endif
 }
+
+#ifdef VBOX_WITH_DEBUGGER_GUI
+void UIMachineLogic::prepareDebugger()
+{
+    if (vboxGlobal().isDebuggerAutoShowEnabled())
+    {
+        /* console in upper left corner of the desktop. */
+//        QRect rct (0, 0, 0, 0);
+//        QDesktopWidget *desktop = QApplication::desktop();
+//        if (desktop)
+//            rct = desktop->availableGeometry(pos());
+//        move (QPoint (rct.x(), rct.y()));
+
+        if (vboxGlobal().isDebuggerAutoShowStatisticsEnabled())
+            sltShowDebugStatistics();
+        if (vboxGlobal().isDebuggerAutoShowCommandLineEnabled())
+            sltShowDebugCommandLine();
+
+        if (!vboxGlobal().isStartPausedEnabled())
+            sltPause(false);
+    }
+}
+#endif /* VBOX_WITH_DEBUGGER_GUI */
 
 #ifdef Q_WS_MAC

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

@@ -122 +122 @@
 #endif /* Q_WS_MAC */
     virtual void prepareRequiredFeatures();
+#ifdef VBOX_WITH_DEBUGGER_GUI
+    virtual void prepareDebugger();
+#endif /* VBOX_WITH_DEBUGGER_GUI */
 
     /* Cleanup helpers: */

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

@@ -275 +275 @@
     }
 
-#if 0 // TODO: Rework debugger logic!
-# ifdef VBOX_WITH_DEBUGGER_GUI
-    /* Open the debugger in "full screen" mode requested by the user. */
-    else if (vboxGlobal().isDebuggerAutoShowEnabled())
-    {
-        /* console in upper left corner of the desktop. */
-        QRect rct (0, 0, 0, 0);
-        QDesktopWidget *desktop = QApplication::desktop();
-        if (desktop)
-            rct = desktop->availableGeometry(pos());
-        move (QPoint (rct.x(), rct.y()));
-
-        if (vboxGlobal().isDebuggerAutoShowStatisticsEnabled())
-            sltShowDebugStatistics();
-        if (vboxGlobal().isDebuggerAutoShowCommandLineEnabled())
-            sltShowDebugCommandLine();
-
-        if (!vboxGlobal().isStartPausedEnabled())
-            machineWindowWrapper()->machineView()->pause (false);
-    }
-# endif
-#endif
-
 #ifdef VBOX_WITH_VIDEOHWACCEL
     LogRel(("2D video acceleration is %s.\n",

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

@@ -153 +153 @@
     sltMouseCapabilityChanged();
 
+#ifdef VBOX_WITH_DEBUGGER_GUI
+    prepareDebugger();
+#endif /* VBOX_WITH_DEBUGGER_GUI */
+
     /* Retranslate logic part: */
     retranslateUi();

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

@@ -95 +95 @@
     sltMouseCapabilityChanged();
 
+#ifdef VBOX_WITH_DEBUGGER_GUI
+    prepareDebugger();
+#endif /* VBOX_WITH_DEBUGGER_GUI */
+
     /* Retranslate logic part: */
     retranslateUi();

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineLogicScale.cpp

@@ -92 +92 @@
     sltMouseCapabilityChanged();
 
+#ifdef VBOX_WITH_DEBUGGER_GUI
+    prepareDebugger();
+#endif /* VBOX_WITH_DEBUGGER_GUI */
+
     /* Retranslate logic part: */
     retranslateUi();

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp

@@ -145 +145 @@
     sltMouseCapabilityChanged();
 
+#ifdef VBOX_WITH_DEBUGGER_GUI
+    prepareDebugger();
+#endif /* VBOX_WITH_DEBUGGER_GUI */
+
     /* Retranslate logic part: */
     retranslateUi();