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

Timestamp:

Nov 27, 2020 9:48:39 AM (4 years ago)

Author:

vboxsync

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

141563

Message:

FE/Qt: bugref:9831. Replacing hard coded F1 with platform dependen key squence.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• UITakeSnapshotDialog.cpp (modified) (2 diffs)
• cloud/profilemanager/UICloudProfileManager.cpp (modified) (1 diff)
• extensions/QIManagerDialog.cpp (modified) (1 diff)
• guestctrl/UIFileManagerDialog.cpp (modified) (1 diff)
• logviewer/UIVMLogViewerDialog.cpp (modified) (1 diff)
• medium/UIMediumManager.cpp (modified) (1 diff)
• networkmanager/UINetworkManager.cpp (modified) (1 diff)
• runtime/UIVMCloseDialog.cpp (modified) (1 diff)
• runtime/information/UIVMInformationDialog.cpp (modified) (2 diffs)
• settings/UISettingsDialog.cpp (modified) (1 diff)
• softkeyboard/UISoftKeyboard.cpp (modified) (1 diff)
• wizards/UIWizard.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/UITakeSnapshotDialog.cpp

@@ -113 +113 @@
         m_pButtonBox->button(QDialogButtonBox::Help)->setStatusTip(tr("Show dialog help"));
 
-        m_pButtonBox->button(QDialogButtonBox::Help)->setShortcut(Qt::Key_F1);
+        m_pButtonBox->button(QDialogButtonBox::Help)->setShortcut(QKeySequence::HelpContents);
 
         m_pButtonBox->button(QDialogButtonBox::Ok)->setToolTip(tr("Accept (%1)").arg(m_pButtonBox->button(QDialogButtonBox::Ok)->shortcut().toString()));
@@ -300 +300 @@
             connect(m_pButtonBox->button(QIDialogButtonBox::Help), &QPushButton::pressed,
                     &(msgCenter()), &UIMessageCenter::sltHandleHelpRequest);
-            m_pButtonBox->button(QDialogButtonBox::Help)->setShortcut(Qt::Key_F1);
+            m_pButtonBox->button(QDialogButtonBox::Help)->setShortcut(QKeySequence::HelpContents);
             uiCommon().setHelpKeyword(m_pButtonBox->button(QIDialogButtonBox::Help), "snapshots");
             /* Add into layout: */

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

@@ -963 +963 @@
     button(ButtonType_Apply)->setShortcut(QString("Ctrl+Return"));
     button(ButtonType_Close)->setShortcut(Qt::Key_Escape);
-    button(ButtonType_Help)->setShortcut(Qt::Key_F1);
+    button(ButtonType_Help)->setShortcut(QKeySequence::HelpContents);
     button(ButtonType_Reset)->setToolTip(tr("Reset Changes (%1)").arg(button(ButtonType_Reset)->shortcut().toString()));
     button(ButtonType_Apply)->setToolTip(tr("Apply Changes (%1)").arg(button(ButtonType_Apply)->shortcut().toString()));

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

@@ -176 +176 @@
         /* Assign shortcuts: */
         button(ButtonType_Close)->setShortcut(Qt::Key_Escape);
-        button(ButtonType_Help)->setShortcut(Qt::Key_F1);
+        button(ButtonType_Help)->setShortcut(QKeySequence::HelpContents);
 
         /* Hide 'Reset' and 'Apply' initially: */

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerDialog.cpp

@@ -79 +79 @@
     button(ButtonType_Help)->setStatusTip(UIFileManager::tr("Show dialog help"));
     button(ButtonType_Close)->setShortcut(Qt::Key_Escape);
-    button(ButtonType_Help)->setShortcut(Qt::Key_F1);
+    button(ButtonType_Help)->setShortcut(QKeySequence::HelpContents);
     button(ButtonType_Close)->setToolTip(UIFileManager::tr("Reset Changes (%1)").arg(button(ButtonType_Close)->shortcut().toString()));
     button(ButtonType_Help)->setToolTip(UIFileManager::tr("Show Help (%1)").arg(button(ButtonType_Help)->shortcut().toString()));

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerDialog.cpp

@@ -82 +82 @@
     button(ButtonType_Help)->setStatusTip(UIVMLogViewerWidget::tr("Show dialog help"));
     button(ButtonType_Close)->setShortcut(Qt::Key_Escape);
-    button(ButtonType_Help)->setShortcut(Qt::Key_F1);
+    button(ButtonType_Help)->setShortcut(QKeySequence::HelpContents);
     button(ButtonType_Close)->setToolTip(UIVMLogViewerWidget::tr("Close Window (%1)").arg(button(ButtonType_Close)->shortcut().toString()));
     button(ButtonType_Help)->setToolTip(UIVMLogViewerWidget::tr("Show Help (%1)").arg(button(ButtonType_Help)->shortcut().toString()));

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

