Changeset 34004 in vbox for trunk

Timestamp:

Nov 11, 2010 6:23:37 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: Make the settings page animation much smoother by removing the
jumping on some of the included setting pages.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings

Files:

• UISettingsDialog.cpp (modified) (3 diffs)
• UISettingsDialog.h (modified) (1 diff)
• machine/UIMachineSettingsAudio.ui (modified) (1 diff)
• machine/UIMachineSettingsNetwork.cpp (modified) (1 diff)
• machine/UIMachineSettingsSystem.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp

@@ -163 +163 @@
 void UISettingsDialog::sltCategoryChanged(int cId)
 {
-    QWidget *pRootPage = m_pSelector->rootPage(cId);
+    int index = m_pages[cId];
 #ifdef Q_WS_MAC
     QSize cs = size();
-    /* First make all fully resizeable: */
-    setMinimumSize(QSize(minimumWidth(), 0));
-    setMaximumSize(QSize(minimumWidth(), QWIDGETSIZE_MAX));
-    for (int i = 0; i < m_pStack->count(); ++i)
-        m_pStack->widget(i)->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Ignored);
-    int a = m_pStack->indexOf(pRootPage);
-    if (a < m_sizeList.count())
-    {
-        QSize ss = m_sizeList.at(a);
-        m_pStack->widget(a)->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+    if (index < m_sizeList.count())
+    {
+        QSize ss = m_sizeList.at(index);
         /* Switch to the new page first if we are shrinking: */
         if (cs.height() > ss.height())
-            m_pStack->setCurrentIndex(m_pStack->indexOf(pRootPage));
+            m_pStack->setCurrentIndex(index);
         /* Do the animation: */
         ::darwinWindowAnimateResize(this, QRect (x(), y(), ss.width(), ss.height()));
         /* Switch to the new page last if we are zooming: */
         if (cs.height() <= ss.height())
-            m_pStack->setCurrentIndex(m_pStack->indexOf(pRootPage));
-        /* Make the widget fixed size: */
-        setFixedSize(ss);
+            m_pStack->setCurrentIndex(index);
     }
     ::darwinSetShowsResizeIndicator(this, false);
 #else
     m_pLbTitle->setText(m_pSelector->itemText(cId));
-    m_pStack->setCurrentIndex(m_pStack->indexOf(pRootPage));
+    m_pStack->setCurrentIndex(index);
 #endif
 #ifdef VBOX_GUI_WITH_TOOLBAR_SETTINGS
@@ -281 +272 @@
                                           cId, strLink, pSettingsPage, iParentId);
     if (pPage)
-        m_pStack->addWidget(pPage);
+    {
+#ifdef Q_WS_MAC
+        /* On OSX we add a stretch to the vertical end to make sure the page is
+         * always top aligned. */
+        QWidget *pW = new QWidget();
+        pW->setContentsMargins(0, 0, 0, 0);
+        QVBoxLayout *pBox = new QVBoxLayout(pW);
+        VBoxGlobal::setLayoutMargin(pBox, 0);
+        pBox->addWidget(pPage);
+        pBox->addStretch(0);
+        m_pages[cId] = m_pStack->addWidget(pW);
+#else /* Q_WS_MAC */
+        m_pages[cId] = m_pStack->addWidget(pPage);
+#endif /* !Q_WS_MAC */
+    }
     if (pSettingsPage)
         assignValidator(pSettingsPage);
