Changeset 86979 in vbox

Timestamp:

Nov 26, 2020 7:04:40 AM (4 years ago)

Author:

vboxsync

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

141525

Message:

FE/Qt: bugref:9831. Enabling F1 button for help in wizards

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (1 diff)
• wizards/UIWizard.cpp (modified) (1 diff)
• wizards/clonevm/UIWizardCloneVM.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVM.cpp (modified) (2 diffs)

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

@@ -3463 +3463 @@
 {
 # if defined(VBOX_WITH_DOCS_QHELP) && (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
-    QAbstractButton *pSender = qobject_cast<QAbstractButton*>(sender());
+    QWidget *pSender = qobject_cast<QWidget*>(sender());
     if (!pSender)
         return;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.cpp

@@ -271 +271 @@
 {
     setOptions(options() | QWizard::HaveHelpButton);
+    setProperty("helptag", strHelpTag);
     if (button(QWizard::HelpButton))
-    {
-        button(QWizard::HelpButton)->setProperty("helptag", strHelpTag);
-        connect(button(QWizard::HelpButton), &QAbstractButton::pressed,
-                &(msgCenter()), &UIMessageCenter::sltHandleDialogHelpButtonPress);
-    }
+        button(QWizard::HelpButton)->setShortcut(Qt::Key_F1);
+    connect(this, &UIWizard::helpRequested, &msgCenter(), &UIMessageCenter::sltHandleDialogHelpButtonPress);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVM.cpp

@@ -188 +188 @@
 void UIWizardCloneVM::prepare()
 {
+    enableHelpButton("clone");
     QString strDefaultMachineFolder = uiCommon().virtualBox().GetSystemProperties().GetDefaultMachineFolder();
     /* Create corresponding pages: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

@@ -72 +72 @@
 void UIWizardNewVM::prepare()
 {
+    enableHelpButton("gui-createvm");
     /* Create corresponding pages: */
     switch (mode())
@@ -94 +95 @@
         }
     }
-    enableHelpButton("gui-createvm");
     /* Call to base-class: */
     UIWizard::prepare();