Changeset 89946 in vbox

Timestamp:

Jun 29, 2021 9:22:12 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10049. Connecting the help button to help viewer startup code.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/extensions

Files:

• QIMessageBox.cpp (modified) (4 diffs)
• QIMessageBox.h (modified) (2 diffs)

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

@@ -33 +33 @@
 #include "UICommon.h"
 #include "UIIconPool.h"
+#include "UIMessageCenter.h"
 
 /* Other VBox includes: */
@@ -55 +56 @@
     , m_pButton2(0)
     , m_pButton3(0)
+    , m_pButtonHelp(0)
     , m_pButtonBox(0)
+    , m_strHelpKeyword(strHelpKeyword)
     , m_fDone(false)
 {
-    if (!strHelpKeyword.isEmpty())
-        uiCommon().setHelpKeyword(this, strHelpKeyword);
     /* Prepare: */
     prepare();
@@ -261 +262 @@
             if (m_pButton3)
                 connect(m_pButton3, &QPushButton::clicked, this, &QIMessageBox::sltDone3);
+            /* Create the help button and connect it to relevant slot in case a help word is supplied: */
+            if (!m_strHelpKeyword.isEmpty())
+            {
+                m_pButtonHelp = createButton(AlertButton_Help);
+                if (m_pButtonHelp)
+                {
+                    uiCommon().setHelpKeyword(m_pButtonHelp, m_strHelpKeyword);
+                    connect(m_pButtonHelp, &QPushButton::clicked, &msgCenter(), &UIMessageCenter::sltHandleHelpRequest);
+                }
+            }
+
             /* Make sure Escape button always set: */
             Assert(m_iButtonEsc);
@@ -316 +328 @@
         case AlertButton_Choice2: strText = tr("No");     role = QDialogButtonBox::NoRole; break;
         case AlertButton_Copy:    strText = tr("Copy");   role = QDialogButtonBox::ActionRole; break;
+        case AlertButton_Help:    strText = tr("Help");   role = QDialogButtonBox::HelpRole; break;
         default:
             AssertMsgFailed(("Type %d is not supported!", iButton));

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

@@ -47 +47 @@
     AlertButton_Choice2       =  0x8,  /* 00000000 00001000 */
     AlertButton_Copy          = 0x10,  /* 00000000 00010000 */
+    AlertButton_Help          = 0x11,  /* 00000000 00010001 */
     AlertButtonMask           = 0xFF   /* 00000000 11111111 */
 };
@@ -193 +194 @@
     /** Holds the 3rd button instance. */
     QPushButton *m_pButton3;
+    /** Holds the help-button instance. */
+    QPushButton  *m_pButtonHelp;
+
     /** Holds the button-box instance. */
     QIDialogButtonBox *m_pButtonBox;
 
+    /** Holds the help keyword string. */
+    QString m_strHelpKeyword;
+
     /** Defines whether message was accepted. */
     bool m_fDone : 1;