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

Timestamp:

Nov 20, 2020 4:44:12 PM (4 years ago)

Author:

vboxsync

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

141453

Message:

FE/Qt: bugref:9831. Adding context sensitive help button to dialogs. take 3

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• VirtualBox2.qrc (modified) (1 diff)
• images/soft_keyboard_help_16px.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/soft_keyboard_layout_list_16px.png )
• src/UITakeSnapshotDialog.cpp (modified) (1 diff)
• src/globals/UIMessageCenter.cpp (modified) (1 diff)
• src/guestctrl/UIFileManagerDialog.cpp (modified) (1 diff)
• src/guestctrl/UIFileManagerDialog.h (modified) (1 diff)
• src/logviewer/UIVMLogViewerDialog.cpp (modified) (1 diff)
• src/logviewer/UIVMLogViewerDialog.h (modified) (1 diff)
• src/runtime/information/UIVMInformationDialog.cpp (modified) (2 diffs)
• src/softkeyboard/UISoftKeyboard.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc

@@ -295 +295 @@
         <file alias="soft_keyboard_16px.png">images/soft_keyboard_16px.png</file>
         <file alias="soft_keyboard_32px.png">images/soft_keyboard_32px.png</file>
+        <file alias="soft_keyboard_help_16px.png">images/soft_keyboard_help_16px.png</file>
         <file alias="soft_keyboard_layout_copy_16px.png">images/soft_keyboard_layout_copy_16px.png</file>
         <file alias="soft_keyboard_layout_copy_disabled_16px.png">images/soft_keyboard_layout_copy_disabled_16px.png</file>

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

@@ -280 +280 @@
             connect(m_pButtonBox, &QIDialogButtonBox::rejected,
                     this, &UITakeSnapshotDialog::reject);
-            connect(m_pButtonBox, &QIDialogButtonBox::helpRequested,
-                    &msgCenter(), &UIMessageCenter::sltShowHelpHelpDialog);
-
+            connect(m_pButtonBox->button(QIDialogButtonBox::Help), &QPushButton::pressed,
+                    &(msgCenter()), &UIMessageCenter::sltHandleDialogHelpButtonPress);
+            m_pButtonBox->button(QIDialogButtonBox::Help)->setProperty("helptag", "snapshots");
             /* Add into layout: */
             pLayout->addWidget(m_pButtonBox, 3, 0, 1, 2);

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

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

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

@@ -102 +102 @@
 }
 
+void UIFileManagerDialog::configureButtonBox()
+{
+    configureButtonBoxHelpButton("guestadd-gc-file-manager");
+}
+
 void UIFileManagerDialog::finalize()
 {

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

@@ -86 +86 @@
         /** Configures central-widget. */
         virtual void configureCentralWidget() /* override */;
+        /** Configures button box. */
+        virtual void configureButtonBox() /* override */;
         /** Perform final preparations. */
         virtual void finalize() /* override */;

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

@@ -106 +106 @@
 }
 
+void UIVMLogViewerDialog::configureButtonBox()
+{
+    configureButtonBoxHelpButton("collect-debug-info");
+}
+
 void UIVMLogViewerDialog::finalize()
 {

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

@@ -93 +93 @@
         /** Configures central-widget. */
         virtual void configureCentralWidget() /* override */;
+        virtual void configureButtonBox() /* override */;
         /** Perform final preparations. */
         virtual void finalize() /* override */;

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

@@ -22 +22 @@
 
 /* GUI includes: */
-#include "UIVMInformationDialog.h"
-#include "UIExtraDataManager.h"
-#include "UISession.h"
-#include "UIMachineLogic.h"
-#include "UIMachineWindow.h"
-#include "UIMachineView.h"
-#include "UIConverter.h"
-#include "UIIconPool.h"
 #include "QITabWidget.h"
 #include "QIDialogButtonBox.h"
 #include "UICommon.h"
-#include "VBoxUtils.h"
+#include "UIConverter.h"
+#include "UIExtraDataManager.h"
+#include "UIIconPool.h"
 #include "UIInformationConfiguration.h"
-#include "UIPerformanceMonitor.h"
 #include "UIInformationRuntime.h"
 #include "UIGuestProcessControlWidget.h"
+#include "UIMachineLogic.h"
 #include "UIMachine.h"
+#include "UIMachineView.h"
+#include "UIMachineWindow.h"
+#include "UIMessageCenter.h"
+#include "UIPerformanceMonitor.h"
+#include "UISession.h"
+#include "UIVMInformationDialog.h"
+#include "VBoxUtils.h"
+
 
 /* COM includes: */
@@ -245 +247 @@
     {
         /* Configure button-box: */
-        m_pButtonBox->setStandardButtons(QDialogButtonBox::Close);
+        m_pButtonBox->setStandardButtons(QDialogButtonBox::Close | QDialogButtonBox::Help);
         m_pButtonBox->button(QDialogButtonBox::Close)->setShortcut(Qt::Key_Escape);
+        m_pButtonBox->button(QDialogButtonBox::Help)->setProperty("helptag", "guestadd-guestprops");
         connect(m_pButtonBox, &QIDialogButtonBox::rejected, this, &UIVMInformationDialog::close);
-        /* Add button-box into main-layout: */
+        connect(m_pButtonBox->button(QDialogButtonBox::Help), &QPushButton::pressed,
+                &(msgCenter()), &UIMessageCenter::sltHandleDialogHelpButtonPress);
+        /* add button-box into main-layout: */
         centralWidget()->layout()->addWidget(m_pButtonBox);
     }

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

@@ -831 +831 @@
     QToolButton  *m_pSettingsButton;
     QToolButton  *m_pResetButton;
+    QToolButton  *m_pHelpButton;
     QLabel       *m_pMessageLabel;
 };
@@ -3562 +3563 @@
     , m_pSettingsButton(0)
     , m_pResetButton(0)
+    , m_pHelpButton(0)
     , m_pMessageLabel(0)
 {
@@ -3575 +3577 @@
     if (m_pResetButton)
         m_pResetButton->setToolTip(UISoftKeyboard::tr("Reset the keyboard and release all keys"));
+    if (m_pHelpButton)
+        m_pHelpButton->setToolTip(UISoftKeyboard::tr("Help"));
 }
 
@@ -3622 +3626 @@
         connect(m_pResetButton, &QToolButton::clicked, this, &UISoftKeyboardStatusBarWidget::sigResetKeyboard);
         pLayout->addWidget(m_pResetButton);
+    }
+
+    m_pHelpButton = new QToolButton;
+    if (m_pHelpButton)
+    {
+        m_pHelpButton->setIcon(UIIconPool::iconSet(":/soft_keyboard_help_16px.png"));
+        m_pHelpButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+        const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
+        m_pHelpButton->resize(QSize(iIconMetric, iIconMetric));
+        m_pHelpButton->setStyleSheet("QToolButton { border: 0px none black; margin: 0px 0px 0px 0px; } QToolButton::menu-indicator {image: none;}");
+        m_pHelpButton->setProperty("helptag", "soft-keyb");
+        connect(m_pHelpButton, &QToolButton::clicked, &(msgCenter()), &UIMessageCenter::sltHandleDialogHelpButtonPress);
+        pLayout->addWidget(m_pHelpButton);
     }