Index: trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxDiskImageManagerDlg.ui
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxDiskImageManagerDlg.ui	(revision 13553)
+++ 	(revision )
@@ -1,439 +1,0 @@
-<ui version="4.0" >
- <comment>
- VBox frontends: Qt4 GUI ("VirtualBox"):
-
- Copyright (C) 2008 Sun Microsystems, Inc.
-
- This file is part of VirtualBox Open Source Edition (OSE), as
- available from http://www.virtualbox.org. This file is free software;
- you can redistribute it and/or modify it under the terms of the GNU
- General Public License (GPL) as published by the Free Software
- Foundation, in version 2 as it comes in the "COPYING" file of the
- VirtualBox OSE distribution. VirtualBox OSE is distributed in the
- hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
-
- Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
- Clara, CA 95054 USA or visit http://www.sun.com if you need
- additional information or have any questions.
- </comment>
- <class>VBoxDiskImageManagerDlg</class>
- <widget class="QMainWindow" name="VBoxDiskImageManagerDlg" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>620</width>
-    <height>460</height>
-   </rect>
-  </property>
-  <property name="minimumSize" >
-   <size>
-    <width>283</width>
-    <height>190</height>
-   </size>
-  </property>
-  <property name="windowTitle" >
-   <string>Virtual Disk Manager</string>
-  </property>
-  <widget class="QWidget" name="mCentralWidget" >
-   <layout class="QHBoxLayout" >
-    <item>
-     <layout class="QVBoxLayout" >
-      <item>
-       <widget class="QTabWidget" name="mTwImages" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Expanding" hsizetype="Preferred" >
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="currentIndex" >
-         <number>0</number>
-        </property>
-        <widget class="QWidget" name="mTbHD" >
-         <attribute name="title" >
-          <string>Hard &amp;Disks</string>
-         </attribute>
-         <layout class="QVBoxLayout" >
-          <item>
-           <widget class="QITreeWidget" name="mHdsTree" >
-            <property name="contextMenuPolicy" >
-             <enum>Qt::CustomContextMenu</enum>
-            </property>
-            <property name="acceptDrops" >
-             <bool>true</bool>
-            </property>
-            <property name="horizontalScrollBarPolicy" >
-             <enum>Qt::ScrollBarAlwaysOff</enum>
-            </property>
-            <property name="alternatingRowColors" >
-             <bool>true</bool>
-            </property>
-            <property name="allColumnsShowFocus" >
-             <bool>true</bool>
-            </property>
-            <column>
-             <property name="text" >
-              <string>Name</string>
-             </property>
-            </column>
-            <column>
-             <property name="text" >
-              <string>Virtual Size</string>
-             </property>
-            </column>
-            <column>
-             <property name="text" >
-              <string>Actual Size</string>
-             </property>
-            </column>
-           </widget>
-          </item>
-          <item>
-           <widget class="QFrame" name="mHdsContainer" >
-            <property name="frameShape" >
-             <enum>QFrame::Box</enum>
-            </property>
-            <property name="frameShadow" >
-             <enum>QFrame::Sunken</enum>
-            </property>
-            <layout class="QGridLayout" >
-             <property name="leftMargin" >
-              <number>5</number>
-             </property>
-             <property name="topMargin" >
-              <number>5</number>
-             </property>
-             <property name="rightMargin" >
-              <number>5</number>
-             </property>
-             <property name="bottomMargin" >
-              <number>5</number>
-             </property>
-             <property name="verticalSpacing" >
-              <number>0</number>
-             </property>
-             <item row="0" column="0" >
-              <widget class="QLabel" name="mLbHD1" >
-               <property name="text" >
-                <string>&lt;nobr>Location:&lt;/nobr></string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="1" colspan="3" >
-              <widget class="QILabel" name="mHdsPane1" >
-               <property name="sizePolicy" >
-                <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="0" >
-              <widget class="QLabel" name="mLbHD2" >
-               <property name="text" >
-                <string>&lt;nobr>Disk Type:&lt;/nobr></string>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="1" >
-              <widget class="QILabel" name="mHdsPane2" >
-               <property name="sizePolicy" >
-                <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="2" >
-              <widget class="QLabel" name="mLbHD3" >
-               <property name="text" >
-                <string>&lt;nobr>&amp;nbsp;&amp;nbsp;Storage Type:&lt;/nobr></string>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="3" >
-              <widget class="QILabel" name="mHdsPane3" >
-               <property name="sizePolicy" >
-                <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="0" >
-              <widget class="QLabel" name="mLbHD4" >
-               <property name="text" >
-                <string>&lt;nobr>Attached to:&lt;/nobr></string>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="1" >
-              <widget class="QILabel" name="mHdsPane4" >
-               <property name="sizePolicy" >
-                <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="2" >
-              <widget class="QLabel" name="mLbHD5" >
-               <property name="text" >
-                <string>&lt;nobr>&amp;nbsp;&amp;nbsp;Snapshot:&lt;/nobr></string>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="3" >
-              <widget class="QILabel" name="mHdsPane5" >
-               <property name="sizePolicy" >
-                <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-        <widget class="QWidget" name="mTbCD" >
-         <attribute name="title" >
-          <string>&amp;CD/DVD Images</string>
-         </attribute>
-         <layout class="QVBoxLayout" >
-          <item>
-           <widget class="QITreeWidget" name="mCdsTree" >
-            <property name="contextMenuPolicy" >
-             <enum>Qt::CustomContextMenu</enum>
-            </property>
-            <property name="acceptDrops" >
-             <bool>true</bool>
-            </property>
-            <property name="horizontalScrollBarPolicy" >
-             <enum>Qt::ScrollBarAlwaysOff</enum>
-            </property>
-            <property name="alternatingRowColors" >
-             <bool>true</bool>
-            </property>
-            <property name="allColumnsShowFocus" >
-             <bool>true</bool>
-            </property>
-            <column>
-             <property name="text" >
-              <string>Name</string>
-             </property>
-            </column>
-            <column>
-             <property name="text" >
-              <string>Size</string>
-             </property>
-            </column>
-           </widget>
-          </item>
-          <item>
-           <widget class="QFrame" name="mCdsContainer" >
-            <property name="frameShape" >
-             <enum>QFrame::Box</enum>
-            </property>
-            <property name="frameShadow" >
-             <enum>QFrame::Sunken</enum>
-            </property>
-            <layout class="QGridLayout" >
-             <property name="leftMargin" >
-              <number>5</number>
-             </property>
-             <property name="topMargin" >
-              <number>5</number>
-             </property>
-             <property name="rightMargin" >
-              <number>5</number>
-             </property>
-             <property name="bottomMargin" >
-              <number>5</number>
-             </property>
-             <property name="verticalSpacing" >
-              <number>0</number>
-             </property>
-             <item row="0" column="0" >
-              <widget class="QLabel" name="mLbCD1" >
-               <property name="text" >
-                <string>&lt;nobr>Location:&lt;/nobr></string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="1" >
-              <widget class="QILabel" name="mCdsPane1" >
-               <property name="sizePolicy" >
-                <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="0" >
-              <widget class="QLabel" name="mLbCD2" >
-               <property name="text" >
-                <string>&lt;nobr>Attached to:&lt;/nobr></string>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="1" >
-              <widget class="QILabel" name="mCdsPane2" >
-               <property name="sizePolicy" >
-                <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-        <widget class="QWidget" name="mTbFD" >
-         <attribute name="title" >
-          <string>&amp;Floppy Images</string>
-         </attribute>
-         <layout class="QVBoxLayout" >
-          <item>
-           <widget class="QITreeWidget" name="mFdsTree" >
-            <property name="contextMenuPolicy" >
-             <enum>Qt::CustomContextMenu</enum>
-            </property>
-            <property name="acceptDrops" >
-             <bool>true</bool>
-            </property>
-            <property name="horizontalScrollBarPolicy" >
-             <enum>Qt::ScrollBarAlwaysOff</enum>
-            </property>
-            <property name="alternatingRowColors" >
-             <bool>true</bool>
-            </property>
-            <property name="allColumnsShowFocus" >
-             <bool>true</bool>
-            </property>
-            <column>
-             <property name="text" >
-              <string>Name</string>
-             </property>
-            </column>
-            <column>
-             <property name="text" >
-              <string>Size</string>
-             </property>
-            </column>
-           </widget>
-          </item>
-          <item>
-           <widget class="QFrame" name="mFdsContainer" >
-            <property name="frameShape" >
-             <enum>QFrame::Box</enum>
-            </property>
-            <property name="frameShadow" >
-             <enum>QFrame::Sunken</enum>
-            </property>
-            <layout class="QGridLayout" >
-             <property name="leftMargin" >
-              <number>5</number>
-             </property>
-             <property name="topMargin" >
-              <number>5</number>
-             </property>
-             <property name="rightMargin" >
-              <number>5</number>
-             </property>
-             <property name="bottomMargin" >
-              <number>5</number>
-             </property>
-             <property name="horizontalSpacing" >
-              <number>-1</number>
-             </property>
-             <property name="verticalSpacing" >
-              <number>0</number>
-             </property>
-             <item row="0" column="0" >
-              <widget class="QLabel" name="mLbFD1" >
-               <property name="text" >
-                <string>&lt;nobr>Location:&lt;/nobr></string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="1" >
-              <widget class="QILabel" name="mFdsPane1" >
-               <property name="sizePolicy" >
-                <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="0" >
-              <widget class="QLabel" name="mLbFD2" >
-               <property name="text" >
-                <string>&lt;nobr>Attached to:&lt;/nobr></string>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="1" >
-              <widget class="QILabel" name="mFdsPane2" >
-               <property name="sizePolicy" >
-                <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </widget>
-      </item>
-      <item>
-       <widget class="QIDialogButtonBox" name="mButtonBox" >
-        <property name="standardButtons" >
-         <set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </item>
-   </layout>
-  </widget>
-  <widget class="QStatusBar" name="mStatusBar" />
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>QIDialogButtonBox</class>
-   <extends>QDialogButtonBox</extends>
-   <header>QIDialogButtonBox.h</header>
-  </customwidget>
-  <customwidget>
-   <class>QITreeWidget</class>
-   <extends>QTreeWidget</extends>
-   <header>QITreeWidget.h</header>
-  </customwidget>
-  <customwidget>
-   <class>QILabel</class>
-   <extends>QLabel</extends>
-   <header>QILabel.h</header>
-  </customwidget>
- </customwidgets>
- <resources>
-  <include location="../VirtualBox.qrc" />
- </resources>
- <connections/>
-</ui>
Index: trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxGLSettingsGeneral.ui
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxGLSettingsGeneral.ui	(revision 13553)
+++ trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxGLSettingsGeneral.ui	(revision 13580)
@@ -41,5 +41,5 @@
    </property>
    <item row="0" column="0" >
