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

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• src/VBoxConsoleWnd.cpp (modified) (2 diffs)
• src/VBoxGlobal.cpp (modified) (1 diff)
• ui/VBoxVMSettingsDlg.ui.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -1552 +1552 @@
         {
             case CEnums::HostDriveCaptured:
-                name = tr ("Host Drive ", "DVD-ROM tooltip") +
-                    dvd.GetHostDrive().GetName();
+            {
+                QString description = dvd.GetHostDrive().GetDescription();
+                if (description.isEmpty())
+                {
+                    name = tr ("Host Drive ", "DVD-ROM tooltip") +
+                        dvd.GetHostDrive().GetName();
+                }
+                else
+                {
+                    name = tr ("Host Drive ", "DVD-ROM tooltip") +
+                        description;
+                }
                 break;
+            }
             case CEnums::ImageMounted:
                 name = dvd.GetImage().GetFilePath();
@@ -2187 +2198 @@
         CHostDVDDrive hostDVD = en.GetNext();
         /** @todo set icon */
-        int id = devicesMountDVDMenu->insertItem (
-            tr ("Host Drive ") + hostDVD.GetName()
-        );
+        QString description = hostDVD.GetDescription();
+        int id;
+        if (description.isEmpty())
+        {
+            id = devicesMountDVDMenu->insertItem (
+                tr ("Host Drive ") + hostDVD.GetName()
+                );
+        }
+        else
+        {
+            id = devicesMountDVDMenu->insertItem (
+                tr ("Host Drive ") + description
+                );
+        }
         hostDVDMap [id] = hostDVD;
         if (machine_state != CEnums::Running)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -1173 +1173 @@
             {
                 CHostDVDDrive drv = dvd.GetHostDrive();
+                QString description = drv.GetDescription();
+                if (description.isEmpty())
+                {
                 item = item.arg (tr ("Host Drive", "details report (DVD)"),
                                  drv.GetName());
+                }
+                else
+                {
+                item = item.arg (tr ("Host Drive", "details report (DVD)"),
+                                 description);
+                }
                 break;
             }

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);