Changeset 86963 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 24, 2020 9:43:55 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Deriving the help dialog directly from QMainWindow

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (2 diffs)
• globals/UIMessageCenter.h (modified) (3 diffs)
• helpbrowser/UIHelpBrowserDialog.cpp (modified) (5 diffs)
• helpbrowser/UIHelpBrowserDialog.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

@@ -3445 +3445 @@
     if (!m_pHelpBrowserDialog)
     {
-        UIHelpBrowserDialogFactory dialogFactory(strHelpFilePath);
-        dialogFactory.prepare(m_pHelpBrowserDialog);
+        m_pHelpBrowserDialog = new UIHelpBrowserDialog(0 /* parent */, 0 /* Center Widget */, strHelpFilePath);
         AssertReturnVoid(m_pHelpBrowserDialog);
-        connect(m_pHelpBrowserDialog, &QIManagerDialog::sigClose,
-                this, &UIMessageCenter::sltCloseHelpBrowser);
+        connect(m_pHelpBrowserDialog, &QMainWindow::destroyed, this, &UIMessageCenter::sltHelpBrowserClosed);
     }
 
@@ -3457 +3455 @@
 }
 
-void UIMessageCenter::sltCloseHelpBrowser()
-{
-    QIManagerDialog* pDialog = qobject_cast<QIManagerDialog*>(sender());
-    if (m_pHelpBrowserDialog != pDialog || !pDialog)
-        return;
-
+void UIMessageCenter::sltHelpBrowserClosed()
+{
     m_pHelpBrowserDialog = 0;
-    pDialog->close();
-    UIHelpBrowserDialogFactory().cleanup(pDialog);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h

@@ -34 +34 @@
 
 /* Forward declarations: */
-class QIManagerDialog;
+class UIHelpBrowserDialog;
 class UIMedium;
 struct StorageSlot;
@@ -553 +553 @@
     void sltResetSuppressedMessages();
     void sltShowUserManual(const QString &strLocation);
-    void sltCloseHelpBrowser();
+    void sltHelpBrowserClosed();
     void sltHandleDialogHelpButtonPress();
 
@@ -611 +611 @@
 
     /** Holds UIHelpBrowserDialog instance. */
-    QIManagerDialog *m_pHelpBrowserDialog;
+    UIHelpBrowserDialog *m_pHelpBrowserDialog;
 
     /** Holds the singleton message-center instance. */

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserDialog.cpp

@@ -23 +23 @@
 #include <QKeyEvent>
 #include <QLabel>
+#include <QMenuBar>
 #include <QPlainTextEdit>
 #include <QPushButton>
@@ -41 +42 @@
 
 /*********************************************************************************************************************************
-*   Class UIHelpBrowserDialogFactory implementation.                                                                             *
-*********************************************************************************************************************************/
-
-UIHelpBrowserDialogFactory::UIHelpBrowserDialogFactory(const QString &strHelpFilePath)
-    : m_strHelpFilePath(strHelpFilePath)
-{
-}
-
-UIHelpBrowserDialogFactory::UIHelpBrowserDialogFactory()
-    : m_strHelpFilePath(QString())
-{
-}
-
-void UIHelpBrowserDialogFactory::create(QIManagerDialog *&pDialog, QWidget *pCenterWidget)
-{
-    pDialog = new UIHelpBrowserDialog(pCenterWidget, m_strHelpFilePath);
-}
-
-
-/*********************************************************************************************************************************
 *   Class UIHelpBrowserDialog implementation.                                                                                    *
 *********************************************************************************************************************************/
 
-UIHelpBrowserDialog::UIHelpBrowserDialog(QWidget *pCenterWidget, const QString &strHelpFilePath)
-    : QIWithRetranslateUI<QIManagerDialog>(pCenterWidget)
+UIHelpBrowserDialog::UIHelpBrowserDialog(QWidget *pParent, QWidget *pCenterWidget, const QString &strHelpFilePath)
+    : QIWithRetranslateUI<QIWithRestorableGeometry<QMainWindow> >(pParent)
     , m_strHelpFilePath(strHelpFilePath)
     , m_pWidget(0)
+    , m_pCenterWidget(pCenterWidget)
 {
+    setAttribute(Qt::WA_DeleteOnClose);
+    setWindowIcon(UIIconPool::iconSetFull(":/vm_show_logs_32px.png", ":/vm_show_logs_16px.png"));
+    prepareCentralWidget();
+    loadSettings();
+    retranslateUi();
+}
+
+UIHelpBrowserDialog::~UIHelpBrowserDialog()
+{
+    saveSettings();
 }
 
@@ -84 +76 @@
 {
 #if defined(RT_OS_LINUX) && defined(VBOX_WITH_DOCS_QHELP) && (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
-    setWindowTitle(UIHelpBrowserWidget::tr("User Manual"));
-    button(ButtonType_Close)->setText(UIHelpBrowserWidget::tr("Close"));
+    setWindowTitle(UIHelpBrowserWidget::tr("Oracle VM VirtualBox User Manual"));
 #endif
 }
 
-void UIHelpBrowserDialog::configure()
-{
-    /* Apply window icons: */
-    setWindowIcon(UIIconPool::iconSetFull(":/vm_show_logs_32px.png", ":/vm_show_logs_16px.png"));
-}
 
-void UIHelpBrowserDialog::configureCentralWidget()
+void UIHelpBrowserDialog::prepareCentralWidget()
 {
 #if defined(RT_OS_LINUX) && defined(VBOX_WITH_DOCS_QHELP) && (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
     m_pWidget = new UIHelpBrowserWidget(EmbedTo_Dialog, m_strHelpFilePath);
-    if (m_pWidget)
-    {
-        /* Configure widget: */
-        setWidget(m_pWidget);
-        setWidgetMenus(m_pWidget->menus());
+    AssertPtrReturnVoid(m_pWidget);
 #ifdef VBOX_WS_MAC
-        setWidgetToolbar(m_pWidget->toolbar());
+    setWidgetToolbar(m_pWidget->toolbar());
 #endif
-        connect(m_pWidget, &UIHelpBrowserWidget::sigSetCloseButtonShortCut,
-                this, &UIHelpBrowserDialog::sltSetCloseButtonShortCut);
+    setCentralWidget((m_pWidget));
 
-        /* Add into layout: */
-        centralWidget()->layout()->addWidget(m_pWidget);
-    }
+    const QList<QMenu*> menuList = m_pWidget->menus();
+    foreach (QMenu *pMenu, menuList)
+        menuBar()->addMenu(pMenu);
 #endif
-}
-
-void UIHelpBrowserDialog::finalize()
-{
-    /* Apply language settings: */
-    retranslateUi();
 }
 
@@ -130 +105 @@
 
     /* Load geometry from extradata: */
-    const QRect geo = gEDataManager->helpBrowserDialogGeometry(this, centerWidget(), defaultGeo);
+    const QRect geo = gEDataManager->helpBrowserDialogGeometry(this, m_pCenterWidget, defaultGeo);
     LogRel2(("GUI: UIHelpBrowserDialog: Restoring geometry to: Origin=%dx%d, Size=%dx%d\n",
              geo.x(), geo.y(), geo.width(), geo.height()));
@@ -148 +123 @@
     return gEDataManager->helpBrowserDialogShouldBeMaximized();
 }
-
-void UIHelpBrowserDialog::sltSetCloseButtonShortCut(QKeySequence shortcut)
-{
-    if (button(ButtonType_Close))
-        button(ButtonType_Close)->setShortcut(shortcut);
-}

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserDialog.h

@@ -40 +40 @@
 class UIHelpBrowserWidget;
 
-/** QIManagerDialogFactory extension used as a factory for Log Viewer dialog. */
-class SHARED_LIBRARY_STUFF UIHelpBrowserDialogFactory : public QIManagerDialogFactory
-{
-
-public:
-
-    /** @param strHelpFilePath: the full path of the qHelp archive file. */
-    UIHelpBrowserDialogFactory(const QString &strHelpFilePath);
-    UIHelpBrowserDialogFactory();
-
-protected:
-
-    /** Creates derived @a pDialog instance.
-      * @param  pCenterWidget  Brings the widget to center wrt. pCenterWidget. */
-    virtual void create(QIManagerDialog *&pDialog, QWidget *pCenterWidget) /* override */;
-
-private:
-
-    QString m_strHelpFilePath;
-};
-
-class SHARED_LIBRARY_STUFF UIHelpBrowserDialog : public QIWithRetranslateUI<QIManagerDialog>
+class SHARED_LIBRARY_STUFF UIHelpBrowserDialog : public QIWithRetranslateUI<QIWithRestorableGeometry<QMainWindow> >
 {
     Q_OBJECT;
@@ -67 +46 @@
 public:
 
-    UIHelpBrowserDialog(QWidget *pCenterWidget, const QString &strHelpFilePath);
+    UIHelpBrowserDialog(QWidget *pParent, QWidget *pCenterWidget, const QString &strHelpFilePath);
+    ~UIHelpBrowserDialog();
     /** A passthru function for QHelpIndexWidget::showHelpForKeyword. */
     void showHelpForKeyword(const QString &strKeyword);
@@ -73 +53 @@
 protected:
 
-    /** @name Event-handling stuff.
-      * @{ */
-        /** Handles translation event. */
-        virtual void retranslateUi() /* override */;
-    /** @} */
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */;
 
     /** @name Prepare/cleanup cascade.
      * @{ */
-        /** Configures all. */
-        virtual void configure() /* override */;
-        /** Configures central-widget. */
-        virtual void configureCentralWidget() /* override */;
-        /** Perform final preparations. */
-        virtual void finalize() /* override */;
-        /** Loads dialog setting from extradata. */
+
+        virtual void prepareCentralWidget() /* override */;
         virtual void loadSettings() /* override */;
-
-        /** Saves dialog setting into extradata. */
         virtual void saveSettings() /* override */;
     /** @} */
 
-    /** @name Functions related to geometry restoration.
-     * @{ */
-        /** Returns whether the window should be maximized when geometry being restored. */
-        virtual bool shouldBeMaximized() const /* override */;
-    /** @} */
+    /** Returns whether the window should be maximized when geometry being restored. */
+    virtual bool shouldBeMaximized() const /* override */;
 
 private slots:
-
-    /** Must be handles soemthing related to close @a shortcut. */
-    void sltSetCloseButtonShortCut(QKeySequence shortcut);
 
 private:
@@ -109 +73 @@
     QString m_strHelpFilePath;
     UIHelpBrowserWidget *m_pWidget;
+    QWidget *m_pCenterWidget;
 };