Changeset 21938 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Aug 3, 2009 10:40:43 AM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: 3948: Mini-ToolBar for Full-screen & Seamless modes: Option for per-machine toolbar alignment (top & bottom) implemented. Based on user's patch.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxDefs.h (modified) (1 diff)
• src/VBoxConsoleWnd.cpp (modified) (1 diff)
• src/VBoxDefs.cpp (modified) (1 diff)
• src/VBoxVMSettingsGeneral.cpp (modified) (2 diffs)
• ui/VBoxVMSettingsGeneral.ui (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxDefs.h

@@ -151 +151 @@
     static const char* GUI_SaveMountedAtRuntime;
     static const char* GUI_ShowMiniToolBar;
+    static const char* GUI_MiniToolBarAlignment;
     static const char* GUI_MiniToolBarAutoHide;
     static const char* GUI_LastCloseAction;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -814 +814 @@
     /* Mini toolbar */
     bool isActive = !(cmachine.GetExtraData (VBoxDefs::GUI_ShowMiniToolBar) == "no");
+    bool isAtTop = (cmachine.GetExtraData (VBoxDefs::GUI_MiniToolBarAlignment) == "top");
     bool isAutoHide = !(cmachine.GetExtraData (VBoxDefs::GUI_MiniToolBarAutoHide) == "off");
     QList <QMenu*> menus (QList <QMenu*> () << mMiniVMMenu << mDevicesMenu);
-    mMiniToolBar = new VBoxMiniToolBar (centralWidget(), VBoxMiniToolBar::AlignBottom,
+    mMiniToolBar = new VBoxMiniToolBar (centralWidget(), isAtTop ? VBoxMiniToolBar::AlignTop : VBoxMiniToolBar::AlignBottom,
                                         isActive, isAutoHide);
     *mMiniToolBar << menus;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxDefs.cpp

@@ -33 +33 @@
 const char* VBoxDefs::GUI_SaveMountedAtRuntime = "GUI/SaveMountedAtRuntime";
 const char* VBoxDefs::GUI_ShowMiniToolBar = "GUI/ShowMiniToolBar";
+const char* VBoxDefs::GUI_MiniToolBarAlignment = "GUI/MiniToolBarAlignment";
 const char* VBoxDefs::GUI_MiniToolBarAutoHide = "GUI/MiniToolBarAutoHide";
 const char* VBoxDefs::GUI_LastCloseAction = "GUI/LastCloseAction";

trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsGeneral.cpp

@@ -74 +74 @@
     mCbShowToolBar->setChecked (showMiniToolBar != "no");
 
+    /* Show Mini ToolBar at top */
+    QString miniToolBarAlignment = mMachine.GetExtraData (VBoxDefs::GUI_MiniToolBarAlignment);
+    mCbToolBarAlignment->setChecked (miniToolBarAlignment == "top");
+    mCbToolBarAlignment->setEnabled (mCbShowToolBar->isChecked());
+
     /* Snapshot folder */
     mPsSnapshot->setPath (aMachine.GetSnapshotFolder());
@@ -104 +109 @@
     mMachine.SetExtraData (VBoxDefs::GUI_ShowMiniToolBar,
                            mCbShowToolBar->isChecked() ? "yes" : "no");
+
+    /* Show Mini ToolBar at top */
+    mMachine.SetExtraData (VBoxDefs::GUI_MiniToolBarAlignment,
+                           mCbToolBarAlignment->isChecked() ? "top" : "bottom");
 
     /* Saved state folder */

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsGeneral.ui

@@ -222 +222 @@
            </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 it's 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>
@@ -278 +297 @@
  </customwidgets>
  <resources/>
- <connections/>
+ <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>
 </ui>