Changeset 2932 in vbox for trunk

Timestamp:

May 30, 2007 1:55:20 PM (18 years ago)

Author:

vboxsync

Message:

FE/Qt: Spelling.

Location:

trunk/src/VBox/Frontends/VirtualBox/ui

Files:

• VBoxVMSettingsDlg.ui (modified) (2 diffs)
• VBoxVMSettingsDlg.ui.h (modified) (12 diffs)

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

@@ -2785 +2785 @@
     <variable access="private">QIRichLabel *whatsThisLabel;</variable>
     <variable access="private">BootItemsList *tblBootOrder;</variable>
-    <variable access="private">bool mIsBootSettingsChanged;</variable>
+    <variable access="private">bool mResetFirstRunFlag;</variable>
 </variables>
 <slots>
@@ -2822 +2822 @@
     <slot>updateInterfaces( QWidget* )</slot>
     <slot>networkPageUpdate( QWidget* )</slot>
-    <slot>bootSequenceChanged()</slot>
+    <slot>resetFirstRunFlag()</slot>
 </slots>
 <functions>

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui.h

@@ -400 +400 @@
     polished = false;
 
+    mResetFirstRunFlag = false;
+
     setIcon (QPixmap::fromMimeSource ("settings_16px.png"));
 
@@ -737 +739 @@
     tblBootOrder = new BootItemsList (groupBox12, "tblBootOrder");
     connect (tblBootOrder, SIGNAL (bootSequenceChanged()),
-             this, SLOT (bootSequenceChanged()));
+             this, SLOT (resetFirstRunFlag()));
     /* Fixing focus order for BootItemsList */
     setTabOrder (tbwGeneral, tblBootOrder);
@@ -853 +855 @@
 
     VBoxGlobal::centerWidget (this, parentWidget());
-
-    mIsBootSettingsChanged = false;
 }
 
@@ -911 +911 @@
 
 
-void VBoxVMSettingsDlg::bootSequenceChanged()
-{
-    mIsBootSettingsChanged = true;
+void VBoxVMSettingsDlg::resetFirstRunFlag()
+{
+    mResetFirstRunFlag = true;
 }
 
@@ -919 +919 @@
 void VBoxVMSettingsDlg::hdaMediaChanged()
 {
-    bootSequenceChanged();
+    resetFirstRunFlag();
     uuidHDA = grbHDA->isChecked() ? cbHDA->getId() : QUuid();
     txHDA->setText (getHdInfo (grbHDA, uuidHDA));
@@ -929 +929 @@
 void VBoxVMSettingsDlg::hdbMediaChanged()
 {
-    bootSequenceChanged();
+    resetFirstRunFlag();
     uuidHDB = grbHDB->isChecked() ? cbHDB->getId() : QUuid();
     txHDB->setText (getHdInfo (grbHDB, uuidHDB));
@@ -939 +939 @@
 void VBoxVMSettingsDlg::hddMediaChanged()
 {
-    bootSequenceChanged();
+    resetFirstRunFlag();
     uuidHDD = grbHDD->isChecked() ? cbHDD->getId() : QUuid();
     txHDD->setText (getHdInfo (grbHDD, uuidHDD));
@@ -949 +949 @@
 void VBoxVMSettingsDlg::cdMediaChanged()
 {
-    bootSequenceChanged();
+    resetFirstRunFlag();
     uuidISODVD = bgDVD->isChecked() ? cbISODVD->getId() : QUuid();
     /* revailidate */
@@ -958 +958 @@
 void VBoxVMSettingsDlg::fdMediaChanged()
 {
-    bootSequenceChanged();
+    resetFirstRunFlag();
     uuidISOFloppy = bgFloppy->isChecked() ? cbISOFloppy->getId() : QUuid();
     /* revailidate */
@@ -1728 +1728 @@
     }
 
-    /* Clear the "GUI_FirstRun" extra data key in case of one of the boot
-     * settings was changed */
-    if (mIsBootSettingsChanged)
+    /* Clear the "GUI_FirstRun" extra data key in case if the boot order
+     * and/or disk configuration were changed */
+    if (mResetFirstRunFlag)
         cmachine.SetExtraData (GUI_FirstRun, QString::null);
 
@@ -1826 +1826 @@
 void VBoxVMSettingsDlg::showVDImageManager (QUuid *id, VBoxMediaComboBox *cbb, QLabel*)
 {
-    bootSequenceChanged();
-
     VBoxDefs::DiskType type = VBoxDefs::InvalidType;
     if (cbb == cbISODVD)
@@ -1840 +1838 @@
     QUuid machineId = cmachine.GetId();
     dlg.setup (type, true, &machineId, true /* aRefresh */, cmachine);
-    *id = dlg.exec() == VBoxDiskImageManagerDlg::Accepted ?
-        dlg.getSelectedUuid() : cbb->getId();
+    if (dlg.exec() == VBoxDiskImageManagerDlg::Accepted)
+    {
+        *id = dlg.getSelectedUuid();
+        resetFirstRunFlag();
+    }
+    else
+    {
+        *id = cbb->getId();
+    }
+
     cbb->setCurrentItem (*id);
     cbb->setFocus();