Changeset 24182 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Oct 30, 2009 11:07:40 AM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: Relayout the progress dialog a bit & make the ETA text more user friendly.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/QIDialog.h (modified) (3 diffs)
• include/VBoxCocoaSpecialControls.h (modified) (1 diff)
• include/VBoxProgressDialog.h (modified) (4 diffs)
• include/VBoxSpecialControls.h (modified) (1 diff)
• src/QIDialog.cpp (modified) (3 diffs)
• src/VBoxProgressDialog.cpp (modified) (14 diffs)
• src/VBoxSpecialControls.cpp (modified) (1 diff)
• src/darwin/VBoxCocoaSpecialControls.mm (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/include/QIDialog.h

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2008 Sun Microsystems, Inc.
+ * Copyright (C) 2008-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -27 +27 @@
 #include <QDialog>
 
+/* Qt forwards declarations */
+class QEventLoop;
+
 class QIDialog: public QDialog
 {
@@ -32 +35 @@
 
 public:
-
     QIDialog (QWidget *aParent = 0, Qt::WindowFlags aFlags = 0);
+    void setVisible (bool aVisible);
 
 public slots:
-    int exec();
+    int exec (bool aShow = true);
 
 protected:
-
     void showEvent (QShowEvent *aEvent);
 
+private:
+    /* Private member vars */
     bool mPolished;
+    QEventLoop *mEventLoop;
 };
 
 #endif /* __QIDialog_h__ */
+

trunk/src/VBox/Frontends/VirtualBox/include/VBoxCocoaSpecialControls.h

@@ -49 +49 @@
     QSize sizeHint() const;
 
+    void setText (const QString& aText);
     void setToolTip (const QString& aTip);
 

trunk/src/VBox/Frontends/VirtualBox/include/VBoxProgressDialog.h

@@ -30 +30 @@
 class CProgress;
 class QILabel;
+class VBoxMiniCancelButton;
 
 /* Qt forward declarations */
-class QEventLoop;
 class QProgressBar;
 
@@ -53 +53 @@
 
 public:
-
     VBoxProgressDialog (CProgress &aProgress, const QString &aTitle,
                         int aMinDuration = 2000, QWidget *aParent = 0);
@@ -61 +60 @@
 
 protected:
-
     virtual void retranslateUi();
 
@@ -70 +68 @@
 
 private slots:
-
     void showDialog();
     void cancelOperation();
 
 private:
-
     /* Private member vars */
     CProgress &mProgress;
     QILabel *mLabel;
     QILabel *mETA;
-    QString mETAText;
+    QString mETAText[14];
+    QString mCancelText;
     QProgressBar *mProgressBar;
-    QEventLoop *mEventLoop;
+    VBoxMiniCancelButton *mCancelBtn;
     bool mCancelEnabled;
     const ulong mOpCount;

trunk/src/VBox/Frontends/VirtualBox/include/VBoxSpecialControls.h

@@ -47 +47 @@
     VBoxMiniCancelButton (QWidget *aParent = 0);
 
+    void setText (const QString &aText) { mButton->setText (aText); }
     void setToolTip (const QString &aTip) { mButton->setToolTip (aTip); }
 

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2008 Sun Microsystems, Inc.
+ * Copyright (C) 2008-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -21 +21 @@
  */
 
-
+/* VBox includes */
 #include "QIDialog.h"
 #include "VBoxGlobal.h"
 #ifdef Q_WS_MAC
-#include "VBoxUtils.h"
+# include "VBoxUtils.h"
 #endif /* Q_WS_MAC */
 
-QIDialog::QIDialog (QWidget *aParent, Qt::WindowFlags aFlags)
+/* Qt includes */
+#include <QPointer>
+
+QIDialog::QIDialog (QWidget *aParent /* = 0 */, Qt::WindowFlags aFlags /* = 0 */)
     : QDialog (aParent, aFlags)
     , mPolished (false)
+    , mEventLoop (0)
 {
 }
@@ -61 +65 @@
 }
 
