Changeset 34479 in vbox for trunk/src

Timestamp:

Nov 29, 2010 4:44:03 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt4: UIProgressDialog cleanup; it's possible to add an image to the progress
dialog now; images and sheet windows for save/restore state

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (4 diffs)
• VirtualBox2.qrc (modified) (1 diff)
• images/progress_state_restore_90px.png (added)
• images/progress_state_save_90px.png (added)
• src/VBoxMediaManagerDlg.cpp (modified) (1 diff)
• src/globals/VBoxGlobal.cpp (modified) (1 diff)
• src/globals/VBoxProblemReporter.cpp (modified) (2 diffs)
• src/globals/VBoxProblemReporter.h (modified) (1 diff)
• src/runtime/UIMachineWindow.cpp (modified) (3 diffs)
• src/runtime/UISession.cpp (modified) (4 diffs)
• src/selector/VBoxSelectorWnd.cpp (modified) (1 diff)
• src/selector/VBoxSnapshotsWgt.cpp (modified) (3 diffs)
• src/widgets/UIProgressDialog.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxProgressDialog.cpp ) (6 diffs)
• src/widgets/UIProgressDialog.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxProgressDialog.h ) (3 diffs)
• src/widgets/VBoxImportApplianceWgt.cpp (modified) (2 diffs)
• src/wizards/exportappliance/UIExportApplianceWzd.cpp (modified) (3 diffs)
• src/wizards/newhd/UINewHDWzd.cpp (modified) (1 diff)
• src/wizards/newvm/UINewVMWzd.cpp (modified) (1 diff)

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

@@ -320 +320 @@
         src/wizards/importappliance/UIImportApplianceWzd.h \
         src/widgets/UIBar.h \
+        src/widgets/UIBootTable.h \
         src/widgets/UIDownloader.h \
         src/widgets/UIDownloaderAdditions.h \
         src/widgets/UIDownloaderUserManual.h \
         src/widgets/UIPopupBox.h \
+        src/widgets/UIProgressDialog.h \
         src/widgets/UISpacerWidgets.h \
         src/widgets/UISpecialControls.h \
         src/widgets/VBoxApplianceEditorWgt.h \
-        src/widgets/UIBootTable.h \
         src/widgets/VBoxExportApplianceWgt.h \
         src/widgets/VBoxFilePathSelectorWidget.h \
@@ -336 +337 @@
         src/widgets/VBoxOSTypeSelectorButton.h \
         src/widgets/VBoxOSTypeSelectorWidget.h \
-        src/widgets/VBoxProgressDialog.h \
         src/widgets/VBoxWarningPane.h \
         src/selector/UIVMDesktop.h \
@@ -483 +483 @@
         src/wizards/importappliance/UIImportApplianceWzd.cpp \
         src/widgets/UIBar.cpp \
+        src/widgets/UIBootTable.cpp \
         src/widgets/UIDownloader.cpp \
         src/widgets/UIDownloaderAdditions.cpp \
         src/widgets/UIDownloaderUserManual.cpp \
         src/widgets/UIPopupBox.cpp \
+        src/widgets/UIProgressDialog.cpp \
         src/widgets/UISpecialControls.cpp \
         src/widgets/UIToolBar.cpp \
         src/widgets/VBoxApplianceEditorWgt.cpp \
-        src/widgets/UIBootTable.cpp \
         src/widgets/VBoxExportApplianceWgt.cpp \
         src/widgets/VBoxFilePathSelectorWidget.cpp \
@@ -500 +501 @@
         src/widgets/VBoxOSTypeSelectorButton.cpp \
         src/widgets/VBoxOSTypeSelectorWidget.cpp \
-        src/widgets/VBoxProgressDialog.cpp \
         src/widgets/VBoxWarningPane.cpp \
         src/selector/UIVMDesktop.cpp \

trunk/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc

@@ -147 +147 @@
     <file alias="attachment_remove_16px.png">images/attachment_remove_16px.png</file>
     <file alias="attachment_remove_disabled_16px.png">images/attachment_remove_disabled_16px.png</file>
+    <file alias="progress_state_save_90px.png">images/progress_state_save_90px.png</file>
+    <file alias="progress_state_restore_90px.png">images/progress_state_restore_90px.png</file>
  </qresource>
  </RCC>

trunk/src/VBox/Frontends/VirtualBox/src/VBoxMediaManagerDlg.cpp

