Changeset 8813 in vbox for trunk/src/VBox

Timestamp:

May 14, 2008 2:12:46 PM (17 years ago)

Author:

vboxsync

Message:

Added menu item for disabling and enabling logging. (debug menu)

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxConsoleWnd.h (modified) (2 diffs)
• src/VBoxConsoleWnd.cpp (modified) (9 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleWnd.h

@@ -185 +185 @@
     void processGlobalSettingChange (const char *publicName, const char *name);
 
+    void dbgPrepareDebugMenu();
     void dbgShowStatistics();
     void dbgShowCommandLine();
+    void dbgLoggingToggled (bool);
 
     void onEnterFullscreen();
@@ -233 +235 @@
     QAction *dbgStatisticsAction;
     QAction *dbgCommandLineAction;
+    QAction *dbgLoggingAction;
 #endif
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -112 +112 @@
     , dbgStatisticsAction (NULL)
     , dbgCommandLineAction (NULL)
+    , dbgLoggingAction (NULL)
     , dbgMenu (NULL)
 #endif
@@ -260 +261 @@
 
 #ifdef VBOX_WITH_DEBUGGER_GUI
+    /* Debug menu actions */
     if (vboxGlobal().isDebuggerEnabled())
     {
         dbgStatisticsAction = new QAction (this, "dbgStatisticsAction");
         dbgCommandLineAction = new QAction (this, "dbgCommandLineAction");
+        dbgLoggingAction = new QAction (this, "dbgLoggingAction");
+        dbgLoggingAction->setToggleAction (true);
+        dbgLoggingAction->setIconSet (VBoxGlobal::iconSet ("start_16px.png")); /// @todo find the default check boxes.
     }
     else
@@ -269 +274 @@
         dbgStatisticsAction = NULL;
         dbgCommandLineAction = NULL;
+        dbgLoggingAction = NULL;
     }
 #endif
@@ -378 +384 @@
         dbgStatisticsAction->addTo (dbgMenu);
         dbgCommandLineAction->addTo (dbgMenu);
+        dbgLoggingAction->addTo (dbgMenu);
         menuBar()->insertItem (QString::null, dbgMenu, dbgMenuId);
         mMainMenu->insertItem (QString::null, dbgMenu, dbgMenuId);
@@ -582 +589 @@
 
 #ifdef VBOX_WITH_DEBUGGER_GUI
+    if (dbgMenu)
+        connect (dbgMenu, SIGNAL (aboutToShow()),
+                 this, SLOT (dbgPrepareDebugMenu()));
     if (dbgStatisticsAction)
         connect (dbgStatisticsAction, SIGNAL (activated()),
@@ -588 +598 @@
         connect (dbgCommandLineAction, SIGNAL (activated()),
                  this, SLOT (dbgShowCommandLine()));
+    if (dbgLoggingAction)
+        connect (dbgLoggingAction, SIGNAL (toggled (bool)),
+                 this, SLOT (dbgLoggingToggled (bool)));
 #endif
 
@@ -1551 +1564 @@
     if (dbgCommandLineAction)
         dbgCommandLineAction->setMenuText (tr ("&Command line..."));
+    if (dbgLoggingAction)
+        dbgLoggingAction->setMenuText (tr ("&Logging..."));
 #endif
 
@@ -3363 +3378 @@
 
 /**
+ * Prepare the Debug menu.
+ */
+void VBoxConsoleWnd::dbgPrepareDebugMenu()
+{
+    /* The "Logging" item. */
+    bool fEnabled = false;
+    bool fChecked = false;
+    CConsole cconsole = csession.GetConsole();
+    if (cconsole.isOk())
+    {
+        CMachineDebugger cdebugger = cconsole.GetDebugger();
+        if (cconsole.isOk())
+        {
+            fEnabled = true;
+            fChecked = cdebugger.GetLogEnabled() != FALSE;
+        }
+    }
+    if (fEnabled != dbgLoggingAction->isEnabled())
+        dbgLoggingAction->setEnabled (fEnabled);
+    if (fChecked != dbgLoggingAction->isOn())
+        dbgLoggingAction->setOn (fChecked);
+}
+
+/**
  * Called when the Debug->Statistics... menu item is selected.
  */
@@ -3382 +3421 @@
         DBGGuiShowCommandLine (dbg_gui);
 #endif
+}
+
+/**
+ * Called when the Debug->Logging menu item is selected.
+ */
+void VBoxConsoleWnd::dbgLoggingToggled (bool aState)
+{
+    CConsole cconsole = csession.GetConsole();
+    if (cconsole.isOk())
+    {
+        CMachineDebugger cdebugger = cconsole.GetDebugger();
+        if (cconsole.isOk())
+            cdebugger.SetLogEnabled(aState);
+    }
+
 }