Changeset 90727 in vbox

Timestamp:

Aug 18, 2021 4:09:34 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996: Extend UINativeWizard with interface to show/hide/advance own progress-bar via corresponding signals.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards

Files:

• UINativeWizard.cpp (modified) (5 diffs)
• UINativeWizard.h (modified) (3 diffs)
• UINativeWizardPage.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/UINativeWizard.cpp

@@ -20 +20 @@
 #include <QLabel>
 #include <QPainter>
+#include <QProgressBar>
 #include <QPushButton>
 #include <QStackedWidget>
@@ -100 +101 @@
     , m_pLabelPageTitle(0)
     , m_pWidgetStack(0)
+    , m_pProgressStack(0)
+    , m_pProgressBar(0)
 {
     prepare();
@@ -153 +156 @@
     connect(pPage, &UINativeWizardPage::completeChanged,
             this, &UINativeWizard::sltCompleteChanged);
+    connect(pPage, &UINativeWizardPage::sigProgressStarted,
+            this, &UINativeWizard::sltHandleProgressStarted);
+    connect(pPage, &UINativeWizardPage::sigProgressChange,
+            this, &UINativeWizard::sltHandleProgressChange);
+    connect(pPage, &UINativeWizardPage::sigProgressFinished,
+            this, &UINativeWizard::sltHandleProgressFinished);
 
     /* Returns added page index: */
@@ -272 +281 @@
     AssertMsgReturnVoid(pButtonNext, ("No Next wizard button found!\n"));
     pButtonNext->setEnabled(pPage->isComplete());
+}
+
+void UINativeWizard::sltHandleProgressStarted()
+{
+    m_pProgressStack->setCurrentIndex(1);
+}
+
+void UINativeWizard::sltHandleProgressChange(ulong uPercent)
+{
+    m_pProgressBar->setMinimum(0);
+    m_pProgressBar->setValue(uPercent);
+    m_pProgressBar->setMaximum(100);
+}
+
+void UINativeWizard::sltHandleProgressFinished()
+{
+    m_pProgressStack->setCurrentIndex(0);
 }
 
@@ -467 +493 @@
                         pLayoutBottom->addWidget(pButton);
                     if (enmType == WizardButtonType_Help)
-                        pLayoutBottom->addStretch(1);
+                    {
+                        /* Prepare progress-stack: */
+                        m_pProgressStack = new QStackedWidget(pWidgetBottom);
+                        if (m_pProgressStack)
+                        {
+                            /* Prepare stretch: */
+                            QWidget *pStretch = new QWidget(m_pProgressStack);
+                            if (pStretch)
+                                m_pProgressStack->addWidget(pStretch);
+
+                            /* Prepare progress-bar: */
+                            m_pProgressBar = new QProgressBar(m_pProgressStack);
+                            if (m_pProgressBar)
+                            {
+                                m_pProgressBar->setMaximum(0);
+                                m_pProgressStack->addWidget(m_pProgressBar);
+                            }
+
+                            /* Add to layout: */
+                            pLayoutBottom->addWidget(m_pProgressStack);
+                        }
+                    }
                     if (   pButton
                         && enmType == WizardButtonType_Next)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/UINativeWizard.h

@@ -33 +33 @@
 /* Forward declarations: */
 class QLabel;
+class QProgressBar;
 class QPushButton;
 class QStackedWidget;
@@ -128 +129 @@
     void sltCompleteChanged();
 
+    /** Handles signal about progress has started. */
+    void sltHandleProgressStarted();
+    /** Handles signal about progress changed.
+      * @param  uPercent  Brings the progress percentage. */
+    void sltHandleProgressChange(ulong uPercent);
+    /** Handles signal about progress has finished. */
+    void sltHandleProgressFinished();
+
     /** Toggles between basic and expert modes. */
     void sltExpert();
@@ -178 +187 @@
     /** Holds the widget-stack instance. */
     QStackedWidget                       *m_pWidgetStack;
+    /** Holds the progress-stack instance. */
+    QStackedWidget                       *m_pProgressStack;
+    /** Holds the progress-bar instance. */
+    QProgressBar                         *m_pProgressBar;
     /** Holds button instance map. */
     QMap<WizardButtonType, QPushButton*>  m_buttons;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/UINativeWizardPage.h

@@ -39 +39 @@
     void completeChanged();
 
+    /** Notifies listeners about progress has started. */
+    void sigProgressStarted();
+    /** Notifies listeners about progress has changed.
+      * @param  uPercent  Brings the progress percentage. */
+    void sigProgressChange(ulong uPercent);
+    /** Notifies listeners about progress has finished. */
+    void sigProgressFinished();
+
 public: