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

Timestamp:

Jul 9, 2020 12:56:45 PM (5 years ago)

Author:

vboxsync

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

139101

Message:

FE/Qt: bugref:9515. Marking more widgets.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QILineEdit.cpp (modified) (2 diffs)
• extensions/QILineEdit.h (modified) (2 diffs)
• widgets/UINameAndSystemEditor.cpp (modified) (1 diff)
• widgets/UINameAndSystemEditor.h (modified) (1 diff)
• widgets/UIUserNamePasswordEditor.cpp (modified) (3 diffs)
• widgets/UIUserNamePasswordEditor.h (modified) (2 diffs)
• wizards/newvm/UIWizardNewVM.cpp (modified) (2 diffs)
• wizards/newvm/UIWizardNewVM.h (modified) (2 diffs)
• wizards/newvm/UIWizardNewVMPageBasic1.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVMPageBasic2.cpp (modified) (2 diffs)
• wizards/newvm/UIWizardNewVMPageBasic2.h (modified) (1 diff)
• wizards/newvm/UIWizardNewVMPageExpert.cpp (modified) (3 diffs)
• wizards/newvm/UIWizardNewVMPageExpert.h (modified) (1 diff)

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

@@ -20 +20 @@
 
 /* Qt includes: */
+#include <QPalette>
 #include <QStyleOptionFrame>
 
+QILineEdit::QILineEdit(QWidget *pParent /* = 0 */)
+    : QLineEdit(pParent)
+{
+    m_originalBaseColor = palette().color(QPalette::Base);
+}
 
 void QILineEdit::setMinimumWidthByText(const QString &strText)
@@ -52 +58 @@
     return sa;
 }
+
+void QILineEdit::mark(bool fError)
+{
+    QPalette newPalette = palette();
+    if (fError)
+        newPalette.setColor(QPalette::Base, QColor(255, 180, 180));
+    else
+        newPalette.setColor(QPalette::Base, m_originalBaseColor);
+    setPalette(newPalette);
+}

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

@@ -36 +36 @@
 
     /** Constructs label-separator passing @a pParent to the base-class. */
-    QILineEdit(QWidget *pParent = 0)
-        : QLineEdit(pParent) {}
+    QILineEdit(QWidget *pParent = 0);
+
     /** Constructs label-separator passing @a pParent to the base-class.
       * @param  strContents  Brings the line-edit text. */
@@ -48 +48 @@
     void setFixedWidthByText(const QString &strText);
 
+    /** Sets the color to some reddish color when @p fError is true. Usually used to indicate some error. */
+    void mark(bool fError);
+
 private:
 
     /** Calculates suitable @a strText size. */
     QSize featTextWidth(const QString &strText) const;
+    /** The original background base color. Used when marking/unmarking the combo box. */
+    QColor m_originalBaseColor;
 };
 

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

@@ -254 +254 @@
 }
 
+void UINameAndSystemEditor::markNameLineEdit(bool fError)
+{
+    if (m_pNameLineEdit)
+        m_pNameLineEdit->mark(fError);
+}
+
 void UINameAndSystemEditor::retranslateUi()
 {

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

@@ -113 +113 @@
     void setNameFieldValidator(const QString &strValidator);
 
+    /** Passes the @p fError to QILineEdit::mark(bool) effectively changing the background color. */
+    void markNameLineEdit(bool fError);
+
 protected:
 

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

@@ -119 +119 @@
     , m_pPasswordLabel(0)
     , m_pPasswordRepeatLabel(0)
+    , m_fForceUnmark(false)
 {
     prepare();
@@ -180 +181 @@
 }
 
+void UIUserNamePasswordEditor::setForceUnmark(bool fForceUnmark)
+{
+    m_fForceUnmark = fForceUnmark;
+    isUserNameComplete();
+    isPasswordComplete();
+}
+
 void UIUserNamePasswordEditor::retranslateUi()
 {
@@ -227 +235 @@
         return;
     QPalette palette = pLineEdit->palette();
-    if (fError)
+    if (!fError || m_fForceUnmark)
+        palette.setColor(QPalette::Base, m_orginalLineEditBaseColor);
+    else
         palette.setColor(QPalette::Base, QColor(255, 180, 180));
-    else
-        palette.setColor(QPalette::Base, m_orginalLineEditBaseColor);
     pLineEdit->setPalette(palette);
 }

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

@@ -85 +85 @@
     /** Returns false if username or password fields are empty, or password fields do not match. */
     bool isComplete();
+    /** Sets m_fForceUnmark flag. see it for more info. */
+    void setForceUnmark(bool fForceUnmark);
 
 protected:
@@ -114 +116 @@
     QLabel *m_pPasswordRepeatLabel;
     QColor m_orginalLineEditBaseColor;
+    /** When true line edits are not marked even if they have to be. */
+    bool m_fForceUnmark;
 };
 

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

