Changeset 77412 in vbox

Timestamp:

Feb 21, 2019 6:25:37 PM (6 years ago)

Author:

vboxsync

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

128973

Message:

VBoxDbg: Moved the title management to the VBoxDbgBaseWindow class, combining the approaches in the console and statistics windows.

Location:

trunk/src/VBox/Debugger

Files:

• VBoxDbgBase.cpp (modified) (2 diffs)
• VBoxDbgBase.h (modified) (3 diffs)
• VBoxDbgConsole.cpp (modified) (2 diffs)
• VBoxDbgGui.cpp (modified) (2 diffs)
• VBoxDbgStatsQt.cpp (modified) (2 diffs)
• VBoxDbgStatsQt.h (modified) (1 diff)

trunk/src/VBox/Debugger/VBoxDbgBase.cpp

@@ -163 +163 @@
 
 
-VBoxDbgBaseWindow::VBoxDbgBaseWindow(VBoxDbgGui *a_pDbgGui, QWidget *a_pParent)
-    : QWidget(a_pParent, Qt::Window), VBoxDbgBase(a_pDbgGui), m_fPolished(false),
-    m_x(INT_MAX), m_y(INT_MAX), m_cx(0), m_cy(0)
-{
+VBoxDbgBaseWindow::VBoxDbgBaseWindow(VBoxDbgGui *a_pDbgGui, QWidget *a_pParent, const char *a_pszTitle)
+    : QWidget(a_pParent, Qt::Window), VBoxDbgBase(a_pDbgGui), m_pszTitle(a_pszTitle), m_fPolished(false)
+    , m_x(INT_MAX), m_y(INT_MAX), m_cx(0), m_cy(0)
+{
+    /* Set the title, using the parent one as prefix when possible: */
+    if (!parent())
+    {
+        QString strMachineName = a_pDbgGui->getMachineName();
+        if (strMachineName.isEmpty())
+            setWindowTitle(QString("VBoxDbg - %1").arg(m_pszTitle));
+        else
+            setWindowTitle(QString("%1 - VBoxDbg - %2").arg(strMachineName).arg(m_pszTitle));
+    }
+    else
+    {
+        setWindowTitle(QString("%1 - %2").arg(parentWidget()->windowTitle()).arg(m_pszTitle));
+
+        /* Install an event filter so we can make adjustments when the parent title changes: */
+        parent()->installEventFilter(this);
+    }
 }
 
@@ -215 +231 @@
     vPolishSizeAndPos();
     return fRc;
+}
+
+
+bool VBoxDbgBaseWindow::eventFilter(QObject *pWatched, QEvent *pEvent)
+{
+    /* We're only interested in title changes to the parent so we can amend our own title: */
+    if (   pWatched == parent()
+        && pEvent->type() == QEvent::WindowTitleChange)
+        setWindowTitle(QString("%1 - %2").arg(parentWidget()->windowTitle()).arg(m_pszTitle));
+
+    /* Forward to base-class: */
+    return QWidget::eventFilter(pWatched, pEvent);
 }
 

trunk/src/VBox/Debugger/VBoxDbgBase.h

@@ -134 +134 @@
      * @param   a_pDbgGui   Pointer to the debugger gui object.
      * @param   a_pParent   Pointer to the parent object.
-     */
-    VBoxDbgBaseWindow(VBoxDbgGui *a_pDbgGui, QWidget *a_pParent);
+     * @param   a_pszTitle  The window title string (persistent, not copied).
+     */
+    VBoxDbgBaseWindow(VBoxDbgGui *a_pDbgGui, QWidget *a_pParent, const char *a_pszTitle);
 
     /**
@@ -168 +169 @@
 
     /**
+     * Event filter for various purposes (mainly title bar).
+     *
+     * @param  pWatched         The object event came to.
+     * @param  pEvent           The event being handled.
+     */
+    virtual bool eventFilter(QObject *pWatched, QEvent *pEvent);
+
+    /**
      * Internal worker for polishing the size and position (X11 hacks).
      */
@@ -177 +186 @@
     QSize vGuessBorderSizes();
 
-
 private:
+    /** The Window title string (inflexible, read only). */
+    const char *m_pszTitle;
     /** Whether we've done the size polishing in showEvent or not. */
     bool m_fPolished;

trunk/src/VBox/Debugger/VBoxDbgConsole.cpp

@@ -484 +484 @@
 
 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),
+    : VBoxDbgBaseWindow(a_pDbgGui, a_pParent, "Console"), m_pOutput(NULL), m_pInput(NULL), m_fInputRestoreFocus(false),
     m_pszInputBuf(NULL), m_cbInputBuf(0), m_cbInputBufAlloc(0),
     m_pszOutputBuf(NULL), m_cbOutputBuf(0), m_cbOutputBufAlloc(0),
@@ -490 +490 @@
     m_fTerminate(false), m_fThreadTerminated(false)
 {
-    QString strMachineName;
-    if (a_pDbgGui)
-        strMachineName = a_pDbgGui->getMachineName();
-
-    if (strMachineName.isEmpty())
-        setWindowTitle("VBoxDbg - Console");
-    else
-        setWindowTitle(QString("%1 - VBoxDbg - Console").arg(strMachineName));
     /*
      * Create the output text box.

trunk/src/VBox/Debugger/VBoxDbgGui.cpp

@@ -257 +257 @@
 }
 
+
 QString
 VBoxDbgGui::getMachineName() const
@@ -267 +268 @@
     {
         strName = QString::fromUtf16(bstr);
-    }
-    SysFreeString(bstr);
+        SysFreeString(bstr);
+    }
     return strName;
 }
+
 
 void

trunk/src/VBox/Debugger/VBoxDbgStatsQt.cpp

@@ -3040 +3040 @@
 
 VBoxDbgStats::VBoxDbgStats(VBoxDbgGui *a_pDbgGui, const char *pszPat/* = NULL*/, unsigned uRefreshRate/* = 0*/, QWidget *pParent/* = NULL*/)
-    : VBoxDbgBaseWindow(a_pDbgGui, pParent), m_PatStr(pszPat), m_pPatCB(NULL), m_uRefreshRate(0), m_pTimer(NULL), m_pView(NULL)
-{
-    /* Assign window-title: */
-    if (parent())
-    {
-        setWindowTitle(QString("%1 - Statistics").arg(parentWidget()->windowTitle()));
-        parent()->installEventFilter(this);
-    }
-    else
-        setWindowTitle("VBoxDbg - Statistics");
-
+    : VBoxDbgBaseWindow(a_pDbgGui, pParent, "Statistics")
+    , m_PatStr(pszPat), m_pPatCB(NULL), m_uRefreshRate(0), m_pTimer(NULL), m_pView(NULL)
+{
     /*
      * On top, a horizontal box with the pattern field, buttons and refresh interval.
@@ -3161 +3153 @@
 
 
-bool VBoxDbgStats::eventFilter(QObject *pWatched, QEvent *pEvent)
-{
-    /* Skip events which are not related to our parent: */
-    if (pWatched != parent())
-        return VBoxDbgBaseWindow::eventFilter(pWatched, pEvent);
-
-    /* Depending on event-type: */
-    switch (pEvent->type())
-    {
-        case QEvent::WindowTitleChange: setWindowTitle(QString("%1 - Statistics").arg(parentWidget()->windowTitle())); break;
-        default: break;
-    }
-
-    /* Call to base-class: */
-    return VBoxDbgBaseWindow::eventFilter(pWatched, pEvent);
-}
-
-
 void
 VBoxDbgStats::apply(const QString &Str)

trunk/src/VBox/Debugger/VBoxDbgStatsQt.h

@@ -204 +204 @@
     virtual void closeEvent(QCloseEvent *a_pCloseEvt);
 
-    /**
-     * Event filter for various purposes.
-     *
-     * @param  pWatched         The object event came to.
-     * @param  pEvent           The event being handled.
-     */
-    virtual bool eventFilter(QObject *pWatched, QEvent *pEvent);
-
 protected slots:
     /** Apply the activated combobox pattern. */