Changeset 69519 in vbox for trunk/src/VBox

Timestamp:

Oct 30, 2017 10:31:13 AM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8400: Media Manager: Resurrecting UIEnumerationProgressBar functionality lost during medium manager rework; Now it's embedded into corresponding button-box of either manager dialog or details widget.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium

Files:

• UIMediumDetailsWidget.cpp (modified) (4 diffs)
• UIMediumDetailsWidget.h (modified) (4 diffs)
• UIMediumManager.cpp (modified) (5 diffs)
• UIMediumManager.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumDetailsWidget.cpp

@@ -40 +40 @@
 # include "UIIconPool.h"
 # include "UIMediumDetailsWidget.h"
+# include "UIMediumManager.h"
 # include "UIMediumSizeEditor.h"
 # include "VBoxGlobal.h"
@@ -49 +50 @@
 
 
-UIMediumDetailsWidget::UIMediumDetailsWidget(EmbedTo enmEmbedding, QWidget *pParent /* = 0 */)
+UIMediumDetailsWidget::UIMediumDetailsWidget(UIMediumManagerWidget *pParent, EmbedTo enmEmbedding)
     : QIWithRetranslateUI<QWidget>(pParent)
+    , m_pParent(pParent)
     , m_enmEmbedding(enmEmbedding)
     , m_oldData(UIDataMedium())
@@ -60 +62 @@
     , m_pLabelSize(0), m_pEditorSize(0), m_pErrorPaneSize(0)
     , m_pButtonBox(0)
+    , m_pProgressBar(0)
     , m_fValid(true)
     , m_pLayoutDetails(0)
@@ -495 +498 @@
                 m_pButtonBox = new QIDialogButtonBox;
                 AssertPtrReturnVoid(m_pButtonBox);
-                /* Configure button-box: */
-                m_pButtonBox->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
-                connect(m_pButtonBox, &QIDialogButtonBox::clicked, this, &UIMediumDetailsWidget::sltHandleButtonBoxClick);
+                {
+                    /* Configure button-box: */
+                    m_pButtonBox->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
+                    connect(m_pButtonBox, &QIDialogButtonBox::clicked, this, &UIMediumDetailsWidget::sltHandleButtonBoxClick);
+
+                    /* Create progress-bar: */
+                    m_pProgressBar = new UIEnumerationProgressBar;
+                    AssertPtrReturnVoid(m_pProgressBar);
+                    {
+                        /* Configure progress-bar: */
+                        m_pProgressBar->hide();
+                        /* Add progress-bar into button-box layout: */
+                        m_pButtonBox->addExtraWidget(m_pProgressBar);
+                        /* Notify parent it has progress-bar: */
+                        m_pParent->setProgressBar(m_pProgressBar);
+                    }
+                }
 
                 /* Add into layout: */

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumDetailsWidget.h

@@ -41 +41 @@
 class QITabWidget;
 class QIToolButton;
+class UIEnumerationProgressBar;
+class UIMediumManagerWidget;
 class UIMediumSizeEditor;
 
@@ -185 +187 @@
     /** Constructs medium details dialog passing @a pParent to the base-class.
       * @param  enmEmbedding  Brings embedding type. */
-    UIMediumDetailsWidget(EmbedTo enmEmbedding, QWidget *pParent = 0);
+    UIMediumDetailsWidget(UIMediumManagerWidget *pParent, EmbedTo enmEmbedding);
 
     /** Defines the raised details @a enmType. */
@@ -270 +272 @@
     /** @name General variables.
       * @{ */
+        /** Holds the parent reference. */
+        UIMediumManagerWidget *m_pParent;
         /** Holds the parent widget embedding type. */
         const EmbedTo m_enmEmbedding;
@@ -315 +319 @@
 
         /** Holds the button-box instance. */
-        QIDialogButtonBox *m_pButtonBox;
+        QIDialogButtonBox        *m_pButtonBox;
+        /** Holds the progress-bar widget instance. */
+        UIEnumerationProgressBar *m_pProgressBar;
 
         /** Holds whether options are valid. */

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp

@@ -825 +825 @@
     /* Prepare: */
     prepare();
+}
+
+void UIMediumManagerWidget::setProgressBar(UIEnumerationProgressBar *pProgressBar)
+{
+    /* Cache progress-bar reference:*/
+    m_pProgressBar = pProgressBar;
+
+    /* Update translation: */
+    retranslateUi();
 }
 
@@ -1634 +1643 @@
 {
     /* Create details-widget: */
-    m_pDetailsWidget = new UIMediumDetailsWidget(m_enmEmbedding);
+    m_pDetailsWidget = new UIMediumDetailsWidget(this, m_enmEmbedding);
     AssertPtrReturnVoid(m_pDetailsWidget);
     {
@@ -1653 +1662 @@
     }
 }
-
-//void UIMediumManagerWidget::prepareProgressBar()
-//{
-//    /* Create progress-bar: */
-//    m_pProgressBar = new UIEnumerationProgressBar;
-//    AssertPtrReturnVoid(m_pProgressBar);
-//    {
-//        /* Configure progress-bar: */
-//        m_pProgressBar->hide();
-//        /* Add progress-bar into button-box layout: */
-//        m_pButtonBox->addExtraWidget(m_pProgressBar);
-//    }
-//}
 
 void UIMediumManagerWidget::loadSettings()
@@ -2339 +2335 @@
 UIMediumManager::UIMediumManager(QWidget *pCenterWidget)
     : QIWithRetranslateUI<QIManagerDialog>(pCenterWidget)
+    , m_pProgressBar(0)
 {
 }
@@ -2417 +2414 @@
     connect(buttonBox(), &QIDialogButtonBox::clicked,
             this, &UIMediumManager::sltHandleButtonBoxClick);
+
+    /* Create progress-bar: */
+    m_pProgressBar = new UIEnumerationProgressBar;
+    AssertPtrReturnVoid(m_pProgressBar);
+    {
+        /* Configure progress-bar: */
+        m_pProgressBar->hide();
+        /* Add progress-bar into button-box layout: */
+        buttonBox()->addExtraWidget(m_pProgressBar);
+        /* Notify widget it has progress-bar: */
+        widget()->setProgressBar(m_pProgressBar);
+    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.h

@@ -114 +114 @@
     UIToolBar *toolbar() const { return m_pToolBar; }
 #endif
+
+    /** Defines @a pProgressBar reference. */
+    void setProgressBar(UIEnumerationProgressBar *pProgressBar);
 
 protected:
@@ -216 +219 @@
         /** Prepares details-widget. */
         void prepareDetailsWidget();
-//        /** Prepares progress-bar. */
-//        void prepareProgressBar();
         /** Load settings: */
         void loadSettings();
@@ -359 +360 @@
     /** @name Progress-bar variables.
       * @{ */
-        /** Holds the progress-bar widget instance. */
+        /** Holds the progress-bar widget reference. */
         UIEnumerationProgressBar *m_pProgressBar;
     /** @} */
@@ -426 +427 @@
     /** @} */
 
+    /** @name Progress-bar variables.
+      * @{ */
+        /** Holds the progress-bar widget instance. */
+        UIEnumerationProgressBar *m_pProgressBar;
+    /** @} */
+
     /** Allow factory access to private/protected members: */
     friend class UIMediumManagerFactory;