Changeset 43857 in vbox

Timestamp:

Nov 12, 2012 12:40:08 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: UIProgressDialog rework/cleanup.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UIProgressDialog.cpp (modified) (11 diffs)
• UIProgressDialog.h (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.cpp

@@ -47 +47 @@
                                    int cMinDuration /* = 2000 */,
                                    QWidget *pParent /* = 0 */)
-  : QIDialog(pParent, Qt::MSWindowsFixedSizeDialogHint | Qt::WindowTitleHint)
-  , m_progress(progress)
-  , m_pImageLbl(0)
-  , m_fCancelEnabled(false)
-  , m_cOperations(m_progress.GetOperationCount())
-  , m_iCurrentOperation(m_progress.GetOperation() + 1)
-  , m_fEnded(false)
-{
+    : QIWithRetranslateUI2<QIDialog>(pParent, Qt::MSWindowsFixedSizeDialogHint | Qt::WindowTitleHint)
+    , m_progress(progress)
+    , m_pImageLbl(0)
+    , m_fCancelEnabled(false)
+    , m_cOperations(m_progress.GetOperationCount())
+    , m_iCurrentOperation(m_progress.GetOperation() + 1)
+    , m_fEnded(false)
+{
+    /* Setup dialog: */
     setModal(true);
-
-    QHBoxLayout *pLayout0 = new QHBoxLayout(this);
+    setWindowTitle(QString("%1: %2").arg(strTitle, m_progress.GetDescription()));
+    setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+
+    /* Create main layout: */
+    QHBoxLayout *pMainLayout = new QHBoxLayout(this);
 
 #ifdef Q_WS_MAC
@@ -69 +73 @@
     ::darwinSetShowsResizeIndicator(this, false);
     if (pImage)
-        pLayout0->setContentsMargins(30, 15, 30, 15);
+        pMainLayout->setContentsMargins(30, 15, 30, 15);
     else
-        pLayout0->setContentsMargins(6, 6, 6, 6);
-#else
+        pMainLayout->setContentsMargins(6, 6, 6, 6);
+#else /* Q_WS_MAC */
     NOREF(fSheetOnDarwin);
-#endif /* Q_WS_MAC */
-
+#endif /* !Q_WS_MAC */
+
+    /* Create image: */
     if (pImage)
     {
-        m_pImageLbl = new QILabel(this);
+        m_pImageLbl = new QLabel(this);
         m_pImageLbl->setPixmap(*pImage);
-        pLayout0->addWidget(m_pImageLbl);
-    }
-
-    QVBoxLayout *pLayout1 = new QVBoxLayout();
-    pLayout1->setMargin(0);
-    pLayout0->addLayout(pLayout1);
-    pLayout1->addStretch(1);
+        pMainLayout->addWidget(m_pImageLbl);
+    }
+
+    /* Create description: */
     m_pDescriptionLbl = new QILabel(this);
-    pLayout1->addWidget(m_pDescriptionLbl, 0, Qt::AlignHCenter);
-
-    QHBoxLayout *pLayout2 = new QHBoxLayout();
-    pLayout2->setMargin(0);
-    pLayout1->addLayout(pLayout2);
-
-    m_progressBar = new QProgressBar(this);
-    pLayout2->addWidget(m_progressBar, 0, Qt::AlignVCenter);
-
     if (m_cOperations > 1)
         m_pDescriptionLbl->setText(QString(m_spcszOpDescTpl)
@@ -104 +97 @@
         m_pDescriptionLbl->setText(QString("%1 ...")
                                    .arg(m_progress.GetOperationDescription()));
-    m_progressBar->setMaximum(100);
-    setWindowTitle(QString("%1: %2").arg(strTitle, m_progress.GetDescription()));
-    m_progressBar->setValue(0);
+
+    /* Create progress-bar: */
+    m_pProgressBar = new QProgressBar(this);
+    m_pProgressBar->setMaximum(100);
+    m_pProgressBar->setValue(0);
+
+    /* Create cancel button: */
     m_fCancelEnabled = m_progress.GetCancelable();
     m_pCancelBtn = new UIMiniCancelButton(this);
     m_pCancelBtn->setEnabled(m_fCancelEnabled);
     m_pCancelBtn->setFocusPolicy(Qt::ClickFocus);
-    pLayout2->addWidget(m_pCancelBtn, 0, Qt::AlignVCenter);
-    connect(m_pCancelBtn, SIGNAL(clicked()), this, SLOT(cancelOperation()));
-
+    connect(m_pCancelBtn, SIGNAL(clicked()), this, SLOT(sltCancelOperation()));
+
+    /* Create estimation label: */
     m_pEtaLbl = new QILabel(this);
-    pLayout1->addWidget(m_pEtaLbl, 0, Qt::AlignLeft | Qt::AlignVCenter);
-
-    pLayout1->addStretch(1);
-
-    setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-
+
+    /* Create proggress layout: */
+    QHBoxLayout *pProgressLayout = new QHBoxLayout;
+    pProgressLayout->setMargin(0);
+    pProgressLayout->addWidget(m_pProgressBar, 0, Qt::AlignVCenter);
+    pProgressLayout->addWidget(m_pCancelBtn, 0, Qt::AlignVCenter);
+
+    /* Create description layout: */
+    QVBoxLayout *pDescriptionLayout = new QVBoxLayout;
+    pDescriptionLayout->setMargin(0);
+    pDescriptionLayout->addStretch(1);
+    pDescriptionLayout->addWidget(m_pDescriptionLbl, 0, Qt::AlignHCenter);
+    pDescriptionLayout->addLayout(pProgressLayout);
+    pDescriptionLayout->addWidget(m_pEtaLbl, 0, Qt::AlignLeft | Qt::AlignVCenter);
+    pDescriptionLayout->addStretch(1);
+    pMainLayout->addLayout(pDescriptionLayout);
+
+    /* Translate finally: */
     retranslateUi();
 
     /* The progress dialog will be shown automatically after
      * the duration is over if progress is not finished yet. */
-    QTimer::singleShot(cMinDuration, this, SLOT(showDialog()));
+    QTimer::singleShot(cMinDuration, this, SLOT(sltShowDialog()));
 }
 
@@ -154 +163 @@
          * We don't do this on the Mac, cause regarding the design rules of
          * Apple there is no busy window behavior. A window should always be
-         * responsive and is it in our case (We show the progress dialog bar). */
+         * responsive and it is in our case (We show the progress dialog bar). */
 #ifndef Q_WS_MAC
         if (m_fCancelEnabled)
@@ -181 +190 @@
 {
     if (m_fCancelEnabled)
-        cancelOperation();
-}
-
-void UIProgressDialog::timerEvent(QTimerEvent * /* pEvent */)
+        sltCancelOperation();
+}
+
+void UIProgressDialog::timerEvent(QTimerEvent* /* pEvent */)
 {
     /* We should hide progress-dialog
@@ -201 +210 @@
     if (!m_fEnded && (!m_progress.isOk() || m_progress.GetCompleted()))
     {
-        /* Progress finished */
+        /* Progress finished: */
         if (m_progress.isOk())
         {
-            m_progressBar->setValue(100);
+            m_pProgressBar->setValue(100);
             done(Accepted);
         }
-        /* Progress is not valid */
+        /* Progress is not valid: */
         else
             done(Rejected);
 
-        /* Request to exit loop */
+        /* Request to exit loop: */
         m_fEnded = true;
         return;
@@ -218 +227 @@
     if (!m_progress.GetCanceled())
     {
-        /* Update the progress dialog */
+        /* Update the progress dialog: */
         /* First ETA */
         long newTime = m_progress.GetTimeRemaining();
@@ -271 +280 @@
             m_pEtaLbl->clear();
 
-        /* Then operation text if changed */
+        /* Then operation text if changed: */
         ulong newOp = m_progress.GetOperation() + 1;
         if (newOp != m_iCurrentOperation)
@@ -280 +289 @@
                                        .arg(m_iCurrentOperation).arg(m_cOperations));
         }
