Changeset 2895 in vbox

Timestamp:

May 28, 2007 1:16:22 PM (18 years ago)

Author:

vboxsync

Message:

1750: Add CDROM configuration to "Create VM" wizard:

Done: The “GUI/FirstRun” flag is erased from the configuration file in case of user manually changes the boot sequence or the CD/FD/HD configuration through the "VM Settings Dialog".

Location:

trunk/src/VBox/Frontends/VirtualBox/ui

Files:

• VBoxVMSettingsDlg.ui (modified) (1 diff)
• VBoxVMSettingsDlg.ui.h (modified) (22 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">QStringList mHDList;</variable>
+    <variable access="private">QString mCDsettings;</variable>
+    <variable access="private">QString mFDsettings;</variable>
+    <variable access="private">bool mIsBootSettingsChanged;</variable>
 </variables>
 <slots>

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

@@ -29 +29 @@
 ** place of a destructor.
 *****************************************************************************/
+
+
+extern const char *GUI_FirstRun;
 
 
@@ -187 +190 @@
         QStringList uniqueList;
         int minimumWidth = 0;
+        mSequence = QString::null;
         for (int i = 1; i <= 4; ++ i)
         {
@@ -192 +196 @@
             if (type != CEnums::NoDevice)
             {
+                mSequence += type;
                 QString name = vboxGlobal().toString (type);
                 QCheckListItem *item = new QCheckListItem (mBootTable,
@@ -228 +233 @@
         int index = 1;
         item = static_cast<QCheckListItem*> (mBootTable->firstChild());
+        QString sequence = QString::null;
         while (item)
         {
@@ -235 +241 @@
                     vboxGlobal().toDeviceType (item->text (0));
                 aMachine.SetBootOrder (index++, type);
+                sequence += type;
             }
             item = static_cast<QCheckListItem*> (item->nextSibling());
@@ -245 +252 @@
                 aMachine.SetBootOrder (index++, CEnums::NoDevice);
             item = static_cast<QCheckListItem*> (item->nextSibling());
+        }
+        /* Check if the boot sequence was changed */
+        if (mSequence != sequence)
+        {
+            /* Clear the "GUI_FirstRun" extra data key */
+            aMachine.SetExtraData (GUI_FirstRun, QString::null);
         }
     }
@@ -300 +313 @@
     QToolButton *mBtnUp;
     QToolButton *mBtnDown;
+    QString mSequence;
 };
 
@@ -1273 +1287 @@
         grbHDD->setChecked (false);
 
+        /* Creating a clean hd array */
+        for (uint i = 0; i < SIZEOF_ARRAY (diskSet); ++ i)
+            mHDList << QUuid();
+
         CHardDiskAttachmentEnumerator en =
             machine.GetHardDiskAttachments().Enumerate();
@@ -1295 +1313 @@
                     diskSet [i].data.tx->setText (vboxGlobal().details (hd));
                     *(diskSet [i].data.uuid) = QUuid (root.GetId());
+                    mHDList [i] = root.GetId();
                 }
             }
@@ -1319 +1338 @@
 
         CFloppyDrive floppy = machine.GetFloppyDrive();
+        mFDsettings = QString ("%1 %2").arg (floppy.GetState());
         switch (floppy.GetState())
         {
@@ -1340 +1360 @@
                 }
                 rbHostFloppy->setChecked (true);
+                mFDsettings += name;
                 break;
             }
@@ -1350 +1371 @@
                 rbISOFloppy->setChecked (true);
                 uuidISOFloppy = QUuid (img.GetId());
+                mFDsettings += uuidISOFloppy;
                 break;
             }
@@ -1381 +1403 @@
 
         CDVDDrive dvd = machine.GetDVDDrive();
+        mCDsettings = QString ("%1 %2").arg (dvd.GetState());
         switch (dvd.GetState())
         {
@@ -1402 +1425 @@
                 }
                 rbHostDVD->setChecked (true);
+                mCDsettings += name;
                 break;
             }
@@ -1412 +1436 @@
                 rbISODVD->setChecked (true);
                 uuidISODVD = QUuid (img.GetId());
+                mCDsettings += uuidISODVD;
                 break;
             }
@@ -1528 +1553 @@
 COMResult VBoxVMSettingsDlg::putBackToMachine()
 {
+    mIsBootSettingsChanged = false;
+
     CVirtualBox vbox = vboxGlobal().virtualBox();
     CBIOSSettings biosSettings = cmachine.GetBIOSSettings();
@@ -1605 +1632 @@
 
         /* now, attach new disks */
+        QStringList hdList;
         for (uint i = 0; i < SIZEOF_ARRAY (diskSet); i++)
         {
             QUuid *newId = diskSet [i].data.uuid;
+            hdList << *newId;
             if (diskSet [i].data.grb->isChecked() && !(*newId).isNull())
             {
@@ -1616 +1645 @@
             }
         }
+
+        /* Check if the hd sequence was changed */
+        if (mHDList != hdList)
+            mIsBootSettingsChanged = true;
     }
 
     /* floppy image */
     {
+        QString curFDsettings;
         CFloppyDrive floppy = cmachine.GetFloppyDrive();
         if (!bgFloppy->isChecked())
         {
             floppy.Unmount();
+            curFDsettings = QString ("%1 %2").arg (floppy.GetState());
         }
         else if (rbHostFloppy->isChecked())
@@ -1635 +1670 @@
              *  as is
              */
+            curFDsettings = QString ("%1 %2").arg (floppy.GetState())
+                .arg (floppy.GetHostDrive().GetName());
         }
         else if (rbISOFloppy->isChecked())
@@ -1640 +1677 @@
             Assert (!uuidISOFloppy.isNull());
             floppy.MountImage (uuidISOFloppy);
-        }
+            curFDsettings = QString ("%1 %2").arg (floppy.GetState())
+                .arg (floppy.GetImage().GetId());
+        }
+
+        /* Check if the fd settings was changed */
+        if (mFDsettings != curFDsettings)
+            mIsBootSettingsChanged = true;
     }
 
     /* CD/DVD-ROM image */
     {
+        QString curCDsettings;
         CDVDDrive dvd = cmachine.GetDVDDrive();
         if (!bgDVD->isChecked())
         {
             dvd.Unmount();
+            curCDsettings = QString ("%1 %2").arg (dvd.GetState());
         }
         else if (rbHostDVD->isChecked())
@@ -1660 +1705 @@
              *  as is
              */
+            curCDsettings = QString ("%1 %2").arg (dvd.GetState())
+                .arg (dvd.GetHostDrive().GetName());
         }
         else if (rbISODVD->isChecked())
@@ -1665 +1712 @@
             Assert (!uuidISODVD.isNull());
             dvd.MountImage (uuidISODVD);
-        }
-    }
+            curCDsettings = QString ("%1 %2").arg (dvd.GetState())
+                .arg (dvd.GetImage().GetId());
+        }
+
+        /* Check if the cd sequence was changed */
+        if (mCDsettings != curCDsettings)
+            mIsBootSettingsChanged = true;
+    }
+
+    /* Clear the "GUI_FirstRun" extra data key in case of one of the boot
+     * settings was changed */
+    if (mIsBootSettingsChanged)
+        cmachine.SetExtraData (GUI_FirstRun, QString::null);
 
     /* audio */