Changeset 92149 in vbox for trunk

Timestamp:

Oct 29, 2021 1:54:47 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: Revert r146357 and r146352 cause this functionality is no more necessary.

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>
@@ -93 +92 @@
     , m_pLabelPageTitle(0)
     , m_pWidgetStack(0)
-    , m_pProgressStack(0)
-    , m_pProgressBar(0)
     , m_pNotificationCenter(0)
 {
@@ -173 +170 @@
     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: */
@@ -239 +230 @@
     pButtonCancel->setText(tr("&Cancel"));
     pButtonCancel->setToolTip(tr("Cancel wizard execution."));
-}
-
-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);
 }
 
@@ -508 +482 @@
                         pLayoutBottom->addWidget(pButton);
                     if (enmType == WizardButtonType_Help)
-                    {
-                        /* 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);
-                        }
-                    }
+                        pLayoutBottom->addStretch(1);
                     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;
@@ -139 +138 @@
 protected slots:
 
-    /** 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();
-
-private slots:
-
     /** Handles current-page change to page with @a iIndex. */
     void sltCurrentIndexChanged(int iIndex = -1);
@@ -206 +195 @@
     /** 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

@@ -38 +38 @@
     /** Notifies about page validity changes. */
     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: