Changeset 2917 in vbox for trunk/src/VBox/Frontends/VirtualBox/ui

Timestamp:

May 29, 2007 2:17:19 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

21590

Message:

Updated the host DVD code on Linux to use hal for device detection

File:

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

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

@@ -1426 +1426 @@
             CHostDVDDrive hostDVD = en.GetNext();
             /// @todo (r=dmik) set icon?
-            cbHostDVD->insertItem (hostDVD.GetName(), id);
+            QString description = hostDVD.GetDescription();
+            if (description.isEmpty())
+            {
+                cbHostDVD->insertItem (hostDVD.GetName(), id);
+            }
+            else
+            {
+                cbHostDVD->insertItem (description, id);
+            }
             hostDVDs [id] = hostDVD;
             ++ id;
@@ -1438 +1446 @@
                 CHostDVDDrive drv = dvd.GetHostDrive();
                 QString name = drv.GetName();
+                QString description = drv.GetDescription();
                 if (coll.FindByName (name).isNull())
                 {
@@ -1444 +1453 @@
                      *  add it to the end of the list with a special mark
                      */
-                    cbHostDVD->insertItem ("* " + name);
+                    if (description.isEmpty())
+                    {
+                        cbHostDVD->insertItem ("* " + name);
+                    }
+                    else
+                    {
+                        cbHostDVD->insertItem ("* " + description);
+                    }
                     cbHostDVD->setCurrentItem (cbHostDVD->count() - 1);
                 }
@@ -1450 +1466 @@
                 {
                     /* this will select the correct item from the prepared list */
-                    cbHostDVD->setCurrentText (name);
+                    if (description.isEmpty())
+                    {
+                        cbHostDVD->setCurrentText (name);
+                    }
+                    else
+                    {
+                        cbHostDVD->setCurrentText (description);
+                    }
                 }
                 rbHostDVD->setChecked (true);