-    <widget class="QLabel" name="mLbVdi" >
+    <widget class="QLabel" name="mLbHardDisk" >
      <property name="text" >
       <string>Default &amp;Hard Disk Folder:</string>
@@ -49,10 +49,10 @@
      </property>
      <property name="buddy" >
-      <cstring>mPsVdi</cstring>
+      <cstring>mPsHardDisk</cstring>
      </property>
     </widget>
    </item>
    <item row="0" column="1" >
-    <widget class="VBoxFilePathSelectorWidget" name="mPsVdi" >
+    <widget class="VBoxFilePathSelectorWidget" name="mPsHardDisk" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
Index: trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxMediaManagerDlg.ui
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxMediaManagerDlg.ui	(revision 13580)
+++ trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxMediaManagerDlg.ui	(revision 13580)
@@ -0,0 +1,382 @@
+<ui version="4.0" >
+ <comment>
+ VBox frontends: Qt4 GUI ("VirtualBox"):
+
+ Copyright (C) 2008 Sun Microsystems, Inc.
+
+ This file is part of VirtualBox Open Source Edition (OSE), as
+ available from http://www.virtualbox.org. This file is free software;
+ you can redistribute it and/or modify it under the terms of the GNU
+ General Public License (GPL) as published by the Free Software
+ Foundation, in version 2 as it comes in the "COPYING" file of the
+ VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+
+ Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
+ Clara, CA 95054 USA or visit http://www.sun.com if you need
+ additional information or have any questions.
+ </comment>
+ <class>VBoxMediaManagerDlg</class>
+ <widget class="QMainWindow" name="VBoxMediaManagerDlg" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>620</width>
+    <height>460</height>
+   </rect>
+  </property>
+  <property name="minimumSize" >
+   <size>
+    <width>283</width>
+    <height>190</height>
+   </size>
+  </property>
+  <property name="windowTitle" >
+   <string>Virtual Disk Manager</string>
+  </property>
+  <property name="windowIcon" >
+   <iconset resource="../VirtualBox.qrc" >
+    <normaloff>:/diskim_16px.png</normaloff>:/diskim_16px.png</iconset>
+  </property>
+  <widget class="QWidget" name="mCentralWidget" >
+   <layout class="QHBoxLayout" >
+    <item>
+     <layout class="QVBoxLayout" >
+      <item>
+       <widget class="QTabWidget" name="mTwImages" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Expanding" hsizetype="Preferred" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="currentIndex" >
+         <number>0</number>
+        </property>
+        <widget class="QWidget" name="mTbHD" >
+         <attribute name="title" >
+          <string>Hard &amp;Disks</string>
+         </attribute>
+         <layout class="QVBoxLayout" >
+          <item>
+           <widget class="QITreeWidget" name="mHardDiskView" >
+            <property name="contextMenuPolicy" >
+             <enum>Qt::CustomContextMenu</enum>
+            </property>
+            <property name="acceptDrops" >
+             <bool>true</bool>
+            </property>
+            <property name="horizontalScrollBarPolicy" >
+             <enum>Qt::ScrollBarAlwaysOff</enum>
+            </property>
+            <property name="alternatingRowColors" >
+             <bool>true</bool>
+            </property>
+            <property name="allColumnsShowFocus" >
+             <bool>true</bool>
+            </property>
+            <column>
+             <property name="text" >
+              <string>Name</string>
+             </property>
+            </column>
+            <column>
+             <property name="text" >
+              <string>Virtual Size</string>
+             </property>
+            </column>
+            <column>
+             <property name="text" >
+              <string>Actual Size</string>
+             </property>
+            </column>
+           </widget>
+          </item>
+          <item>
+           <widget class="QFrame" name="mHdsContainer" >
+            <property name="frameShape" >
+             <enum>QFrame::Box</enum>
+            </property>
+            <property name="frameShadow" >
+             <enum>QFrame::Sunken</enum>
+            </property>
+            <layout class="QGridLayout" >
+             <property name="verticalSpacing" >
+              <number>0</number>
+             </property>
+             <property name="margin" >
+              <number>5</number>
+             </property>
+             <item row="0" column="0" >
+              <widget class="QLabel" name="mLbHD1" >
+               <property name="text" >
+                <string>Location</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="1" colspan="2" >
+              <widget class="QILabel" name="mHdsPane1" >
+               <property name="sizePolicy" >
+                <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="0" >
+              <widget class="QLabel" name="mLbHD2" >
+               <property name="text" >
+                <string>Type (Format)</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1" >
+              <widget class="QILabel" name="mHdsPane2" >
+               <property name="sizePolicy" >
+                <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="0" >
+              <widget class="QLabel" name="mLbHD3" >
+               <property name="text" >
+                <string>Attached to</string>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="1" >
+              <widget class="QILabel" name="mHdsPane3" >
+               <property name="sizePolicy" >
+                <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+        <widget class="QWidget" name="mTbCD" >
+         <attribute name="title" >
+          <string>&amp;CD/DVD Images</string>
+         </attribute>
+         <layout class="QVBoxLayout" >
+          <item>
+           <widget class="QITreeWidget" name="mDVDView" >
+            <property name="contextMenuPolicy" >
+             <enum>Qt::CustomContextMenu</enum>
+            </property>
+            <property name="acceptDrops" >
+             <bool>true</bool>
+            </property>
+            <property name="horizontalScrollBarPolicy" >
+             <enum>Qt::ScrollBarAlwaysOff</enum>
+            </property>
+            <property name="alternatingRowColors" >
+             <bool>true</bool>
+            </property>
+            <property name="allColumnsShowFocus" >
+             <bool>true</bool>
+            </property>
+            <column>
+             <property name="text" >
+              <string>Name</string>
+             </property>
+            </column>
+            <column>
+             <property name="text" >
+              <string>Size</string>
+             </property>
+            </column>
+           </widget>
+          </item>
+          <item>
+           <widget class="QFrame" name="mCdsContainer" >
+            <property name="frameShape" >
+             <enum>QFrame::Box</enum>
+            </property>
+            <property name="frameShadow" >
+             <enum>QFrame::Sunken</enum>
+            </property>
+            <layout class="QGridLayout" >
+             <property name="verticalSpacing" >
+              <number>0</number>
+             </property>
+             <property name="margin" >
+              <number>5</number>
+             </property>
+             <item row="0" column="0" >
+              <widget class="QLabel" name="mLbCD1" >
+               <property name="text" >
+                <string>Location</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="1" >
+              <widget class="QILabel" name="mCdsPane1" >
+               <property name="sizePolicy" >
+                <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="0" >
+              <widget class="QLabel" name="mLbCD2" >
+               <property name="text" >
+                <string>Attached to</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1" >
+              <widget class="QILabel" name="mCdsPane2" >
+               <property name="sizePolicy" >
+                <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+        <widget class="QWidget" name="mTbFD" >
+         <attribute name="title" >
+          <string>&amp;Floppy Images</string>
+         </attribute>
+         <layout class="QVBoxLayout" >
+          <item>
+           <widget class="QITreeWidget" name="mFloppyView" >
+            <property name="contextMenuPolicy" >
+             <enum>Qt::CustomContextMenu</enum>
+            </property>
+            <property name="acceptDrops" >
+             <bool>true</bool>
+            </property>
+            <property name="horizontalScrollBarPolicy" >
+             <enum>Qt::ScrollBarAlwaysOff</enum>
+            </property>
+            <property name="alternatingRowColors" >
+             <bool>true</bool>
+            </property>
+            <property name="allColumnsShowFocus" >
+             <bool>true</bool>
+            </property>
+            <column>
+             <property name="text" >
+              <string>Name</string>
+             </property>
+            </column>
+            <column>
+             <property name="text" >
+              <string>Size</string>
+             </property>
+            </column>
+           </widget>
+          </item>
+          <item>
+           <widget class="QFrame" name="mFdsContainer" >
+            <property name="frameShape" >
+             <enum>QFrame::Box</enum>
+            </property>
+            <property name="frameShadow" >
+             <enum>QFrame::Sunken</enum>
+            </property>
+            <layout class="QGridLayout" >
+             <property name="horizontalSpacing" >
+              <number>6</number>
+             </property>
+             <property name="verticalSpacing" >
+              <number>0</number>
+             </property>
+             <property name="margin" >
+              <number>5</number>
+             </property>
+             <item row="0" column="0" >
+              <widget class="QLabel" name="mLbFD1" >
+               <property name="text" >
+                <string>Location</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="1" >
+              <widget class="QILabel" name="mFdsPane1" >
+               <property name="sizePolicy" >
+                <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="0" >
+              <widget class="QLabel" name="mLbFD2" >
+               <property name="text" >
+                <string>Attached to</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1" >
+              <widget class="QILabel" name="mFdsPane2" >
+               <property name="sizePolicy" >
+                <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </widget>
+      </item>
+      <item>
+       <widget class="QIDialogButtonBox" name="mButtonBox" >
+        <property name="standardButtons" >
+         <set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QStatusBar" name="mStatusBar" />
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QIDialogButtonBox</class>
+   <extends>QDialogButtonBox</extends>
+   <header>QIDialogButtonBox.h</header>
+  </customwidget>
+  <customwidget>
+   <class>QITreeWidget</class>
+   <extends>QTreeWidget</extends>
+   <header>QITreeWidget.h</header>
+  </customwidget>
+  <customwidget>
+   <class>QILabel</class>
+   <extends>QLabel</extends>
+   <header>QILabel.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources>
+  <include location="../VirtualBox.qrc" />
+ </resources>
+ <connections/>
+</ui>
Index: trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxNewHDWzd.ui
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxNewHDWzd.ui	(revision 13553)
+++ trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxNewHDWzd.ui	(revision 13580)
@@ -119,5 +119,5 @@
              </property>
              <property name="text" >