@@ -427 +427 @@
 }
 
+void UIWizardNewVM::sltCustomButtonClicked(int iId)
+{
+    UIWizard::sltCustomButtonClicked(iId);
+    setFieldsFromDefaultUnttendedInstallData();
+}
+
 void UIWizardNewVM::retranslateUi()
 {
@@ -505 +511 @@
 void UIWizardNewVM::setDefaultUnattendedInstallData(const UIUnattendedInstallData &unattendedInstallData)
 {
-    setField("userName", unattendedInstallData.m_strUserName);
-    setField("password", unattendedInstallData.m_strPassword);
-    setField("hostname", unattendedInstallData.m_strHostname);
-    setField("installGuestAdditions", unattendedInstallData.m_fInstallGuestAdditions);
-    setField("guestAdditionsISOPath", unattendedInstallData.m_strGuestAdditionsISOPath);
+    m_unattendedInstallData = unattendedInstallData;
+    setFieldsFromDefaultUnttendedInstallData();
+}
+
+void UIWizardNewVM::setFieldsFromDefaultUnttendedInstallData()
+{
+    setField("userName", m_unattendedInstallData.m_strUserName);
+    setField("password", m_unattendedInstallData.m_strPassword);
+    setField("hostname", m_unattendedInstallData.m_strHostname);
+    setField("installGuestAdditions", m_unattendedInstallData.m_fInstallGuestAdditions);
+    setField("guestAdditionsISOPath", m_unattendedInstallData.m_strGuestAdditionsISOPath);
 }
 

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

@@ -105 +105 @@
     void sltHandleWizardCancel();
     void sltHandleDetectedOSTypeChange();
+    virtual void sltCustomButtonClicked(int iId) /* override */;
 
 private:
@@ -114 +115 @@
     /* Helping stuff: */
     QString getNextControllerName(KStorageBus type);
+    void setFieldsFromDefaultUnttendedInstallData();
 
     /* Variables: */

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

@@ -492 +492 @@
 {
     if (m_pISOFilePathSelector)
-        m_pISOFilePathSelector->mark(isISOFileSelectorComplete());
+        m_pISOFilePathSelector->mark(!isISOFileSelectorComplete());
+    if (m_pNameAndSystemEditor)
+        m_pNameAndSystemEditor->markNameLineEdit(m_pNameAndSystemEditor->name().isEmpty());
 }
 

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

@@ -185 +185 @@
 }
 
+void UIWizardNewVMPage2::markWidgets() const
+{
+    if (m_pGAISOFilePathSelector)
+        m_pGAISOFilePathSelector->mark(!checkGAISOFile());
+}
+
 UIWizardNewVMPageBasic2::UIWizardNewVMPageBasic2()
     : m_pLabel(0)
@@ -268 +274 @@
 bool UIWizardNewVMPageBasic2::isComplete() const
 {
+    markWidgets();
     if (!checkGAISOFile())
         return false;

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

@@ -72 +72 @@
 
     bool checkGAISOFile() const;
+    void markWidgets() const;
 
     /** @name Widgets

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

@@ -334 +334 @@
 }
 
+void UIWizardNewVMPageExpert::markWidgets() const
+{
+    UIWizardNewVMPage1::markWidgets();
+
+    if (m_pGAISOFilePathSelector)
+        m_pGAISOFilePathSelector->mark(isUnattendedEnabled() && !checkGAISOFile());
+}
+
 bool UIWizardNewVMPageExpert::isComplete() const
 {
-    UIWizardNewVMPage1::markWidgets();
+    markWidgets();
+
     /* Make sure mandatory fields are complete,
      * 'ram' field feats the bounds,
@@ -352 +361 @@
         if (!checkGAISOFile())
             return false;
-    }
-    if (m_pUserNamePasswordEditor)
-    {
-        if (!m_pUserNamePasswordEditor->isComplete())
-            return false;
+        if (m_pUserNamePasswordEditor)
+        {
+            if (!m_pUserNamePasswordEditor->isComplete())
+                return false;
+        }
     }
     return true;
@@ -421 +430 @@
     if (m_pUsernameHostnameContainer)
         m_pUsernameHostnameContainer->setEnabled(fEnabled);
+    if (m_pUserNamePasswordEditor)
+        m_pUserNamePasswordEditor->setForceUnmark(!fEnabled);
     if (m_pProductKeyLabel)
         m_pProductKeyLabel->setEnabled(isProductKeyWidgetEnabled());

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

@@ -110 +110 @@
     bool isProductKeyWidgetEnabled() const;
     void disableEnableUnattendedRelatedWidgets(bool fEnabled);
-
+    void markWidgets() const;
     /** Widgets. */
     QWidget *m_pNameAndSystemContainer;