Changeset 55263 in vbox

Timestamp:

Apr 15, 2015 5:41:04 AM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Settings dialog: Own progress-dialog implementation.

Location:

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

Files:

• UISettingsSerializer.cpp (modified) (6 diffs)
• UISettingsSerializer.h (modified) (5 diffs)

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

@@ -21 +21 @@
 /* Qt includes: */
 # include <QTimer>
+# include <QLabel>
+# include <QHBoxLayout>
+# include <QVBoxLayout>
+# include <QProgressBar>
 /* GUI includes: */
 # include "UISettingsSerializer.h"
 # include "UISettingsPage.h"
+# include "UIIconPool.h"
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
@@ -171 +176 @@
 UISettingsSerializerProgress::UISettingsSerializerProgress(QWidget *pParent, UISettingsSerializer::SerializationDirection direction,
                                                            const QVariant &data, const UISettingsPageList &pages)
-    : QIWithRetranslateUI<QProgressDialog>(pParent)
+    : QIWithRetranslateUI<QIDialog>(pParent)
     , m_direction(direction)
     , m_data(data)
@@ -189 +194 @@
 
     /* Call to base-class: */
-    return QIWithRetranslateUI<QProgressDialog>::exec();
+    return QIWithRetranslateUI<QIDialog>::exec();
 }
 
@@ -202 +207 @@
     /* Configure self: */
     setWindowModality(Qt::WindowModal);
-    setMinimumDuration(0);
-    setCancelButton(0);
+    setWindowTitle(parentWidget()->windowTitle());
     connect(this, SIGNAL(sigAskForProcessStart()),
             this, SLOT(sltStartProcess()), Qt::QueuedConnection);
@@ -218 +222 @@
     }
 
-    /* Set maximum/minimum/current values: */
-    setMaximum(m_pSerializer->pageCount() + 1);
-    setMinimum(0);
-    setValue(0);
+    /* Create layout: */
+    QVBoxLayout *pLayout = new QVBoxLayout(this);
+    AssertPtrReturnVoid(pLayout);
+    {
+        /* Create top layout: */
+        QHBoxLayout *pLayoutTop = new QHBoxLayout;
+        AssertPtrReturnVoid(pLayoutTop);
+        {
+            /* Create pixmap label: */
+            QLabel *pLabelPixmap = new QLabel;
+            AssertPtrReturnVoid(pLabelPixmap);
+            {
+                /* Configure label: */
+                const QIcon icon = UIIconPool::iconSet(":/progress_refresh_90px.png");
+                pLabelPixmap->setPixmap(icon.pixmap(icon.availableSizes().first()));
+                /* Add label into layout: */
+                pLayoutTop->addWidget(pLabelPixmap);
+            }
+            /* Create progress layout: */
+            QVBoxLayout *pLayoutProgress = new QVBoxLayout(this);
+            AssertPtrReturnVoid(pLayoutProgress);
+            {
+                /* Create progress label: */
+                m_pLabelProgress = new QLabel;
+                AssertPtrReturnVoid(m_pLabelProgress);
+                {
+                    /* Add label into layout: */
+                    pLayoutProgress->addWidget(m_pLabelProgress);
+                }
+                /* Create progress bar: */
+                m_pBarProgress = new QProgressBar;
+                AssertPtrReturnVoid(m_pBarProgress);
+                {
+                    /* Configure progress bar: */
+                    m_pBarProgress->setMinimumWidth(200);
+                    m_pBarProgress->setMaximum(m_pSerializer->pageCount() + 1);
+                    m_pBarProgress->setMinimum(0);
+                    m_pBarProgress->setValue(0);
+                    connect(m_pBarProgress, SIGNAL(valueChanged(int)),
+                            this, SLOT(sltProgressValueChanged(int)));
+                    /* Add bar into layout: */
+                    pLayoutProgress->addWidget(m_pBarProgress);
+                }
+                /* Add stretch: */
+                pLayoutProgress->addStretch();
+                /* Add layout into parent: */
+                pLayoutTop->addLayout(pLayoutProgress);
+            }
+            /* Add layout into parent: */
+            pLayout->addLayout(pLayoutTop);
+        }
+    }
 }
 
 void UISettingsSerializerProgress::retranslateUi()
 {
-    /* Translate title: */
+    /* Translate progress label: */
+    AssertPtrReturnVoid(m_pLabelProgress);
     switch (m_pSerializer->direction())
     {
-        case UISettingsSerializer::Load: setLabelText(tr("Loading Settings...")); break;
-        case UISettingsSerializer::Save: setLabelText(tr("Saving Settings...")); break;
+        case UISettingsSerializer::Load: m_pLabelProgress->setText(tr("Loading Settings...")); break;
+        case UISettingsSerializer::Save: m_pLabelProgress->setText(tr("Saving Settings...")); break;
     }
 }
@@ -251 +304 @@
 }
 
+void UISettingsSerializerProgress::sltAdvanceProgressValue()
+{
+    /* Advance the serialize progress bar: */
+    AssertPtrReturnVoid(m_pBarProgress);
+    m_pBarProgress->setValue(m_pBarProgress->value() + 1);
+}
+
+void UISettingsSerializerProgress::sltProgressValueChanged(int iValue)
+{
+    AssertPtrReturnVoid(m_pBarProgress);
+    if (iValue == m_pBarProgress->maximum())
+        hide();
+}
+

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

@@ -22 +22 @@
 #include <QVariant>
 #include <QWaitCondition>
-#include <QProgressDialog>
 #include <QMutex>
 #include <QList>
@@ -29 +28 @@
 /* GUI includes: */
 #include "QIWithRetranslateUI.h"
+#include "QIDialog.h"
 
 /* Forward declarations: */
 class UISettingsPage;
+class QProgressBar;
+class QLabel;
 
 /* Type definitions: */
@@ -125 +127 @@
 };
 
-/** QProgressDialog reimplementation used to
+/** QIDialog reimplementation used to
   * reflect the settings serialization operation. */
-class UISettingsSerializerProgress : public QIWithRetranslateUI<QProgressDialog>
+class UISettingsSerializerProgress : public QIWithRetranslateUI<QIDialog>
 {
     Q_OBJECT;
@@ -172 +174 @@
 
     /** Advances the current progress value. */
-    void sltAdvanceProgressValue() { setValue(value() + 1); }
+    void sltAdvanceProgressValue();
+
+    /** Handles the progress value change. */
+    void sltProgressValueChanged(int iValue);
 
 private:
@@ -186 +191 @@
     /** Holds the pointer to the thread loading/saving settings in async mode. */
     UISettingsSerializer *m_pSerializer;
+
+    /** Holds the progress label. */
+    QLabel *m_pLabelProgress;
+    /** Holds the progress bar. */
+    QProgressBar *m_pBarProgress;
 };