Changeset 47763 in vbox

Timestamp:

Aug 15, 2013 1:18:56 PM (12 years ago)

Author:

vboxsync

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

88021

Message:

FE/Qt: Settings Dialog: Moving validation mechanism warning from tooltip/whatsthis-pane to popup-pane.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings

Files:

• UISettingsDialog.cpp (modified) (10 diffs)
• UISettingsDialog.h (modified) (1 diff)

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

@@ -30 +30 @@
 #include "VBoxGlobal.h"
 #include "UIMessageCenter.h"
+#include "UIPopupCenter.h"
 #include "QIWidgetValidator.h"
 #include "VBoxSettingsSelector.h"
@@ -107 +108 @@
     /* Creating stack of pages: */
     m_pStack = new QStackedWidget(m_pWtStackHandler);
+    popupCenter().setPopupStackOrientation(m_pStack, UIPopupStackOrientation_Bottom);
     QVBoxLayout *pStackLayout = new QVBoxLayout(m_pWtStackHandler);
     pStackLayout->setContentsMargins(0, 0, 0, 0);
@@ -120 +122 @@
     /* Setup error & warning stuff: */
     m_pStatusBar->addWidget(m_pWarningPane);
+    connect(m_pWarningPane, SIGNAL(sigHoverEnter()), this, SLOT(sltHandleWarningPaneHovered()));
+    connect(m_pWarningPane, SIGNAL(sigHoverLeave()), this, SLOT(sltHandleWarningPaneUnhovered()));
 
     /* Setup whatsthis stuff: */
@@ -146 +150 @@
 UISettingsDialog::~UISettingsDialog()
 {
+    /* Recall popup-pane if any: */
+    popupCenter().recall(m_pStack, "SettingsDialogWarning");
     /* Delete selector early! */
     delete m_pSelector;
@@ -276 +282 @@
     m_strErrorString = strError.isEmpty() ? QString() :
                        QString("<font color=red>%1</font>").arg(strError);
-
-    /* Do not touching QILabel until dialog is polished
-     * otherwise it can change its size to undefined: */
-    if (m_fPolished)
-    {
-        if (!m_strErrorString.isEmpty() && m_pStatusBar->currentWidget() == m_pWarningPane)
-            m_pLbWhatsThis->setText(m_strErrorString);
-        else
-            sltUpdateWhatsThis(true /* got focus? */);
-    }
 }
 
@@ -292 +288 @@
     m_strWarningString = strWarning.isEmpty() ? QString() :
                          QString("<font color=#ff5400>%1</font>").arg(strWarning);
-
-    /* Do not touching QILabel until dialog is polished
-     * otherwise it can change its size to undefined: */
-    if (m_fPolished)
-    {
-        if (!m_strWarningString.isEmpty() && m_pStatusBar->currentWidget() == m_pWarningPane)
-            m_pLbWhatsThis->setText(m_strWarningString);
-        else
-            sltUpdateWhatsThis(true /* got focus? */);
-    }
 }
 
@@ -377 +363 @@
                 setError(pValidator->lastMessage());
                 m_pWarningPane->setWarningText(m_strErrorHint);
-#ifdef Q_WS_MAC
-                m_pWarningPane->setToolTip(m_strErrorString);
-#endif /* Q_WS_MAC */
             }
             /* Show warning if message is not an error: */
@@ -387 +370 @@
                 setWarning(pValidator->lastMessage());
                 m_pWarningPane->setWarningText(m_strWarningHint);
-#ifdef Q_WS_MAC
-                m_pWarningPane->setToolTip(m_strWarningString);
-#endif /* Q_WS_MAC */
             }
 
-            /* Configure warning pixmap: */
+            /* Configure warning-pane pixmap: */
             m_pWarningPane->setWarningPixmap(pFailedSettingsPage->warningPixmap());
 
@@ -434 +414 @@
 }
 
+void UISettingsDialog::sltHandleWarningPaneHovered()
+{
+    LogRel(("Settings Dialog: Warning-pane hovered.\n"));
+
+    /* Show corresponding popup: */
+    if (!m_fValid || !m_fSilent)
+    {
+        popupCenter().popup(m_pStack, "SettingsDialogWarning",
+                            !m_fValid ? m_strErrorString :
+                            !m_fSilent ? m_strWarningString :
+                            QString());
+    }
+}
+
+void UISettingsDialog::sltHandleWarningPaneUnhovered()
+{
+    LogRel(("Settings Dialog: Warning-pane unhovered.\n"));
+
+    /* Recall corresponding popup: */
+    popupCenter().recall(m_pStack, "SettingsDialogWarning");
+}
+
 void UISettingsDialog::sltUpdateWhatsThis(bool fGotFocus /* = false */)
 {
@@ -463 +465 @@
 
 #ifndef Q_WS_MAC
-    if (m_pStatusBar->currentWidget() == m_pWarningPane)
-    {
-        if (strWhatsThisText.isEmpty() && !m_strErrorString.isEmpty())
-            strWhatsThisText = m_strErrorString;
-        else if (strWhatsThisText.isEmpty() && !m_strWarningString.isEmpty())
-            strWhatsThisText = m_strWarningString;
-    }
     if (strWhatsThisText.isEmpty())
         strWhatsThisText = whatsThis();
     m_pLbWhatsThis->setText(strWhatsThisText);
-#else
+#else /* !Q_WS_MAC */
     if (pWhatsThisWidget && !strWhatsThisText.isEmpty())
         pWhatsThisWidget->setToolTip(QString("<qt>%1</qt>").arg(strWhatsThisText));
-#endif
+#endif /* Q_WS_MAC */
 }
 

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

@@ -104 +104 @@
 private slots:
 
-    /* Handler: Validation stuff: */
+    /* Handlers: Validation stuff: */
     void sltHandleValidityChange(UIPageValidator *pValidator);
+    void sltHandleWarningPaneHovered();
+    void sltHandleWarningPaneUnhovered();
 
     /* Slot to update whats-this: */