Changeset 86991 in vbox

Timestamp:

Nov 26, 2020 2:48:09 PM (4 years ago)

Author:

vboxsync

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

141537

Message:

FE/Qt: bugref:9831. Some more fixes

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• UITakeSnapshotDialog.cpp (modified) (3 diffs)
• cloud/profilemanager/UICloudProfileDetailsWidget.cpp (modified) (1 diff)
• runtime/information/UIVMInformationDialog.cpp (modified) (2 diffs)

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

@@ -27 +27 @@
 #include "QILabel.h"
 #include "VBoxUtils.h"
+#include "UICommon.h"
 #include "UIDesktopWidgetWatchdog.h"
 #include "UIMessageCenter.h"
@@ -101 +102 @@
                              "attached to it. As long as you are working from this snapshot the immutable image(s) "
                              "will not be reset to avoid loss of data.", "", m_cImmutableMedia));
+
+    if (m_pButtonBox)
+    {
+        m_pButtonBox->button(QDialogButtonBox::Ok)->setText(tr("Ok"));
+        m_pButtonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
+        m_pButtonBox->button(QDialogButtonBox::Help)->setText(tr("Help"));
+
+        m_pButtonBox->button(QDialogButtonBox::Ok)->setStatusTip(tr("Take Snapshot and close the dialog"));
+        m_pButtonBox->button(QDialogButtonBox::Cancel)->setStatusTip(tr("Close dialog without taking a snapshot"));
+        m_pButtonBox->button(QDialogButtonBox::Help)->setStatusTip(tr("Show dialog help"));
+
+        m_pButtonBox->button(QDialogButtonBox::Help)->setShortcut(Qt::Key_F1);
+
+        m_pButtonBox->button(QDialogButtonBox::Ok)->setToolTip(tr("Accept (%1)").arg(m_pButtonBox->button(QDialogButtonBox::Ok)->shortcut().toString()));
+        m_pButtonBox->button(QDialogButtonBox::Cancel)->setToolTip(tr("Cancel (%1)").arg(m_pButtonBox->button(QDialogButtonBox::Cancel)->shortcut().toString()));
+        m_pButtonBox->button(QDialogButtonBox::Help)->setToolTip(tr("Show Help (%1)").arg(m_pButtonBox->button(QDialogButtonBox::Help)->shortcut().toString()));
+    }
 }
 
@@ -282 +300 @@
             connect(m_pButtonBox->button(QIDialogButtonBox::Help), &QPushButton::pressed,
                     &(msgCenter()), &UIMessageCenter::sltHandleDialogHelpButtonPress);
-            m_pButtonBox->button(QIDialogButtonBox::Help)->setProperty("helptag", "snapshots");
+            m_pButtonBox->button(QDialogButtonBox::Help)->setShortcut(Qt::Key_F1);
+            uiCommon().setHelpKeyword(m_pButtonBox->button(QIDialogButtonBox::Help), "snapshots");
             /* Add into layout: */
             pLayout->addWidget(m_pButtonBox, 3, 0, 1, 2);

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

@@ -27 +27 @@
 /* GUI includes: */
 #include "QIDialogButtonBox.h"
+#include "UICommon.h"
 #include "UICloudProfileDetailsWidget.h"
 

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

@@ -124 +124 @@
         m_pButtonBox->button(QDialogButtonBox::Close)->setStatusTip(tr("Close dialog without saving"));
         m_pButtonBox->button(QDialogButtonBox::Help)->setStatusTip(tr("Show dialog help"));
+        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()));
+
         m_pButtonBox->button(QDialogButtonBox::Close)->setShortcut(Qt::Key_Escape);
         m_pButtonBox->button(QDialogButtonBox::Help)->setShortcut(Qt::Key_F1);
-        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("Reset Changes (%1)").arg(m_pButtonBox->button(QDialogButtonBox::Help)->shortcut().toString()));
     }
 }
@@ -262 +263 @@
         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);
         uiCommon().setHelpKeyword(m_pButtonBox->button(QDialogButtonBox::Help), "guestadd-guestprops");
         connect(m_pButtonBox, &QIDialogButtonBox::rejected, this, &UIVMInformationDialog::close);