Changeset 9296 in vbox

Timestamp:

Jun 2, 2008 12:58:24 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: Readded the progress bar to the VDM. QIDialogButtonBox can now display
an extra item in the empty space.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/QIDialogButtonBox.h (modified) (2 diffs)
• include/VBoxDiskImageManagerDlg.h (modified) (2 diffs)
• src/QIDialogButtonBox.cpp (modified) (2 diffs)
• src/VBoxDiskImageManagerDlg.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/QIDialogButtonBox.h

@@ -29 +29 @@
 #include <QDialogButtonBox>
 
+class QBoxLayout;
+
 class QIDialogButtonBox: public QIWithRetranslateUI<QDialogButtonBox>
 {
@@ -41 +43 @@
     void setStandardButtons (StandardButtons aButtons);
 
+    void addExtraWidget (QWidget *aWidget);
+    void addExtraLayout (QLayout *aLayout);
+
 protected:
+
+    QBoxLayout *boxLayout() const;
+    int findEmptySpace (QBoxLayout *aLayout) const;
 
     void retranslateUi();

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxDiskImageManagerDlg.h

@@ -34 +34 @@
 class VBoxToolBar;
 class InfoPaneLabel;
+class VBoxProgressBar;
 
 class VBoxDiskImageManagerDlg : public QIWithRetranslateUI2<QIMainDialog>,
@@ -138 +139 @@
     bool mDoSelect;
     static VBoxDiskImageManagerDlg *mModelessDialog;
+    VBoxProgressBar  *mProgressBar;
 
     /* Type if we are in the select modus */

trunk/src/VBox/Frontends/VirtualBox4/src/QIDialogButtonBox.cpp

@@ -23 +23 @@
 #include "QIDialogButtonBox.h"
 
+#include <iprt/assert.h>
+
 /* Qt includes */
 #include <QPushButton>
 #include <QEvent>
+#include <QBoxLayout>
 
 QIDialogButtonBox::QIDialogButtonBox (StandardButtons aButtons, Qt::Orientation aOrientation, QWidget *aParent)
@@ -56 +59 @@
 }
 
+void QIDialogButtonBox::addExtraWidget (QWidget* aWidget)
+{
+    QBoxLayout *layout = boxLayout();
+    int index = findEmptySpace (layout);
+    layout->insertWidget (index + 1, aWidget);
+    layout->insertStretch(index + 2);
+}
+
+void QIDialogButtonBox::addExtraLayout (QLayout* aLayout)
+{
+    QBoxLayout *layout = boxLayout();
+    int index = findEmptySpace (layout);
+    layout->insertLayout (index + 1, aLayout);
+    layout->insertStretch(index + 2);
+}
+
+QBoxLayout *QIDialogButtonBox::boxLayout() const
+{
+  QBoxLayout *boxlayout = qobject_cast<QBoxLayout*> (layout());
+  AssertMsg (VALID_PTR (boxlayout), ("Layout of the QDialogButtonBox isn't a box layout."));
+  return boxlayout;
+}
+
+int QIDialogButtonBox::findEmptySpace (QBoxLayout *aLayout) const
+{
+  /* Search for the first occurrence of QSpacerItem and return the index.
+   * Please note that this is Qt internal, so it may change at any time. */
+  int i=0;
+  for (; i < aLayout->count(); ++i)
+  {
+      QLayoutItem *item = aLayout->itemAt(i);
+      if (QSpacerItem *sitem = item->spacerItem())
+          break;
+  }
+  return i;
+}
+
 void QIDialogButtonBox::retranslateUi()
 {

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxDiskImageManagerDlg.cpp

@@ -35 +35 @@
 #include <QPushButton>
 #include <QUrl>
+#include <QProgressBar>
 
 class AddVDMUrlsEvent: public QEvent
@@ -204 +205 @@
     /* Private member vars */
     QLabel *mLabel;
+};
+
+class VBoxProgressBar: public QWidget
+{
+public:
+
+    VBoxProgressBar (QWidget *aParent)
+        : QWidget (aParent)
+    {
+        QHBoxLayout *layout = new QHBoxLayout (this);
+        VBoxGlobal::setLayoutMargin (layout, 0);
+        mText = new QLabel ();
+        layout->addWidget (mText);
+        mProgressBar = new QProgressBar;
+        /* The text is provided by our own label */
+        mProgressBar->setTextVisible (false);
+        layout->addWidget (mProgressBar);
+    }
+
+public slots:
+
+    void setText (const QString& aText) { mText->setText (aText); }
+    void setValue (int aValue) { mProgressBar->setValue (aValue); }
+    void setMinimum (int aValue) { mProgressBar->setMinimum (aValue); }
+    void setMaximum (int aValue) { mProgressBar->setMaximum (aValue); }
+    void setRange (int aMin, int aMax) { mProgressBar->setRange (aMin, aMax); }
+
+    QLabel *label() const { return mText; }
+    QProgressBar *progressBar() const { return mProgressBar; }
+
+private:
+
+    /* Private member vars */
+    QLabel       *mText;
+    QProgressBar *mProgressBar;
 };
 
