Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp	(revision 53396)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp	(revision 53397)
@@ -26,8 +26,9 @@
 # include "QIWidgetValidator.h"
 # include "UIMachineSettingsDisplay.h"
+# include "UIExtraDataManager.h"
+# include "UIMessageCenter.h"
+# include "UIActionPool.h"
+# include "UIConverter.h"
 # include "VBoxGlobal.h"
-# include "UIMessageCenter.h"
-# include "UIConverter.h"
-# include "UIActionPool.h"
 
 /* COM includes: */
@@ -140,4 +141,8 @@
     displayData.m_screens = m_machine.GetVideoCaptureScreens();
 
+    /* Cache Machine Window data: */
+    displayData.m_fShowMiniToolBar = gEDataManager->miniToolbarEnabled(m_machine.GetId());
+    displayData.m_fMiniToolBarAtTop = gEDataManager->miniToolbarAlignment(m_machine.GetId()) == Qt::AlignTop;
+
     /* Initialize other variables: */
     m_iInitialVRAM = RT_MIN(displayData.m_iCurrentVRAM, m_iMaxVRAM);
@@ -192,4 +197,6 @@
     m_pStatusBarEditor->setMachineID(strMachineID);
     m_pMenuBarEditor->setActionPool(m_pActionPool);
+    m_pCheckBoxShowMiniToolBar->setChecked(displayData.m_fShowMiniToolBar);
+    m_pComboToolBarAlignment->setChecked(displayData.m_fMiniToolBarAtTop);
 
     /* Polish page finally: */
@@ -234,4 +241,8 @@
     displayData.m_iVideoCaptureBitRate = m_pEditorVideoCaptureBitRate->value();
     displayData.m_screens = m_pScrollerVideoCaptureScreens->value();
+
+    /* Gather Machine Window data from page: */
+    displayData.m_fShowMiniToolBar = m_pCheckBoxShowMiniToolBar->isChecked();
+    displayData.m_fMiniToolBarAtTop = m_pComboToolBarAlignment->isChecked();
 
     /* Cache display data: */
@@ -316,4 +327,11 @@
             m_machine.SetVideoCaptureScreens(displayData.m_screens);
         }
+
+        /* Store Machine Window data: */
+        if (isMachineInValidMode())
+        {
+            gEDataManager->setMiniToolbarEnabled(displayData.m_fShowMiniToolBar, m_machine.GetId());
+            gEDataManager->setMiniToolbarAlignment(displayData.m_fMiniToolBarAtTop ? Qt::AlignTop : Qt::AlignBottom, m_machine.GetId());
+        }
     }
 
@@ -477,4 +495,8 @@
     setTabOrder(m_pEditorVideoCaptureFrameRate, m_pSliderVideoCaptureQuality);
     setTabOrder(m_pSliderVideoCaptureQuality, m_pEditorVideoCaptureBitRate);
+
+    /* Machine Window tab-order: */
+    setTabOrder(m_pEditorVideoCaptureBitRate, m_pCheckBoxShowMiniToolBar);
+    setTabOrder(m_pCheckBoxShowMiniToolBar, m_pComboToolBarAlignment);
 }
 
@@ -530,4 +552,9 @@
     m_pContainerVideoCapture->setEnabled(isMachineInValidMode());
     sltHandleVideoCaptureCheckboxToggle();
+
+    /* Machine-window tab: */
+    m_pLabelMiniToolBar->setEnabled(isMachineInValidMode());
+    m_pCheckBoxShowMiniToolBar->setEnabled(isMachineInValidMode());
+    m_pComboToolBarAlignment->setEnabled(isMachineInValidMode() && m_pCheckBoxShowMiniToolBar->isChecked());
 }
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.h	(revision 53396)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.h	(revision 53397)
@@ -52,4 +52,6 @@
         , m_iVideoCaptureFrameRate(0)
         , m_iVideoCaptureBitRate(0)
+        , m_fShowMiniToolBar(false)
+        , m_fMiniToolBarAtTop(false)
     {}
 
@@ -75,5 +77,7 @@
                (m_iVideoCaptureFrameRate == other.m_iVideoCaptureFrameRate) &&
                (m_iVideoCaptureBitRate == other.m_iVideoCaptureBitRate) &&
-               (m_screens == other.m_screens);
+               (m_screens == other.m_screens) &&
+               (m_fShowMiniToolBar == other.m_fShowMiniToolBar) &&
+               (m_fMiniToolBarAtTop == other.m_fMiniToolBarAtTop);
     }
 
@@ -107,4 +111,8 @@
     int m_iVideoCaptureBitRate;
     QVector<BOOL> m_screens;
+
+    /* Variables: Machine Window stuff: */
+    bool m_fShowMiniToolBar;
+    bool m_fMiniToolBarAtTop;
 };
 typedef UISettingsCache<UIDataSettingsMachineDisplay> UICacheSettingsMachineDisplay;
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.ui
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.ui	(revision 53396)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.ui	(revision 53397)
@@ -649,6 +649,6 @@
        <string>Machine &amp;Window</string>
       </attribute>
-      <layout class="QVBoxLayout" name="m_pLayoutTabMachineWindow">
-       <item>
+      <layout class="QGridLayout" name="m_pLayoutTabMachineWindow">
+       <item row="0" column="0" colspan="2">
         <widget class="UIMenuBarEditorWidget" name="m_pMenuBarEditor">
          <property name="whatsThis">
@@ -657,5 +657,53 @@
         </widget>
        </item>
-       <item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="m_pLabelMiniToolBar">
+         <property name="text">
+          <string>Mini ToolBar:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QCheckBox" name="m_pCheckBoxShowMiniToolBar">
+         <property name="sizePolicy">
+          <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="whatsThis">
+          <string>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</string>
+         </property>
+         <property name="text">
+          <string>Show in &amp;Fullscreen/Seamless</string>
+         </property>
+         <property name="checked">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1">
+        <widget class="QCheckBox" name="m_pComboToolBarAlignment">
+         <property name="sizePolicy">
+          <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="whatsThis">
+          <string>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</string>
+         </property>
+         <property name="text">
+          <string>Show at &amp;Top of Screen</string>
+         </property>
+         <property name="checked">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0" colspan="2">
         <spacer name="m_pSpacer">
          <property name="orientation">
@@ -670,5 +718,5 @@
         </spacer>
        </item>
-       <item>
+       <item row="4" column="0" colspan="2">
         <widget class="UIStatusBarEditorWidget" name="m_pStatusBarEditor">
          <property name="whatsThis">
@@ -724,4 +772,20 @@
    <slot>setEnabled(bool)</slot>
   </connection>
+  <connection>
+   <sender>m_pCheckBoxShowMiniToolBar</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>m_pComboToolBarAlignment</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>195</x>
+     <y>50</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>196</x>
+     <y>72</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp	(revision 53396)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp	(revision 53397)
@@ -27,5 +27,4 @@
 # include "QIWidgetValidator.h"
 # include "UIMachineSettingsGeneral.h"
-# include "UIExtraDataManager.h"
 # include "UIMessageCenter.h"
 # include "UIConverter.h"
@@ -112,6 +111,4 @@
     generalData.m_strName = m_machine.GetName();
     generalData.m_strGuestOsTypeId = m_machine.GetOSTypeId();
-    generalData.m_fShowMiniToolBar = gEDataManager->miniToolbarEnabled(m_machine.GetId());
-    generalData.m_fMiniToolBarAtTop = gEDataManager->miniToolbarAlignment(m_machine.GetId()) == Qt::AlignTop;
     generalData.m_strSnapshotsFolder = m_machine.GetSnapshotFolder();
     generalData.m_strSnapshotsHomeDir = QFileInfo(m_machine.GetSettingsFilePath()).absolutePath();
@@ -137,6 +134,4 @@
     m_pNameAndSystemEditor->setName(generalData.m_strName);
     m_pNameAndSystemEditor->setType(vboxGlobal().vmGuestOSType(generalData.m_strGuestOsTypeId));
-    mCbShowToolBar->setChecked(generalData.m_fShowMiniToolBar);
-    mCbToolBarAlignment->setChecked(generalData.m_fMiniToolBarAtTop);
     mPsSnapshot->setPath(generalData.m_strSnapshotsFolder);
     mPsSnapshot->setHomeDir(generalData.m_strSnapshotsHomeDir);
@@ -162,6 +157,4 @@
     generalData.m_strName = m_pNameAndSystemEditor->name();
     generalData.m_strGuestOsTypeId = m_pNameAndSystemEditor->type().GetId();
-    generalData.m_fShowMiniToolBar = mCbShowToolBar->isChecked();
-    generalData.m_fMiniToolBarAtTop = mCbToolBarAlignment->isChecked();
     generalData.m_strSnapshotsFolder = mPsSnapshot->path();
     generalData.m_clipboardMode = (KClipboardMode)mCbClipboard->currentIndex();
@@ -193,6 +186,4 @@
             m_machine.SetClipboardMode(generalData.m_clipboardMode);
             m_machine.SetDnDMode(generalData.m_dndMode);
-            gEDataManager->setMiniToolbarEnabled(generalData.m_fShowMiniToolBar, m_machine.GetId());
-            gEDataManager->setMiniToolbarAlignment(generalData.m_fMiniToolBarAtTop ? Qt::AlignTop : Qt::AlignBottom, m_machine.GetId());
             /* Description tab: */
             m_machine.SetDescription(generalData.m_strDescription);
@@ -265,9 +256,7 @@
     setTabOrder (mPsSnapshot, mCbClipboard);
     setTabOrder (mCbClipboard, mCbDragAndDrop);
-    setTabOrder (mCbDragAndDrop, mCbShowToolBar);
-    setTabOrder (mCbShowToolBar, mCbToolBarAlignment);
 
     /* Description tab-order */
-    setTabOrder (mCbToolBarAlignment, mTeDescription);
+    setTabOrder (mCbDragAndDrop, mTeDescription);
 }
 
@@ -314,7 +303,4 @@
     mLbDragAndDrop->setEnabled(isMachineInValidMode());
     mCbDragAndDrop->setEnabled(isMachineInValidMode());
-    mLbToolBar->setEnabled(isMachineInValidMode());
-    mCbShowToolBar->setEnabled(isMachineInValidMode());
-    mCbToolBarAlignment->setEnabled(isMachineInValidMode() && mCbShowToolBar->isChecked());
-}
-
+}
+
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.h	(revision 53396)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.h	(revision 53397)
@@ -29,6 +29,4 @@
         : m_strName(QString())
         , m_strGuestOsTypeId(QString())
-        , m_fShowMiniToolBar(false)
-        , m_fMiniToolBarAtTop(false)
         , m_strSnapshotsFolder(QString())
         , m_strSnapshotsHomeDir(QString())
@@ -36,4 +34,5 @@
         , m_dndMode(KDnDMode_Disabled)
         , m_strDescription(QString()) {}
+
     /* Functions: */
     bool equal(const UIDataSettingsMachineGeneral &other) const
@@ -41,6 +40,4 @@
         return (m_strName == other.m_strName) &&
                (m_strGuestOsTypeId == other.m_strGuestOsTypeId) &&
-               (m_fShowMiniToolBar == other.m_fShowMiniToolBar) &&
-               (m_fMiniToolBarAtTop == other.m_fMiniToolBarAtTop) &&
                (m_strSnapshotsFolder == other.m_strSnapshotsFolder) &&
                (m_strSnapshotsHomeDir == other.m_strSnapshotsHomeDir) &&
@@ -49,12 +46,12 @@
                (m_strDescription == other.m_strDescription);
     }
+
     /* Operators: */
     bool operator==(const UIDataSettingsMachineGeneral &other) const { return equal(other); }
     bool operator!=(const UIDataSettingsMachineGeneral &other) const { return !equal(other); }
+
     /* Variables: */
     QString m_strName;
     QString m_strGuestOsTypeId;
-    bool m_fShowMiniToolBar;
-    bool m_fMiniToolBarAtTop;
     QString m_strSnapshotsFolder;
     QString m_strSnapshotsHomeDir;
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.ui
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.ui	(revision 53396)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.ui	(revision 53397)
@@ -170,52 +170,4 @@
            </spacer>
           </item>
-          <item row="3" column="0" >
-           <widget class="QLabel" name="mLbToolBar" >
-            <property name="text" >
-             <string>Mini ToolBar:</string>
-            </property>
-            <property name="alignment" >
-             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="1" >
-           <widget class="QCheckBox" name="mCbShowToolBar" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="whatsThis" >
-             <string>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</string>
-            </property>
-            <property name="text" >
-             <string>Show in &amp;Fullscreen/Seamless</string>
-            </property>
-            <property name="checked" >
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="1" >
-           <widget class="QCheckBox" name="mCbToolBarAlignment" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="whatsThis" >
-             <string>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</string>
-            </property>
-            <property name="text" >
-             <string>Show at &amp;Top of Screen</string>
-            </property>
-            <property name="checked" >
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
          </layout>
         </widget>
@@ -279,21 +231,4 @@
  </customwidgets>
  <resources/>
- <connections>
-  <connection>
-   <sender>mCbShowToolBar</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>mCbToolBarAlignment</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>195</x>
-     <y>50</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>196</x>
-     <y>72</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
+ <connections/>
 </ui>