Changeset 11609 in vbox

Timestamp:

Aug 25, 2008 12:14:41 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: Fixed some layout/handling issues for the networking pane.

File:

• trunk/src/VBox/Frontends/VirtualBox4/src/VBoxVMSettingsNetwork.cpp (modified) (5 diffs)

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

@@ -371 +371 @@
     mLeTerminate_x11->setVisible (aVisible);
     mTbTerminate_x11->setVisible (aVisible);
+    /* Make sure the layout is recalculated (Important on the mac). */
+    layout()->activate();
 }
 
@@ -416 +418 @@
     : QIWithRetranslateUI<QWidget> (aParent)
 {
-    QGridLayout *mainLayout = new QGridLayout (this);
+    QVBoxLayout *mainLayout = new QVBoxLayout (this);
     VBoxGlobal::setLayoutMargin (mainLayout, 0);
     mLbTitle = new QILabelSeparator();
-    mainLayout->addWidget (mLbTitle, 0, 0, 1, 2);
+    mainLayout->addWidget (mLbTitle);
 //    mainLayout->addItem (new QSpacerItem (8, 16, QSizePolicy::Fixed, QSizePolicy::Minimum), 1, 0);
     /* Creating List Widget */
     QHBoxLayout *layout = new QHBoxLayout ();
-    mainLayout->addLayout (layout, 1, 0);
+    mainLayout->addLayout (layout);
     mList = new QTreeWidget (this);
     setFocusProxy (mList);
@@ -447 +449 @@
 # endif /* Q_WS_WIN */
 
+# if defined (Q_WS_WIN)
     /* Prepare toolbar */
     VBoxToolBar *toolBar = new VBoxToolBar (this);
@@ -452 +455 @@
     toolBar->setIconSize (QSize (16, 16));
     toolBar->setOrientation (Qt::Vertical);
-# if defined (Q_WS_WIN)
     toolBar->addAction (mAddAction);
     toolBar->addAction (mDelAction);
+    layout->addWidget (toolBar);
 # endif /* Q_WS_WIN */
-    layout->addWidget (toolBar);
 
     /* Setup connections */
@@ -495 +497 @@
     if (aName.isEmpty())
     {
+#ifdef Q_WS_MAC
+        /* Always select the first item to have an initial value. */
+        QTreeWidgetItem *item = mList->topLevelItem (0);
+        if (item)
+        {
+            item->setSelected (true);
+            mList->setCurrentItem (item);
+            onCurrentItemChanged (mList->currentItem());
+        }
+#else
         /* Make sure no one of items selected in the list currently */
-        mList->setCurrentItem (0);
+        mList->setCurrentItem (NULL);
         mList->clearSelection();
+#endif 
     }
     else