-int QIDialog::exec()
+int QIDialog::exec (bool aShow /* = true */)
 {
-#if QT_VERSION >= 0x040500
-    /* After 4.5 exec ignores the Qt::Sheet flag. See "New Ways of Using
-     * Dialogs" in http://doc.trolltech.com/qq/QtQuarterly30.pdf why. Because
-     * we are lazy, we recreate the old behavior. */
+    /* Reset the result code */
+    setResult (QDialog::Rejected);
+
+    bool wasDeleteOnClose = testAttribute (Qt::WA_DeleteOnClose);
+    setAttribute (Qt::WA_DeleteOnClose, false);
+#if defined(Q_WS_MAC) && QT_VERSION >= 0x040500
+    /* After 4.5 Qt changed the behavior of Sheets for the window/application
+     * modal case. See "New Ways of Using Dialogs" in
+     * http://doc.trolltech.com/qq/QtQuarterly30.pdf why. We want the old
+     * behavior back, where all modal windows where shown as sheets. So make
+     * the modal mode window, but be application modal in any case. */
+    Qt::WindowModality winModality = windowModality();
+    bool wasSetWinModality = testAttribute (Qt::WA_SetWindowModality);
     if ((windowFlags() & Qt::Sheet) == Qt::Sheet)
     {
-        QEventLoop eventLoop;
-        connect(this, SIGNAL(finished(int)),
-                &eventLoop, SLOT(quit()));
-        /* Use the new open call. */
-        open();
-        eventLoop.exec();
+        setWindowModality (Qt::WindowModal);
+        setAttribute (Qt::WA_SetWindowModality, false);
+    }
+#endif /* defined(Q_WS_MAC) && QT_VERSION >= 0x040500 */
+    /* The dialog has to modal in any case. Save the current modality to
+     * restore it later. */
+    bool wasShowModal = testAttribute (Qt::WA_ShowModal);
+    setAttribute (Qt::WA_ShowModal, true);
 
-        return result();
+    /* Create a local event loop */
+    mEventLoop = new QEventLoop();
+    /* Show the window if requested */
+    if (aShow)
+        show();
+    /* A guard to ourself for the case we destroy ourself. */
+    QPointer<QIDialog> guard = this;
+    /* Start the event loop. This blocks. */
+    mEventLoop->exec();
+    /* Delete the event loop */
+    delete mEventLoop;
+    mEventLoop = 0;
+    /* Are we valid anymore? */
+    if (guard.isNull())
+        return QDialog::Rejected;
+    /* Save the result code in case we delete ourself */
+    QDialog::DialogCode res = (QDialog::DialogCode)result();
+#if defined(Q_WS_MAC) && QT_VERSION >= 0x040500
+    /* Restore old modality mode */
+    if ((windowFlags() & Qt::Sheet) == Qt::Sheet)
+    {
+        setWindowModality (winModality);
+        setAttribute (Qt::WA_SetWindowModality, wasSetWinModality);
     }
-    else
-#endif /* QT_VERSION >= 0x040500 */
-        return QDialog::exec();
+#endif /* defined(Q_WS_MAC) && QT_VERSION >= 0x040500 */
+    /* Set the old show modal attribute */
+    setAttribute (Qt::WA_ShowModal, wasShowModal);
+    /* Delete us in the case we should do so on close */
+    if (wasDeleteOnClose)
+        delete this;
+    /* Return the final result */
+    return res;
 }
+
+void QIDialog::setVisible (bool aVisible)
+{
+    QDialog::setVisible (aVisible);
+    /* Exit from the event loop if there is any and we are changing our state
+     * from visible to invisible. */
+    if (mEventLoop && !aVisible)
+        mEventLoop->exit();
+}
+

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

@@ -27 +27 @@
 #include "VBoxGlobal.h"
 #include "VBoxProgressDialog.h"
-
+#include "VBoxSpecialControls.h"
 #ifdef Q_WS_MAC
 # include "VBoxUtils-darwin.h"
@@ -40 +40 @@
 #include <QVBoxLayout>
 
+#define VBOX_SECOND 1
+#define VBOX_MINUTE VBOX_SECOND * 60
+#define VBOX_HOUR VBOX_MINUTE * 60
+#define VBOX_DAY VBOX_HOUR * 24
+
 const char *VBoxProgressDialog::sOpDescTpl = "%1... (%2/%3)";
 
@@ -46 +51 @@
                                         int aMinDuration /* = 2000 */,
                                         QWidget *aParent /* = 0 */)
+//  : QIDialog (aParent, Qt::Sheet | Qt::MSWindowsFixedSizeDialogHint | Qt::WindowTitleHint)
   : QIDialog (aParent, Qt::MSWindowsFixedSizeDialogHint | Qt::WindowTitleHint)
   , mProgress (aProgress)