-              <string>&lt;p>This wizard will help you to create a new virtual hard disk image for your virtual machine.&lt;/p>&lt;p>Use the &lt;b>Next&lt;/b> button to go to the next page of the wizard and the &lt;b>Back&lt;/b> button to return to the previous page.&lt;/p></string>
+              <string>&lt;p>This wizard will help you to create a new virtual hard disk for your virtual machine.&lt;/p>&lt;p>Use the &lt;b>Next&lt;/b> button to go to the next page of the wizard and the &lt;b>Back&lt;/b> button to return to the previous page.&lt;/p></string>
              </property>
              <property name="alignment" >
@@ -225,5 +225,5 @@
          </property>
          <property name="text" >
-          <string>Virtual Disk Image Type</string>
+          <string>Hard Disk Storage Type</string>
          </property>
         </widget>
@@ -283,5 +283,5 @@
              </property>
              <property name="text" >
-              <string>&lt;p>Select the type of virtual hard disk image you want to create.&lt;/p>&lt;p>A &lt;b>dynamically expanding image&lt;/b> initially occupies a very small amount of space on your physical hard disk. It will grow dynamically (up to the size specified) as the Guest OS claims disk space.&lt;/p>&lt;p>A &lt;b>fixed-size image&lt;/b> does not grow. It is stored in a file of approximately the same size as the size of the virtual hard disk. The creation of a fixed-size image may take a long time depending on the image size and the write performance of your harddisk.&lt;/p></string>
+              <string>&lt;p>Select the type of virtual hard disk you want to create.&lt;/p>&lt;p>A &lt;b>dynamically expanding storage&lt;/b> initially occupies a very small amount of space on your physical hard disk. It will grow dynamically (up to the size specified) as the Guest OS claims disk space.&lt;/p>&lt;p>A &lt;b>fixed-size storage&lt;/b> does not grow. It is stored in a file of approximately the same size as the size of the virtual hard disk. The creation of a fixed-size storage may take a long time depending on the storage size and the write performance of your harddisk.&lt;/p></string>
              </property>
              <property name="alignment" >
