Changeset 89954 in vbox for trunk

Timestamp:

Jun 29, 2021 1:48:59 PM (4 years ago)

Author:

vboxsync

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

145412

Message:

FE/Qt: bugref:10049. Adding help keyword parameter whereever it is needed.

Location:

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

Files:

• UIMessageCenter.cpp (modified) (9 diffs)
• UIMessageCenter.h (modified) (6 diffs)

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

@@ -162 +162 @@
                              const QString &strButtonText1 /* = QString() */,
                              const QString &strButtonText2 /* = QString() */,
-                             const QString &strButtonText3 /* = QString() */) const
+                             const QString &strButtonText3 /* = QString() */,
+                             const QString &strHelpKeyword /* = QString() */) const
 {
     /* If this is NOT a GUI thread: */
@@ -173 +174 @@
                                  iButton1, iButton2, iButton3,
                                  strButtonText1, strButtonText2, strButtonText3,
-                                 QString(pcszAutoConfirmId));
+                                 QString(pcszAutoConfirmId), strHelpKeyword);
         /* Inter-thread communications are not yet implemented: */
         return 0;
@@ -182 +183 @@
                           iButton1, iButton2, iButton3,
                           strButtonText1, strButtonText2, strButtonText3,
-                          QString(pcszAutoConfirmId));
+                          QString(pcszAutoConfirmId), strHelpKeyword);
 }
 
@@ -188 +189 @@
                            const QString &strMessage,
                            const QString &strDetails,
-                           const char *pcszAutoConfirmId /* = 0*/) const
+                           const char *pcszAutoConfirmId /* = 0*/,
+                           const QString &strHelpKeyword /* = QString() */) const
 {
     message(pParent, enmType, strMessage, strDetails, pcszAutoConfirmId,
-            AlertButton_Ok | AlertButtonOption_Default | AlertButtonOption_Escape);
+            AlertButton_Ok | AlertButtonOption_Default | AlertButtonOption_Escape, 0 /* Button 2 */, 0 /* Button 3 */,
+            QString() /* strButtonText1 */, QString() /* strButtonText2 */, QString() /* strButtonText3 */, strHelpKeyword);
 }
 
@@ -630 +633 @@
     error(pParent, MessageType_Warning,
           tr("Failed to enumerate host USB devices."),
-          UIErrorString::formatErrorInfo(comHost), "USBEnumerationWarning");
+          UIErrorString::formatErrorInfo(comHost), "USBEnumerationWarning",
+          "install-linux-vboxusers" /* help keyword */);
 }
 
@@ -3437 +3441 @@
                                         int iButton1, int iButton2, int iButton3,
                                         const QString &strButtonText1, const QString &strButtonText2, const QString &strButtonText3,
-                                        const QString &strAutoConfirmId) const
+                                        const QString &strAutoConfirmId, const QString &strHelpKeyword) const
 {
     /* Now we can show a message-box directly: */
@@ -3444 +3448 @@
                    iButton1, iButton2, iButton3,
                    strButtonText1, strButtonText2, strButtonText3,
-                   strAutoConfirmId);
+                   strAutoConfirmId, strHelpKeyword);
 }
 
@@ -3506 +3510 @@
                                     int iButton1, int iButton2, int iButton3,
                                     const QString &strButtonText1, const QString &strButtonText2, const QString &strButtonText3,
-                                    const QString &strAutoConfirmId) const
+                                    const QString &strAutoConfirmId, const QString &strHelpKeyword) const
 {
     /* Choose the 'default' button: */
@@ -3571 +3575 @@
     QPointer<QIMessageBox> pMessageBox = new QIMessageBox(title, strMessage, icon,
                                                           iButton1, iButton2, iButton3,
-                                                          pMessageBoxParent);
+                                                          pMessageBoxParent, strHelpKeyword);
     windowManager().registerNewParent(pMessageBox, pMessageBoxParent);
 

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

@@ -79 +79 @@
                              int iButton1, int iButton2, int iButton3,
                              const QString &strButtonText1, const QString &strButtonText2, const QString &strButtonText3,
-                             const QString &strAutoConfirmId) const;
+                             const QString &strAutoConfirmId, const QString &strHelpKeyword) const;
 
 public:
@@ -104 +104 @@
       * @param  strButtonText1     Brings the button 1 text.
       * @param  strButtonText2     Brings the button 2 text.
-      * @param  strButtonText3     Brings the button 3 text. */
+      * @param  strButtonText3     Brings the button 3 text.
+      * @param  strHelpKeyword     Brings the help keyword string. */
     int message(QWidget *pParent, MessageType enmType,
                 const QString &strMessage, const QString &strDetails,
@@ -111 +112 @@
                 const QString &strButtonText1 = QString(),
                 const QString &strButtonText2 = QString(),
-                const QString &strButtonText3 = QString()) const;
+                const QString &strButtonText3 = QString(),
+                const QString &strHelpKeyword = QString()) const;
 
     /** Shows an 'Error' type of 'Message'.
@@ -119 +121 @@
       * @param  strMessage         Brings the message.
       * @param  strDetails         Brings the details.
-      * @param  pcszAutoConfirmId  Brings the auto-confirm ID. */
+      * @param  pcszAutoConfirmId  Brings the auto-confirm ID.
+      * @param  strHelpKeyword     Brings the help keyword string. */
     void error(QWidget *pParent, MessageType enmType,
                const QString &strMessage,
                const QString &strDetails,
-               const char *pcszAutoConfirmId = 0) const;
+               const char *pcszAutoConfirmId = 0,
+               const QString &strHelpKeyword = QString()) const;
 
     /** Shows an 'Error with Question' type of 'Message'.
@@ -594 +598 @@
       * @param  strButtonText2    Brings the button 2 text.
       * @param  strButtonText3    Brings the button 3 text.
-      * @param  strAutoConfirmId  Brings whether this message can be auto-confirmed. */
+      * @param  strAutoConfirmId  Brings whether this message can be auto-confirmed.
+      * @param  strHelpKeyword    Brings the help keyword string. */
     void sltShowMessageBox(QWidget *pParent, MessageType enmType,
                            const QString &strMessage, const QString &strDetails,
                            int iButton1, int iButton2, int iButton3,
                            const QString &strButtonText1, const QString &strButtonText2, const QString &strButtonText3,
-                           const QString &strAutoConfirmId) const;
+                           const QString &strAutoConfirmId, const QString &strHelpKeyword) const;
 
 private:
@@ -624 +629 @@
       * @param  strButtonText2    Brings the button 2 text.
       * @param  strButtonText3    Brings the button 3 text.
-      * @param  strAutoConfirmId  Brings whether this message can be auto-confirmed. */
+      * @param  strAutoConfirmId  Brings whether this message can be auto-confirmed.
+      * @param  strHelpKeyword    Brings the help keyowrd. */
     int showMessageBox(QWidget *pParent, MessageType type,
                        const QString &strMessage, const QString &strDetails,
                        int iButton1, int iButton2, int iButton3,
                        const QString &strButtonText1, const QString &strButtonText2, const QString &strButtonText3,
-                       const QString &strAutoConfirmId) const;
+                       const QString &strAutoConfirmId, const QString &strHelpKeyword) const;
     void showHelpBrowser(const QString &strHelpFilePath, QWidget *pParent = 0);