Changeset 20412 in vbox

Timestamp:

Jun 8, 2009 2:42:47 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: 3948: Mini-ToolBar for Full-screen & Seamless modes - VM Settings / General Page / Advanced Tab - updated with show-hide Mini ToolBar option.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

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

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

@@ -150 +150 @@
     static const char* GUI_FirstRun;
     static const char* GUI_SaveMountedAtRuntime;
+    static const char* GUI_ShowMiniToolBar;
     static const char* GUI_LastCloseAction;
     static const char* GUI_SuppressMessages;

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

@@ -51 +51 @@
     VBoxMiniToolBar (QWidget *aParent, Alignment aAlignment);
 
+    void setActive (bool aIsActive);
     void setIsSeamlessMode (bool aIsSeamless);
 
@@ -96 +97 @@
     int mPositionY;
 
+    bool mIsActive;
     bool mIsSeamless;
 

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

@@ -900 +900 @@
             mIsAutoSaveMedia = false;
 
+        str = cmachine.GetExtraData (VBoxDefs::GUI_ShowMiniToolBar);
+        if (str == "no")
+            mMiniToolBar->setActive (false);
+
         /* Check if one of extended modes to be activated on loading */
         QString fsMode = cmachine.GetExtraData (VBoxDefs::GUI_Fullscreen);

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

@@ -32 +32 @@
 const char* VBoxDefs::GUI_FirstRun = "GUI/FirstRun";
 const char* VBoxDefs::GUI_SaveMountedAtRuntime = "GUI/SaveMountedAtRuntime";
+const char* VBoxDefs::GUI_ShowMiniToolBar = "GUI/ShowMiniToolBar";
 const char* VBoxDefs::GUI_LastCloseAction = "GUI/LastCloseAction";
 const char* VBoxDefs::GUI_SuppressMessages = "GUI/SuppressMessages";

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

@@ -45 +45 @@
     , mHideAfterSlide (false)
     , mPolished (false)
+    , mIsActive (true)
     , mIsSeamless (false)
     , mAlignment (aAlignment)
@@ -107 +108 @@
 }
 
+void VBoxMiniToolBar::setActive (bool aIsActive)
+{
+    mIsActive = aIsActive;
+}
+
 void VBoxMiniToolBar::setIsSeamlessMode (bool aIsSeamless)
 {
@@ -147 +153 @@
                 mSlideToScreen = true;
             }
-            show();
+            if (mIsActive) show();
             mScrollTimer.start (mScrollDelay, this);
         }
-        else
-            show();
+        else if (mIsActive) show();
 
         if (mAutoHide)

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

@@ -70 +70 @@
     mCbSaveMounted->setChecked (saveRtimeImages != "no");
 
+    /* Show Mini ToolBar in fullscreen/seamless */
+    QString showMiniToolBar = mMachine.GetExtraData (VBoxDefs::GUI_ShowMiniToolBar);
+    mCbShowToolBar->setChecked (showMiniToolBar != "no");
+
     /* Snapshot folder */
     mPsSnapshot->setPath (aMachine.GetSnapshotFolder());
@@ -96 +100 @@
     mMachine.SetExtraData (VBoxDefs::GUI_SaveMountedAtRuntime,
                            mCbSaveMounted->isChecked() ? "yes" : "no");
+
+    /* Show Mini ToolBar in fullscreen/seamless */
+    mMachine.SetExtraData (VBoxDefs::GUI_ShowMiniToolBar,
+                           mCbShowToolBar->isChecked() ? "yes" : "no");
 
     /* Saved state folder */

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

@@ -164 +164 @@
            </spacer>
           </item>
+          <item row="2" column="0" >
+           <widget class="QLabel" name="mLbMedia" >
+            <property name="text" >
+             <string>Removable Media:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
           <item row="2" column="1" >
            <widget class="QCheckBox" name="mCbSaveMounted" >
@@ -183 +193 @@
            </widget>
           </item>
-          <item row="2" column="0" >
-           <widget class="QLabel" name="mLbAdvanced" >
-            <property name="text" >
-             <string>Removable Media:</string>
-            </property>
-            <property name="alignment" >
-             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          <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>