@@ -302,5 +302,5 @@
              </property>
              <property name="title" >
-              <string>Image Type</string>
+              <string>Storage Type</string>
              </property>
              <layout class="QVBoxLayout" >
@@ -317,5 +317,5 @@
                 </property>
                 <property name="text" >
-                 <string>&amp;Dynamically expanding image</string>
+                 <string>&amp;Dynamically expanding storage</string>
                 </property>
                 <property name="checked" >
@@ -333,5 +333,5 @@
                 </property>
                 <property name="text" >
-                 <string>&amp;Fixed-size image</string>
+                 <string>&amp;Fixed-size storage</string>
                 </property>
                </widget>
@@ -491,5 +491,5 @@
              </property>
              <property name="text" >
-              <string>&lt;p>Press the &lt;b>Select&lt;/b> button to select the location and name of the file to store the virtual hard disk image or type a file name in the entry field.&lt;/p></string>
+              <string>&lt;p>Press the &lt;b>Select&lt;/b> button to select the location of a file to store the hard disk data or type a file name in the entry field.&lt;/p></string>
              </property>
              <property name="alignment" >
@@ -510,5 +510,5 @@
              </property>
              <property name="title" >
-              <string>&amp;Image File Name</string>
+              <string>&amp;Location</string>
              </property>
              <layout class="QHBoxLayout" >
