Changeset 78092 in vbox

Timestamp:

Apr 10, 2019 2:27:06 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699. Marking the session username and password fields when session creation fails.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIDialogPanel.h (modified) (1 diff)
• guestctrl/UIFileManager.cpp (modified) (2 diffs)
• guestctrl/UIFileManagerOperationsPanel.cpp (modified) (1 diff)
• guestctrl/UIFileManagerSessionPanel.cpp (modified) (10 diffs)
• guestctrl/UIFileManagerSessionPanel.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDialogPanel.h

@@ -61 +61 @@
 
     /** Handles the Qt show @a pEvent. */
-    void showEvent(QShowEvent *pEvent);
+    void showEvent(QShowEvent *pEvent) /* override */;
     /** Handles the Qt hide @a pEvent. */
-    void hideEvent(QHideEvent *pEvent);
+    void hideEvent(QHideEvent *pEvent) /* override */;
     void addVerticalSeparator();
 

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.cpp

@@ -413 +413 @@
         appendLog("Could not find Guest Additions", FileManagerLogType_Error);
         postSessionClosed();
+        if (m_pSessionPanel)
+            m_pSessionPanel->markForError(true);
         return;
     }
@@ -418 +420 @@
     {
         appendLog("No user name is given", FileManagerLogType_Error);
-        return;
-    }
-    createSession(strUserName, strPassword);
+        if (m_pSessionPanel)
+            m_pSessionPanel->markForError(true);
+        return;
+    }
+    if (m_pSessionPanel)
+        m_pSessionPanel->markForError(!createSession(strUserName, strPassword));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerOperationsPanel.cpp

@@ -338 +338 @@
         return;
 
+    QPalette mPalette = palette();
+    mPalette.setColor(QPalette::Window, qApp->palette().color(QPalette::Light));
+    setPalette(mPalette);
 
     m_pScrollArea = new QScrollArea;

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerSessionPanel.cpp

@@ -46 +46 @@
     /** Makes sure certain widgets are enabled so that a guest session can be created. */
     void switchSessionCloseMode();
+    void markForError(bool fMarkForError);
 
 protected:
@@ -57 +58 @@
     void sltCreateButtonClick();
     void sltShowHidePassword(bool flag);
+    void sltHandleTextChanged(const QString &strText);
 
 private:
@@ -67 +69 @@
     QHBoxLayout  *m_pMainLayout;
     QCheckBox    *m_pShowPasswordCheckBox;
+    QColor        m_defaultBaseColor;
+    QColor        m_errorBaseColor;
+    bool          m_fMarkedForError;
 };
 
@@ -82 +87 @@
     , m_pMainLayout(0)
     , m_pShowPasswordCheckBox(0)
+    , m_fMarkedForError(0)
 {
     prepareWidgets();
@@ -97 +103 @@
         m_pMainLayout->addWidget(m_pUserNameEdit, 2);
         m_pUserNameEdit->setPlaceholderText(QApplication::translate("UIFileManager", "User Name"));
+        m_defaultBaseColor = m_pUserNameEdit->palette().color(QPalette::Base);
+        m_errorBaseColor = QColor(m_defaultBaseColor.red(),
+                                  0.5 * m_defaultBaseColor.green(),
+                                  0.5 * m_defaultBaseColor.blue());
+        connect(m_pUserNameEdit, &QILineEdit::textChanged,
+                this, &UIGuestSessionCreateWidget::sltHandleTextChanged);
     }
 
@@ -105 +117 @@
         m_pPasswordEdit->setPlaceholderText(QApplication::translate("UIFileManager", "Password"));
         m_pPasswordEdit->setEchoMode(QLineEdit::Password);
+        connect(m_pPasswordEdit, &QILineEdit::textChanged,
+                this, &UIGuestSessionCreateWidget::sltHandleTextChanged);
     }
 
@@ -148 +162 @@
     else
         m_pPasswordEdit->setEchoMode(QLineEdit::Password);
+}
+
+void UIGuestSessionCreateWidget::sltHandleTextChanged(const QString &strText)
+{
+    Q_UNUSED(strText);
+    markForError(false);
 }
 
@@ -213 +233 @@
 }
 
+void UIGuestSessionCreateWidget::markForError(bool fMarkForError)
+{
+    if (m_fMarkedForError == fMarkForError)
+        return;
+    m_fMarkedForError = fMarkForError;
+
+        if (m_pUserNameEdit)
+        {
+            QPalette mPalette = m_pUserNameEdit->palette();
+            if (m_fMarkedForError)
+                mPalette.setColor(QPalette::Base, m_errorBaseColor);
+            else
+                mPalette.setColor(QPalette::Base, m_defaultBaseColor);
+            m_pUserNameEdit->setPalette(mPalette);
+        }
+        if (m_pPasswordEdit)
+        {
+            QPalette mPalette = m_pPasswordEdit->palette();
+            if (m_fMarkedForError)
+                mPalette.setColor(QPalette::Base, m_errorBaseColor);
+            else
+                mPalette.setColor(QPalette::Base, m_defaultBaseColor);
+            m_pPasswordEdit->setPalette(mPalette);
+        }
+}
+
 
 /*********************************************************************************************************************************
@@ -240 +286 @@
 {
     return "SessionPanel";
+}
+
+void UIFileManagerSessionPanel::markForError(bool fMarkForError)
+{
+    if (m_pSessionCreateWidget)
+        m_pSessionCreateWidget->markForError(fMarkForError);
 }
 
@@ -268 +320 @@
 }
 
+void UIFileManagerSessionPanel::showEvent(QShowEvent *pEvent)
+{
+    markForError(false);
+    UIDialogPanel::showEvent(pEvent);
+}
+
 #include "UIFileManagerSessionPanel.moc"

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerSessionPanel.h

@@ -47 +47 @@
     /** @} */
     virtual QString panelName() const /* override */;
+    void markForError(bool fMarkForError);
 
 protected:
@@ -53 +54 @@
     virtual void prepareConnections() /* override */;
     void retranslateUi();
+    void showEvent(QShowEvent *pEvent) /* override */;
 
 private: