Changeset 47846 in vbox

Timestamp:

Aug 19, 2013 3:27:57 PM (12 years ago)

Author:

vboxsync

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

88139

Message:

FE/Qt: Settings Dialog: Warning-pane: Support for multiple warning-icons.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIWidgetValidator.cpp (modified) (2 diffs)
• extensions/QIWidgetValidator.h (modified) (5 diffs)
• settings/UISettingsDialog.cpp (modified) (9 diffs)
• settings/UISettingsDialog.h (modified) (3 diffs)
• settings/UISettingsDialogSpecific.cpp (modified) (2 diffs)
• widgets/UIWarningPane.cpp (modified) (4 diffs)
• widgets/UIWarningPane.h (modified) (4 diffs)

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -29 +29 @@
     , m_fIsValid(true)
 {
+}
+
+QPixmap UIPageValidator::warningPixmap() const
+{
+    return m_pPage->warningPixmap();
+}
+
+QString UIPageValidator::internalName() const
+{
+    return m_pPage->internalName();
+}
+
+void UIPageValidator::setLastMessage(const QString &strLastMessage)
+{
+    /* Remember new message: */
+    m_strLastMessage = strLastMessage;
+
+    /* Should we show corresponding warning icon? */
+    if (m_strLastMessage.isEmpty())
+        emit sigHideWarningIcon();
+    else
+        emit sigShowWarningIcon();
 }
 

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -22 +22 @@
 /* Qt includes: */
 #include <QValidator>
+#include <QPixmap>
 
 /* External includes: */
@@ -41 +42 @@
     void sigValidityChanged(UIPageValidator *pValidator);
 
+    /* Notifiers: Warning stuff: */
+    void sigShowWarningIcon();
+    void sigHideWarningIcon();
+
 public:
 
@@ -48 +53 @@
     /* API: Page stuff: */
     UISettingsPage* page() const { return m_pPage; }
+    QPixmap warningPixmap() const;
+    QString internalName() const;
 
     /* API: Validity stuff: */
@@ -55 +62 @@
     /* API: Message stuff: */
     QString lastMessage() const { return m_strLastMessage; }
-    void setLastMessage(const QString &strLastMessage) { m_strLastMessage = strLastMessage; }
+    void setLastMessage(const QString &strLastMessage);
 
 public slots:

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp

@@ -115 +115 @@
     /* Prepare warning-pane: */
     m_pWarningPane = new UIWarningPane;
-    connect(m_pWarningPane, SIGNAL(sigHoverEnter()), this, SLOT(sltHandleWarningPaneHovered()));
-    connect(m_pWarningPane, SIGNAL(sigHoverLeave()), this, SLOT(sltHandleWarningPaneUnhovered()));
+    connect(m_pWarningPane, SIGNAL(sigHoverEnter(UIPageValidator*)), this, SLOT(sltHandleWarningPaneHovered(UIPageValidator*)));
+    connect(m_pWarningPane, SIGNAL(sigHoverLeave(UIPageValidator*)), this, SLOT(sltHandleWarningPaneUnhovered(UIPageValidator*)));
 
     /* Prepare status-bar: */
@@ -229 +229 @@
     Ui::UISettingsDialog::retranslateUi(this);
 
-    /* Translate error/warning stuff: */
-    m_strErrorHint = tr("Invalid settings detected");
-    m_strWarningHint = tr("Non-optimal settings detected");
-    if (!m_fValid)
-        m_pWarningPane->setWarningText(m_strErrorHint);
-    else if (!m_fSilent)
-        m_pWarningPane->setWarningText(m_strWarningHint);
+    /* Translate warning stuff: */
+    m_strWarningHint = tr("Invalid settings detected");
+    if (!m_fValid || !m_fSilent)
+        m_pWarningPane->setWarningLabel(m_strWarningHint);
 
 #ifndef VBOX_GUI_WITH_TOOLBAR_SETTINGS
@@ -266 +263 @@
     return tr("Settings");
 #endif
-}
-
-void UISettingsDialog::setError(const QString &strError)
-{
-    m_strErrorString = strError.isEmpty() ? QString() :
-                       QString("<font color=red>%1</font>").arg(strError);
-}
-
-void UISettingsDialog::setWarning(const QString &strWarning)
-{
-    m_strWarningString = strWarning.isEmpty() ? QString() :
-                         QString("<font color=#ff5400>%1</font>").arg(strWarning);
 }
 
@@ -302 +287 @@
     /* Assign validator if necessary: */
     if (pSettingsPage)
+    {
+        pSettingsPage->setId(cId);
         assignValidator(pSettingsPage);
+    }
 }
 
@@ -332 +320 @@
     m_fValid = true;
     m_fSilent = true;
-    setError(QString());
-    setWarning(QString());
-    m_pWarningPane->setWarningText(QString());
+    m_pWarningPane->setWarningLabel(QString());
 
     /* Enumerating all the validators we have: */
@@ -350 +336 @@
             /* Show error first: */
             if (!pValidator->isValid())
-            {
                 m_fValid = false;
-                setError(pValidator->lastMessage());
-                m_pWarningPane->setWarningText(m_strErrorHint);
-            }
             /* Show warning if message is not an error: */
             else
-            {
                 m_fSilent = false;
-                setWarning(pValidator->lastMessage());
-                m_pWarningPane->setWarningText(m_strWarningHint);
-            }
-
-            /* Configure warning-pane pixmap: */
-            m_pWarningPane->setWarningPixmap(pFailedSettingsPage->warningPixmap());
+
+            /* Configure warning-pane label: */
+            m_pWarningPane->setWarningLabel(m_strWarningHint);
 
             /* Stop dialog revalidation on first error/warning: */
@@ -405 +383 @@
 }
 
-void UISettingsDialog::sltHandleWarningPaneHovered()
-{
-    LogRel(("Settings Dialog: Warning-pane hovered.\n"));
+void UISettingsDialog::sltHandleWarningPaneHovered(UIPageValidator *pValidator)
+{
+    LogRel(("Settings Dialog: Warning-icon hovered: %s.\n", pValidator->internalName().toUtf8().constData()));
 
     /* Show corresponding popup: */
@@ -413 +391 @@
     {
         popupCenter().popup(m_pStack, "SettingsDialogWarning",
-                            !m_fValid ? m_strErrorString :
-                            !m_fSilent ? m_strWarningString :
-                            QString());
-    }
-}
-
-void UISettingsDialog::sltHandleWarningPaneUnhovered()
-{
-    LogRel(("Settings Dialog: Warning-pane unhovered.\n"));
+                            pValidator->lastMessage());
+    }
+}
+
+void UISettingsDialog::sltHandleWarningPaneUnhovered(UIPageValidator *pValidator)
+{
+    LogRel(("Settings Dialog: Warning-icon unhovered: %s.\n", pValidator->internalName().toUtf8().constData()));
 
     /* Recall corresponding popup: */
@@ -568 +544 @@
     connect(pValidator, SIGNAL(sigValidityChanged(UIPageValidator*)), this, SLOT(sltHandleValidityChange(UIPageValidator*)));
     pPage->setValidator(pValidator);
+    m_pWarningPane->registerValidator(pValidator);
 
     // TODO: Why here?

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.h

@@ -83 +83 @@
     virtual QString titleExtension() const;
 
-    /* Setters for error/warning: */
-    void setError(const QString &strError);
-    void setWarning(const QString &strWarning);
-
     /* Add settings page: */
     void addItem(const QString &strBigIcon, const QString &strBigIconDisabled,
@@ -106 +102 @@
     /* Handlers: Validation stuff: */
     void sltHandleValidityChange(UIPageValidator *pValidator);
-    void sltHandleWarningPaneHovered();
-    void sltHandleWarningPaneUnhovered();
+    void sltHandleWarningPaneHovered(UIPageValidator *pValidator);
+    void sltHandleWarningPaneUnhovered(UIPageValidator *pValidator);
 
     /* Slot to update whats-this: */
@@ -142 +138 @@
     bool m_fValid;
     bool m_fSilent;
-    QString m_strErrorHint;
     QString m_strWarningHint;
-    QString m_strErrorString;
-    QString m_strWarningString;
 
     /* Whats-This stuff: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp

@@ -413 +413 @@
             }
             if (pSettingsPage)
-            {
                 pSettingsPage->setDialogType(dialogType());
-                pSettingsPage->setId(iPageIndex);
-            }
         }
     }
@@ -683 +680 @@
             }
             if (pSettingsPage)
-            {
                 pSettingsPage->setDialogType(dialogType());
-                pSettingsPage->setId(iPageIndex);
-            }
         }
     }

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

@@ -25 +25 @@
 /* GUI includes: */
 #include "UIWarningPane.h"
+#include "QIWidgetValidator.h"
+
+/* Other VBox includes: */
+#include <VBox/sup.h>
 
 UIWarningPane::UIWarningPane(QWidget *pParent)
     : QWidget(pParent)
-    , m_pLabelIcon(0)
-    , m_pLabelText(0)
-    , m_fHovered(false)
+    , m_pWarningLabel(0)
 {
     /* Prepare: */
@@ -36 +38 @@
 }
 
-void UIWarningPane::setWarningPixmap(const QPixmap &pixmap)
+void UIWarningPane::setWarningLabel(const QString &strWarningLabel)
 {
-    m_pLabelIcon->setPixmap(pixmap);
+    m_pWarningLabel->setText(strWarningLabel);
 }
 
-void UIWarningPane::setWarningText(const QString &strText)
+void UIWarningPane::registerValidator(UIPageValidator *pValidator)
 {
-    m_pLabelText->setText(strText);
+    /* Make sure validator is set! */
+    AssertPtrReturnVoid(pValidator);
+
+    /* Makre sure validator is not registered yet: */
+    if (m_validators.contains(pValidator))
+    {
+        AssertMsgFailed(("Validator is registered already!\n"));
+        return;
+    }
+
+    /* Register validator: */
+    m_validators << pValidator;
+
+    /* Create icon-label for newly registered validator: */
+    QLabel *pIconLabel = new QLabel;
+    {
+        /* Add icon-label into list: */
+        m_icons << pIconLabel;
+        /* Add icon-label into layout: */
+        m_pLayout->addWidget(pIconLabel);
+        /* Configure icon-label: */
+        pIconLabel->setMouseTracking(true);
+        pIconLabel->installEventFilter(this);
+        pIconLabel->setPixmap(pValidator->warningPixmap());
+        connect(pValidator, SIGNAL(sigShowWarningIcon()), pIconLabel, SLOT(show()));
+        connect(pValidator, SIGNAL(sigHideWarningIcon()), pIconLabel, SLOT(hide()));
+    }
+
+    /* Mark icon as 'non-hovered': */
+    m_hovered << false;
 }
 
@@ -54 +85 @@
 void UIWarningPane::prepareContent()
 {
-    /* Configure self: */
-    setMouseTracking(true);
-    installEventFilter(this);
-    /* Create layout: */
-    QHBoxLayout *pLayout = new QHBoxLayout(this);
+    /* Create main-layout: */
+    QHBoxLayout *pMainLayout = new QHBoxLayout(this);
     {
         /* Configure layout: */
-        pLayout->setContentsMargins(0, 0, 0, 0);
-        /* Create icon label: */
-        m_pLabelIcon = new QLabel;
+        pMainLayout->setContentsMargins(0, 0, 0, 0);
+        /* Add left stretch: */
+        pMainLayout->addStretch();
+        /* Create warning-label: */
+        m_pWarningLabel = new QLabel;
         {
-            /* Configure icon label: */
-            m_pLabelIcon->setMouseTracking(true);
-            m_pLabelIcon->installEventFilter(this);
+            /* Add into main-layout: */
+            pMainLayout->addWidget(m_pWarningLabel);
         }
-        /* Create text label: */
-        m_pLabelText = new QLabel;
+        /* Create layout: */
+        m_pLayout = new QHBoxLayout;
         {
-            /* Configure text label: */
-            m_pLabelText->setMouseTracking(true);
-            m_pLabelText->installEventFilter(this);
+            /* Configure layout: */
+            m_pLayout->setContentsMargins(0, 0, 0, 0);
+            /* Add into main-layout: */
+            pMainLayout->addLayout(m_pLayout);
         }
-        /* Add widgets into layout: */
-        pLayout->addWidget(m_pLabelIcon);
-        pLayout->addWidget(m_pLabelText);
+        /* Add right stretch: */
+        pMainLayout->addStretch();
     }
 }
@@ -87 +116 @@
     switch (pEvent->type())
     {
-        /* Anything is hovered: */
+        /* One of icons hovered: */
         case QEvent::MouseMove:
         {
-            /* Hover warning-pane if not yet hovered: */
-            if (!m_fHovered)
+            /* Cast object to label: */
+            if (QLabel *pIconLabel = qobject_cast<QLabel*>(pWatched))
             {
-                m_fHovered = true;
-                emit sigHoverEnter();
+                /* Search for the corresponding icon: */
+                if (m_icons.contains(pIconLabel))
+                {
+                    /* Mark icon-label hovered if not yet: */
+                    int iIconLabelPosition = m_icons.indexOf(pIconLabel);
+                    if (!m_hovered[iIconLabelPosition])
+                    {
+                        m_hovered[iIconLabelPosition] = true;
+                        emit sigHoverEnter(m_validators[iIconLabelPosition]);
+                    }
+                }
             }
             break;
         }
-        /* Warning-pane is unhovered: */
+        /* One of icons unhovered: */
         case QEvent::Leave:
         {
-            /* Unhover warning-pane if hovered: */
-            if (pWatched == this && m_fHovered)
+            /* Cast object to label: */
+            if (QLabel *pIconLabel = qobject_cast<QLabel*>(pWatched))
             {
-                m_fHovered = false;
-                emit sigHoverLeave();
+                /* Search for the corresponding icon: */
+                if (m_icons.contains(pIconLabel))
+                {
+                    /* Mark icon-label unhovered if not yet: */
+                    int iIconLabelPosition = m_icons.indexOf(pIconLabel);
+                    if (m_hovered[iIconLabelPosition])
+                    {
+                        m_hovered[iIconLabelPosition] = false;
+                        emit sigHoverLeave(m_validators[iIconLabelPosition]);
+                    }
+                }
             }
             break;

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

@@ -24 +24 @@
 
 /* Forward declarations: */
+class UIPageValidator;
+class QHBoxLayout;
 class QLabel;
 
@@ -34 +36 @@
 
     /* Notifiers: Hover stuff: */
-    void sigHoverEnter();
-    void sigHoverLeave();
+    void sigHoverEnter(UIPageValidator *pValidator);
+    void sigHoverLeave(UIPageValidator *pValidator);
 
 public:
@@ -43 +45 @@
 
     /* API: Warning stuff: */
-    void setWarningPixmap(const QPixmap &pixmap);
-    void setWarningText(const QString &strText);
+    void setWarningLabel(const QString &strWarningLabel);
+
+    /* API: Registry stuff: */
+    void registerValidator(UIPageValidator *pValidator);
 
 private:
@@ -55 +59 @@
     bool eventFilter(QObject *pWatched, QEvent *pEvent);
 
-    /* Variables: Widgets: */
-    QLabel *m_pLabelIcon;
-    QLabel *m_pLabelText;
-
-    /* Variable: Hover stuff: */
-    bool m_fHovered;
+    /* Variables: */
+    QHBoxLayout *m_pLayout;
+    QLabel *m_pWarningLabel;
+    QList<UIPageValidator*> m_validators;
+    QList<QLabel*> m_icons;
+    QList<bool> m_hovered;
 };