@@ -547,5 +547,5 @@
              </property>
              <property name="text" >
-              <string>&lt;p>Select the size of the virtual hard disk image in megabytes. This size will be reported to the Guest OS as the size of the virtual hard disk.&lt;/p></string>
+              <string>&lt;p>Select the size of the virtual hard disk in megabytes. This size will be reported to the Guest OS as the maximum size of this hard disk.&lt;/p></string>
              </property>
              <property name="alignment" >
@@ -566,5 +566,5 @@
              </property>
              <property name="title" >
-              <string>Image &amp;Size</string>
+              <string>&amp;Size</string>
              </property>
              <layout class="QGridLayout" >
@@ -797,5 +797,5 @@
              </property>
              <property name="text" >
-              <string>You are going to create a new virtual hard disk image with the following parameters:</string>
+              <string>You are going to create a new virtual hard disk with the following parameters:</string>
              </property>
              <property name="alignment" >
@@ -847,5 +847,5 @@
              </property>
              <property name="text" >
-              <string>If the above settings are correct, press the &lt;b>Finish&lt;/b> button. Once you press it, a new hard disk image will be created.</string>
+              <string>If the above settings are correct, press the &lt;b>Finish&lt;/b> button. Once you press it, a new hard disk will be created.</string>
              </property>
              <property name="alignment" >
Index: trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxNewVMWzd.ui
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxNewVMWzd.ui	(revision 13553)
+++ trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxNewVMWzd.ui	(revision 13580)
@@ -833,5 +833,5 @@
              </property>
              <property name="text" >
-              <string>&lt;p>Select a hard disk image to be used as the boot hard disk of the virtual machine. You can either create a new hard disk using the &lt;b>New&lt;/b> button or select an existing hard disk image from the drop-down list or by pressing the &lt;b>Existing&lt;/b> button (to invoke the Virtual Disk Manager dialog).&lt;/p>&lt;p>If you need a more complicated hard disk setup, you can also skip this step and attach hard disks later using the VM Settings dialog.&lt;/p></string>
+              <string>&lt;p>Select a hard disk image to be used as the boot hard disk of the virtual machine. You can either create a new hard disk using the &lt;b>New&lt;/b> button or select an existing hard disk image from the drop-down list or by pressing the &lt;b>Existing&lt;/b> button (to invoke the Virtual Media Manager dialog).&lt;/p>&lt;p>If you need a more complicated hard disk setup, you can also skip this step and attach hard disks later using the VM Settings dialog.&lt;/p></string>
              </property>
              <property name="wordWrap" >
@@ -863,5 +863,5 @@
            </item>
            <item>
