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

Timestamp:

May 22, 2023 2:44:15 PM (2 years ago)

Author:

vboxsync

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

157547

Message:

FE/Qt: bugref:10451. Some cleaning before moving stuff around. part 1.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

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

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

@@ -2141 +2141 @@
 }
 
-void UIMessageCenter::sltShowUserManual(const QString &strLocation)
-{
-    Q_UNUSED(strLocation);
-#if defined (VBOX_WITH_DOCS_QHELP)
-    showHelpBrowser(strLocation);
+void UIMessageCenter::sltShowUserManual(const QString &strHelpFilePath)
+{
+#if defined(VBOX_WITH_DOCS_QHELP)
+    if (!QFileInfo(strHelpFilePath).exists())
+    {
+        UINotificationMessage::cannotFindHelpFile(strHelpFilePath);
+        return;
+    }
+    if (!m_pHelpBrowserDialog)
+    {
+        m_pHelpBrowserDialog = new UIHelpBrowserDialog(0 /* parent */, 0 /* Center Widget */, strHelpFilePath);
+        AssertReturnVoid(m_pHelpBrowserDialog);
+        connect(m_pHelpBrowserDialog, &QMainWindow::destroyed, this, &UIMessageCenter::sltHelpBrowserClosed);
+    }
+
+    m_pHelpBrowserDialog->show();
+    m_pHelpBrowserDialog->setWindowState(m_pHelpBrowserDialog->windowState() & ~Qt::WindowMinimized);
+    m_pHelpBrowserDialog->activateWindow();
 #else
- #if defined (VBOX_WS_WIN)
-        HtmlHelp(GetDesktopWindow(), strLocation.utf16(), HH_DISPLAY_TOPIC, NULL);
- #endif
-
- #if !defined(VBOX_OSE)
-    char szViewerPath[RTPATH_MAX];
-    int rc;
-    rc = RTPathAppPrivateArch(szViewerPath, sizeof(szViewerPath));
-    AssertRC(rc);
-    QProcess::startDetached(QString(szViewerPath) + "/kchmviewer", QStringList(strLocation));
- # else /* #ifndef VBOX_OSE */
-    uiCommon().openURL("file://" + strLocation);
- # endif /* #ifdef VBOX_OSE */
- #if defined (VBOX_WS_MAC)
-    uiCommon().openURL("file://" + strLocation);
- #endif
+    Q_UNUSED(strHelpFilePath);
 #endif
+
 }
 
@@ -2182 +2181 @@
 #if defined(VBOX_WITH_DOCS_QHELP)
     /* First open or show the help browser: */
-    showHelpBrowser(uiCommon().helpFile());
+    sltShowUserManual(uiCommon().helpFile());
     /* Show the help page for the @p strHelpKeyword: */
     if (m_pHelpBrowserDialog)
@@ -2374 +2373 @@
     return iResultCode;
 }
-
-void UIMessageCenter::showHelpBrowser(const QString &strHelpFilePath)
-{
-#if defined(VBOX_WITH_DOCS_QHELP)
-    if (!QFileInfo(strHelpFilePath).exists())
-    {
-        UINotificationMessage::cannotFindHelpFile(strHelpFilePath);
-        return;
-    }
-    if (!m_pHelpBrowserDialog)
-    {
-        m_pHelpBrowserDialog = new UIHelpBrowserDialog(0 /* parent */, 0 /* Center Widget */, strHelpFilePath);
-        AssertReturnVoid(m_pHelpBrowserDialog);
-        connect(m_pHelpBrowserDialog, &QMainWindow::destroyed, this, &UIMessageCenter::sltHelpBrowserClosed);
-    }
-
-    m_pHelpBrowserDialog->show();
-    m_pHelpBrowserDialog->setWindowState(m_pHelpBrowserDialog->windowState() & ~Qt::WindowMinimized);
-    m_pHelpBrowserDialog->activateWindow();
-#else
-    Q_UNUSED(strHelpFilePath);
-#endif
-}

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

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