Changeset 2915 in vbox

Timestamp:

May 29, 2007 1:02:09 PM (18 years ago)

Author:

vboxsync

Message:

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

Done as requested:
The "FirstRun" flag is reseted upon every boot-sequence or hd/cd/fd settings related widget changed (comment #17).

Location:

trunk/src/VBox/Frontends/VirtualBox/ui

Files:

• VBoxVMSettingsDlg.ui (modified) (2 diffs)
• VBoxVMSettingsDlg.ui.h (modified) (36 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>
@@ -2825 +2822 @@
     <slot>updateInterfaces( QWidget* )</slot>
     <slot>networkPageUpdate( QWidget* )</slot>
+    <slot>bootSequenceChanged()</slot>
 </slots>
 <functions>

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

@@ -87 +87 @@
     ~BootItemsTable() {}
 
+    void emitItemToggled() { emit itemToggled(); }
+
 signals:
 
     void moveItemUp();
     void moveItemDown();
+    void itemToggled();
 
 private slots:
@@ -131 +134 @@
 {
     Q_OBJECT
+
+    class BootItem : public QCheckListItem
+    {
+        public:
+
+            BootItem (BootItemsTable *aParent, QListViewItem *aAfter,
+                      const QString &aName, Type aType)
+                : QCheckListItem (aParent, aAfter, aName, aType) {}
+
+        private:
+
+            void stateChange (bool)
+            {
+                BootItemsTable *table = static_cast<BootItemsTable*> (listView());
+                table->emitItemToggled();
+            }
+    };
 
 public:
@@ -168 +188 @@
         connect (mBootTable, SIGNAL (moveItemUp()), this, SLOT (moveItemUp()));
         connect (mBootTable, SIGNAL (moveItemDown()), this, SLOT (moveItemDown()));
+        connect (mBootTable, SIGNAL (itemToggled()), this, SLOT (onItemToggled()));
         buttonLayout->addWidget (mBtnUp);
         buttonLayout->addWidget (mBtnDown);
@@ -190 +211 @@
         QStringList uniqueList;
         int minimumWidth = 0;
-        mSequence = QString::null;
         for (int i = 1; i <= 4; ++ i)
         {
@@ -196 +216 @@
             if (type != CEnums::NoDevice)
             {
-                mSequence += type;
                 QString name = vboxGlobal().toString (type);
-                QCheckListItem *item = new QCheckListItem (mBootTable,
+                QCheckListItem *item = new BootItem (mBootTable,
                     mBootTable->lastItem(), name, QCheckListItem::CheckBox);
                 item->setOn (true);
@@ -212 +231 @@
             if (!uniqueList.contains (name))
             {
-                QCheckListItem *item = new QCheckListItem (mBootTable,
+                QCheckListItem *item = new BootItem (mBootTable,
                     mBootTable->lastItem(), name, QCheckListItem::CheckBox);
                 uniqueList << name;
@@ -233 +252 @@
         int index = 1;
         item = static_cast<QCheckListItem*> (mBootTable->firstChild());
-        QString sequence = QString::null;
         while (item)
         {
@@ -241 +259 @@
                     vboxGlobal().toDeviceType (item->text (0));
                 aMachine.SetBootOrder (index++, type);
-                sequence += type;
             }
             item = static_cast<QCheckListItem*> (item->nextSibling());
@@ -253 +270 @@
             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);
-        }
     }
 
@@ -274 +285 @@
         }
     }
+
+signals:
+
+    void bootSequenceChanged();
 
 private slots:
@@ -285 +300 @@
         itemAbove->moveItem (item);
         processCurrentChanged (item);
+        emit bootSequenceChanged();
     }
 
@@ -295 +311 @@
         item->moveItem (itemBelow);
         processCurrentChanged (item);
+        emit bootSequenceChanged();
+    }
+
+    void onItemToggled()
+    {
+        emit bootSequenceChanged();
     }
 
@@ -313 +335 @@
     QToolButton *mBtnUp;
     QToolButton *mBtnDown;
-    QString mSequence;
 };
 
@@ -715 +736 @@
     /* Boot-order table */
     tblBootOrder = new BootItemsList (groupBox12, "tblBootOrder");
+    connect (tblBootOrder, SIGNAL (bootSequenceChanged()),
+             this, SLOT (bootSequenceChanged()));
     /* Fixing focus order for BootItemsList */
     setTabOrder (tbwGeneral, tblBootOrder);
@@ -830 +853 @@
 
     VBoxGlobal::centerWidget (this, parentWidget());
+
+    mIsBootSettingsChanged = false;
 }
 
