Changeset 84022 in vbox for trunk/src/VBox/Frontends

Timestamp:

Apr 27, 2020 7:18:37 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: Rework QIDialogContainer to be able to add caption to progress-bar and embed that stuff to button-box directly.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/extensions

Files:

• QIDialogContainer.cpp (modified) (5 diffs)
• QIDialogContainer.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIDialogContainer.cpp

@@ -18 +18 @@
 /* Qt includes: */
 #include <QGridLayout>
+#include <QLabel>
 #include <QProgressBar>
 #include <QPushButton>
@@ -30 +31 @@
 
 QIDialogContainer::QIDialogContainer(QWidget *pParent /* = 0 */, Qt::WindowFlags enmFlags /* = Qt::WindowFlags() */)
-    : QDialog(pParent, enmFlags)
+    : QIWithRetranslateUI2<QDialog>(pParent, enmFlags)
     , m_pLayout(0)
     , m_pWidget(0)
+    , m_pProgressLabel(0)
     , m_pProgressBar(0)
     , m_pButtonBox(0)
@@ -49 +51 @@
 void QIDialogContainer::setProgressBarHidden(bool fHidden)
 {
+    AssertPtrReturnVoid(m_pProgressLabel);
     AssertPtrReturnVoid(m_pProgressBar);
+    m_pProgressLabel->setHidden(fHidden);
     m_pProgressBar->setHidden(fHidden);
 }
@@ -60 +64 @@
 }
 
+void QIDialogContainer::retranslateUi()
+{
+    m_pProgressLabel->setText(tr("Loading"));
+}
+
 void QIDialogContainer::prepare()
 {
@@ -66 +75 @@
     if (m_pLayout)
     {
-        /* Prepare horizontal layout: */
-        QHBoxLayout *pHLayout = new QHBoxLayout;
-        if (pHLayout)
+        /* Prepare dialog button-box: */
+        m_pButtonBox = new QIDialogButtonBox(this);
+        if (m_pButtonBox)
         {
-            /* Prepare progress-bar: */
-            m_pProgressBar = new QProgressBar(this);
-            if (m_pProgressBar)
+            m_pButtonBox->setStandardButtons(QDialogButtonBox::Ok);
+            connect(m_pButtonBox, &QIDialogButtonBox::accepted,
+                    this, &QDialog::accept);
+            connect(m_pButtonBox, &QIDialogButtonBox::rejected,
+                    this, &QDialog::reject);
+
+            /* Prepare progress-layout: */
+            QHBoxLayout *pHLayout = new QHBoxLayout;
+            if (pHLayout)
             {
-                m_pProgressBar->setHidden(true);
-                m_pProgressBar->setMinimum(0);
-                m_pProgressBar->setMaximum(0);
+                pHLayout->setContentsMargins(0, 0, 0, 0);
 
-                /* Add into layout: */
-                pHLayout->addWidget(m_pProgressBar);
-            }
+                /* Prepare progress-label: */
+                m_pProgressLabel = new QLabel(this);
+                if (m_pProgressLabel)
+                {
+                    m_pProgressLabel->setHidden(true);
 
-            /* Prepare dialog button-box: */
-            m_pButtonBox = new QIDialogButtonBox(this);
-            if (m_pButtonBox)
-            {
-                m_pButtonBox->setStandardButtons(QDialogButtonBox::Ok);
-                connect(m_pButtonBox, &QIDialogButtonBox::accepted,
-                        this, &QDialog::accept);
-                connect(m_pButtonBox, &QIDialogButtonBox::rejected,
-                        this, &QDialog::reject);
+                    /* Add into layout: */
+                    pHLayout->addWidget(m_pProgressLabel);
+                }
+                /* Prepare progress-bar: */
+                m_pProgressBar = new QProgressBar(this);
+                if (m_pProgressBar)
+                {
+                    m_pProgressBar->setHidden(true);
+                    m_pProgressBar->setTextVisible(false);
+                    m_pProgressBar->setMinimum(0);
+                    m_pProgressBar->setMaximum(0);
 
-                /* Add into layout: */
-                pHLayout->addWidget(m_pButtonBox);
+                    /* Add into layout: */
+                    pHLayout->addWidget(m_pProgressBar);
+                }
+
+                /* Add into button-box: */
+                m_pButtonBox->addExtraLayout(pHLayout);
             }
 
             /* Add into layout: */
-            m_pLayout->addLayout(pHLayout, 1, 0);
+            m_pLayout->addWidget(m_pButtonBox, 1, 0);
         }
     }
+
+    /* Apply language settings: */
+    retranslateUi();
 }

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIDialogContainer.h

@@ -26 +26 @@
 
 /* GUI includes: */
+#include "QIWithRetranslateUI.h"
 #include "UILibraryDefs.h"
 
 /* Forward declarations: */
 class QGridLayout;
+class QLabel;
 class QProgressBar;
 class QWidget;
@@ -36 +38 @@
 /** QDialog sub-class used as executable input container for passed widget.
   * Should be used as popup or modal dialog wrapping functionality of the passed widget. */
-class SHARED_LIBRARY_STUFF QIDialogContainer : public QDialog
+class SHARED_LIBRARY_STUFF QIDialogContainer : public QIWithRetranslateUI2<QDialog>
 {
     Q_OBJECT;
@@ -59 +61 @@
     void setOkButtonEnabled(bool fEnabled);
 
+protected:
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */;
+
 private:
 
@@ -69 +76 @@
     QWidget           *m_pWidget;
     /** Holds the progress-bar instance. */
+    QLabel            *m_pProgressLabel;
+    /** Holds the progress-bar instance. */
     QProgressBar      *m_pProgressBar;
     /** Holds the button-box instance. */