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

Timestamp:

Feb 11, 2021 3:21:12 PM (4 years ago)

Author:

vboxsync

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

142770

Message:

FE/Qt: Dont mark QILineEdit thru color change. Use instead an icon

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QILineEdit.cpp (modified) (7 diffs)
• extensions/QILineEdit.h (modified) (3 diffs)
• wizards/newvm/UIWizardNewVMPageExpert.cpp (modified) (1 diff)

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

@@ -20 +20 @@
 #include <QClipboard>
 #include <QContextMenuEvent>
+#include <QLabel>
 #include <QMenu>
 #include <QPalette>
@@ -26 +27 @@
 /* GUI includes: */
 #include "QILineEdit.h"
-
+#include "UIIconPool.h"
 
 QILineEdit::QILineEdit(QWidget *pParent /* = 0 */)
@@ -32 +33 @@
     , m_fAllowToCopyContentsWhenDisabled(false)
     , m_pCopyAction(0)
+    , m_pIconLabel(0)
+    , m_fMarkForError(false)
 {
     prepare();
@@ -40 +43 @@
     , m_fAllowToCopyContentsWhenDisabled(false)
     , m_pCopyAction(0)
+    , m_pIconLabel(0)
+    , m_fMarkForError(false)
 {
     prepare();
@@ -61 +66 @@
 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);
+    if (fError == m_fMarkForError)
+        return;
+    m_fMarkForError = fError;
+    update();
 }
 
@@ -94 +97 @@
 }
 
+void QILineEdit::paintEvent(QPaintEvent *pPaintEvent)
+{
+    QLineEdit::paintEvent(pPaintEvent);
+
+    if (m_fMarkForError)
+    {
+        const int iIconMargin = 0.5 * QApplication::style()->pixelMetric(QStyle::PM_LayoutTopMargin);
+        int iIconSize = height() - 2 * iIconMargin;
+        if (!m_pIconLabel)
+            m_pIconLabel = new QLabel(this);
+        m_pIconLabel->setPixmap(m_markIcon.pixmap(windowHandle(), QSize(iIconSize, iIconSize)));
+        m_pIconLabel->move(width() - iIconSize - iIconMargin, iIconMargin);
+        m_pIconLabel->show();
+    }
+    else
+    {
+        if (m_pIconLabel)
+            m_pIconLabel->hide();
+    }
+}
+
 void QILineEdit::copy()
 {
@@ -103 +127 @@
 void QILineEdit::prepare()
 {
+    m_markIcon = UIIconPool::iconSet(":/status_error_16px.png");
     /* Prepare original base color: */
     m_originalBaseColor = palette().color(QPalette::Base);

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

@@ -23 +23 @@
 
 /* Qt includes */
+#include <QIcon>
 #include <QLineEdit>
 
 /* GUI includes: */
 #include "UILibraryDefs.h"
+
+class QLabel;
 
 /** QLineEdit extension with advanced functionality. */
@@ -56 +59 @@
     /** Handles any Qt @a pEvent. */
     virtual bool event(QEvent *pEvent) /* override */;
+    virtual void paintEvent(QPaintEvent *pPaintEvent) /* override */;
 
 private slots:
@@ -77 +81 @@
     /** Holds the copy to clipboard action. */
     QAction *m_pCopyAction;
+
+    QLabel *m_pIconLabel;
+    QIcon m_markIcon;
+    bool m_fMarkForError;
 };
 

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

@@ -438 +438 @@
                 m_pToolBox->setPageTitleIcon(ExpertToolboxItems_Unattended,
                                              UIIconPool::iconSet(":/status_error_16px.png"),
-                                             UIWizardNewVM::tr("Invalid username and password"));
+                                             UIWizardNewVM::tr("Invalid username and/or password"));
                 fIsComplete = false;
             }