@@ -1082 +1082 @@
                 if (hardDisk.isOk())
                 {
-                    vboxProblem().showModalProgressDialog (progress, windowTitle(), parentWidget());
+                    vboxProblem().showModalProgressDialog (progress, windowTitle(), "", parentWidget());
                     if (progress.isOk() && progress.GetResultCode() == S_OK)
                         success = true;

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -5574 +5574 @@
     /* I hope 1 minute will be enough to spawn any running VM silently, isn't it? */
     int iSpawningDuration = 60000;
-    vboxProblem().showModalProgressDialog(progress, machine.GetName(), 0, iSpawningDuration);
+    vboxProblem().showModalProgressDialog(progress, machine.GetName(), "", 0, false, iSpawningDuration);
     if (progress.GetResultCode() != 0)
         vboxProblem().cannotOpenSession(vbox, machine, progress);

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxProblemReporter.cpp

@@ -22 +22 @@
 #include "VBoxGlobal.h"
 #include "VBoxSelectorWnd.h"
-#include "VBoxProgressDialog.h"
+#include "UIProgressDialog.h"
 #include "UIDownloaderUserManual.h"
 #include "UIMachine.h"
@@ -286 +286 @@
  *  @param aMinDuration time (ms) that must pass before the dialog appears
  */
-bool VBoxProblemReporter::showModalProgressDialog (
-    CProgress &aProgress, const QString &aTitle, QWidget *aParent,
-    int aMinDuration)
-{
-    VBoxProgressDialog progressDlg (aProgress, aTitle, aMinDuration, aParent ? aParent : mainWindowShown());
-
+bool VBoxProblemReporter::showModalProgressDialog(CProgress &progress, const QString &strTitle, const QString &strImage /* = "" */, QWidget *pParent /* = 0 */, bool fSheetOnDarwin /* = false */, int cMinDuration /* = 2000 */)
+{
+    QPixmap *pPixmap = 0;
+    if (!strImage.isEmpty())
+        pPixmap = new QPixmap(strImage);
+
+    UIProgressDialog progressDlg(progress, strTitle, pPixmap, fSheetOnDarwin, cMinDuration, pParent ? pParent : mainWindowShown());
     /* Run the dialog with the 350 ms refresh interval. */
-    progressDlg.run (350);
+    progressDlg.run(350);
+
+    if (pPixmap)
+        delete pPixmap;
 
     return true;

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxProblemReporter.h

@@ -143 +143 @@
                                 aAutoConfirmId, aOkText, aCancelText); }
 
-    bool showModalProgressDialog (CProgress &aProgress, const QString &aTitle,
-                                  QWidget *aParent, int aMinDuration = 2000);
+    bool showModalProgressDialog(CProgress &progress, const QString &strTitle,
+                                 const QString &strImage = "", QWidget *pParent = 0,
+                                 bool fSheetOnDarwin = false, int cMinDuration = 2000);
 
     QWidget* mainWindowShown() const;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp

@@ -320 +320 @@
                         {
                             /* Show the "VM saving" progress dialog: */
-                            vboxProblem().showModalProgressDialog(progress, machine.GetName(), 0, 0);
+                            vboxProblem().showModalProgressDialog(progress, machine.GetName(), ":/progress_state_save_90px.png", 0, true);
                             if (progress.GetResultCode() != 0)
                                 vboxProblem().cannotSaveMachineState(progress);
@@ -352 +352 @@
                         {
                             /* Show the power down progress dialog: */
-                            vboxProblem().showModalProgressDialog(progress, machine.GetName(), 0);
+                            vboxProblem().showModalProgressDialog(progress, machine.GetName());
                             if (progress.GetResultCode() != 0)
                                 vboxProblem().cannotStopMachine(progress);
@@ -371 +371 @@
                                 {
                                     /* Show the progress dialog: */
-                                    vboxProblem().showModalProgressDialog(progress, machine.GetName(), 0);
+                                    vboxProblem().showModalProgressDialog(progress, machine.GetName());
                                     if (progress.GetResultCode() != 0)
                                         vboxProblem().cannotRestoreSnapshot(progress, snapshot.GetName());

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -203 +203 @@
     /* Show "Starting/Restoring" progress dialog: */
     if (isSaved())
-        vboxProblem().showModalProgressDialog(progress, machine.GetName(), mainMachineWindow(), 0);
+        vboxProblem().showModalProgressDialog(progress, machine.GetName(), ":/progress_state_restore_90px.png", mainMachineWindow(), true, 0);
     else
-        vboxProblem().showModalProgressDialog(progress, machine.GetName(), mainMachineWindow());
+        vboxProblem().showModalProgressDialog(progress, machine.GetName(), "", mainMachineWindow());
 
     /* Check for a progress failure: */
@@ -258 +258 @@
                     uimachine()->machineLogic()->setPreventAutoClose(true);
                 /* Show the power down progress dialog */
-                vboxProblem().showModalProgressDialog(progress, machine.GetName(), mainMachineWindow());
+                vboxProblem().showModalProgressDialog(progress, machine.GetName(), "", mainMachineWindow());
                 if (progress.GetResultCode() != 0)
                     vboxProblem().cannotStopMachine(progress);
@@ -376 +376 @@
     if (fResult)
     {
-        vboxProblem().showModalProgressDialog(progressInstall, tr("Install"),
-                                              mainMachineWindow(), 500 /* 500ms delay. */);
+        vboxProblem().showModalProgressDialog(progressInstall, tr("Install"), "",
+                                              mainMachineWindow(), false, 500 /* 500ms delay. */);
         if (progressInstall.GetCanceled())
             return;
@@ -1009 +1009 @@
     /* Check if we are in teleportation waiting mode. In that case no first run
      * wizard is necessary. */
-    KMachineState state = machine.GetState();
+    m_machineState = machine.GetState();
     if (   isFirstTimeStarted()
-        && !((   state == KMachineState_PoweredOff
-              || state == KMachineState_Aborted
-              || state == KMachineState_Teleported)
+        && !((   m_machineState == KMachineState_PoweredOff
+              || m_machineState == KMachineState_Aborted
+              || m_machineState == KMachineState_Teleported)
              && machine.GetTeleporterEnabled()))
     {

trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp

@@ -770 +770 @@
                 if (machine.isOk())
                 {
-                    vboxProblem().showModalProgressDialog(progress, item->name(), 0, 0);
+                    vboxProblem().showModalProgressDialog(progress, item->name(), "");
                     if (progress.GetResultCode() != 0)
                         vboxProblem().cannotDeleteMachine(machine);

trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp

@@ -536 +536 @@
     {
         /* Show the progress dialog */
-        vboxProblem().showModalProgressDialog (progress, mMachine.GetName(),
+        vboxProblem().showModalProgressDialog (progress, mMachine.GetName(), "",
                                                vboxProblem().mainWindowShown());
 
@@ -582 +582 @@
     {
         /* Show the progress dialog */
-        vboxProblem().showModalProgressDialog (progress, mMachine.GetName(),
+        vboxProblem().showModalProgressDialog (progress, mMachine.GetName(), "",
                                                vboxProblem().mainWindowShown());
 
@@ -653 +653 @@
         {
             /* Show the progress dialog */
-            vboxProblem().showModalProgressDialog (progress, mMachine.GetName(),
+            vboxProblem().showModalProgressDialog (progress, mMachine.GetName(), "",
                                                    vboxProblem().mainWindowShown());
 

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

@@ -3 +3 @@
  *
  * VBox frontends: Qt GUI ("VirtualBox"):
- * VBoxProgressDialog class implementation
+ * UIProgressDialog class implementation
  */
 
 /*
- * Copyright (C) 2006-2009 Oracle Corporation
+ * Copyright (C) 2006-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -19 +19 @@
 
 /* VBox includes */
+#include "UIProgressDialog.h"
 #include "COMDefs.h"
 #include "QIDialogButtonBox.h"
 #include "QILabel.h"
+#include "UISpecialControls.h"
 #include "VBoxGlobal.h"
-#include "VBoxProgressDialog.h"
-#include "UISpecialControls.h"
+
 #ifdef Q_WS_MAC
 # include "VBoxUtils-darwin.h"
-#endif
+#endif /* Q_WS_MAC */
 
 /* Qt includes */
@@ -42 +43 @@
 #define VBOX_DAY VBOX_HOUR * 24
 
-const char *VBoxProgressDialog::sOpDescTpl = "%1... (%2/%3)";
-
-VBoxProgressDialog::VBoxProgressDialog (CProgress &aProgress,
-                                        const QString &aTitle,
-                                        int aMinDuration /* = 2000 */,
-                                        QWidget *aParent /* = 0 */)
-//  : QIDialog (aParent, Qt::Sheet | Qt::MSWindowsFixedSizeDialogHint | Qt::WindowTitleHint)
-  : QIDialog (aParent, Qt::MSWindowsFixedSizeDialogHint | Qt::WindowTitleHint)
-  , mProgress (aProgress)
-  , mCancelBtn (0)
-  , mCancelEnabled (false)
-  , mOpCount (mProgress.GetOperationCount())
-  , mCurOp (mProgress.GetOperation() + 1)
-  , mEnded (false)
-{
-    setModal (true);
-
-    QVBoxLayout *pLayout1 = new QVBoxLayout (this);
+const char *UIProgressDialog::m_spcszOpDescTpl = "%1 ... (%2/%3)";
+
+UIProgressDialog::UIProgressDialog(CProgress &progress,
+                                   const QString &strTitle,
+                                   QPixmap *pImage /* = 0 */,
+                                   bool fSheetOnDarwin /* = false */,
+                                   int cMinDuration /* = 2000 */,
+                                   QWidget *pParent /* = 0 */)
+//  : QIDialog(aParent, Qt::Sheet | Qt::MSWindowsFixedSizeDialogHint | Qt::WindowTitleHint)
+  : QIDialog(pParent, Qt::MSWindowsFixedSizeDialogHint | Qt::WindowTitleHint)
+  , m_progress(progress)
+  , m_pImageLbl(0)
+  , m_pCancelBtn(0)
+  , m_fCancelEnabled(false)
+  , m_cOperations(m_progress.GetOperationCount())
+  , m_iCurrentOperation(m_progress.GetOperation() + 1)
+  , m_fEnded(false)
+{
+    setModal(true);
+
+    QHBoxLayout *pLayout0 = new QHBoxLayout(this);
 
 #ifdef Q_WS_MAC
-    ::darwinSetHidesAllTitleButtons (this);
-    ::darwinSetShowsResizeIndicator (this, false);
-    VBoxGlobal::setLayoutMargin (pLayout1, 6);
+    /* No sheets in another mode than normal for now. Firstly it looks ugly and
+     * secondly in some cases it is broken. */
+    if (   fSheetOnDarwin
+        && vboxGlobal().isSheetWindowsAllowed(pParent))
+        setWindowFlags(Qt::Sheet);
+    ::darwinSetHidesAllTitleButtons(this);
+    ::darwinSetShowsResizeIndicator(this, false);
+    if (pImage)
+        pLayout0->setContentsMargins(30, 15, 30, 15);
+    else
+        pLayout0->setContentsMargins(6, 6, 6, 6);
+#else
+    NOREF(fSheetOnDarwin);
 #endif /* Q_WS_MAC */
 
-    mLabel = new QILabel (this);
-    pLayout1->addWidget (mLabel, 0, Qt::AlignHCenter);
+    if (pImage)
+    {
+        m_pImageLbl = new QILabel(this);
+        m_pImageLbl->setPixmap(*pImage);
+        pLayout0->addWidget(m_pImageLbl);
+    }
+
+    QVBoxLayout *pLayout1 = new QVBoxLayout();
+    pLayout1->setMargin(0);
+    pLayout0->addLayout(pLayout1);
+    pLayout1->addStretch(1);
+    m_pDescriptionLbl = new QILabel(this);
+    pLayout1->addWidget(m_pDescriptionLbl, 0, Qt::AlignHCenter);
 
     QHBoxLayout *pLayout2 = new QHBoxLayout();
-    pLayout2->setMargin (0);
-    pLayout1->addLayout (pLayout2);
-
-    mProgressBar = new QProgressBar (this);
-    pLayout2->addWidget (mProgressBar, 0, Qt::AlignVCenter);
-
-    if (mOpCount > 1)
-        mLabel->setText (QString (sOpDescTpl)
-                         .arg (mProgress.GetOperationDescription())
-                         .arg (mCurOp).arg (mOpCount));
+    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)
+                                   .arg(m_progress.GetOperationDescription())
+                                   .arg(m_iCurrentOperation).arg(m_cOperations));
     else
-        mLabel->setText (QString ("%1...")
-                         .arg (mProgress.GetOperationDescription()));
-    mProgressBar->setMaximum (100);
-    setWindowTitle (QString ("%1: %2").arg (aTitle, mProgress.GetDescription()));
-    mProgressBar->setValue (0);
-    mCancelEnabled = aProgress.GetCancelable();
-    if (mCancelEnabled)
-    {
-        mCancelBtn = new UIMiniCancelButton (this);
-        mCancelBtn->setFocusPolicy (Qt::ClickFocus);
-        pLayout2->addWidget (mCancelBtn, 0, Qt::AlignVCenter);
-        connect (mCancelBtn, SIGNAL (clicked()), this, SLOT (cancelOperation()));
-    }
-
-    mETA = new QILabel (this);
-    pLayout1->addWidget (mETA, 0, Qt::AlignLeft | Qt::AlignVCenter);
-
-    setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed);
+        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);
+    m_fCancelEnabled = m_progress.GetCancelable();
+    if (m_fCancelEnabled)
+    {
+        m_pCancelBtn = new UIMiniCancelButton(this);
+        m_pCancelBtn->setFocusPolicy(Qt::ClickFocus);
+        pLayout2->addWidget(m_pCancelBtn, 0, Qt::AlignVCenter);
+        connect(m_pCancelBtn, SIGNAL(clicked()), this, SLOT(cancelOperation()));
+    }
+
+    m_pEtaLbl = new QILabel(this);
+    pLayout1->addWidget(m_pEtaLbl, 0, Qt::AlignLeft | Qt::AlignVCenter);
+
+    pLayout1->addStretch(1);
+
+    setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
 
     retranslateUi();
@@ -105 +132 @@
     /* The progress dialog will be shown automatically after
      * the duration is over if progress is not finished yet. */
-    QTimer::singleShot (aMinDuration, this, SLOT (showDialog()));
-}
-
-void VBoxProgressDialog::retranslateUi()
-{
-    mCancelText = tr ("Canceling...");
-    if (mCancelBtn)
-    {
-        mCancelBtn->setText (tr ("&Cancel"));
-        mCancelBtn->setToolTip (tr ("Cancel the current operation"));
-    }
-}
-
-int VBoxProgressDialog::run (int aRefreshInterval)
-{
-    if (mProgress.isOk())
+    QTimer::singleShot(cMinDuration, this, SLOT(showDialog()));
+}
+
+void UIProgressDialog::retranslateUi()
+{
+    m_strCancel = tr("Canceling...");
+    if (m_pCancelBtn)
+    {
+        m_pCancelBtn->setText(tr("&Cancel"));
+        m_pCancelBtn->setToolTip(tr("Cancel the current operation"));
+    }
+}
+
+int UIProgressDialog::run(int cRefreshInterval)
+{
+    if (m_progress.isOk())
     {
         /* Start refresh timer */
-        int id = startTimer (aRefreshInterval);
+        int id = startTimer(cRefreshInterval);
 
         /* Set busy cursor */
-        QApplication::setOverrideCursor (QCursor (Qt::WaitCursor));
+        QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
 
         /* Enter the modal loop, but don't show the window immediately */
-        exec (false);
+        exec(false);
 
         /* Kill refresh timer */
-        killTimer (id);
+        killTimer(id);
 
         QApplication::restoreOverrideCursor();
@@ -141 +168 @@
 }
 
-void VBoxProgressDialog::showDialog()
+void UIProgressDialog::reject()
+{
+    if (m_fCancelEnabled)
+        cancelOperation();
+}
+
+void UIProgressDialog::timerEvent(QTimerEvent * /* pEvent */)
+{
+    /* We should hide progress-dialog
+     * if it was already finalized but not yet closed.
+     * This could happens in case of some other
+     * modal dialog prevents our event-loop from
+     * being exit overlapping 'this'. */
+    if (m_fEnded && !isHidden())
+    {
+        hide();
+        return;
+    }
+    else if (m_fEnded)
+        return;
+
+    if (!m_fEnded && (!m_progress.isOk() || m_progress.GetCompleted()))
+    {
+        /* Progress finished */
+        if (m_progress.isOk())
+        {
+            m_progressBar->setValue(100);
+            done(Accepted);
+        }
+        /* Progress is not valid */
+        else
+            done(Rejected);
+
+        /* Request to exit loop */
+        m_fEnded = true;
+        return;
+    }
+
+    if (!m_progress.GetCanceled())
+    {
+        /* Update the progress dialog */
+        /* First ETA */
+        long newTime = m_progress.GetTimeRemaining();
+        QDateTime time;
+        time.setTime_t(newTime);
+        QDateTime refTime;
+        refTime.setTime_t(0);
+
+        int days = refTime.daysTo(time);
+        int hours = time.addDays(-days).time().hour();
+        int minutes = time.addDays(-days).time().minute();
+        int seconds = time.addDays(-days).time().second();
+
+        QString strDays = VBoxGlobal::daysToString(days);
+        QString strHours = VBoxGlobal::hoursToString(hours);
+        QString strMinutes = VBoxGlobal::minutesToString(minutes);
+        QString strSeconds = VBoxGlobal::secondsToString(seconds);
+
+        QString strTwoComp = tr("%1, %2 remaining", "You may wish to translate this more like \"Time remaining: %1, %2\"");
+        QString strOneComp = tr("%1 remaining", "You may wish to translate this more like \"Time remaining: %1\"");
+
+        if (newTime > VBOX_DAY * 2 + VBOX_HOUR)
+            m_pEtaLbl->setText(strTwoComp.arg(strDays).arg(strHours));
+        else if (newTime > VBOX_DAY * 2 + VBOX_MINUTE * 5)
+            m_pEtaLbl->setText(strTwoComp.arg(strDays).arg(strMinutes));
+        else if (newTime > VBOX_DAY * 2)
+            m_pEtaLbl->setText(strOneComp.arg(strDays));
+        else if (newTime > VBOX_DAY + VBOX_HOUR)
+            m_pEtaLbl->setText(strTwoComp.arg(strDays).arg(strHours));
+        else if (newTime > VBOX_DAY + VBOX_MINUTE * 5)
+            m_pEtaLbl->setText(strTwoComp.arg(strDays).arg(strMinutes));
+        else if (newTime > VBOX_HOUR * 23 + VBOX_MINUTE * 55)
+            m_pEtaLbl->setText(strOneComp.arg(strDays));
+        else if (newTime >= VBOX_HOUR * 2)
+            m_pEtaLbl->setText(strTwoComp.arg(strHours).arg(strMinutes));
+        else if (newTime > VBOX_HOUR + VBOX_MINUTE * 5)
+            m_pEtaLbl->setText(strTwoComp.arg(strHours).arg(strMinutes));
+        else if (newTime > VBOX_MINUTE * 55)
+            m_pEtaLbl->setText(strOneComp.arg(strHours));
+        else if (newTime > VBOX_MINUTE * 2)
+            m_pEtaLbl->setText(strOneComp.arg(strMinutes));
+        else if (newTime > VBOX_MINUTE + VBOX_SECOND * 5)
+            m_pEtaLbl->setText(strTwoComp.arg(strMinutes).arg(strSeconds));
+        else if (newTime > VBOX_SECOND * 55)
+            m_pEtaLbl->setText(strOneComp.arg(strMinutes));
+        else if (newTime > VBOX_SECOND * 5)
+            m_pEtaLbl->setText(strOneComp.arg(strSeconds));
+        else if (newTime >= 0)
+            m_pEtaLbl->setText(tr("A few seconds remaining"));
+        else
+            m_pEtaLbl->clear();
+
+        /* Then operation text if changed */
+        ulong newOp = m_progress.GetOperation() + 1;
+        if (newOp != m_iCurrentOperation)
+        {
+            m_iCurrentOperation = newOp;
+            m_pDescriptionLbl->setText(QString(m_spcszOpDescTpl)
+                                       .arg(m_progress.GetOperationDescription())
+                                       .arg(m_iCurrentOperation).arg(m_cOperations));
+        }
+        m_progressBar->setValue(m_progress.GetPercent());
+    }else
+        m_pEtaLbl->setText(m_strCancel);
+}
+
+void UIProgressDialog::closeEvent(QCloseEvent *pEvent)
+{
+    if (m_fCancelEnabled)
+        cancelOperation();
+    else
+        pEvent->ignore();
+}
+
+void UIProgressDialog::showDialog()
 {
     /* We should not show progress-dialog
@@ -148 +289 @@
      * modal dialog prevents our event-loop from
      * being exit overlapping 'this'. */
-    if (!mEnded)
+    if (!m_fEnded)
         show();
 }
 
-void VBoxProgressDialog::cancelOperation()
-{
-    if (mCancelBtn)
-        mCancelBtn->setEnabled (false);
-    mProgress.Cancel();
-}
-
-void VBoxProgressDialog::timerEvent (QTimerEvent * /* aEvent */)
-{
-    /* We should hide progress-dialog
-     * if it was already finalized but not yet closed.
-     * This could happens in case of some other
-     * modal dialog prevents our event-loop from
-     * being exit overlapping 'this'. */
-    if (mEnded && !isHidden())
-    {
-        hide();
-        return;
-    }
-    else if (mEnded)
-        return;
-
-    if (!mEnded && (!mProgress.isOk() || mProgress.GetCompleted()))
-    {
-        /* Progress finished */
-        if (mProgress.isOk())
-        {
-            mProgressBar->setValue (100);
-            done (Accepted);
-        }
-        /* Progress is not valid */
-        else
-            done (Rejected);
-
-        /* Request to exit loop */
-        mEnded = true;
-        return;
-    }
-
-    if (!mProgress.GetCanceled())
-    {
-        /* Update the progress dialog */
-        /* First ETA */
-        long newTime = mProgress.GetTimeRemaining();
-        QDateTime time;
-        time.setTime_t (newTime);
-        QDateTime refTime;
-        refTime.setTime_t (0);
-
-        int days = refTime.daysTo (time);
-        int hours = time.addDays (-days).time().hour();
-        int minutes = time.addDays (-days).time().minute();
-        int seconds = time.addDays (-days).time().second();
-
-        QString strDays = VBoxGlobal::daysToString(days);
-        QString strHours = VBoxGlobal::hoursToString(hours);
-        QString strMinutes = VBoxGlobal::minutesToString(minutes);
-        QString strSeconds = VBoxGlobal::secondsToString(seconds);
-
-        QString strTwoComp = tr ("%1, %2 remaining", "You may wish to translate this more like \"Time remaining: %1, %2\"");
-        QString strOneComp = tr ("%1 remaining", "You may wish to translate this more like \"Time remaining: %1\"");
-
-        if (newTime > VBOX_DAY * 2 + VBOX_HOUR)
-            mETA->setText (strTwoComp.arg (strDays).arg (strHours));
-        else if (newTime > VBOX_DAY * 2 + VBOX_MINUTE * 5)
-            mETA->setText (strTwoComp.arg (strDays).arg (strMinutes));
-        else if (newTime > VBOX_DAY * 2)
-            mETA->setText (strOneComp.arg (strDays));
-        else if (newTime > VBOX_DAY + VBOX_HOUR)
-            mETA->setText (strTwoComp.arg (strDays).arg (strHours));
-        else if (newTime > VBOX_DAY + VBOX_MINUTE * 5)
-            mETA->setText (strTwoComp.arg (strDays).arg (strMinutes));
-        else if (newTime > VBOX_HOUR * 23 + VBOX_MINUTE * 55)
-            mETA->setText (strOneComp.arg (strDays));
-        else if (newTime >= VBOX_HOUR * 2)
-            mETA->setText (strTwoComp.arg (strHours).arg (strMinutes));
-        else if (newTime > VBOX_HOUR + VBOX_MINUTE * 5)
-            mETA->setText (strTwoComp.arg (strHours).arg (strMinutes));
-        else if (newTime > VBOX_MINUTE * 55)
-            mETA->setText (strOneComp.arg (strHours));
-        else if (newTime > VBOX_MINUTE * 2)
-            mETA->setText (strOneComp.arg (strMinutes));
-        else if (newTime > VBOX_MINUTE + VBOX_SECOND * 5)
-            mETA->setText (strTwoComp.arg (strMinutes).arg (strSeconds));
-        else if (newTime > VBOX_SECOND * 55)
-            mETA->setText (strOneComp.arg (strMinutes));
-        else if (newTime > VBOX_SECOND * 5)
-            mETA->setText (strOneComp.arg (strSeconds));
-        else if (newTime >= 0)
-            mETA->setText (tr ("A few seconds remaining"));
-        else
-            mETA->clear();
-
-        /* Then operation text if changed */
-        ulong newOp = mProgress.GetOperation() + 1;
-        if (newOp != mCurOp)
-        {
-            mCurOp = newOp;
-            mLabel->setText (QString (sOpDescTpl)
-                             .arg (mProgress.GetOperationDescription())
-                             .arg (mCurOp).arg (mOpCount));
-        }
-        mProgressBar->setValue (mProgress.GetPercent());
-    }else
-        mETA->setText (mCancelText);
-}
-
-void VBoxProgressDialog::reject()
-{
-    if (mCancelEnabled)
-        cancelOperation();
-}
-
-void VBoxProgressDialog::closeEvent (QCloseEvent *aEvent)
-{
-    if (mCancelEnabled)
-        cancelOperation();
-    else
-        aEvent->ignore();
-}
-
+void UIProgressDialog::cancelOperation()
+{
+    if (m_pCancelBtn)
+        m_pCancelBtn->setEnabled(false);
+    m_progress.Cancel();
+}
+

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

@@ -2 +2 @@
  *
  * VBox frontends: Qt4 GUI ("VirtualBox"):
- * VBoxProgressDialog class declaration
+ * UIProgressDialog class declaration
  */
 
 /*
- * Copyright (C) 2009 Oracle Corporation
+ * Copyright (C) 2009-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -17 +17 @@
  */
 
-#ifndef __VBoxProgressDialog_h__
-#define __VBoxProgressDialog_h__
+#ifndef __UIProgressDialog_h__
+#define __UIProgressDialog_h__
 
 /* Qt includes */
@@ -41 +41 @@
  * @note The CProgress instance is passed as a non-const reference to the
  *       constructor (to memorize COM errors if they happen), and therefore must
- *       not be destroyed before the created VBoxProgressDialog instance is
+ *       not be destroyed before the created UIProgressDialog instance is
  *       destroyed.
  */
-class VBoxProgressDialog: protected QIDialog
+class UIProgressDialog: protected QIDialog
 {
     Q_OBJECT;
 
 public:
-    VBoxProgressDialog (CProgress &aProgress, const QString &aTitle,
-                        int aMinDuration = 2000, QWidget *aParent = 0);
 
-    int run (int aRefreshInterval);
-    bool cancelEnabled() const { return mCancelEnabled; }
+    UIProgressDialog(CProgress &progress, const QString &strTitle,
+                     QPixmap *pImage = 0, bool fSheetOnDarwin = false,
+                     int cMinDuration = 2000, QWidget *pParent = 0);
+
+    int run(int aRefreshInterval);
+    bool cancelEnabled() const { return m_fCancelEnabled; }
 
 protected:
+
     virtual void retranslateUi();
 
     virtual void reject();
 
-    virtual void timerEvent (QTimerEvent *aEvent);
-    virtual void closeEvent (QCloseEvent *aEvent);
+    virtual void timerEvent(QTimerEvent *pEvent);
+    virtual void closeEvent(QCloseEvent *pEvent);
 
 private slots:
+
     void showDialog();
     void cancelOperation();
 
 private:
+
     /* Private member vars */
-    CProgress &mProgress;
-    QILabel *mLabel;
-    QILabel *mETA;
-    QString mCancelText;
-    QProgressBar *mProgressBar;
-    UIMiniCancelButton *mCancelBtn;
-    bool mCancelEnabled;
-    const ulong mOpCount;
-    ulong mCurOp;
-    bool mEnded;
+    CProgress &m_progress;
+    QILabel *m_pImageLbl;
+    QILabel *m_pDescriptionLbl;
+    QILabel *m_pEtaLbl;
+    QString m_strCancel;
+    QProgressBar *m_progressBar;
+    UIMiniCancelButton *m_pCancelBtn;
+    bool m_fCancelEnabled;
+    const ulong m_cOperations;
+    ulong m_iCurrentOperation;
+    bool m_fEnded;
 
-    static const char *sOpDescTpl;
+    static const char *m_spcszOpDescTpl;
 };
 
-#endif /* __VBoxProgressDialog_h__ */
+#endif /* __UIProgressDialog_h__ */
 

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

@@ -61 +61 @@
             {
                 /* Show some progress, so the user know whats going on */
-                vboxProblem().showModalProgressDialog (progress, tr ("Reading Appliance ..."), this);
+                vboxProblem().showModalProgressDialog (progress, tr ("Reading Appliance ..."), "", this);
                 if (!progress.isOk() || progress.GetResultCode() != 0)
                 {
@@ -135 +135 @@
         {
             /* Show some progress, so the user know whats going on */
-            vboxProblem().showModalProgressDialog (progress, tr ("Importing Appliance ..."), this);
+            vboxProblem().showModalProgressDialog (progress, tr ("Importing Appliance ..."), "", this);
             if (progress.GetCanceled())
                 return false;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzd.cpp

@@ -584 +584 @@
     {
         /* Show some progress, so the user know whats going on */
-        vboxProblem().showModalProgressDialog(progress, tr("Checking files ..."), this);
+        vboxProblem().showModalProgressDialog(progress, tr("Checking files ..."), "", this);
         if (progress.GetCanceled())
             return false;
@@ -605 +605 @@
         {
             /* Show some progress, so the user know whats going on */
-            vboxProblem().showModalProgressDialog(progress1, tr("Removing files ..."), this);
+            vboxProblem().showModalProgressDialog(progress1, tr("Removing files ..."), "", this);
             if (progress1.GetCanceled())
                 return false;
@@ -641 +641 @@
     {
         /* Show some progress, so the user know whats going on */
-        vboxProblem().showModalProgressDialog(progress, tr("Exporting Appliance ..."), this);
+        vboxProblem().showModalProgressDialog(progress, tr("Exporting Appliance ..."), "", this);
         if (progress.GetCanceled())
             return false;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newhd/UINewHDWzd.cpp

@@ -522 +522 @@
     }
 
-    vboxProblem().showModalProgressDialog(progress, windowTitle(), parentWidget());
+    vboxProblem().showModalProgressDialog(progress, windowTitle(), "", parentWidget());
 
     if (progress.GetCanceled())

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp

@@ -496 +496 @@
     if (m_HardDisk.isOk())
     {
-        vboxProblem().showModalProgressDialog(progress, windowTitle(), this);
+        vboxProblem().showModalProgressDialog(progress, windowTitle(), "", this);
         if (progress.isOk() && progress.GetResultCode() == S_OK)
             success = true;