Changeset 5795 in vbox

Timestamp:

Nov 19, 2007 2:02:39 PM (17 years ago)

Author:

vboxsync

Message:

2507: "Changing any VM setting after creating a new VM cancels the First Run Wizard" updated (some minor fixes and comments).

Location:

trunk/src/VBox/Frontends/VirtualBox/ui

Files:

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

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

@@ -3167 +3167 @@
     <variable access="private">BootItemsList *tblBootOrder;</variable>
     <variable access="private">QString mNoInterfaces;</variable>
-    <variable access="private">bool mAllowResetFRF;</variable>
+    <variable access="private">bool mAllowResetFirstRunFlag;</variable>
     <variable access="private">bool mResetFirstRunFlag;</variable>
 </variables>
@@ -3208 +3208 @@
     <slot>hostInterfaceAdd()</slot>
     <slot>hostInterfaceRemove()</slot>
-    <slot>onMediaEnumDone()</slot>
+    <slot>onMediaEnumerationDone()</slot>
     <slot>resetFirstRunFlag()</slot>
 </slots>

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

@@ -474 +474 @@
     polished = false;
 
-    mAllowResetFRF = false;
+    /* disallow resetting First Run Wizard flag until media enumeration
+     * process is finished and all data is finally loaded into ui */
+    mAllowResetFirstRunFlag = false;
     connect (&vboxGlobal(), SIGNAL (mediaEnumFinished (const VBoxMediaList &)),
-             this, SLOT (onMediaEnumDone()));
-    mResetFirstRunFlag = false;
+             this, SLOT (onMediaEnumerationDone()));
 
     setIcon (QPixmap::fromMimeSource ("settings_16px.png"));
@@ -829 +830 @@
     /* Boot-order table */
     tblBootOrder = new BootItemsList (groupBox12, "tblBootOrder");
+    connect (tblBootOrder, SIGNAL (bootSequenceChanged()),
+             this, SLOT (resetFirstRunFlag()));
 
     /* Fixing focus order for BootItemsList */
@@ -1139 +1142 @@
 
 
-void VBoxVMSettingsDlg::onMediaEnumDone()
-{
-    mAllowResetFRF = true;
+void VBoxVMSettingsDlg::onMediaEnumerationDone()
+{
+    mAllowResetFirstRunFlag = true;
 }
 
@@ -1147 +1150 @@
 void VBoxVMSettingsDlg::resetFirstRunFlag()
 {
-    if (mAllowResetFRF)
+    if (mAllowResetFirstRunFlag)
         mResetFirstRunFlag = true;
 }
@@ -1579 +1582 @@
     /* Boot-order */
     tblBootOrder->getFromMachine (machine);
-    connect (tblBootOrder, SIGNAL (bootSequenceChanged()),
-             this, SLOT (resetFirstRunFlag()));
 
     /* ACPI */
@@ -1914 +1915 @@
     wvalFloppy->revalidate();
     wvalVRDP->revalidate();
+
+    /* finally set the reset First Run Wizard flag to "false" to make sure
+     * user will see this dialog if he hasn't change the boot-order
+     * and/or mounted images configuration */
+    mResetFirstRunFlag = false;
 }