Changeset 86928 in vbox

Timestamp:

Nov 20, 2020 9:22:25 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Adding context sensitive help button to dialogs. take 2

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• cloud/profilemanager/UICloudProfileManager.cpp (modified) (1 diff)
• extensions/QIManagerDialog.cpp (modified) (3 diffs)
• extensions/QIManagerDialog.h (modified) (1 diff)
• globals/UIMessageCenter.cpp (modified) (4 diffs)
• globals/UIMessageCenter.h (modified) (1 diff)
• hostnetwork/UIHostNetworkManager.cpp (modified) (1 diff)
• medium/UIMediumManager.cpp (modified) (1 diff)
• wizards/exportappliance/UIWizardExportApp.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/cloud/profilemanager/UICloudProfileManager.cpp

@@ -1008 +1008 @@
     button(ButtonType_Apply)->setVisible(gEDataManager->cloudProfileManagerDetailsExpanded());
     button(ButtonType_Reset)->setVisible(gEDataManager->cloudProfileManagerDetailsExpanded());
+
+    configureButtonBoxHelpButton("ovf-cloud-profile-manager");
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.cpp

@@ -27 +27 @@
 #include "UICommon.h"
 #include "UIDesktopWidgetWatchdog.h"
+#include "UIMessageCenter.h"
 #ifdef VBOX_WS_MAC
 # include "QIToolBar.h"
@@ -75 +76 @@
         m_fCloseEmitted = true;
         emit sigClose();
+    }
+}
+
+void QIManagerDialog::configureButtonBoxHelpButton(const QString &strHelpTag)
+{
+    QPushButton *pHelpButton = m_pButtonBox->button(QDialogButtonBox::Help);
+    if (pHelpButton)
+    {
+        pHelpButton->setProperty("helptag", strHelpTag);
+        connect(pHelpButton, &QPushButton::pressed,
+               &(msgCenter()), &UIMessageCenter::sltHandleDialogHelpButtonPress);
     }
 }
@@ -155 +167 @@
         /* Configure button-box: */
 #ifdef VBOX_WS_WIN
-        m_pButtonBox->setStandardButtons(QDialogButtonBox::Reset | QDialogButtonBox::Save |  QDialogButtonBox::Close);
+        m_pButtonBox->setStandardButtons(QDialogButtonBox::Reset | QDialogButtonBox::Save |  QDialogButtonBox::Close | QDialogButtonBox::Help);
 #else
-        m_pButtonBox->setStandardButtons(QDialogButtonBox::Reset | QDialogButtonBox::Apply |  QDialogButtonBox::Close);
+        m_pButtonBox->setStandardButtons(QDialogButtonBox::Reset | QDialogButtonBox::Apply |  QDialogButtonBox::Close | QDialogButtonBox::Help);
 #endif
         m_buttons[ButtonType_Reset] = m_pButtonBox->button(QDialogButtonBox::Reset);

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.h

@@ -150 +150 @@
         virtual void closeEvent(QCloseEvent *pEvent) /* override */;
     /** @} */
+    /** Sets the property 'helptag' of the button box's help button to @param strHelpTag and
+      * sets up the appropirate connection. */
+    void configureButtonBoxHelpButton(const QString &strHelpTag);
 
 private:

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

@@ -3236 +3236 @@
 #elif defined (VBOX_WS_X11)
 # if defined(VBOX_WITH_DOCS_QHELP) && (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
-    showHelpBrowser(strLocation, QString());
+    showHelpBrowser(strLocation);
 # elif !defined(VBOX_OSE)
     char szViewerPath[RTPATH_MAX];
@@ -3435 +3435 @@
 }
 
-void UIMessageCenter::showHelpBrowser(const QString &strHelpFilePath, const QString &strKeyword, QWidget *pParent /* = 0 */)
+void UIMessageCenter::showHelpBrowser(const QString &strHelpFilePath, QWidget *pParent /* = 0 */)
 {
     Q_UNUSED(pParent);
@@ -3450 +3450 @@
         connect(m_pHelpBrowserDialog, &QIManagerDialog::sigClose,
                 this, &UIMessageCenter::sltCloseHelpBrowser);
-    }
-    if (!strKeyword.isEmpty())
-    {
-        UIHelpBrowserDialog *pWidget = qobject_cast<UIHelpBrowserDialog*>(m_pHelpBrowserDialog);
-        if (pWidget)
-            pWidget->showHelpForKeyword(strKeyword);
     }
 
@@ -3494 +3488 @@
     }
 
-    showHelpBrowser(uiCommon().helpFile(), strKeyword);
+    showHelpBrowser(uiCommon().helpFile());
+
+    UIHelpBrowserDialog *pWidget = qobject_cast<UIHelpBrowserDialog*>(m_pHelpBrowserDialog);
+    if (pWidget)
+        pWidget->showHelpForKeyword(strKeyword);
 # endif /* #if defined(VBOX_WITH_DOCS_QHELP) && (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))&& (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)) */
 }

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

@@ -605 +605 @@
                        const QString &strButtonText1, const QString &strButtonText2, const QString &strButtonText3,
                        const QString &strAutoConfirmId) const;
-    /** @param strKeyword is passed possbily from a hrlp button and used by QHelpEngine infrastructure to find a
-      * corresponding Url. */
-    void showHelpBrowser(const QString &strHelpFilePath, const QString &strKeyword, QWidget *pParent = 0);
+    void showHelpBrowser(const QString &strHelpFilePath, QWidget *pParent = 0);
 
     /** Holds the list of shown warnings. */

trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.cpp

@@ -1049 +1049 @@
     button(ButtonType_Apply)->setVisible(gEDataManager->hostNetworkManagerDetailsExpanded());
     button(ButtonType_Reset)->setVisible(gEDataManager->hostNetworkManagerDetailsExpanded());
+
+    configureButtonBoxHelpButton("networkingdetails");
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp

@@ -1722 +1722 @@
         widget()->setProgressBar(m_pProgressBar);
     }
+    configureButtonBoxHelpButton("vdis");
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp

@@ -238 +238 @@
         }
     }
-    enableHelpButton("ovf");
+
+    if (!m_fFastTraverToExportOCI)
+        enableHelpButton("ovf");
+    else
+        enableHelpButton("cloud-export-oci");
+
     /* Call to base-class: */
     UIWizard::prepare();