Changeset 51593 in vbox

Timestamp:

Jun 10, 2014 4:49:32 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: 6660: Advanced extra-data management framework: Remove code related to unused GUI_SaveMountedAtRuntime.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• runtime/UISession.cpp (modified) (2 diffs)
• runtime/UISession.h (modified) (2 diffs)
• settings/machine/UIMachineSettingsGeneral.cpp (modified) (6 diffs)
• settings/machine/UIMachineSettingsGeneral.h (modified) (3 diffs)
• settings/machine/UIMachineSettingsGeneral.ui (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp

@@ -92 +92 @@
 const char* UIExtraDataDefs::GUI_AutoresizeGuest = "GUI/AutoresizeGuest";
 const char* UIExtraDataDefs::GUI_AutomountGuestScreens = "GUI/AutomountGuestScreens";
-const char* UIExtraDataDefs::GUI_SaveMountedAtRuntime = "GUI/SaveMountedAtRuntime";
 const char* UIExtraDataDefs::GUI_PassCAD = "GUI/PassCAD";
 const char* UIExtraDataDefs::GUI_DefaultCloseAction = "GUI/DefaultCloseAction";

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -100 +100 @@
     extern const char* GUI_AutoresizeGuest;
     extern const char* GUI_AutomountGuestScreens;
-    extern const char* GUI_SaveMountedAtRuntime;
     extern const char* GUI_PassCAD;
     extern const char* GUI_DefaultCloseAction;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -152 +152 @@
     , m_fIsStarted(false)
     , m_fIsFirstTimeStarted(false)
-    , m_fIsIgnoreRuntimeMediumsChanging(false)
     , m_fIsGuestResizeIgnored(false)
     , m_fIsAutoCaptureDisabled(false)
@@ -1135 +1134 @@
         m_fIsFirstTimeStarted = gEDataManager->isFirstRun(vboxGlobal().managedVMUuid());
 
-        /* Ignore mediums mounted at runtime? */
-        strSettings = machine.GetExtraData(GUI_SaveMountedAtRuntime);
-        if (strSettings == "no")
-            m_fIsIgnoreRuntimeMediumsChanging = true;
-
         /* Should guest autoresize? */
         QAction *pGuestAutoresizeSwitch = gActionPool->action(UIActionIndexRuntime_Toggle_GuestAutoresize);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

@@ -181 +181 @@
     bool isStarted() const { return m_fIsStarted; }
     bool isFirstTimeStarted() const { return m_fIsFirstTimeStarted; }
-    bool isIgnoreRuntimeMediumsChanging() const { return m_fIsIgnoreRuntimeMediumsChanging; }
     bool isGuestResizeIgnored() const { return m_fIsGuestResizeIgnored; }
     bool isAutoCaptureDisabled() const { return m_fIsAutoCaptureDisabled; }
@@ -436 +435 @@
     bool m_fIsStarted : 1;
     bool m_fIsFirstTimeStarted : 1;
-    bool m_fIsIgnoreRuntimeMediumsChanging : 1;
     bool m_fIsGuestResizeIgnored : 1;
     bool m_fIsAutoCaptureDisabled : 1;

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp

@@ -106 +106 @@
     generalData.m_strName = m_machine.GetName();
     generalData.m_strGuestOsTypeId = m_machine.GetOSTypeId();
-    QString strSaveMountedAtRuntime = m_machine.GetExtraData(GUI_SaveMountedAtRuntime);
-    generalData.m_fSaveMountedAtRuntime = strSaveMountedAtRuntime != "no";
     QString strShowMiniToolBar = m_machine.GetExtraData(GUI_ShowMiniToolBar);
     generalData.m_fShowMiniToolBar = strShowMiniToolBar != "no";
@@ -135 +133 @@
     m_pNameAndSystemEditor->setName(generalData.m_strName);
     m_pNameAndSystemEditor->setType(vboxGlobal().vmGuestOSType(generalData.m_strGuestOsTypeId));
-    mCbSaveMounted->setChecked(generalData.m_fSaveMountedAtRuntime);
     mCbShowToolBar->setChecked(generalData.m_fShowMiniToolBar);
     mCbToolBarAlignment->setChecked(generalData.m_fMiniToolBarAtTop);
@@ -161 +158 @@
     generalData.m_strName = m_pNameAndSystemEditor->name();
     generalData.m_strGuestOsTypeId = m_pNameAndSystemEditor->type().GetId();
-    generalData.m_fSaveMountedAtRuntime = mCbSaveMounted->isChecked();
     generalData.m_fShowMiniToolBar = mCbShowToolBar->isChecked();
     generalData.m_fMiniToolBarAtTop = mCbToolBarAlignment->isChecked();
@@ -193 +189 @@
             m_machine.SetClipboardMode(generalData.m_clipboardMode);
             m_machine.SetDnDMode(generalData.m_dndMode);
-            m_machine.SetExtraData(GUI_SaveMountedAtRuntime, generalData.m_fSaveMountedAtRuntime ? "yes" : "no");
             m_machine.SetExtraData(GUI_ShowMiniToolBar, generalData.m_fShowMiniToolBar ? "yes" : "no");
             m_machine.SetExtraData(GUI_MiniToolBarAlignment, generalData.m_fMiniToolBarAtTop ? "top" : "bottom");
@@ -266 +261 @@
     setTabOrder (mPsSnapshot, mCbClipboard);
     setTabOrder (mCbClipboard, mCbDragAndDrop);
-    setTabOrder (mCbDragAndDrop, mCbSaveMounted);
-    setTabOrder (mCbSaveMounted, mCbShowToolBar);
+    setTabOrder (mCbDragAndDrop, mCbShowToolBar);
     setTabOrder (mCbShowToolBar, mCbToolBarAlignment);
 
@@ -316 +310 @@
     mLbDragAndDrop->setEnabled(isMachineInValidMode());
     mCbDragAndDrop->setEnabled(isMachineInValidMode());
-    mLbMedia->setEnabled(isMachineInValidMode());
-    mCbSaveMounted->setEnabled(isMachineInValidMode());
     mLbToolBar->setEnabled(isMachineInValidMode());
     mCbShowToolBar->setEnabled(isMachineInValidMode());

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.h

@@ -31 +31 @@
         : m_strName(QString())
         , m_strGuestOsTypeId(QString())
-        , m_fSaveMountedAtRuntime(false)
         , m_fShowMiniToolBar(false)
         , m_fMiniToolBarAtTop(false)
@@ -44 +43 @@
         return (m_strName == other.m_strName) &&
                (m_strGuestOsTypeId == other.m_strGuestOsTypeId) &&
-               (m_fSaveMountedAtRuntime == other.m_fSaveMountedAtRuntime) &&
                (m_fShowMiniToolBar == other.m_fShowMiniToolBar) &&
                (m_fMiniToolBarAtTop == other.m_fMiniToolBarAtTop) &&
@@ -59 +57 @@
     QString m_strName;
     QString m_strGuestOsTypeId;
-    bool m_fSaveMountedAtRuntime;
     bool m_fShowMiniToolBar;
     bool m_fMiniToolBarAtTop;

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.ui

@@ -171 +171 @@
           </item>
           <item row="3" column="0" >
-           <widget class="QLabel" name="mLbMedia" >
-            <property name="text" >
-             <string>Removable Media:</string>
+           <widget class="QLabel" name="mLbToolBar" >
+            <property name="text" >
+             <string>Mini ToolBar:</string>
             </property>
             <property name="alignment" >
@@ -181 +181 @@
           </item>
           <item row="3" column="1" >
-           <widget class="QCheckBox" name="mCbSaveMounted" >
+           <widget class="QCheckBox" name="mCbShowToolBar" >
             <property name="sizePolicy" >
              <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
@@ -189 +189 @@
             </property>
             <property name="whatsThis" >
-             <string>If checked, any CD/DVD or floppy disks inserted into or removed from the virtual drives while the machine is running will be remembered.</string>
-            </property>
-            <property name="text" >
-             <string>&amp;Remember Runtime Changes</string>
+             <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" >
@@ -199 +199 @@
            </widget>
           </item>
-          <item row="4" 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="4" 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="5" column="1" >
            <widget class="QCheckBox" name="mCbToolBarAlignment" >
             <property name="sizePolicy" >