@@ -1662 +1662 @@
     button(ButtonType_Apply)->setShortcut(QString("Ctrl+Return"));
     button(ButtonType_Close)->setShortcut(Qt::Key_Escape);
-    button(ButtonType_Help)->setShortcut(Qt::Key_F1);
+    button(ButtonType_Help)->setShortcut(QKeySequence::HelpContents);
     button(ButtonType_Reset)->setToolTip(tr("Reset Changes (%1)").arg(button(ButtonType_Reset)->shortcut().toString()));
     button(ButtonType_Apply)->setToolTip(tr("Apply Changes (%1)").arg(button(ButtonType_Apply)->shortcut().toString()));

trunk/src/VBox/Frontends/VirtualBox/src/networkmanager/UINetworkManager.cpp

@@ -1001 +1001 @@
     button(ButtonType_Apply)->setShortcut(QString("Ctrl+Return"));
     button(ButtonType_Close)->setShortcut(Qt::Key_Escape);
-    button(ButtonType_Help)->setShortcut(Qt::Key_F1);
+    button(ButtonType_Help)->setShortcut(QKeySequence::HelpContents);
     button(ButtonType_Reset)->setToolTip(tr("Reset Changes (%1)").arg(button(ButtonType_Reset)->shortcut().toString()));
     button(ButtonType_Apply)->setToolTip(tr("Apply Changes (%1)").arg(button(ButtonType_Apply)->shortcut().toString()));

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.cpp

@@ -514 +514 @@
         connect(pButtonBox->button(QIDialogButtonBox::Help), &QPushButton::pressed,
                 &msgCenter(), &UIMessageCenter::sltHandleHelpRequest);
-        pButtonBox->button(QIDialogButtonBox::Help)->setShortcut(Qt::Key_F1);
+        pButtonBox->button(QIDialogButtonBox::Help)->setShortcut(QKeySequence::HelpContents);
         uiCommon().setHelpKeyword(pButtonBox->button(QIDialogButtonBox::Help), "intro-save-machine-state");
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.cpp

@@ -125 +125 @@
         m_pButtonBox->button(QDialogButtonBox::Help)->setStatusTip(tr("Show dialog help"));
         m_pButtonBox->button(QDialogButtonBox::Close)->setShortcut(Qt::Key_Escape);
-        m_pButtonBox->button(QDialogButtonBox::Help)->setShortcut(Qt::Key_F1);
+        m_pButtonBox->button(QDialogButtonBox::Help)->setShortcut(QKeySequence::HelpContents);
         m_pButtonBox->button(QDialogButtonBox::Close)->setToolTip(tr("Reset Changes (%1)").arg(m_pButtonBox->button(QDialogButtonBox::Close)->shortcut().toString()));
         m_pButtonBox->button(QDialogButtonBox::Help)->setToolTip(tr("Show Help (%1)").arg(m_pButtonBox->button(QDialogButtonBox::Help)->shortcut().toString()));
@@ -262 +262 @@
         m_pButtonBox->setStandardButtons(QDialogButtonBox::Close | QDialogButtonBox::Help);
         m_pButtonBox->button(QDialogButtonBox::Close)->setShortcut(Qt::Key_Escape);
-        m_pButtonBox->button(QDialogButtonBox::Help)->setShortcut(Qt::Key_F1);
+        m_pButtonBox->button(QDialogButtonBox::Help)->setShortcut(QKeySequence::HelpContents);
         uiCommon().setHelpKeyword(m_pButtonBox->button(QDialogButtonBox::Help), "guestadd-guestprops");
         connect(m_pButtonBox, &QIDialogButtonBox::rejected, this, &UIVMInformationDialog::close);

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp

@@ -771 +771 @@
     m_pButtonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|
                                      QDialogButtonBox::Ok| QDialogButtonBox::Help);
-    m_pButtonBox->button(QDialogButtonBox::Help)->setShortcut(Qt::Key_F1);
+    m_pButtonBox->button(QDialogButtonBox::Help)->setShortcut(QKeySequence::HelpContents);
 
     pMainLayout->addWidget(m_pButtonBox, 2, 0, 1, 2);

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp

@@ -3913 +3913 @@
         if (pKeyEvent)
         {
-            if (pKeyEvent->key() == Qt::Key_F1)
+            if (QKeySequence(pKeyEvent->key()) == QKeySequence::HelpContents)
                 sltHandleHelpRequest();
         }

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

@@ -273 +273 @@
     uiCommon().setHelpKeyword(this, strHelpKeyword);
     if (button(QWizard::HelpButton))
-        button(QWizard::HelpButton)->setShortcut(Qt::Key_F1);
+        button(QWizard::HelpButton)->setShortcut(QKeySequence::HelpContents);
     connect(this, &UIWizard::helpRequested, &msgCenter(), &UIMessageCenter::sltHandleHelpRequest);
 }