-        m_progressBar->setValue(m_progress.GetPercent());
+        m_pProgressBar->setValue(m_progress.GetPercent());
 
         /* Then cancel button: */
@@ -293 +302 @@
 {
     if (m_fCancelEnabled)
-        cancelOperation();
+        sltCancelOperation();
     else
         pEvent->ignore();
 }
 
-void UIProgressDialog::showDialog()
+void UIProgressDialog::sltShowDialog()
 {
     /* We should not show progress-dialog
@@ -309 +318 @@
 }
 
-void UIProgressDialog::cancelOperation()
+void UIProgressDialog::sltCancelOperation()
 {
     m_pCancelBtn->setEnabled(false);

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.h

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -20 +20 @@
 #define __UIProgressDialog_h__
 
-/* Qt includes: */
+/* GUI includes: */
 #include "QIDialog.h"
+#include "QIWithRetranslateUI.h"
 
 /* Forward declarations: */
 class QProgressBar;
+class QLabel;
 class QILabel;
 class UIMiniCancelButton;
@@ -42 +44 @@
  *       destroyed.
  */
-class UIProgressDialog: protected QIDialog
+class UIProgressDialog: protected QIWithRetranslateUI2<QIDialog>
 {
     Q_OBJECT;
@@ -48 +50 @@
 public:
 
+    /* Constructor/destructor: */
     UIProgressDialog(CProgress &progress, const QString &strTitle,
                      QPixmap *pImage = 0, bool fSheetOnDarwin = false,
@@ -53 +56 @@
     ~UIProgressDialog();
 
+    /* API: Run stuff: */
     int run(int aRefreshInterval);
-    bool cancelEnabled() const { return m_fCancelEnabled; }
 
 protected:
 
-    virtual void retranslateUi();
+    /* Helper: Translate stuff: */
+    void retranslateUi();
 
-    virtual void reject();
+    /* Helper: Cancel stuff: */
+    void reject();
 
+    /* Handlers: Event processing stuff: */
     virtual void timerEvent(QTimerEvent *pEvent);
     virtual void closeEvent(QCloseEvent *pEvent);
@@ -67 +73 @@
 private slots:
 
-    void showDialog();
-    void cancelOperation();
+    /* Handlers: */
+    void sltShowDialog();
+    void sltCancelOperation();
 
 private:
 
-    /* Private member vars */
+    /* Variables: */
     CProgress &m_progress;
-    QILabel *m_pImageLbl;
+    QLabel *m_pImageLbl;
     QILabel *m_pDescriptionLbl;
+    QProgressBar *m_pProgressBar;
+    UIMiniCancelButton *m_pCancelBtn;
     QILabel *m_pEtaLbl;
+    bool m_fCancelEnabled;
     QString m_strCancel;
-    QProgressBar *m_progressBar;
-    UIMiniCancelButton *m_pCancelBtn;
-    bool m_fCancelEnabled;
     const ulong m_cOperations;
     ulong m_iCurrentOperation;