Changeset 25686 in vbox

Timestamp:

Jan 8, 2010 9:01:04 AM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

56406

Message:

FE/Qt4: move the RTCUseUTC to the System/Motherboard tab

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm

Files:

• VBoxVMSettingsGeneral.cpp (modified) (2 diffs)
• VBoxVMSettingsGeneral.ui (modified) (1 diff)
• VBoxVMSettingsSystem.cpp (modified) (2 diffs)
• VBoxVMSettingsSystem.ui (modified) (1 diff)

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

@@ -86 +86 @@
     mCbToolBarAlignment->setEnabled (mCbShowToolBar->isChecked());
 
-    /* RTC use UTC */
-    bool rtcUseUTC = mMachine.GetRTCUseUTC ();
-    mCbTCUseUTC->setChecked (rtcUseUTC);
-
     /* Snapshot folder */
     mPsSnapshot->setPath (aMachine.GetSnapshotFolder());
@@ -124 +120 @@
     mMachine.SetExtraData (VBoxDefs::GUI_MiniToolBarAlignment,
                            mCbToolBarAlignment->isChecked() ? "top" : "bottom");
-
-    /* RTC reports time in UTC */
-    mMachine.SetRTCUseUTC (mCbTCUseUTC->isChecked());
 
     /* Saved state folder */

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

@@ -241 +241 @@
            </widget>
           </item>
-          <item row="5" column="0" >
-           <widget class="QLabel" name="mLbRTCUseUTC" >
-            <property name="text" >
-             <string>Hardware clock:</string>
-            </property>
-            <property name="alignment" >
-             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-            </property>
-           </widget>
-          </item>
-          <item row="5" column="1" >
-           <widget class="QCheckBox" name="mCbTCUseUTC" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="whatsThis" >
-             <string>If checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</string>
-            </property>
-            <property name="text" >
-             <string>Report &amp;UTC time</string>
-            </property>
-            <property name="checked" >
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
          </layout>
         </widget>

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsSystem.cpp

@@ -170 +170 @@
     mCbEFI->setChecked (mMachine.GetFirmwareType() >= KFirmwareType_EFI && mMachine.GetFirmwareType() <= KFirmwareType_EFIDUAL);
 
+    /* RTC */
+    bool rtcUseUTC = mMachine.GetRTCUseUTC ();
+    mCbTCUseUTC->setChecked (rtcUseUTC);
+
     /* CPU count */
     bool fVTxAMDVSupported = vboxGlobal().virtualBox().GetHost()
@@ -233 +237 @@
     /* EFI */
     mMachine.SetFirmwareType (mCbEFI->isChecked() ? KFirmwareType_EFI : KFirmwareType_BIOS);
+
+    /* RTC */
+    mMachine.SetRTCUseUTC (mCbTCUseUTC->isChecked());
 
     /* RAM size */

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsSystem.ui

@@ -343 +343 @@
         </widget>
        </item>
-       <item row="6" column="0" colspan="3">
+       <item row="6" column="1" >
+        <widget class="QCheckBox" name="mCbTCUseUTC" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+           </sizepolicy>
+         </property>
+         <property name="whatsThis" >
+          <string>If checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</string>
+         </property>
+         <property name="text" >
+          <string>Hardware clock in &amp;UTC time</string>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="0" colspan="3">
         <spacer name="mSpVer1">
          <property name="orientation">