Changeset 107134 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Nov 25, 2024 4:38:52 PM (3 months ago)

Author:

vboxsync

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

166112

Message:

FE/Qt: Advanced Settings Dialog: bugref:9923: Removing all the changes which hides Help button for macOS host.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialog.cpp (modified) (2 diffs)

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

@@ -846 +846 @@
     m_pScrollArea->requestVerticalScrollBarPosition(iPosition);
 
-#ifndef VBOX_WS_MAC
     uiCommon().setHelpKeyword(m_pButtonBox->button(QDialogButtonBox::Help), m_pageHelpKeywords.value(cId));
-#endif
 }
 
@@ -1571 +1569 @@
     if (m_pButtonBox)
     {
-#ifndef VBOX_WS_MAC
         m_pButtonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel |
                                          QDialogButtonBox::NoButton | QDialogButtonBox::Help);
         m_pButtonBox->button(QDialogButtonBox::Help)->setShortcut(UIShortcutPool::standardSequence(QKeySequence::HelpContents));
-#else
-        // WORKAROUND:
-        // No Help button on macOS for now, conflict with old Qt.
-        m_pButtonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel |
-                                         QDialogButtonBox::NoButton);
-#endif
         m_pButtonBox->button(QDialogButtonBox::Ok)->setShortcut(Qt::Key_Return);
         m_pButtonBox->button(QDialogButtonBox::Cancel)->setShortcut(Qt::Key_Escape);
         connect(m_pButtonBox, &QIDialogButtonBox::rejected, this, &UIAdvancedSettingsDialog::sltClose);
         connect(m_pButtonBox, &QIDialogButtonBox::accepted, this, &UIAdvancedSettingsDialog::accept);
-#ifndef VBOX_WS_MAC
         connect(m_pButtonBox->button(QDialogButtonBox::Help), &QAbstractButton::pressed,
                 m_pButtonBox, &QIDialogButtonBox::sltHandleHelpRequest);
-#endif
 
         /* Prepare status-bar: */