Changeset 2930 in vbox

Timestamp:

May 30, 2007 1:32:57 PM (18 years ago)

Author:

vboxsync

Message:

FE/Qt: Fixed USB details alignment; fixed Host DVD drive name representation.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

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

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

@@ -1553 +1553 @@
             case CEnums::HostDriveCaptured:
             {
-                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;
-                }
+                CHostDVDDrive drv = dvd.GetHostDrive();
+                QString drvName = drv.GetName();
+                QString description = drv.GetDescription();
+                QString fullName = description.isEmpty() ?
+                    drvName :
+                    QString ("%1 (%2)").arg (description, drvName);
+                name = tr ("Host Drive ", "DVD-ROM tooltip") +
+                    fullName;
                 break;
             }
             case CEnums::ImageMounted:
+            {
                 name = dvd.GetImage().GetFilePath();
                 break;
+            }
             case CEnums::NotMounted:
+            {
                 name = tr ("not mounted", "DVD-ROM tooltip");
                 break;
+            }
             default:
                 AssertMsgFailed (("Invalid dvd drive state: %d\n", state));
@@ -2198 +2199 @@
         CHostDVDDrive hostDVD = en.GetNext();
         /** @todo set icon */
+        QString drvName = 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
-                );
-        }
+        QString fullName = description.isEmpty() ?
+            drvName :
+            QString ("%1 (%2)").arg (description, drvName);
+        int id = devicesMountDVDMenu->insertItem (
+            tr ("Host Drive ") + fullName);
         hostDVDMap [id] = hostDVD;
         if (machine_state != CEnums::Running)

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

@@ -881 +881 @@
     QString p = aDevice.GetProduct();
     if (m.isEmpty() && p.isEmpty())
-        details +=
+        details =
             tr ("Unknown device %1:%2", "USB device details")
             .arg (QString().sprintf ("%04hX", aDevice.GetVendorId()))
             .arg (QString().sprintf ("%04hX", aDevice.GetProductId()));
     else
-    {
-        if (!m.isEmpty())
-            details += m;
-        if (!p.isEmpty())
-            details += " " + p;
-    }
+        details = m + " " + p;
     ushort r = aDevice.GetRevision();
     if (r != 0)
         details += QString().sprintf (" [%04hX]", r);
 
-    return details;
+    return details.stripWhiteSpace();
 }
 
@@ -1173 +1168 @@
             {
                 CHostDVDDrive drv = dvd.GetHostDrive();
+                QString drvName = drv.GetName();
                 QString description = drv.GetDescription();
-                if (description.isEmpty())
-                {
+                QString fullName = description.isEmpty() ?
+                    drvName :
+                    QString ("%1 (%2)").arg (description, drvName);
                 item = item.arg (tr ("Host Drive", "details report (DVD)"),
-                                 drv.GetName());
-                }
-                else
-                {
-                item = item.arg (tr ("Host Drive", "details report (DVD)"),
-                                 description);
-                }
+                                 fullName);
                 break;
             }

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

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