@@ -474 +479 @@
     {
         m_pStack->widget(i)->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+        /* Prevent this widgets to go in the Small/Mini size state which is
+         * available on Mac OS X. Not sure why this happens but this seems to help
+         * against. */
+        QList <QWidget*> list = m_pStack->widget(i)->findChildren<QWidget*>();
+        for (int a = 0; a < list.size(); ++a)
+        {
+            QWidget *w = list.at(a);
+            if (w->parent() == m_pStack->widget(i))
+                w->setFixedHeight(w->sizeHint().height());
+        }
         m_pStack->setCurrentIndex(i);
+        /* Now make sure the layout is freshly calculated. */
         layout()->activate();
         QSize s = minimumSize();

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.h

@@ -117 +117 @@
     QPointer<QWidget> m_pWhatsThisCandidate;
 
+    QMap<int, int> m_pages;
 #ifdef Q_WS_MAC
     QList<QSize> m_sizeList;

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.ui

@@ -131 +131 @@
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>0</width>
+       <height>0</height>
       </size>
      </property>

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp

@@ -59 +59 @@
     connect (mTbMAC, SIGNAL (clicked()), this, SLOT (generateMac()));
     connect (mPbPortForwarding, SIGNAL (clicked()), this, SLOT (sltOpenPortForwardingDlg()));
-
-#ifdef Q_WS_MAC
-    /* Prevent this widgets to go in the Small/Mini size state which is
-     * available on Mac OS X. Not sure why this happens but this seems to help
-     * against. */
-    QList <QWidget*> list = findChildren <QWidget*>();
-    foreach (QWidget *w, list)
-        if (w->parent() == this)
-            w->setFixedHeight (w->sizeHint().height());
-#endif /* Q_WS_MAC */
 
     /* Applying language settings */

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp

@@ -47 +47 @@
      * 1. Floppy, 2. DVD-ROM, 3. Hard Disk, 4. Network.
      * But maximum boot devices count supported by machine
-     * should be retreived through the ISystemProperties getter.
+     * should be retrieved through the ISystemProperties getter.
      * Moreover, possible boot device types are not listed in some separate Main vector,
      * so we should get them (randomely?) from the list of all device types.
@@ -74 +74 @@
     }
 
+    /* Add all available devices types, so we could initially calculate the
+     * right size. */
+    for (int i = 0; i < m_possibleBootItems.size(); ++i)
+    {
+        QString name = vboxGlobal().toString(m_possibleBootItems[i]);
+        QTreeWidgetItem *pItem = new QTreeWidgetItem(QStringList(name));
+        pItem->setData(0, ITEM_TYPE_ROLE, QVariant(m_possibleBootItems[i]));
+        pItem->setCheckState(0, Qt::Unchecked);
+        mTwBootOrder->addTopLevelItem(pItem);
+    }
+
     /* Setup validators */
     mLeMemory->setValidator (new QIntValidator (mSlMemory->minRAM(), mSlMemory->maxRAM(), this));
@@ -220 +231 @@
 void UIMachineSettingsSystem::getFromCache()
 {
+    /* Remove any old data in the boot view. */
+    QAbstractItemView *iv = qobject_cast <QAbstractItemView*> (mTwBootOrder);
+    iv->model()->removeRows(0, iv->model()->rowCount());
     /* Apply internal variables data to QWidget(s): */
     for (int i = 0; i < m_cache.m_bootItems.size(); ++i)
@@ -246 +260 @@
     int iChipsetPositionPos = mCbChipset->findData(m_cache.m_chipsetType);
     mCbChipset->setCurrentIndex(iChipsetPositionPos == -1 ? 0 : iChipsetPositionPos);
-    adjustBootOrderTWSize();
     if (!m_cache.m_fPFHwVirtExSupported)
         mTwSystem->removeTab(2);
@@ -529 +542 @@
     int h = 2 * mTwBootOrder->frameWidth();
     int w = h;
-#ifdef Q_WS_MAC
-    int left, top, right, bottom;
-    mTwBootOrder->getContentsMargins (&left, &top, &right, &bottom);
-    h += top + bottom;
-    w += left + right;
-#else /* Q_WS_MAC */
-    w += 4;
-#endif /* Q_WS_MAC */
-    mTwBootOrder->setFixedSize (
-        iv->sizeHintForColumn (0) + w,
-        iv->sizeHintForRow (0) * mTwBootOrder->topLevelItemCount() + h);
+    mTwBootOrder->setFixedSize(
+        iv->sizeHintForColumn(0) + w,
+        iv->sizeHintForRow(0) * mTwBootOrder->topLevelItemCount() + h);
 
     /* Update the layout system */