-            <widget class="QGroupBox" name="grbHDA" >
+            <widget class="QGroupBox" name="mGbHDA" >
              <property name="sizePolicy" >
               <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
@@ -871,5 +871,8 @@
              </property>
              <property name="title" >
-              <string>B&amp;oot Hard Disk (Primary Master)</string>
+              <string>Boot Hard &amp;Disk (Primary Master)</string>
+             </property>
+             <property name="checkable">
+              <bool>true</bool>
              </property>
              <layout class="QGridLayout" >
@@ -905,5 +908,5 @@
               </item>
               <item row="0" column="0" colspan="3" >
-               <widget class="VBoxMediaComboBox" name="mMediaCombo" >
+               <widget class="VBoxMediaComboBox" name="mHDCombo" >
                 <property name="sizePolicy" >
                  <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
@@ -1244,5 +1247,5 @@
   <tabstop>mBtnNext3</tabstop>
   <tabstop>mBtnCancel3</tabstop>
-  <tabstop>mMediaCombo</tabstop>
+  <tabstop>mHDCombo</tabstop>
   <tabstop>mPbNewHD</tabstop>
   <tabstop>mPbExistingHD</tabstop>
Index: trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMFirstRunWzd.ui
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMFirstRunWzd.ui	(revision 13553)
+++ trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMFirstRunWzd.ui	(revision 13580)
@@ -487,5 +487,5 @@
                 </item>
                 <item>