-  , mEventLoop (new QEventLoop (this))
+  , mCancelBtn (0)
   , mCancelEnabled (false)
   , mOpCount (mProgress.GetOperationCount())
@@ -56 +62 @@
     setModal (true);
 
-    QVBoxLayout *pMainLayout = new QVBoxLayout (this);
+    QVBoxLayout *pLayout1 = new QVBoxLayout (this);
 
 #ifdef Q_WS_MAC
     ::darwinSetHidesAllTitleButtons (this);
     ::darwinSetShowsResizeIndicator (this, false);
-    VBoxGlobal::setLayoutMargin (pMainLayout, 6);
+    VBoxGlobal::setLayoutMargin (pLayout1, 6);
 #endif /* Q_WS_MAC */
 
     mLabel = new QILabel (this);
-    pMainLayout->addWidget (mLabel);
-    pMainLayout->setAlignment (mLabel, Qt::AlignHCenter);
+    pLayout1->addWidget (mLabel, 0, Qt::AlignHCenter);
+
+    QHBoxLayout *pLayout2 = new QHBoxLayout();
+    pLayout2->setMargin (0);
+    pLayout1->addLayout (pLayout2);
 
     mProgressBar = new QProgressBar (this);
-    pMainLayout->addWidget (mProgressBar);
-
-    QHBoxLayout *pLayout1 = new QHBoxLayout();
-    pLayout1->setMargin (0);
-    mETA = new QILabel (this);
-    pLayout1->addWidget (mETA);
-    pMainLayout->addLayout (pLayout1);
+    pLayout2->addWidget (mProgressBar, 0, Qt::AlignVCenter);
 
     if (mOpCount > 1)
@@ -90 +93 @@
     if (mCancelEnabled)
     {
-        QDialogButtonBox *pBtnBox = new QDialogButtonBox (QDialogButtonBox::Cancel,
-                                                          Qt::Horizontal, this);
-        pLayout1->addWidget (pBtnBox);
-        connect (pBtnBox, SIGNAL (rejected()), this, SLOT (cancelOperation()));
-    }
+        mCancelBtn = new VBoxMiniCancelButton (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);
 
     retranslateUi();
@@ -105 +113 @@
 void VBoxProgressDialog::retranslateUi()
 {
-    mETAText = tr ("Time remaining: %1");
+    mETAText[ 0] = tr ("%1 days, %2 hours remaining");
+    mETAText[ 1] = tr ("%1 days, %2 minutes remaining");
+    mETAText[ 2] = tr ("%1 days remaining");
+    mETAText[ 3] = tr ("1 day, %1 hours remaining");
+    mETAText[ 4] = tr ("1 day, %1 minutes remaining");
+    mETAText[ 5] = tr ("1 day remaining");
+    mETAText[ 6] = tr ("%1 hours, %2 minutes remaining");
+    mETAText[ 7] = tr ("1 hour, %1 minutes remaining");
+    mETAText[ 8] = tr ("1 hour remaining");
+    mETAText[ 9] = tr ("%1 minutes remaining");
+    mETAText[10] = tr ("1 minute, %2 seconds remaining");
+    mETAText[11] = tr ("1 minute remaining");
+    mETAText[12] = tr ("%1 seconds remaining");
+    mETAText[13] = tr ("A few seconds remaining");
+
+    mCancelText = tr ("Canceling...");
+    if (mCancelBtn)
+    {
+        mCancelBtn->setText (tr ("&Cancel"));
+        mCancelBtn->setToolTip (tr ("Cancel the current operation"));
+    }
 }
 
@@ -118 +146 @@
         QApplication::setOverrideCursor (QCursor (Qt::WaitCursor));
 
-        /* Enter the modal loop */
-        mEventLoop->exec();
+        /* Enter the modal loop, but don't show the window immediately */
+        exec (false);
 
         /* Kill refresh timer */
         killTimer (id);
+
+        QApplication::restoreOverrideCursor();
 
         return result();
@@ -142 +172 @@
 void VBoxProgressDialog::cancelOperation()
 {
+    if (mCancelBtn)
+        mCancelBtn->setEnabled (false);
     mProgress.Cancel();
 }
@@ -153 +185 @@
      * being exit overlapping 'this'. */
     if (mEnded && !isHidden())
+    {
         hide();
+        return;
+    }
+    else if (mEnded)
+        return;
 
     if (!mEnded && (!mProgress.isOk() || mProgress.GetCompleted()))
