Changeset 10525 in vbox for trunk/src/VBox

Timestamp:

Jul 11, 2008 1:25:34 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: Enable the page animation on the setting dialogs again.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• src/VBoxSettingsDialog.cpp (modified) (2 diffs)
• ui/VBoxGLSettingsLanguage.ui (modified) (1 diff)
• ui/VBoxVMSettingsHD.ui (modified) (2 diffs)
• ui/VBoxVMSettingsSF.ui (modified) (1 diff)

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

@@ -192 +192 @@
 void VBoxSettingsDialog::categoryChanged (int aId)
 {
-//#ifndef Q_WS_MAC
-#if 1
+    int index = mSelector->idToIndex (aId);
+#ifndef Q_WS_MAC
 # ifdef VBOX_GUI_WITH_TOOLBAR_SETTINGS
     setWindowTitle (dialogTitle());
 # endif
     mLbTitle->setText (mSelector->itemText (aId));
-    mStack->setCurrentIndex (aId);
+    mStack->setCurrentIndex (index);
 #else /* Q_WS_MAC */
-    int index = mSelector->idToIndex (aId);
-    /* We will update at once later */
-    setUpdatesEnabled (false);
-    /* Set all tab size policies to ignored */
-    for (int i = 0; i < mStack->count(); ++i)
-        mStack->widget (i)->setSizePolicy (QSizePolicy::Preferred, QSizePolicy::Ignored);
-    /* Set the size policy of the current tab to preferred */
-    if (mStack->widget (index))
-        mStack->widget (index)->setSizePolicy (QSizePolicy::Preferred, QSizePolicy::Preferred);
-    /* Set the new current tab */
-    mLbTitle->setText (::path (aItem));
-    mStack->setCurrentIndex (index);
-    /* Activate the new layout */
-    layout()->activate();
-    setUpdatesEnabled (true);
-    //        mAllWidget->hide();
-    /* Play the resize animation */
-    ::darwinWindowAnimateResize (this, QRect (x(), y(), 
-                                              minimumSizeHint().width(), minimumSizeHint().height()));
-    //        mAllWidget->show();
-    /* Set the new size to Qt also */
-    setFixedSize (minimumSizeHint());
+    if (isVisible())
+    {
+        int index = mSelector->idToIndex (aId);
+        /* We will update at once later */
+        setUpdatesEnabled (false);
+        setMinimumSize (QSize (minimumWidth(), 0));
+        setMaximumSize (QSize (minimumWidth(), QWIDGETSIZE_MAX));
+        /* Set all tab size policies to ignored */
+        for (int i = 0; i < mStack->count(); ++i)
+            mStack->widget (i)->setSizePolicy (QSizePolicy::Preferred, QSizePolicy::Ignored);
+        /* Set the size policy of the current tab to preferred */
+        if (mStack->widget (index))
+            mStack->widget (index)->setSizePolicy (QSizePolicy::Preferred, QSizePolicy::Preferred);
+        /* Set the new current tab */
+        mLbTitle->setText (mSelector->itemText (aId));
+        mStack->setCurrentIndex (index);
+        /* Activate the new layout */
+        layout()->activate();
+        setUpdatesEnabled (true);
+        //        mAllWidget->hide();
+        QSize s = minimumSize();
+        int minWidth = mSelector->minWidth();
+        if (minWidth > s.width())
+            s.setWidth (minWidth);
+        /* Play the resize animation */
+        ::darwinWindowAnimateResize (this, QRect (x(), y(), 
+                                                  s.width(), s.height()));
+        //        mAllWidget->show();
+        /* Set the new size to Qt also */
+        setFixedSize (s);
+    }else
+    {
+        mLbTitle->setText (mSelector->itemText (aId));
+        mStack->setCurrentIndex (index);
+    }
 #endif /* !Q_WS_MAC */
 }
@@ -336 +349 @@
     if (minWidth > s.width())
         s.setWidth (minWidth);
+#ifdef Q_WS_MAC
+    setFixedSize (s);
+#else /* Q_WS_MAC */
     resize (s);
+#endif /* Q_WS_MAC */
 
     VBoxGlobal::centerWidget (this, parentWidget());

trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxGLSettingsLanguage.ui

@@ -53 +53 @@
           <verstretch>0</verstretch>
          </sizepolicy>
+        </property>
+        <property name="minimumSize" >
+         <size>
+          <width>0</width>
+          <height>150</height>
+         </size>
         </property>
         <property name="whatsThis" >

trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsHD.ui

@@ -23 +23 @@
     <x>0</x>
     <y>0</y>
-    <width>332</width>
-    <height>270</height>
+    <width>336</width>
+    <height>306</height>
    </rect>
   </property>
@@ -70 +70 @@
          <item>
           <widget class="QITableView" name="mTwAts" >
+           <property name="minimumSize" >
+            <size>
+             <width>0</width>
+             <height>200</height>
+            </size>
+           </property>
            <property name="contextMenuPolicy" >
             <enum>Qt::ActionsContextMenu</enum>

trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsSF.ui

@@ -57 +57 @@
       <item>
        <widget class="QTreeWidget" name="mTreeView" >
+        <property name="minimumSize" >
+         <size>
+          <width>0</width>
+          <height>200</height>
+         </size>
+        </property>
         <property name="contextMenuPolicy" >
          <enum>Qt::CustomContextMenu</enum>