-                 <widget class="QToolButton" name="mTbVdm" >
+                 <widget class="QToolButton" name="mTbVmm" >
                   <property name="icon" >
                    <iconset resource="../VirtualBox.qrc" >:/select_file_16px.png</iconset>
Index: trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsCD.ui
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsCD.ui	(revision 13553)
+++ trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsCD.ui	(revision 13580)
@@ -153,5 +153,5 @@
        <widget class="QToolButton" name="mTbIsoCD" >
         <property name="whatsThis" >
-         <string>Invokes the Virtual Disk Manager to select a CD/DVD image to mount.</string>
+         <string>Invokes the Virtual Media Manager to select a CD/DVD image to mount.</string>
         </property>
         <property name="text" >
Index: trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsFD.ui
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsFD.ui	(revision 13553)
+++ trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsFD.ui	(revision 13580)
@@ -137,5 +137,5 @@
        <widget class="QToolButton" name="mTbIsoFD" >
         <property name="whatsThis" >
-         <string>Invokes the Virtual Disk Manager to select a Floppy image to mount.</string>
+         <string>Invokes the Virtual Media Manager to select a Floppy image to mount.</string>
         </property>
         <property name="text" >
Index: trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsHD.ui
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsHD.ui	(revision 13553)
+++ trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsHD.ui	(revision 13580)
@@ -29,5 +29,5 @@
   <layout class="QGridLayout" >
    <item row="0" column="0" >
-    <widget class="QCheckBox" name="mCbSATA" >
+    <widget class="QCheckBox" name="mSATACheck" >
      <property name="whatsThis" >
       <string>When checked, enables the virtual SATA controller of this machine. Note that you cannot attach hard disks to SATA ports when the virtual SATA controller is disabled.</string>
@@ -81,5 +81,5 @@
         </property>
         <property name="whatsThis" >
-         <string>Lists all hard disks attached to this machine. Use a mouse click or the &lt;tt&gt;Space&lt;/tt&gt; key on the highlighted item to activate the drop-down list and choose the desired value. Use the context menu or buttons to the right to add or remove hard disk attachments.</string>
+         <string>Lists all hard disks attached to this machine. Use a mouse click or the &lt;tt>Space&lt;/tt> key on the highlighted item to activate the drop-down list and choose the desired value. Use the context menu or buttons to the right to add or remove hard disk attachments.</string>
         </property>
         <property name="horizontalScrollBarPolicy" >
@@ -109,4 +109,14 @@
     </widget>
    </item>
+   <item row="3" column="0" >
+    <widget class="QCheckBox" name="mShowDiffsCheck" >
+     <property name="whatsThis" >
+      <string>If checked, it will show differencing hard disks actually attached to the slots instead of their base hard disks (shown in case of indirect attachments) and will also let attach other differencing hard disks explicitly. Check this only if you need a complex hard disk setup.</string>
+     </property>
+     <property name="text" >
+      <string>&amp;Show Differencing Hard Disks</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
