Changeset 49276 in vbox

Timestamp:

Oct 24, 2013 1:58:35 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

90214

Message:

Debugger/VBoxDbgConsole: Backed out r89996.

Location:

trunk/src/VBox/Debugger

Files:

• VBoxDbgConsole.cpp (modified) (3 diffs)
• VBoxDbgConsole.h (modified) (2 diffs)

trunk/src/VBox/Debugger/VBoxDbgConsole.cpp

@@ -30 +30 @@
 #include <QAction>
 #include <QContextMenuEvent>
-#include <QMenu>
 
 #include <VBox/dbg.h>
@@ -84 +83 @@
     setPalette(Pal);
     setTextColor(QColor(qRgb(0, 0xe0, 0)));
-    m_fGreenOnBlack = true;
+
+#ifdef DEBUG_ramshankar
+    /* Solaris host (esp. S10) has illegible Courier font (bad aliasing). */
+    Font.setFamily("Monospace [Monotype]");
+    setFont(Font);
+
+    /* White on black while I'm at it. */
+    Pal.setColor(QPalette::All, QPalette::Base, QColor(Qt::white));
+    setPalette(Pal);
+    setTextColor(QColor(qRgb(0, 0, 0)));
+#endif
 
     NOREF(pszName);
@@ -93 +102 @@
 {
     Assert(m_hGUIThread == RTThreadNativeSelf());
-}
-
-void
-VBoxDbgConsoleOutput::contextMenuEvent(QContextMenuEvent *pEvent)
-{
-    QMenu *pMenu = createStandardContextMenu();
-
-    QAction *pToggleAction = new QAction(tr("Toggle Theme"), this);
-    pMenu->addSeparator();
-    pMenu->addAction(pToggleAction);
-    connect(pToggleAction, SIGNAL(triggered()), this, SLOT(toggleTheme()));
-
-    pMenu->exec(pEvent->globalPos());
-    delete pMenu;
-}
-
-
-void
-VBoxDbgConsoleOutput::toggleTheme()
-{
-    QFont Font = font();
-    Font.setStyleHint(QFont::TypeWriter);
-    QPalette Pal(palette());
-
-    /* Don't switch fonts on Mac for now. Haven't tested it. */
-    if (m_fGreenOnBlack)
-    {
-        /* Black on White. */
-#ifndef Q_WS_MAC
-        Font.setFamily("Monospace [Monotype]");
-        setFont(Font);
-#endif
-        Pal.setColor(QPalette::All, QPalette::Base, QColor(Qt::white));
-        setPalette(Pal);
-        setTextColor(QColor(qRgb(0, 0, 0)));
-        m_fGreenOnBlack = false;
-    }
-    else
-    {
-        /* Green on Black */
-#ifndef Q_WS_MAC
-        Font.setFamily("Courier [Monotype]");
-        setFont(Font);
-#endif
-        QPalette Pal(palette());
-        Pal.setColor(QPalette::All, QPalette::Base, QColor(Qt::black));
-        setPalette(Pal);
-        setTextColor(QColor(qRgb(0, 0xe0, 0)));
-        m_fGreenOnBlack = true;
-    }
 }
 

trunk/src/VBox/Debugger/VBoxDbgConsole.h

@@ -62 +62 @@
 
 protected:
-    /**
-     * Context menu event.
-     * This adds custom menu items for the output view.
-     *
-     * @param   pEvent      Pointer to the event.
-     */
-    virtual void contextMenuEvent(QContextMenuEvent *pEvent);
-
-
     /** The current line (paragraph) number. */
     unsigned m_uCurLine;
@@ -77 +68 @@
     /** The handle to the GUI thread. */
     RTNATIVETHREAD m_hGUIThread;
-    /** Whether the current theme is 'green-on-black'. */
-    bool           m_fGreenOnBlack;
-
-private slots:
-    /**
-     * The "Toggle Theme" context-menu item was triggered.
-     *
-     * Will toggle font and colors of VBoxDbgConsoleOutput.
-     */
-    void         toggleTheme();
 };