Index: /trunk/src/VBox/Frontends/VirtualBox4/src/VBoxMediaComboBox.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox4/src/VBoxMediaComboBox.cpp	(revision 10683)
+++ /trunk/src/VBox/Frontends/VirtualBox4/src/VBoxMediaComboBox.cpp	(revision 10684)
@@ -44,11 +44,7 @@
     /* Setup the elide mode */
     view()->setTextElideMode (Qt::ElideRight);
-    /* Setup default size policy */
-#ifdef Q_WS_MAC
-    QSizePolicy sp (QSizePolicy::Expanding, QSizePolicy::Fixed, QSizePolicy::ComboBox);
-#else
-    QSizePolicy sp (QSizePolicy::Ignored, QSizePolicy::Fixed, QSizePolicy::ComboBox);
-#endif
-    setSizePolicy (sp);
+    QSizePolicy sp1 (QSizePolicy::Ignored, QSizePolicy::Fixed, QSizePolicy::ComboBox);
+    sp1.setHorizontalStretch (2);
+    setSizePolicy (sp1);
 
 #if 0
Index: /trunk/src/VBox/Frontends/VirtualBox4/src/VBoxVMSettingsFD.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox4/src/VBoxVMSettingsFD.cpp	(revision 10683)
+++ /trunk/src/VBox/Frontends/VirtualBox4/src/VBoxVMSettingsFD.cpp	(revision 10684)
@@ -215,4 +215,6 @@
     }
 
+    mMountFDChild->setEnabled (aSwitchedOn);
+
     onCbChange();
 }
Index: /trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsFD.ui
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsFD.ui	(revision 10683)
+++ /trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsFD.ui	(revision 10684)
@@ -23,156 +23,132 @@
     <x>0</x>
     <y>0</y>
-    <width>410</width>
-    <height>194</height>
+    <width>496</width>
+    <height>265</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="leftMargin" >
-    <number>0</number>
-   </property>
-   <property name="topMargin" >
-    <number>5</number>
-   </property>
-   <property name="rightMargin" >
-    <number>0</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>5</number>
-   </property>
-   <item>
-    <widget class="QGroupBox" name="mGbFD" >
+  <layout class="QGridLayout" >
+   <item row="0" column="0" colspan="2" >
+    <widget class="QCheckBox" name="mGbFD" >
+     <property name="whatsThis" >
+      <string>When checked, mounts the specified media to the Floppy drive of the virtual machine.</string>
+     </property>
+     <property name="text" >
+      <string>&amp;Mount Floppy Drive</string>
+     </property>
+     <property name="checked" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="1" >
+    <widget class="QWidget" native="1" name="mMountFDChild" >
      <property name="sizePolicy" >
-      <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+      <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="whatsThis" >
-      <string>When checked, mounts the specified media to the Floppy drive of the virtual machine.</string>
-     </property>
-     <property name="title" >
-      <string>&amp;Mount Floppy Drive</string>
-     </property>
-     <property name="checkable" >
-      <bool>true</bool>
-     </property>
-     <property name="checked" >
-      <bool>true</bool>
-     </property>
-     <layout class="QVBoxLayout" >
+     <layout class="QGridLayout" >
+      <property name="leftMargin" >
+       <number>0</number>
+      </property>
       <property name="topMargin" >
-       <number>5</number>
+       <number>0</number>
       </property>
-      <item>
-       <layout class="QHBoxLayout" >
-        <item>
-         <widget class="QRadioButton" name="mRbHostFD" >
-          <property name="whatsThis" >
-           <string>Mounts the specified host Floppy drive to the virtual Floppy drive.</string>
-          </property>
-          <property name="text" >
-           <string>Host Floppy &amp;Drive</string>
-          </property>
-          <property name="autoExclusive" >
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QComboBox" name="mCbHostFD" >
-          <property name="whatsThis" >
-           <string>Lists host Floppy drives available to mount to the virtual machine.</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" >
-           <size>
-            <width>0</width>
-            <height>10</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
+      <property name="rightMargin" >
+       <number>0</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>0</number>
+      </property>
+      <item row="0" column="0" colspan="2" >
+       <widget class="QRadioButton" name="mRbHostFD" >
+        <property name="whatsThis" >
+         <string>Mounts the specified host Floppy drive to the virtual Floppy drive.</string>
+        </property>
+        <property name="text" >
+         <string>Host Floppy &amp;Drive</string>
+        </property>
+        <property name="autoExclusive" >
+         <bool>false</bool>
+        </property>
+       </widget>
       </item>
-      <item>
-       <layout class="QHBoxLayout" >
-        <item>
-         <widget class="QRadioButton" name="mRbIsoFD" >
-          <property name="whatsThis" >
-           <string>Mounts the specified Floppy image to the virtual Floppy drive.</string>
-          </property>
-          <property name="text" >
-           <string>&amp;Image File</string>
-          </property>
-          <property name="autoExclusive" >
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" >
-           <size>
-            <width>0</width>
-            <height>10</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
+      <item row="1" column="0" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType" >
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>8</width>
+          <height>16</height>
+         </size>
+        </property>
+       </spacer>
       </item>
-      <item>
-       <layout class="QHBoxLayout" >
-        <item>
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType" >
-           <enum>QSizePolicy::Fixed</enum>
-          </property>
-          <property name="sizeHint" >
-           <size>
-            <width>19</width>
-            <height>16</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="VBoxMediaComboBox" name="mCbIsoFD" >
-          <property name="whatsThis" >
-           <string>Displays the image file to mount to the virtual Floppy drive and allows to quickly select a different image.</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QToolButton" name="mTbIsoFD" >
-          <property name="whatsThis" >
-           <string>Invokes the Virtual Disk Manager to select a Floppy image to mount.</string>
-          </property>
-          <property name="text" >
-           <string/>
-          </property>
-          <property name="autoRaise" >
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-       </layout>
+      <item row="1" column="1" >
+       <widget class="QComboBox" name="mCbHostFD" >
+        <property name="whatsThis" >
+         <string>Lists host Floppy drives available to mount to the virtual machine.</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" colspan="2" >
+       <widget class="QRadioButton" name="mRbIsoFD" >
+        <property name="whatsThis" >
+         <string>Mounts the specified Floppy image to the virtual Floppy drive.</string>
+        </property>
+        <property name="text" >
+         <string>&amp;Image File</string>
+        </property>
+        <property name="autoExclusive" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" >
+       <widget class="VBoxMediaComboBox" name="mCbIsoFD" >
+        <property name="whatsThis" >
+         <string>Displays the image file to mount to the virtual Floppy drive and allows to quickly select a different image.</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="2" >
+       <widget class="QToolButton" name="mTbIsoFD" >
+        <property name="whatsThis" >
+         <string>Invokes the Virtual Disk Manager to select a Floppy image to mount.</string>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+        <property name="autoRaise" >
+         <bool>true</bool>
+        </property>
+       </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="2" column="1" >
     <spacer>
      <property name="orientation" >
@@ -182,5 +158,5 @@
       <size>
        <width>20</width>
-       <height>0</height>
+       <height>51</height>
       </size>
      </property>