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

Timestamp:

May 23, 2023 8:56:52 AM (20 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10451. More refactoring.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (1 diff)
• globals/UICommon.cpp (modified) (1 diff)
• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIMessageCenter.h (modified) (2 diffs)
• runtime/UIMachineLogic.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -1689 +1689 @@
         m_pButtonBox->setStandardButtons(QDialogButtonBox::Help | QDialogButtonBox::Close);
         m_pButtonBox->button(QDialogButtonBox::Close)->setShortcut(Qt::Key_Escape);
-        connect(m_pButtonBox, &QIDialogButtonBox::helpRequested, &msgCenter(), &UIMessageCenter::sltShowHelpHelpDialog);
+        connect(m_pButtonBox, &QIDialogButtonBox::helpRequested, &msgCenter(), &UIMessageCenter::sltHandleHelpRequest);
         connect(m_pButtonBox, &QIDialogButtonBox::rejected,      this, &UIExtraDataManagerWindow::close);
         /* Add button-box into main layout: */

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

@@ -2377 +2377 @@
 QString UICommon::helpFile()
 {
-#if defined (VBOX_WITH_DOCS_QHELP)
     const QString strName = "UserManual";
     const QString strSuffix = "qhc";
-#else
- #if defined(VBOX_WS_WIN)
-     const QString strName = "VirtualBox";
-     const QString strSuffix = "chm";
- #elif defined(VBOX_WS_MAC)
-     const QString strName = "UserManual";
-     const QString strSuffix = "pdf";
- #elif defined(VBOX_WS_X11)
-     //# if defined(VBOX_OSE) || !defined(VBOX_WITH_KCHMVIEWER)
-     const QString strName = "UserManual";
-     const QString strSuffix = "pdf";
- #endif
-#endif
+
     /* Where are the docs located? */
     char szDocsPath[RTPATH_MAX];

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

@@ -2135 +2135 @@
 {
     /* First open or show the help browser: */
-    sltShowUserManual(uiCommon().helpFile());
+    checkManualFileAndShow();
     /* Show the help page for the @p strHelpKeyword: */
-    if (m_pHelpBrowserDialog)
+    if (m_pHelpBrowserDialog && !strHelpKeyword.isEmpty())
         m_pHelpBrowserDialog->showHelpForKeyword(strHelpKeyword);
 }
 
-void UIMessageCenter::sltShowHelpHelpDialog()
+void UIMessageCenter::checkManualFileAndShow()
 {
 #ifndef VBOX_OSE

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

@@ -465 +465 @@
     void sltShowOnlineDocumentation();
     void sltShowHelpAboutDialog();
-    void sltShowHelpHelpDialog();
     void sltResetSuppressedMessages();
     void sltShowUserManual(const QString &strHelpFilePath);
@@ -526 +525 @@
                        const QString &strAutoConfirmId, const QString &strHelpKeyword) const;
 
+    /// @todo move it away ..
+    void checkManualFileAndShow();
+
     /** Holds the list of shown warnings. */
     mutable QStringList m_warnings;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -1087 +1087 @@
      * in manager and runtime UI: */
     connect(actionPool()->action(UIActionIndex_Simple_Contents), &UIAction::triggered,
-            &msgCenter(), &UIMessageCenter::sltShowHelpHelpDialog);
+            &msgCenter(), &UIMessageCenter::sltHandleHelpRequest);
 
 #ifdef VBOX_WITH_DEBUGGER_GUI