Changeset 107133 in vbox

Timestamp:

Nov 25, 2024 4:17:23 PM (8 weeks ago)

Author:

vboxsync

Message:

FE/Qt: Make sure Help button shortcuts across project assigned after corresponding buttons received a new name; Otherwise old assignment will be lost.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• UITakeSnapshotDialog.cpp (modified) (1 diff)
• cloud/consolemanager/UICloudConsoleManager.cpp (modified) (2 diffs)
• extensions/QIManagerDialog.cpp (modified) (1 diff)
• medium/viso/UIVisoCreator.cpp (modified) (3 diffs)
• runtime/information/UIVMInformationDialog.cpp (modified) (1 diff)
• wizards/UINativeWizard.cpp (modified) (2 diffs)

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

@@ -307 +307 @@
             connect(m_pButtonBox->button(QIDialogButtonBox::Help), &QPushButton::pressed,
                     m_pButtonBox, &QIDialogButtonBox::sltHandleHelpRequest);
-            m_pButtonBox->button(QDialogButtonBox::Help)->setShortcut(UIShortcutPool::standardSequence(QKeySequence::HelpContents));
             uiCommon().setHelpKeyword(m_pButtonBox->button(QIDialogButtonBox::Help), "snapshots");
 

trunk/src/VBox/Frontends/VirtualBox/src/cloud/consolemanager/UICloudConsoleManager.cpp

@@ -47 +47 @@
 #include "UICloudConsoleManager.h"
 #include "UIMessageCenter.h"
+#include "UIShortcutPool.h"
 #include "UITranslationEventListener.h"
 #include "QIToolBar.h"
@@ -1193 +1194 @@
     button(ButtonType_Apply)->setShortcut(QString("Ctrl+Return"));
     button(ButtonType_Close)->setShortcut(Qt::Key_Escape);
+    button(ButtonType_Help)->setShortcut(UIShortcutPool::standardSequence(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

@@ -195 +195 @@
         m_buttons[ButtonType_Help] = m_pButtonBox->button(QDialogButtonBox::Help);
 
-        /* Assign shortcuts: */
-        button(ButtonType_Close)->setShortcut(Qt::Key_Escape);
-        button(ButtonType_Help)->setShortcut(UIShortcutPool::standardSequence(QKeySequence::HelpContents));
-
         /* Hide some of buttons initially: */
         button(ButtonType_Reset)->hide();

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp

@@ -831 +831 @@
     pMainLayout->addWidget(m_pButtonBox);
 
-    connect(m_pButtonBox->button(QIDialogButtonBox::Help), &QPushButton::pressed,
+    connect(m_pButtonBox->button(QDialogButtonBox::Help), &QPushButton::pressed,
             m_pButtonBox, &QIDialogButtonBox::sltHandleHelpRequest);
-
-    m_pButtonBox->button(QDialogButtonBox::Help)->setShortcut(UIShortcutPool::standardSequence(QKeySequence::HelpContents));
 
     connect(m_pButtonBox, &QIDialogButtonBox::rejected, this, &UIVisoCreatorDialog::close);
@@ -840 +838 @@
 
 
-    uiCommon().setHelpKeyword(m_pButtonBox->button(QIDialogButtonBox::Help), "create-optical-disk-image");
+    uiCommon().setHelpKeyword(m_pButtonBox->button(QDialogButtonBox::Help), "create-optical-disk-image");
 
     sltRetranslateUI();
@@ -856 +854 @@
     }
     if (m_pButtonBox && m_pButtonBox->button(QDialogButtonBox::Help))
+    {
         m_pButtonBox->button(QDialogButtonBox::Help)->setToolTip(UIVisoCreatorWidget::tr("Opens the help browser and navigates to the related section"));
+        m_pButtonBox->button(QDialogButtonBox::Help)->setShortcut(UIShortcutPool::standardSequence(QKeySequence::HelpContents));
+    }
     updateWindowTitle();
 }

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

@@ -276 +276 @@
         /* Configure button-box: */
         m_pButtonBox->setStandardButtons(QDialogButtonBox::Close | QDialogButtonBox::Help);
-        m_pButtonBox->button(QDialogButtonBox::Close)->setShortcut(Qt::Key_Escape);
-        m_pButtonBox->button(QDialogButtonBox::Help)->setShortcut(UIShortcutPool::standardSequence(QKeySequence::HelpContents));
         uiCommon().setHelpKeyword(m_pButtonBox->button(QDialogButtonBox::Help), "vm-session-information");
         connect(m_pButtonBox, &QIDialogButtonBox::rejected, this, &UIVMInformationDialog::sigClose);

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

@@ -205 +205 @@
         pButtonHelp->setText(tr("&Help"));
         pButtonHelp->setToolTip(tr("Open corresponding Help topic."));
+        pButtonHelp->setShortcut(UIShortcutPool::standardSequence(QKeySequence::HelpContents));
     }
 
@@ -549 +550 @@
                     connect(wizardButton(WizardButtonType_Help), &QPushButton::clicked,
                             this, &UINativeWizard::sltHandleHelpRequest);
-                    wizardButton(WizardButtonType_Help)->setShortcut(UIShortcutPool::standardSequence(QKeySequence::HelpContents));
                     uiCommon().setHelpKeyword(this, m_strHelpKeyword);
                 }