Changeset 91717 in vbox for trunk

Timestamp:

Oct 13, 2021 3:23:17 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9974. Adding suppress check box to the dialog.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackendGlobal.cpp (modified) (2 diffs)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• runtime/UIBootFailureDialog.cpp (modified) (9 diffs)
• runtime/UIBootFailureDialog.h (modified) (4 diffs)
• runtime/UIMachineLogic.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

@@ -390 +390 @@
     {
         case UIExtraDataMetaDefs::DialogType_VISOCreator: strResult = "VISOCreator"; break;
+        case UIExtraDataMetaDefs::DialogType_BootFailure: strResult = "BootFailure"; break;
         case UIExtraDataMetaDefs::DialogType_All:         strResult = "All"; break;
         default:
@@ -407 +408 @@
     QStringList keys;      QList<UIExtraDataMetaDefs::DialogType> values;
     keys << "VISOCreator"; values << UIExtraDataMetaDefs::DialogType_VISOCreator;
+    keys << "BootFailure"; values << UIExtraDataMetaDefs::DialogType_BootFailure;
     keys << "All";         values << UIExtraDataMetaDefs::DialogType_All;
     /* Invalid type for unknown words: */

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -495 +495 @@
         DialogType_Invalid     = 0,
         DialogType_VISOCreator = RT_BIT(0),
+        DialogType_BootFailure = RT_BIT(1),
         DialogType_All         = 0xFFFF
     };

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

@@ -18 +18 @@
 /* Qt includes: */
 #include <QAction>
+#include <QCheckBox>
 #include <QHeaderView>
 #include <QLabel>
@@ -28 +29 @@
 #include "QIToolButton.h"
 #include "QIRichTextLabel.h"
-
+#include "UIBootFailureDialog.h"
 #include "UICommon.h"
+#include "UIConverter.h"
 #include "UIDesktopWidgetWatchdog.h"
-
+#include "UIExtraDataManager.h"
 #include "UIFilePathSelector.h"
-#include "UIBootFailureDialog.h"
-
 #include "UIIconPool.h"
+#include "UIMessageCenter.h"
 #include "UIModalWindowManager.h"
-#include "UIMessageCenter.h"
-
-
+
+/* COM includes: */
 #include "CMediumAttachment.h"
 #include "CStorageController.h"
@@ -54 +54 @@
     , m_pBootImageSelector(0)
     , m_pBootImageLabel(0)
+    , m_pIconLabel(0)
+    , m_pSuppressDialogCheckBox(0)
     , m_comMachine(comMachine)
 {
     configure();
+}
+
+UIBootFailureDialog::~UIBootFailureDialog()
+{
+    if (m_pSuppressDialogCheckBox && m_pSuppressDialogCheckBox->isChecked())
+    {
+        QStringList suppressedMessageList = gEDataManager->suppressedMessages();
+        suppressedMessageList << gpConverter->toInternalString(UIExtraDataMetaDefs::DialogType_BootFailure);
+        gEDataManager->setSuppressedMessages(suppressedMessageList);
+    }
 }
 
@@ -79 +91 @@
     if (m_pBootImageLabel)
         m_pBootImageLabel->setText(tr("Boot DVD:"));
+    if (m_pSuppressDialogCheckBox)
+        m_pSuppressDialogCheckBox->setText(tr("Do not show this dialog again"));
 }
 
@@ -110 +124 @@
         return;
 
+    QHBoxLayout *pTopLayout = new QHBoxLayout;
+    pTopLayout->setContentsMargins(0, 0, 0, 0);
+
+    m_pIconLabel = new QLabel;
+    if (m_pIconLabel)
+    {
+        m_pIconLabel->setPixmap(iconPixmap());
+        m_pIconLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
+        pTopLayout->addWidget(m_pIconLabel, Qt::AlignTop | Qt::AlignCenter);
+    }
+
     m_pLabel = new QIRichTextLabel;
     if (m_pLabel)
-        m_pMainLayout->addWidget(m_pLabel);
+        pTopLayout->addWidget(m_pLabel);
 
     QHBoxLayout *pSelectorLayout = new QHBoxLayout;
@@ -134 +159 @@
                 this, &UIBootFailureDialog::sltFileSelectorPathChanged);
     }
+
+    m_pMainLayout->addLayout(pTopLayout);
     m_pMainLayout->addLayout(pSelectorLayout);
+
+    m_pSuppressDialogCheckBox = new QCheckBox;
+    if (m_pSuppressDialogCheckBox)
+        m_pMainLayout->addWidget(m_pSuppressDialogCheckBox);
+
     m_pButtonBox = new QIDialogButtonBox;
     if (m_pButtonBox)
@@ -144 +176 @@
         m_pMainLayout->addWidget(m_pButtonBox);
     }
+
     m_pMainLayout->addStretch();
     retranslateUi();
@@ -184 +217 @@
     if (m_pParent)
         UIDesktopWidgetWatchdog::centerWidget(this, m_pParent, false);
-
+    QIWithRetranslateUI<QIMainDialog>::showEvent(pEvent);
 }
 
@@ -247 +280 @@
     insertBootMedium(uiCommon().openMedium(UIMediumDeviceType_DVD, strPath));
 }
+
+QPixmap UIBootFailureDialog::iconPixmap()
+{
+    QIcon icon = UIIconPool::defaultIcon(UIIconPool::UIDefaultIconType_MessageBoxWarning);
+    if (icon.isNull())
+        return QPixmap();
+    int iSize = QApplication::style()->pixelMetric(QStyle::PM_MessageBoxIconSize, 0, 0);
+    return icon.pixmap(iSize, iSize);
+}

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIBootFailureDialog.h

@@ -30 +30 @@
 
 /* Forward declarations: */
+class QCheckBox;
 class QLabel;
 class QVBoxLayout;
@@ -58 +59 @@
 
     UIBootFailureDialog(QWidget *pParent, const CMachine &comMachine);
+    ~UIBootFailureDialog();
     QString bootMediumPath() const;
 
 protected:
 
-    void showEvent(QShowEvent *pEvent);
-
+    virtual void showEvent(QShowEvent *pEvent) /* override */;
 
 private slots:
@@ -74 +75 @@
 
     bool insertBootMedium(const QUuid &uMediumId);
+    QPixmap iconPixmap();
 
     /** @name Event-handling stuff.
@@ -100 +102 @@
     UIFilePathSelector   *m_pBootImageSelector;
     QLabel               *m_pBootImageLabel;
+    QLabel               *m_pIconLabel;
+    QCheckBox            *m_pSuppressDialogCheckBox;
     CMachine              m_comMachine;
 };

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

@@ -667 +667 @@
         return askUserForTheDiskEncryptionPasswords();
     else if (strErrorId == "VMBootFail")
-        return showBootFailureDialog();
+    {
+        if (!gEDataManager->suppressedMessages().contains(gpConverter->toInternalString(UIExtraDataMetaDefs::DialogType_BootFailure)))
+            return showBootFailureDialog();
+        else
+            return;
+    }
 
     /* Show runtime error: */
@@ -3266 +3271 @@
     int iResult = pBootFailureDialog->exec(false);
 
-
     delete pBootFailureDialog;