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

Timestamp:

Nov 26, 2020 5:26:38 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Some refactoring.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• UITakeSnapshotDialog.cpp (modified) (1 diff)
• extensions/QIManagerDialog.cpp (modified) (1 diff)
• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIMessageCenter.h (modified) (1 diff)
• runtime/UIVMCloseDialog.cpp (modified) (1 diff)
• runtime/information/UIVMInformationDialog.cpp (modified) (1 diff)
• 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

@@ -299 +299 @@
                     this, &UITakeSnapshotDialog::reject);
             connect(m_pButtonBox->button(QIDialogButtonBox::Help), &QPushButton::pressed,
-                    &(msgCenter()), &UIMessageCenter::sltHandleDialogHelpButtonPress);
+                    &(msgCenter()), &UIMessageCenter::sltHandleHelpRequest);
             m_pButtonBox->button(QDialogButtonBox::Help)->setShortcut(Qt::Key_F1);
             uiCommon().setHelpKeyword(m_pButtonBox->button(QIDialogButtonBox::Help), "snapshots");

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

@@ -187 +187 @@
         /* Connections to enable the context sensitive help: */
         connect(m_pButtonBox, &QDialogButtonBox::helpRequested, this, &QIManagerDialog::sltHandleHelpRequested);
-        connect(this, &QIManagerDialog::sigHelpRequested, &msgCenter(), &UIMessageCenter::sltHandleHelpRequest);
+        connect(this, &QIManagerDialog::sigHelpRequested, &msgCenter(), &UIMessageCenter::sltHandleHelpRequestWithKeyword);
 
         /* Configure button-box: */

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

@@ -3460 +3460 @@
 }
 
-void UIMessageCenter::sltHandleDialogHelpButtonPress()
+void UIMessageCenter::sltHandleHelpRequest()
 {
 # if defined(VBOX_WITH_DOCS_QHELP) && (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
-    sltHandleHelpRequest(uiCommon().helpKeyword(sender()));
+    sltHandleHelpRequestWithKeyword(uiCommon().helpKeyword(sender()));
 #endif /* #if defined(VBOX_WITH_DOCS_QHELP) && (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))&& (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)) */
 }
 
-void UIMessageCenter::sltHandleHelpRequest(const QString &strHelpKeyword)
+void UIMessageCenter::sltHandleHelpRequestWithKeyword(const QString &strHelpKeyword)
 {
 # if defined(VBOX_WITH_DOCS_QHELP) && (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))

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

@@ -554 +554 @@
     void sltShowUserManual(const QString &strLocation);
     void sltHelpBrowserClosed();
-    void sltHandleDialogHelpButtonPress();
-    void sltHandleHelpRequest(const QString &strHelpKeyword);
+    void sltHandleHelpRequest();
+    void sltHandleHelpRequestWithKeyword(const QString &strHelpKeyword);
 
 private slots:

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

@@ -513 +513 @@
         connect(pButtonBox, &QIDialogButtonBox::rejected, this, &UIVMCloseDialog::reject);
         connect(pButtonBox->button(QIDialogButtonBox::Help), &QPushButton::pressed,
-                &msgCenter(), &UIMessageCenter::sltHandleDialogHelpButtonPress);
+                &msgCenter(), &UIMessageCenter::sltHandleHelpRequest);
         pButtonBox->button(QIDialogButtonBox::Help)->setProperty("helptag", "intro-save-machine-state");
 

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

@@ -266 +266 @@
         connect(m_pButtonBox, &QIDialogButtonBox::rejected, this, &UIVMInformationDialog::close);
         connect(m_pButtonBox->button(QDialogButtonBox::Help), &QPushButton::pressed,
-                &(msgCenter()), &UIMessageCenter::sltHandleDialogHelpButtonPress);
+                &(msgCenter()), &UIMessageCenter::sltHandleHelpRequest);
         /* add button-box into main-layout: */
         centralWidget()->layout()->addWidget(m_pButtonBox);

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

@@ -780 +780 @@
     QObject::connect(m_pButtonBox, &QIDialogButtonBox::accepted, this, &UISettingsDialog::accept);
     connect(m_pButtonBox->button(QDialogButtonBox::Help), &QAbstractButton::pressed,
-                                 &(msgCenter()), &UIMessageCenter::sltHandleDialogHelpButtonPress);
+                                 &(msgCenter()), &UIMessageCenter::sltHandleHelpRequest);
 }
 

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

@@ -4216 +4216 @@
     connect(m_pSettingsWidget, &UISoftKeyboardSettingsWidget::sigColorThemeSelectionChanged, this, &UISoftKeyboard::sltHandleColorThemeListSelection);
 
-    connect(this, &UISoftKeyboard::sigHelpRequested, &msgCenter(), &UIMessageCenter::sltHandleDialogHelpButtonPress);
+    connect(this, &UISoftKeyboard::sigHelpRequested, &msgCenter(), &UIMessageCenter::sltHandleHelpRequest);
 }
 

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

@@ -274 +274 @@
     if (button(QWizard::HelpButton))
         button(QWizard::HelpButton)->setShortcut(Qt::Key_F1);
-    connect(this, &UIWizard::helpRequested, &msgCenter(), &UIMessageCenter::sltHandleDialogHelpButtonPress);
+    connect(this, &UIWizard::helpRequested, &msgCenter(), &UIMessageCenter::sltHandleHelpRequest);
 }