Changeset 65521 in vbox for trunk/src/VBox

Timestamp:

Jan 30, 2017 5:54:29 PM (8 years ago)

Author:

vboxsync

Message:

Debugger: make font + color scheme setting persistent

Location:

trunk/src/VBox/Debugger

Files:

• VBoxDbgConsole.cpp (modified) (10 diffs)
• VBoxDbgConsole.h (modified) (4 diffs)
• VBoxDbgGui.cpp (modified) (1 diff)

trunk/src/VBox/Debugger/VBoxDbgConsole.cpp

@@ -44 +44 @@
 #include <iprt/string.h>
 
+#include <VBox/com/string.h>
+#ifdef VBOX_WITH_XPCOM
+# include <VirtualBox_XPCOM.h>
+#else
+# include <VirtualBox.h>
+#endif
 
 
@@ -57 +63 @@
 
 
-VBoxDbgConsoleOutput::VBoxDbgConsoleOutput(QWidget *pParent/* = NULL*/, const char *pszName/* = NULL*/)
-    : QTextEdit(pParent), m_uCurLine(0), m_uCurPos(0), m_hGUIThread(RTThreadNativeSelf())
+VBoxDbgConsoleOutput::VBoxDbgConsoleOutput(QWidget *pParent/* = NULL*/, IVirtualBox *a_pVirtualBox /* = NULL */,
+                                           const char *pszName/* = NULL*/)
+    : QTextEdit(pParent), m_uCurLine(0), m_uCurPos(0), m_hGUIThread(RTThreadNativeSelf()), m_pVirtualBox(a_pVirtualBox)
 {
     setReadOnly(true);
@@ -112 +119 @@
      * Set the defaults (which syncs with the menu item checked state).
      */
-    setFontCourier();
-    setColorGreenOnBlack();
+
+    if (m_pVirtualBox)
+    {
+        com::Bstr strColor;
+        HRESULT hrc = m_pVirtualBox->GetExtraData(com::Bstr("DbgConsole/ColorScheme").raw(), strColor.asOutParam());
+        if (  SUCCEEDED(hrc)
+            && strColor.compareUtf8("blackonwhite", com::Bstr::CaseInsensitive) == 0)
+            setColorBlackOnWhite();
+        else
+            setColorGreenOnBlack();
+        com::Bstr strFont;
+        hrc = m_pVirtualBox->GetExtraData(com::Bstr("DbgConsole/Font").raw(), strFont.asOutParam());
+        if (  SUCCEEDED(hrc)
+            && strFont.compareUtf8("monospace", com::Bstr::CaseInsensitive) == 0)
+            setFontMonospace();
+        else
+            setFontCourier();
+    }
 
     NOREF(pszName);
@@ -122 +145 @@
 {
     Assert(m_hGUIThread == RTThreadNativeSelf());
+    if (m_pVirtualBox)
+    {
+        m_pVirtualBox->Release();
+        m_pVirtualBox = NULL;
+    }
 }
 
@@ -155 +183 @@
     if (!m_pGreenOnBlackAction->isChecked())
         m_pGreenOnBlackAction->setChecked(true);
+    
+    /* Make this setting persistent */
+    if (m_pVirtualBox)
+        m_pVirtualBox->SetExtraData(com::Bstr("DbgConsole/ColorScheme").raw(), com::Bstr("GreenOnBlack").raw());
 }
 
@@ -166 +198 @@
     if (!m_pBlackOnWhiteAction->isChecked())
         m_pBlackOnWhiteAction->setChecked(true);
+
+    /* Make this setting persistent */
+    if (m_pVirtualBox)
+        m_pVirtualBox->SetExtraData(com::Bstr("DbgConsole/ColorScheme").raw(), com::Bstr("BlackOnWhite").raw());
 }
 
@@ -184 +220 @@
     if (!m_pCourierFontAction->isChecked())
         m_pCourierFontAction->setChecked(true);
+    
+    /* Make this setting persistent */
+    if (m_pVirtualBox)
+        m_pVirtualBox->SetExtraData(com::Bstr("DbgConsole/Font").raw(), com::Bstr("Courier").raw());
 }
 
@@ -198 +238 @@
     if (!m_pMonospaceFontAction->isChecked())
         m_pMonospaceFontAction->setChecked(true);
+
+    /* Make this setting persistent */
+    if (m_pVirtualBox)
+        m_pVirtualBox->SetExtraData(com::Bstr("DbgConsole/Font").raw(), com::Bstr("Monospace").raw());
 }
 
@@ -353 +397 @@
 
 
-VBoxDbgConsole::VBoxDbgConsole(VBoxDbgGui *a_pDbgGui, QWidget *a_pParent/* = NULL*/)
+VBoxDbgConsole::VBoxDbgConsole(VBoxDbgGui *a_pDbgGui, QWidget *a_pParent/* = NULL*/, IVirtualBox *a_pVirtualBox/* = NULL */)
     : VBoxDbgBaseWindow(a_pDbgGui, a_pParent), m_pOutput(NULL), m_pInput(NULL), m_fInputRestoreFocus(false),
     m_pszInputBuf(NULL), m_cbInputBuf(0), m_cbInputBufAlloc(0),
@@ -365 +409 @@
      * Create the output text box.
      */
-    m_pOutput = new VBoxDbgConsoleOutput(this);
+    m_pOutput = new VBoxDbgConsoleOutput(this, a_pVirtualBox);
 
     /* try figure a suitable size */

trunk/src/VBox/Debugger/VBoxDbgConsole.h

@@ -30 +30 @@
 #include <iprt/thread.h>
 
+class IVirtualBox;
 
 class VBoxDbgConsoleOutput : public QTextEdit
@@ -42 +43 @@
      * @param   pszName     Widget name.
      */
-    VBoxDbgConsoleOutput(QWidget *pParent = NULL, const char *pszName = NULL);
+    VBoxDbgConsoleOutput(QWidget *pParent = NULL, IVirtualBox *pVirtualBox = NULL, const char *pszName = NULL);
 
     /**
@@ -90 +91 @@
     /** The current color scheme (foreground on background). */
     VBoxDbgConsoleColor m_enmColorScheme;
+    /** The IVirtualBox object */
+    IVirtualBox *m_pVirtualBox;
 
 private slots:
@@ -180 +183 @@
      * @param   a_pParent       Parent Widget.
      */
-    VBoxDbgConsole(VBoxDbgGui *a_pDbgGui, QWidget *a_pParent = NULL);
+    VBoxDbgConsole(VBoxDbgGui *a_pDbgGui, QWidget *a_pParent = NULL, IVirtualBox *a_pVirtualBox = NULL);
 
     /**

trunk/src/VBox/Debugger/VBoxDbgGui.cpp

@@ -196 +196 @@
     if (!m_pDbgConsole)
     {
-        m_pDbgConsole = new VBoxDbgConsole(this, m_pParent);
+        IVirtualBox *pVirtualBox = NULL;
+        m_pMachine->COMGETTER(Parent)(&pVirtualBox);
+        m_pDbgConsole = new VBoxDbgConsole(this, m_pParent, pVirtualBox);
         connect(m_pDbgConsole, SIGNAL(destroyed(QObject *)), this, SLOT(notifyChildDestroyed(QObject *)));
         repositionConsole();