Changeset 86963 in vbox for trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserDialog.cpp

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

File:

• trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserDialog.cpp (modified) (5 diffs)

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);
-}