@@ -886 +911 @@
 
 
+void VBoxVMSettingsDlg::bootSequenceChanged()
+{
+    mIsBootSettingsChanged = true;
+}
+
+
 void VBoxVMSettingsDlg::hdaMediaChanged()
 {
+    bootSequenceChanged();
     uuidHDA = grbHDA->isChecked() ? cbHDA->getId() : QUuid();
     txHDA->setText (getHdInfo (grbHDA, uuidHDA));
@@ -897 +929 @@
 void VBoxVMSettingsDlg::hdbMediaChanged()
 {
+    bootSequenceChanged();
     uuidHDB = grbHDB->isChecked() ? cbHDB->getId() : QUuid();
     txHDB->setText (getHdInfo (grbHDB, uuidHDB));
@@ -906 +939 @@
 void VBoxVMSettingsDlg::hddMediaChanged()
 {
+    bootSequenceChanged();
     uuidHDD = grbHDD->isChecked() ? cbHDD->getId() : QUuid();
     txHDD->setText (getHdInfo (grbHDD, uuidHDD));
@@ -915 +949 @@
 void VBoxVMSettingsDlg::cdMediaChanged()
 {
+    bootSequenceChanged();
     uuidISODVD = bgDVD->isChecked() ? cbISODVD->getId() : QUuid();
     /* revailidate */
@@ -923 +958 @@
 void VBoxVMSettingsDlg::fdMediaChanged()
 {
+    bootSequenceChanged();
     uuidISOFloppy = bgFloppy->isChecked() ? cbISOFloppy->getId() : QUuid();
     /* revailidate */
@@ -1288 +1324 @@
         grbHDD->setChecked (false);
 
-        /* Creating a clean hd array */
-        for (uint i = 0; i < SIZEOF_ARRAY (diskSet); ++ i)
-            mHDList << QUuid();
-
         CHardDiskAttachmentEnumerator en =
             machine.GetHardDiskAttachments().Enumerate();
@@ -1314 +1346 @@
                     diskSet [i].data.tx->setText (vboxGlobal().details (hd));
                     *(diskSet [i].data.uuid) = QUuid (root.GetId());
-                    mHDList [i] = root.GetId();
                 }
             }
@@ -1339 +1370 @@
 
         CFloppyDrive floppy = machine.GetFloppyDrive();
-        mFDsettings = QString ("%1 %2").arg (floppy.GetState());
         switch (floppy.GetState())
         {
@@ -1361 +1391 @@
                 }
                 rbHostFloppy->setChecked (true);
-                mFDsettings += name;
                 break;
             }
@@ -1372 +1401 @@
                 rbISOFloppy->setChecked (true);
                 uuidISOFloppy = QUuid (img.GetId());
-                mFDsettings += uuidISOFloppy;
                 break;
             }
@@ -1404 +1432 @@
 
         CDVDDrive dvd = machine.GetDVDDrive();
-        mCDsettings = QString ("%1 %2").arg (dvd.GetState());
         switch (dvd.GetState())
         {
@@ -1426 +1453 @@
                 }
                 rbHostDVD->setChecked (true);
-                mCDsettings += name;
                 break;
             }
@@ -1437 +1463 @@
                 rbISODVD->setChecked (true);
                 uuidISODVD = QUuid (img.GetId());
-                mCDsettings += uuidISODVD;
                 break;
             }
@@ -1554 +1579 @@
 COMResult VBoxVMSettingsDlg::putBackToMachine()
 {
-    mIsBootSettingsChanged = false;
-
     CVirtualBox vbox = vboxGlobal().virtualBox();
     CBIOSSettings biosSettings = cmachine.GetBIOSSettings();
@@ -1633 +1656 @@
 
         /* 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())
             {
@@ -1646 +1667 @@
             }
         }
-
-        /* 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())
@@ -1671 +1686 @@
              *  as is
              */
-            curFDsettings = QString ("%1 %2").arg (floppy.GetState())
-                .arg (floppy.GetHostDrive().GetName());
         }
         else if (rbISOFloppy->isChecked())
@@ -1678 +1691 @@
             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())
@@ -1706 +1711 @@
              *  as is
              */
-            curCDsettings = QString ("%1 %2").arg (dvd.GetState())
-                .arg (dvd.GetHostDrive().GetName());
         }
         else if (rbISODVD->isChecked())
@@ -1713 +1716 @@
             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;
+        }
     }
 
@@ -1820 +1817 @@
 void VBoxVMSettingsDlg::showVDImageManager (QUuid *id, VBoxMediaComboBox *cbb, QLabel*)
 {
+    bootSequenceChanged();
+
     VBoxDefs::DiskType type = VBoxDefs::InvalidType;
     if (cbb == cbISODVD)