Changeset 69518 in vbox

Timestamp:

Oct 30, 2017 10:18:08 AM (7 years ago)

Author:

vboxsync

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

118861

Message:

FE/Qt: bugref:8400: Media Manager: Moving UIEnumerationProgressBar code to header.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/medium/UIMediumManager.cpp (modified) (3 diffs)
• src/medium/UIMediumManager.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -544 +544 @@
         src/globals/UIThreadPool.cpp \
         src/medium/UIMediumEnumerator.cpp \
-        src/medium/UIMediumManager.cpp \
         src/runtime/UIActionPoolRuntime.cpp \
         src/runtime/UIAddDiskEncryptionPasswordDialog.cpp \

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

@@ -240 +240 @@
 
 
-/** Medium manager progress-bar.
-  * Reflects medium-enumeration progress, stays hidden otherwise. */
-class UIEnumerationProgressBar : public QWidget
-{
-    Q_OBJECT;
-
-public:
-
-    /** Constructor on the basis of passed @a pParent. */
-    UIEnumerationProgressBar(QWidget *pParent = 0)
-        : QWidget(pParent)
-    {
-        /* Prepare: */
-        prepare();
-    }
-
-    /** Defines progress-bar label-text. */
-    void setText(const QString &strText) { m_pLabel->setText(strText); }
-
-    /** Returns progress-bar current-value. */
-    int value() const { return m_pProgressBar->value(); }
-    /** Defines progress-bar current-value. */
-    void setValue(int iValue) { m_pProgressBar->setValue(iValue); }
-    /** Defines progress-bar maximum-value. */
-    void setMaximum(int iValue) { m_pProgressBar->setMaximum(iValue); }
-
-private:
-
-    /** Prepares progress-bar content. */
-    void prepare()
-    {
-        /* Create layout: */
-        QHBoxLayout *pLayout = new QHBoxLayout(this);
-        {
-            /* Configure layout: */
-            pLayout->setContentsMargins(0, 0, 0, 0);
-            /* Create label: */
-            m_pLabel = new QLabel;
-            /* Create progress-bar: */
-            m_pProgressBar = new QProgressBar;
-            {
-                /* Configure progress-bar: */
-                m_pProgressBar->setTextVisible(false);
-            }
-            /* Add widgets into layout: */
-            pLayout->addWidget(m_pLabel);
-            pLayout->addWidget(m_pProgressBar);
-        }
-    }
-
-    /** Progress-bar label. */
-    QLabel *m_pLabel;
-    /** Progress-bar itself. */
-    QProgressBar *m_pProgressBar;
-};
-
-
 /*********************************************************************************************************************************
 *   Class UIMediumItem implementation.                                                                                           *
@@ -799 +742 @@
     /* Return failure: */
     return false;
+}
+
+
+/*********************************************************************************************************************************
+*   Class UIEnumerationProgressBar implementation.                                                                               *
+*********************************************************************************************************************************/
+
+UIEnumerationProgressBar::UIEnumerationProgressBar(QWidget *pParent /* = 0 */)
+    : QWidget(pParent)
+{
+    /* Prepare: */
+    prepare();
+}
+
+void UIEnumerationProgressBar::setText(const QString &strText)
+{
+    m_pLabel->setText(strText);
+}
+
+int UIEnumerationProgressBar::value() const
+{
+    return m_pProgressBar->value();
+}
+
+void UIEnumerationProgressBar::setValue(int iValue)
+{
+    m_pProgressBar->setValue(iValue);
+}
+
+void UIEnumerationProgressBar::setMaximum(int iValue)
+{
+    m_pProgressBar->setMaximum(iValue);
+}
+
+void UIEnumerationProgressBar::prepare()
+{
+    /* Create layout: */
+    QHBoxLayout *pLayout = new QHBoxLayout(this);
+    {
+        /* Configure layout: */
+        pLayout->setContentsMargins(0, 0, 0, 0);
+        /* Create label: */
+        m_pLabel = new QLabel;
+        /* Create progress-bar: */
+        m_pProgressBar = new QProgressBar;
+        {
+            /* Configure progress-bar: */
+            m_pProgressBar->setTextVisible(false);
+        }
+        /* Add widgets into layout: */
+        pLayout->addWidget(m_pLabel);
+        pLayout->addWidget(m_pProgressBar);
+    }
 }
 
@@ -2434 +2430 @@
 }
 
-#include "UIMediumManager.moc"
-

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

@@ -27 +27 @@
 class QAbstractButton;
 class QLabel;
+class QProgressBar;
 class QTabWidget;
 class QTreeWidgetItem;
@@ -32 +33 @@
 class QILabel;
 class QITreeWidget;
-class UIEnumerationProgressBar;
 class UIMedium;
 class UIMediumDetailsWidget;
@@ -49 +49 @@
     /** Determines whether passed @a pItem is suitable. */
     virtual bool isItSuitable(UIMediumItem *pItem) const = 0;
+};
+
+
+/** Medium manager progress-bar.
+  * Reflects medium-enumeration progress, stays hidden otherwise. */
+class UIEnumerationProgressBar : public QWidget
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructor on the basis of passed @a pParent. */
+    UIEnumerationProgressBar(QWidget *pParent = 0);
+
+    /** Defines progress-bar label-text. */
+    void setText(const QString &strText);
+
+    /** Returns progress-bar current-value. */
+    int value() const;
+    /** Defines progress-bar current-value. */
+    void setValue(int iValue);
+    /** Defines progress-bar maximum-value. */
+    void setMaximum(int iValue);
+
+private:
+
+    /** Prepares progress-bar content. */
+    void prepare();
+
+    /** Progress-bar label. */
+    QLabel       *m_pLabel;
+    /** Progress-bar itself. */
+    QProgressBar *m_pProgressBar;
 };