Changeset 47806 in vbox

Timestamp:

Aug 16, 2013 12:52:34 PM (12 years ago)

Author:

vboxsync

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

88067

Message:

FE/Qt: Settings Dialog: Warning-pane: Cleanup and mouse-hovering workaround.

Location:

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

Files:

• UISettingsDialog.cpp (modified) (8 diffs)
• UISettingsDialog.h (modified) (2 diffs)

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

@@ -57 +57 @@
     , m_fLoaded(false)
     , m_fSaved(false)
-    /* Status bar stuff: */
-    , m_pStatusBar(new QStackedWidget(this))
-    /* Process bar stuff: */
-    , m_pProcessBar(new QProgressBar(this))
-    /* Error/Warning stuff: */
+    /* Status-bar stuff: */
+    , m_pStatusBar(0)
+    /* Process-bar stuff: */
+    , m_pProcessBar(0)
+    /* Warning-pane stuff: */
+    , m_pWarningPane(0)
     , m_fValid(true)
     , m_fSilent(true)
-    , m_pWarningPane(new UIWarningPane(this))
     /* Whats-this stuff: */
     , m_pWhatsThisTimer(new QTimer(this))
@@ -71 +71 @@
     /* Apply UI decorations: */
     Ui::UISettingsDialog::setupUi(this);
-
-#ifdef Q_WS_MAC
-    /* No status bar on the mac: */
-    setSizeGripEnabled(false);
-    setStatusBar(0);
-#endif /* Q_WS_MAC */
 
     /* Page-title font is derived from the system font: */
@@ -84 +78 @@
     m_pLbTitle->setFont(pageTitleFont);
 
-    /* Get main grid layout: */
+    /* Prepare selector: */
     QGridLayout *pMainLayout = static_cast<QGridLayout*>(centralWidget()->layout());
 #ifdef VBOX_GUI_WITH_TOOLBAR_SETTINGS
@@ -103 +97 @@
     pMainLayout->setSpacing(10);
 #endif /* VBOX_GUI_WITH_TOOLBAR_SETTINGS */
-
-    /* Creating stack of pages: */
+    connect(m_pSelector, SIGNAL(categoryChanged(int)), this, SLOT(sltCategoryChanged(int)));
+
+    /* Prepare page-stack: */
     m_pStack = new QStackedWidget(m_pWtStackHandler);
     popupCenter().setPopupStackOrientation(m_pStack, UIPopupStackOrientation_Bottom);
@@ -111 +106 @@
     pStackLayout->addWidget(m_pStack);
 
-    /* Status bar: */
-    m_pStatusBar->addWidget(new QWidget);
-    m_pButtonBox->addExtraWidget(m_pStatusBar);
-
-    /* Setup process bar stuff: */
-    m_pStatusBar->addWidget(m_pProcessBar);
-
-    /* Setup error & warning stuff: */
-    m_pStatusBar->addWidget(m_pWarningPane);
+    /* Prepare button-box: */
+    m_pButtonBox->button(QDialogButtonBox::Ok)->setDefault(true);
+    connect(m_pButtonBox, SIGNAL(helpRequested()), &msgCenter(), SLOT(sltShowHelpHelpDialog()));
+
+    /* Prepare process-bar: */
+    m_pProcessBar = new QProgressBar;
+
+    /* Prepare warning-pane: */
+    m_pWarningPane = new UIWarningPane;
     connect(m_pWarningPane, SIGNAL(sigHoverEnter()), this, SLOT(sltHandleWarningPaneHovered()));
     connect(m_pWarningPane, SIGNAL(sigHoverLeave()), this, SLOT(sltHandleWarningPaneUnhovered()));
+
+    /* Prepare status-bar: */
+    m_pStatusBar = new QStackedWidget;
+    /* Add empty widget: */
+    m_pStatusBar->addWidget(new QWidget);
+    /* Add process-bar widget: */
+    m_pStatusBar->addWidget(m_pProcessBar);
+    /* Add warning-pane: */
+    m_pStatusBar->addWidget(m_pWarningPane);
+    /* Add status-bar to button-box: */
+    m_pButtonBox->addExtraWidget(m_pStatusBar);
 
     /* Setup whatsthis stuff: */
@@ -127 +133 @@
     m_pWhatsThisTimer->setSingleShot(true);
     connect(m_pWhatsThisTimer, SIGNAL(timeout()), this, SLOT(sltUpdateWhatsThis()));
-
-    /* Set the default button: */
-    m_pButtonBox->button(QDialogButtonBox::Ok)->setDefault(true);
-
-    /* Setup connections: */
-    connect(m_pSelector, SIGNAL(categoryChanged(int)), this, SLOT(sltCategoryChanged(int)));
-    connect(m_pButtonBox, SIGNAL(helpRequested()), &msgCenter(), SLOT(sltShowHelpHelpDialog()));
 
     /* Translate UI: */
@@ -335 +334 @@
     setError(QString());
     setWarning(QString());
+    m_pWarningPane->setWarningText(QString());
 
     /* Enumerating all the validators we have: */
@@ -371 +371 @@
     }
 
-    /* Make sure message-pane visible if necessary: */
+    /* Make sure warning-pane visible if necessary: */
     if ((!m_fValid || !m_fSilent) && m_pStatusBar->currentIndex() == 0)
         m_pStatusBar->setCurrentWidget(m_pWarningPane);
-    /* Make sure whats-this-pane visible otherwise: */
+    /* Make sure empty-pane visible otherwise: */
     else if (m_fValid && m_fSilent && m_pStatusBar->currentWidget() == m_pWarningPane)
         m_pStatusBar->setCurrentIndex(0);

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

@@ -139 +139 @@
 
     /* Error & Warning stuff: */
+    UIWarningPane *m_pWarningPane;
     bool m_fValid;
     bool m_fSilent;
@@ -145 +146 @@
     QString m_strErrorString;
     QString m_strWarningString;
-    UIWarningPane *m_pWarningPane;
 
     /* Whats-This stuff: */