@@ -388 +424 @@
     createInfoString (mFdsPane2, mFdsContainer, 1, 0);
 
-    /* enumeration progressbar creation */
-//    mProgressText = new QLabel (centralWidget());
-//    mProgressText->setHidden (true);
-#warning port me
-//    buttonLayout->insertWidget (2, mProgressText);
-//    mProgressBar = new Q3ProgressBar (centralWidget());
-//    mProgressBar->setHidden (true);
-//    mProgressBar->setFrameShadow (Q3Frame::Sunken);
-//    mProgressBar->setFrameShape  (Q3Frame::Panel);
-//    mProgressBar->setPercentageVisible (false);
-//    mProgressBar->setMaximumWidth (100);
-#warning port me
-//    buttonLayout->insertWidget (3, mProgressBar);
+    /* Enumeration progressbar creation */
+    mProgressBar = new VBoxProgressBar (this);
+    /* Add to the dialog button box */
+    mButtonBox->addExtraWidget (mProgressBar);
+    /* Default is invisible */
+    mProgressBar->setVisible (false);
 
     /* Connects for the button box */
@@ -473 +502 @@
         {
             mediaAdded (*it);
-//            if ((*it).status != VBoxMedia::Unknown)
-//                mProgressBar->setProgress (++ index);
+            if ((*it).status != VBoxMedia::Unknown)
+            {
+                mProgressBar->setValue (++ index);
+                qApp->processEvents();
+            }
         }
 
@@ -807 +839 @@
     mFdsPane2->label()->setText (QString ("<nobr>%1:</nobr>").arg (tr ("Attached to")));
 
-//    mProgressText->setText (tr ("Checking accessibility"));
-//
+    mProgressBar->setText (tr ("Checking accessibility"));
+#ifdef Q_WS_MAC
+    /* Make sure that the widgets aren't jumping around while the progress bar
+     * get visible. */
+    mProgressBar->adjustSize();
+    int h = mProgressBar->height();
+    mButtonBox->setMinimumHeight (h + 12);
+#endif 
+
     if (mHdsTree->model()->rowCount() || mCdsTree->model()->rowCount() || mFdsTree->model()->rowCount())
         refreshAll();
@@ -1034 +1073 @@
     mediaUpdated (aMedia);
     Assert (aMedia.status != VBoxMedia::Unknown);
-//    if (aMedia.status != VBoxMedia::Unknown)
-//        mProgressBar->setProgress (aIndex + 1);
+    if (aMedia.status != VBoxMedia::Unknown)
+    {
+        mProgressBar->setValue (aIndex + 1);
+        qApp->processEvents();
+    }
 }
 
 void VBoxDiskImageManagerDlg::mediaEnumFinished (const VBoxMediaList &/* aList */)
 {
-//    mProgressBar->setHidden (true);
-//    mProgressText->setHidden (true);
+    mProgressBar->setVisible (false);
 
     mRefreshAction->setEnabled (true);
@@ -1923 +1964 @@
 
     /* Prepare progressbar */
-//    if (mProgressBar)
-//    {
-//        mProgressBar->setProgress (0, aTotal);
-//        mProgressBar->setHidden (false);
-//        mProgressText->setHidden (false);
-//    }
+    if (mProgressBar)
+    {
+        mProgressBar->setMaximum (aTotal);
+        mProgressBar->setValue (0);
+        mProgressBar->setVisible (true);
+    }
 
     mRefreshAction->setEnabled (false);