@@ -161 +198 @@
         {
             mProgressBar->setValue (100);
-            setResult (Accepted);
+            done (Accepted);
         }
         /* Progress is not valid */
         else
-            setResult (Rejected);
+            done (Rejected);
 
         /* Request to exit loop */
         mEnded = true;
-
-        /* The progress will be finalized
-         * on next timer iteration. */
-        return;
-    }
-
-    if (mEnded)
-    {
-        if (mEventLoop->isRunning())
-        {
-            /* Exit loop if it is running */
-            mEventLoop->quit();
-
-            /* Restore normal cursor */
-            QApplication::restoreOverrideCursor();
-        }
         return;
     }
@@ -193 +214 @@
         /* First ETA */
         long newTime = mProgress.GetTimeRemaining();
-        if (newTime >= 0)
-        {
-            QTime time (0, 0);
-            time = time.addSecs (newTime);
-            mETA->setText (mETAText.arg (time.toString()));
-        }
+        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();
+        if (newTime > VBOX_DAY * 2 + VBOX_HOUR)
+            mETA->setText (mETAText[ 0].arg (days).arg (hours));
+        else if (newTime > VBOX_DAY * 2 + VBOX_MINUTE * 5)
+            mETA->setText (mETAText[ 1].arg (days).arg (minutes));
+        else if (newTime > VBOX_DAY * 2)
+            mETA->setText (mETAText[ 2].arg (days));
+        else if (newTime > VBOX_DAY + VBOX_HOUR)
+            mETA->setText (mETAText[ 3].arg (hours));
+        else if (newTime > VBOX_DAY + VBOX_MINUTE * 5)
+            mETA->setText (mETAText[ 4].arg (minutes));
+        else if (newTime > VBOX_HOUR * 23 + VBOX_MINUTE * 55)
+            mETA->setText (mETAText[ 5]);
+        else if (newTime > VBOX_HOUR * 2)
+            mETA->setText (mETAText[ 6].arg (hours).arg (minutes));
+        else if (newTime > VBOX_HOUR + VBOX_MINUTE * 5)
+            mETA->setText (mETAText[ 7].arg (hours).arg (minutes));
+        else if (newTime > VBOX_MINUTE * 55)
+            mETA->setText (mETAText[ 8]);
+        else if (newTime > VBOX_MINUTE * 2)
+            mETA->setText (mETAText[ 9].arg (minutes));
+        else if (newTime > VBOX_MINUTE + VBOX_SECOND * 5)
+            mETA->setText (mETAText[10].arg (seconds));
+        else if (newTime > VBOX_SECOND * 55)
+            mETA->setText (mETAText[11]);
+        else if (newTime > VBOX_SECOND * 5)
+            mETA->setText (mETAText[12].arg (seconds));
+        else if (newTime >= 0)
+            mETA->setText (mETAText[13]);
         else
             mETA->clear();
+
         /* Then operation text if changed */
         ulong newOp = mProgress.GetOperation() + 1;
@@ -211 +264 @@
         }
         mProgressBar->setValue (mProgress.GetPercent());
-    }
+    }else
+        mETA->setText (mCancelText);
 }
 
@@ -217 +271 @@
 {
     if (mCancelEnabled)
-        QIDialog::reject();
+        cancelOperation();
 }
 
@@ -223 +277 @@
 {
     if (mCancelEnabled)
-        QIDialog::closeEvent (aEvent);
+        cancelOperation();
     else
         aEvent->ignore();

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

@@ -75 +75 @@
     setFocusPolicy (Qt::TabFocus);
     setShortcut (QKeySequence (Qt::Key_Escape));
-    setIcon (VBoxGlobal::iconSet (":/delete_16px.png",
-                                  ":/delete_dis_16px.png"));
+    QIcon cancelIcon = style()->standardIcon (QStyle::SP_DialogCancelButton);
+    if (cancelIcon.isNull())
+        cancelIcon = VBoxGlobal::iconSet (":/delete_16px.png",
+                                          ":/delete_dis_16px.png");
+    setIcon (cancelIcon);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/darwin/VBoxCocoaSpecialControls.mm

@@ -248 +248 @@
 }
 
+void VBoxCocoaButton::setText (const QString& aText)
+{
+    QString s (aText);
+    /* Set it for accessibility reasons as alternative title */
+    [mNativeRef setAlternateTitle: ::darwinQStringToNSString (s.remove ('&'))];
+}
+
 void VBoxCocoaButton::setToolTip (const QString& aTip)
 {