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

Timestamp:

Jul 9, 2020 6:59:35 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9515. Marking the iso file selector if it breaks isComplete.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIComboBox.cpp (modified) (2 diffs)
• extensions/QIComboBox.h (modified) (2 diffs)
• widgets/UIFilePathSelector.cpp (modified) (2 diffs)
• widgets/UIFilePathSelector.h (modified) (2 diffs)
• wizards/newvm/UIWizardNewVM.h (modified) (1 diff)
• wizards/newvm/UIWizardNewVMPageBasic1.cpp (modified) (2 diffs)
• wizards/newvm/UIWizardNewVMPageBasic1.h (modified) (3 diffs)
• wizards/newvm/UIWizardNewVMPageExpert.cpp (modified) (2 diffs)

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

@@ -303 +303 @@
 }
 
+void QIComboBox::mark(bool fError)
+{
+    if (!m_pComboBox)
+        return;
+    QPalette palette = m_pComboBox->palette();
+    if (fError)
+        palette.setColor(QPalette::Base, QColor(255, 180, 180));
+    else
+        palette.setColor(QPalette::Base, m_originalBaseColor);
+    m_pComboBox->setPalette(palette);
+}
+
 void QIComboBox::clear()
 {
@@ -376 +388 @@
         AssertPtrReturnVoid(m_pComboBox);
         {
+            /* Cache original base color: */
+            m_originalBaseColor = m_pComboBox->palette().color(QPalette::Base);
             /* Configure combo-box: */
             setFocusProxy(m_pComboBox);

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIComboBox.h

@@ -119 +119 @@
     /** Defines size adjust @a enmPolicy. */
     void setSizeAdjustPolicy(QComboBox::SizeAdjustPolicy enmPolicy);
+    /** Paints the file selectors background to a reddish color when @p fError is true. */
+    void mark(bool fError);
 
 public slots:
@@ -154 +156 @@
     /** Holds the original combo-box instance. */
     QComboBox *m_pComboBox;
+
+    /** The original background base color. Used when marking/unmarking the combo box. */
+    QColor m_originalBaseColor;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp

@@ -27 +27 @@
 # include <QListView>
 #endif
+#include <QPalette>
 
 /* GUI includes: */
@@ -184 +185 @@
 }
 
+
 void UIFilePathSelector::setPath(const QString &strPath, bool fRefreshText /* = true */)
 {

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.h

@@ -118 +118 @@
     const QString& defaultPath() const;
 
+    /** Paints the file selectors background to a reddish color when @p fError is true. */
+    void markFileSelector(bool fError);
+
 public slots:
 
@@ -213 +216 @@
     /** Path is set to m_strDefaultPath when it is reset. */
     QString m_strDefaultPath;
+
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.h

@@ -72 +72 @@
     };
 
-    /* Constructor: */
+    /** Constructor: */
     UIWizardNewVM(QWidget *pParent, const QString &strGroup = QString());
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp

@@ -483 +483 @@
 }
 
+void UIWizardNewVMPage1::setTypeByISODetectedOSType(const QString &strDetectedOSType)
+{
+    if (!strDetectedOSType.isEmpty())
+        onNameChanged(strDetectedOSType);
+}
+
+void UIWizardNewVMPage1::markWidgets() const
+{
+    if (m_pISOFilePathSelector)
+        m_pISOFilePathSelector->mark(isISOFileSelectorComplete());
+}
+
+bool UIWizardNewVMPage1::isISOFileSelectorComplete() const
+{
+    if (!m_pISOFilePathSelector)
+        return false;
+    return checkISOFile();
+}
+
 UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup)
     : UIWizardNewVMPage1(strGroup)
@@ -525 +544 @@
 }
 
-void UIWizardNewVMPage1::setTypeByISODetectedOSType(const QString &strDetectedOSType)
-{
-    if (!strDetectedOSType.isEmpty())
-        onNameChanged(strDetectedOSType);
-}
-
 bool UIWizardNewVMPageBasic1::isComplete() const
 {
+    markWidgets();
     if (m_pNameAndSystemEditor->name().isEmpty())
         return false;
-    return checkISOFile();
+    return isISOFileSelectorComplete();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.h

@@ -71 +71 @@
     /** @} */
 
-
     bool determineOSType(const QString &strISOPath);
     /** calls CVirtualBox::ComposeMachineFilename(...) and sets related member variables */
     void composeMachineFilePath();
-    bool checkISOFile() const;
     /** Creates the page widgets and adds them into the @p pGridLayout. */
     void createNameOSTypeWidgets(QGridLayout *pGridLayout, bool fCreateLabels = true);
     void setTypeByISODetectedOSType(const QString &strDetectedOSType);
+    /** Colors the widgets red if they cause isComplete to fail. */
+    void markWidgets() const;
+
+    bool isISOFileSelectorComplete() const;
 
     /** @name Widgets
@@ -89 +91 @@
        QLabel *m_pISOSelectorLabel;
        /** Holds the ISO selector editor instance. */
-       UIFilePathSelector *m_pISOFilePathSelector;
+       mutable UIFilePathSelector *m_pISOFilePathSelector;
        /** Holds the headless start label instance. */
        QLabel *m_pStartHeadlessLabel;
@@ -105 +107 @@
 private:
 
+    bool checkISOFile() const;
 
     /** Full path (including the file name) of the machine's configuration file. */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp

@@ -336 +336 @@
 bool UIWizardNewVMPageExpert::isComplete() const
 {
+    UIWizardNewVMPage1::markWidgets();
     /* Make sure mandatory fields are complete,
      * 'ram' field feats the bounds,
@@ -346 +347 @@
     {
         /* Check the installation medium: */
-        if (!checkISOFile())
+        if (!isISOFileSelectorComplete())
             return false;
         /* Check the GA installation medium: */