Changeset 548 in vbox for trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui.h

Timestamp:

Feb 2, 2007 1:57:12 PM (18 years ago)

Author:

vboxsync

Message:

FE/Qt: Latest fixes to VDM and media enumeration process (better cooperation between media cobmoboxes, modal and modeless VDMs during the enumeration).

File:

• trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui.h (modified) (8 diffs)

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

@@ -658 +658 @@
 {
     /* setup necessary combobox item */
-    cbHDA->setRequiredItem (uuidHDA);
-    cbHDB->setRequiredItem (uuidHDB);
-    cbHDD->setRequiredItem (uuidHDD);
-    cbISODVD->setRequiredItem (uuidISODVD);
-    cbISOFloppy->setRequiredItem (uuidISOFloppy);
-    /* request for refresh every combo-box */
-    cbHDA->setReadyForRefresh();
-    cbHDB->setReadyForRefresh();
-    cbHDD->setReadyForRefresh();
-    cbISODVD->setReadyForRefresh();
-    cbISOFloppy->setReadyForRefresh();
-    /* starting media-enumerating process */
-    vboxGlobal().startEnumeratingMedia();
+    cbHDA->setCurrentItem (uuidHDA);
+    cbHDB->setCurrentItem (uuidHDB);
+    cbHDD->setCurrentItem (uuidHDD);
+    cbISODVD->setCurrentItem (uuidISODVD);
+    cbISOFloppy->setCurrentItem (uuidISOFloppy);
+    /* check if the enumeration process has been started yet */
+    if (!vboxGlobal().isMediaEnumerationStarted())
+        vboxGlobal().startEnumeratingMedia();
+    else
+    {
+        cbHDA->refresh();
+        cbHDB->refresh();
+        cbHDD->refresh();
+        cbISODVD->refresh();
+        cbISOFloppy->refresh();
+    }
 }
 
@@ -677 +680 @@
 {
     uuidHDA = grbHDA->isChecked() ? cbHDA->getId() : QUuid();
-    cbHDA->setRequiredItem (uuidHDA);
     txHDA->setText (getHdInfo (grbHDA, uuidHDA));
     /* revailidate */
@@ -687 +689 @@
 {
     uuidHDB = grbHDB->isChecked() ? cbHDB->getId() : QUuid();
-    cbHDB->setRequiredItem (uuidHDB);
     txHDB->setText (getHdInfo (grbHDB, uuidHDB));
     /* revailidate */
@@ -697 +698 @@
 {
     uuidHDD = grbHDD->isChecked() ? cbHDD->getId() : QUuid();
-    cbHDD->setRequiredItem (uuidHDD);
     txHDD->setText (getHdInfo (grbHDD, uuidHDD));
     /* revailidate */
@@ -707 +707 @@
 {
     uuidISODVD = bgDVD->isChecked() ? cbISODVD->getId() : QUuid();
-    cbISODVD->setRequiredItem (uuidISODVD);
     /* revailidate */
     wvalDVD->revalidate();
@@ -716 +715 @@
 {
     uuidISOFloppy = bgFloppy->isChecked() ? cbISOFloppy->getId() : QUuid();
-    cbISOFloppy->setRequiredItem (uuidISOFloppy);
     /* revailidate */
     wvalFloppy->revalidate();
@@ -1288 +1286 @@
 
     /* request for media shortcuts update */
-    cbHDA->setBelongsTo(machine.GetId());
-    cbHDB->setBelongsTo(machine.GetId());
-    cbHDD->setBelongsTo(machine.GetId());
+    cbHDA->setBelongsTo (machine.GetId());
+    cbHDB->setBelongsTo (machine.GetId());
+    cbHDD->setBelongsTo (machine.GetId());
     updateShortcuts();
 
@@ -1541 +1539 @@
     QUuid machineId = cmachine.GetId();
     dlg.setup (type, true, &machineId, (const VBoxMediaList*)0, cmachine);
-    if (dlg.exec() == VBoxDiskImageManagerDlg::Accepted)
-        *id = dlg.getSelectedUuid();
-    updateShortcuts();
+    *id = dlg.exec() == VBoxDiskImageManagerDlg::Accepted ?
+        dlg.getSelectedUuid() : cbb->getId();
+    cbb->setCurrentItem (*id);
     cbb->setFocus();
+
+    /* revalidate pages with custom validation */
+    wvalHDD->revalidate();
+    wvalDVD->revalidate();
+    wvalFloppy->revalidate();
 }