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

Timestamp:

Apr 17, 2008 12:34:17 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt: Be consistent (use the same spelling in the Details box as in the Hard Disk UI; method order).

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxGlobal.h (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (4 diffs)
• ui/VBoxHardDiskSettings.ui (modified) (1 diff)
• ui/VBoxHardDiskSettings.ui.h (modified) (15 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxGlobal.h

@@ -215 +215 @@
     }
 
-    KStorageBus toStorageBusType (const QString &s) const
-    {
-        QStringVector::const_iterator it =
-            qFind (storageBuses.begin(), storageBuses.end(), s);
-        AssertMsg (it != storageBuses.end(), ("No value for {%s}", s.latin1()));
+    /**
+     * Returns a string representation of the given KStorageBus enum value.
+     * Complementary to #toStorageBusType (const QString &) const.
+     */
+    QString toString (KStorageBus aBus) const
+    {
+        AssertMsg (!storageBuses [aBus].isNull(), ("No text for %d", aBus));
+        return storageBuses [aBus];
+    }
+
+    /**
+     * Returns a KStorageBus enum value corresponding to the given string
+     * representation. Complementary to #toString (KStorageBus) const.
+     */
+    KStorageBus toStorageBusType (const QString &aBus) const
+    {
+        QStringVector::const_iterator it =
+            qFind (storageBuses.begin(), storageBuses.end(), aBus);
+        AssertMsg (it != storageBuses.end(), ("No value for {%s}", aBus.latin1()));
         return KStorageBus (it - storageBuses.begin());
     }
 
-    QString toString (KStorageBus t) const
-    {
-        AssertMsg (!storageBuses [t].isNull(), ("No text for %d", t));
-        return storageBuses [t];
-    }
-
-    LONG toStorageChannelType (KStorageBus t, const QString &c) const;
-    QString toString (KStorageBus t, LONG c) const;
-
-    LONG toStorageDeviceType (KStorageBus t, const QString &c) const;
-    QString toString (KStorageBus t, LONG c, LONG d) const;
+    QString toString (KStorageBus aBus, LONG aChannel) const;
+    LONG toStorageChannel (KStorageBus aBus, const QString &aChannel) const;
+
+    QString toString (KStorageBus aBus, LONG aChannel, LONG aDevice) const;
+    LONG toStorageDevice (KStorageBus aBus, LONG aChannel, const QString &aDevice) const;
+
+    QString toFullString (KStorageBus aBus, LONG aChannel, LONG aDevice) const;
 
     QString toString (KHardDiskType t) const

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

@@ -738 +738 @@
     , deviceTypes (KDeviceType_COUNT)
     , storageBuses (KStorageBus_COUNT)
-    , storageBusDevices (4)
-    , storageBusChannels (3)
+    , storageBusDevices (3)
+    , storageBusChannels (2)
     , diskTypes (KHardDiskType_COUNT)
     , diskStorageTypes (KHardDiskStorageType_COUNT)
@@ -960 +960 @@
 }
 
-LONG VBoxGlobal::toStorageDeviceType (KStorageBus t, const QString &c) const
-{
-    LONG device;
-    switch (t)
+/**
+ * Returns a string representation of the given channel number on the given
+ * storage bus. Complementary to #toStorageChannel (KStorageBus, const
+ * QString &) const.
+ */
+QString VBoxGlobal::toString (KStorageBus aBus, LONG aChannel) const
+{
+    Assert (storageBusChannels.count() == 2);
+    QString channel;
+
+    switch (aBus)
     {
         case KStorageBus_IDE:
         {
+            if (aChannel == 0 || aChannel == 1)
+            {
+                channel = storageBusChannels [aChannel];
+                break;
+            }
+
+            AssertMsgFailedBreakVoid (("Invalid channel %d\n", aChannel));
+        }
+        case KStorageBus_SATA:
+        {
+            AssertMsgBreakVoid (aChannel == 0, ("Invalid channel %d\n", aChannel));
+
+            /* null string since the SATA channel is alwayz zero so far */
+            break;
+        }
+        default:
+            AssertFailedBreakVoid();
+    }
+
+    return channel;
+}
+
+/**
+ * Returns a channel number on the given storage bus corresponding to the given
+ * string representation. Complementary to #toString (KStorageBus, LONG) const.
+ */
+LONG VBoxGlobal::toStorageChannel (KStorageBus aBus, const QString &aChannel) const
+{
+    LONG channel = 0;
+
+    switch (aBus)
+    {
+        case KStorageBus_IDE:
+        {
             QStringVector::const_iterator it =
-                qFind (storageBusDevices.begin(), storageBusDevices.end(), c);
-            AssertMsg (it != storageBusDevices.end(), ("No value for {%s}", c.latin1()));
+                qFind (storageBusChannels.begin(), storageBusChannels.end(),
+                       aChannel);
+            AssertMsgBreakVoid (it != storageBusChannels.end(),
+                                ("No value for {%s}\n", aChannel.latin1()));
+            channel = (LONG) (it - storageBusChannels.begin());
+            break;
+        }
+        case KStorageBus_SATA:
+        {
+            AssertMsgBreakVoid (aChannel.isEmpty(),
+                                ("Invalid channel {%s}\n", aChannel.latin1()));
+            /* always zero so far for SATA */
+            break;
+        }
+        default:
+            AssertFailedBreakVoid();
+    }
+
+    return channel;
+}
+
+/**
+ * Returns a string representation of the given device number of the given
+ * channel on the given storage bus. Complementary to #toStorageDevice
+ * (KStorageBus, LONG, const QString &) const.
+ */
+QString VBoxGlobal::toString (KStorageBus aBus, LONG aChannel, LONG aDevice) const
+{
+    NOREF (aChannel);
+
+    Assert (storageBusDevices.count() == 3);
+    QString device;
+
+    switch (aBus)
+    {
+        case KStorageBus_IDE:
+        {
+            if (aDevice == 0 || aDevice == 1)
+            {
+                device = storageBusDevices [aDevice];
+                break;
+            }
+
+            AssertMsgFailedBreakVoid (("Invalid device %d\n", aDevice));
+        }
+        case KStorageBus_SATA:
+        {
+            device = storageBusDevices [2].arg (aDevice);
+            break;
+        }
+        default:
+            AssertFailedBreakVoid();
+    }
+
+    return device;
+}
+
+/**
+ * Returns a device number of the given channel on the given storage bus
+ * corresponding to the given string representation. Complementary to #toString
+ * (KStorageBus, LONG, LONG) const.
+ */
+LONG VBoxGlobal::toStorageDevice (KStorageBus aBus, LONG aChannel,
+                                  const QString &aDevice) const
+{
+    NOREF (aChannel);
+
+    LONG device = 0;
+
+    switch (aBus)
+    {
+        case KStorageBus_IDE:
+        {
+            QStringVector::const_iterator it =
+                qFind (storageBusDevices.begin(), storageBusDevices.end(),
+                       aDevice);
+            AssertMsg (it != storageBusDevices.end(),
+                       ("No value for {%s}", aDevice.latin1()));
             device = (LONG) (it - storageBusDevices.begin());
             break;
         }
-        default:
-        {
-            device = 0;
-            break;
-        }
-    }
-    return device;
-}
-
-QString VBoxGlobal::toString (KStorageBus t, LONG c, LONG d) const
-{
-    Assert (storageBusDevices.count() == 4);
-    QString dev;
-
-    NOREF(c);
-    switch (t)
-    {
-        case KStorageBus_IDE:
-        {
-            if (d == 0 || d == 1)
+        case KStorageBus_SATA:
+        {
+            /// @todo use regexp to properly extract the %1 text
+            QString tpl = storageBusDevices [2].arg ("");
+            if (aDevice.startsWith (tpl))
             {
-                dev = storageBusDevices [d];
+                device = aDevice.right (aDevice.length() - tpl.length()).toLong();
                 break;
             }
+
+            AssertMsgFailedBreakVoid (("Invalid device {%s}\n", aDevice.latin1()));
+        }
+        default:
+            AssertFailedBreakVoid();
+    }
+
+    return device;
+}
+
+/**
+ * Returns a full string representation of the given device of the given channel
+ * on the given storage bus. Complementary to #toStorageParams (KStorageBus,
+ * LONG, LONG) const.
+ */
+QString VBoxGlobal::toFullString (KStorageBus aBus, LONG aChannel,
+                                  LONG aDevice) const
+{
+    QString device;
+
+    switch (aBus)
+    {
+        case KStorageBus_IDE:
+        {
+            device = QString ("%1 %2 %3")
+                .arg (vboxGlobal().toString (aBus))
+                .arg (vboxGlobal().toString (aBus, aChannel))
+                .arg (vboxGlobal().toString (aBus, aChannel, aDevice));
+            break;
         }
         case KStorageBus_SATA:
         {
-            dev = storageBusDevices [3].arg (d);
+            /* we only have one SATA channel so far which is always zero */
+            device = QString ("%1 %2")
+                .arg (vboxGlobal().toString (aBus))
+                .arg (vboxGlobal().toString (aBus, aChannel, aDevice));
             break;
         }
         default:
-            dev = storageBusDevices [2].arg (d);
-    }
-    return dev;
-}
-
-LONG VBoxGlobal::toStorageChannelType (KStorageBus t, const QString &c) const
-{
-    LONG channel;
-    switch (t)
-    {
-        case KStorageBus_IDE:
-        {
-            QStringVector::const_iterator it =
-                qFind (storageBusChannels.begin(), storageBusChannels.end(), c);
-            AssertMsg (it != storageBusChannels.end(), ("No value for {%s}", c.latin1()));
-            channel = (LONG) (it - storageBusChannels.begin());
-            break;
-        }
-        default:
-        {
-            channel = 0;
-            break;
-        }
-    }
-    return channel;
-}
-
-QString VBoxGlobal::toString (KStorageBus t, LONG c) const
-{
-    Assert (storageBusChannels.count() == 3);
-    QString dev;
-    switch (t)
-    {
-        case KStorageBus_IDE:
-        {
-            if (c == 0 || c == 1)
-            {
-                dev = storageBusChannels [c];
-                break;
-            }
-        }
-        default:
-            dev = storageBusChannels [2].arg (c);
-    }
-    return dev;
+            AssertFailedBreakVoid();
+    }
+
+    return device;
 }
 
@@ -1439 +1532 @@
                 {
                     QString src = root.GetLocation();
+                    KStorageBus bus = hda.GetBus();
+                    LONG channel = hda.GetChannel();
+                    LONG device = hda.GetDevice();
                     hardDisks += QString (sSectionItemTpl)
-                        .arg (QString ("%1 %2")
-                              .arg (toString (hda.GetBus(), hda.GetChannel()))
-                              .arg (toString (hda.GetBus(), hda.GetChannel(),
-                                              hda.GetDevice())))
+                        .arg (toFullString (bus, channel, device))
                         .arg (QString ("%1 [<nobr>%2</nobr>]")
                               .arg (prepareFileNameForHTML (src))
@@ -2344 +2437 @@
         tr ("SATA", "StorageBus");
 
-    Assert (storageBusChannels.count() == 3);
+    Assert (storageBusChannels.count() == 2);
     storageBusChannels [0] =
         tr ("Primary", "StorageBusChannel");
     storageBusChannels [1] =
         tr ("Secondary", "StorageBusChannel");
-    storageBusChannels [2] =
-        tr ("Channel&nbsp;%1", "StorageBusChannel");
-
-    Assert (storageBusDevices.count() == 4);
+
+    Assert (storageBusDevices.count() == 3);
     storageBusDevices [0] = tr ("Master", "StorageBusDevice");
     storageBusDevices [1] = tr ("Slave", "StorageBusDevice");
-    storageBusDevices [2] = tr ("Device&nbsp;%1", "StorageBusDevice");
-    storageBusDevices [3] = tr ("Port %1", "StorageBusDevice");
+    storageBusDevices [2] = tr ("Port %1", "StorageBusDevice");
 
     diskTypes [KHardDiskType_Normal] =

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxHardDiskSettings.ui

@@ -1 +1 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>VBoxHardDiskSettings</class>
+<comment>
+:mode=html:tabSize=4:indentSize=4:noTabs=true:
+:folding=explicit:collapseFolds=1:
+
+VBox GUI: Hard Disk Settings UI (Qt Designer).
+
+     Copyright (C) 2008 innotek GmbH
+
+     This file is part of VirtualBox Open Source Edition (OSE), as
+     available from http://www.virtualbox.org. This file is free software;
+     you can redistribute it and/or modify it under the terms of the GNU
+     General Public License (GPL) as published by the Free Software
+     Foundation, in version 2 as it comes in the "COPYING" file of the
+     VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+     hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+</comment>
 <widget class="QWidget">
     <property name="name">

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2007 innotek GmbH
+ * Copyright (C) 2008 innotek GmbH
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -28 +28 @@
 class HDSlotItem;
 
+/** Combines the string and the numeric representation of the hard disk slot. */
+struct HDSlot
+{
+    HDSlot() : bus (KStorageBus_Null), channel (0), device (0) {}
+    HDSlot (const QString &aStr, KStorageBus aBus, LONG aChannel, LONG aDevice)
+        : str (aStr), bus (aBus), channel (aChannel), device (aDevice) {}
+
+    QString str;
+    KStorageBus bus;
+    LONG channel;
+    LONG device;
+};
+
 /**
  *  QObject class reimplementation to use for making selected IDE & SATA
@@ -47 +60 @@
     }
 
-    QStringList list (HDSlotItem *aForSubscriber);
+    QValueList <HDSlot> list (HDSlotItem *aForSubscriber);
 
     int totalCount() { return mIDEList.size() + mSATAList.size(); }
@@ -95 +108 @@
     void makeIDEList()
     {
-        QString device ("%1 %2 %3");
-
         mIDEList.clear();
 
         /* IDE Primary Master */
-        mIDEList << device.arg (vboxGlobal().toString (KStorageBus_IDE))
-                          .arg (vboxGlobal().toString (KStorageBus_IDE, 0))
-                          .arg (vboxGlobal().toString (KStorageBus_IDE, 0, 0));
-
+        mIDEList << HDSlot (vboxGlobal().toFullString (KStorageBus_IDE, 0, 0),
+                            KStorageBus_IDE, 0, 0);
         /* IDE Primary Slave */
-        mIDEList << device.arg (vboxGlobal().toString (KStorageBus_IDE))
-                          .arg (vboxGlobal().toString (KStorageBus_IDE, 0))
-                          .arg (vboxGlobal().toString (KStorageBus_IDE, 0, 1));
-
+        mIDEList << HDSlot (vboxGlobal().toFullString (KStorageBus_IDE, 0, 1),
+                            KStorageBus_IDE, 0, 1);
         /* IDE Secondary Slave */
-        mIDEList << device.arg (vboxGlobal().toString (KStorageBus_IDE))
-                          .arg (vboxGlobal().toString (KStorageBus_IDE, 1))
-                          .arg (vboxGlobal().toString (KStorageBus_IDE, 1, 1));
+        mIDEList << HDSlot (vboxGlobal().toFullString (KStorageBus_IDE, 1, 1),
+                            KStorageBus_IDE, 1, 1);
 
         emit listChanged();
@@ -119 +125 @@
     void makeSATAList()
     {
-        QString device ("%1 %2");
-
         mSATAList.clear();
 
         for (int i = 0; i < mSataPortsCount; ++ i)
-            mSATAList << device.arg (vboxGlobal().toString (KStorageBus_SATA))
-                               .arg (vboxGlobal().toString (KStorageBus_SATA, 0, i));
+            mSATAList << HDSlot (vboxGlobal().toFullString (KStorageBus_SATA, 0, i),
+                                 KStorageBus_SATA, 0, i);
 
         emit listChanged();
@@ -131 +135 @@
 
     int mSataPortsCount;
-    QStringList mIDEList;
-    QStringList mSATAList;
+    QValueList <HDSlot> mIDEList;
+    QValueList <HDSlot> mSATAList;
     QPtrVector<HDSlotItem> mSubscribersList;
 };
@@ -166 +170 @@
     }
 
+    KStorageBus currentBus() const
+    {
+        AssertReturn (currentItem() >= 0 && (size_t) currentItem() < mHDSlots.size(),
+                      KStorageBus_Null);
+        return mHDSlots [currentItem()].bus;
+    }
+
+    LONG currentChannel() const
+    {
+        AssertReturn (currentItem() >= 0 && (size_t) currentItem() < mHDSlots.size(),
+                      0);
+        return mHDSlots [currentItem()].channel;
+    }
+
+    LONG currentDevice() const
+    {
+        AssertReturn (currentItem() >= 0 && (size_t) currentItem() < mHDSlots.size(),
+                      0);
+        return mHDSlots [currentItem()].device;
+    }
+
 private slots:
 
     void refresh()
     {
-        QString currentItem = currentText();
-        QStringList newList (mUniq->list (this));
+        QString current = currentText();
+        mHDSlots = mUniq->list (this);
         clear();
-        insertStringList (newList);
-        if (newList.contains (currentItem))
-            setCurrentText (currentItem);
+
+        bool setCurrent = false;
+
+        for (QValueList <HDSlot>::const_iterator it = mHDSlots.begin();
+             it != mHDSlots.end(); ++ it)
+        {
+            insertItem ((*it).str);
+            if (!setCurrent)
+                setCurrent = (*it).str == current;
+        }
+
+        if (setCurrent)
+            setCurrentText (current);
     }
 
@@ -192 +227 @@
 
     HDSlotUniquizer *mUniq;
+
+    QValueList <HDSlot> mHDSlots;
 };
 
@@ -222 +259 @@
 };
 
-QStringList HDSlotUniquizer::list (HDSlotItem *aSubscriber)
-{
-    QStringList list = mIDEList + mSATAList;
+QValueList <HDSlot> HDSlotUniquizer::list (HDSlotItem *aSubscriber)
+{
+    QValueList <HDSlot> list = mIDEList + mSATAList;
 
     /* Compose exclude list */
@@ -233 +270 @@
 
     /* Filter the list */
-    QStringList::Iterator it = list.begin();
+    QValueList <HDSlot>::Iterator it = list.begin();
     while (it != list.end())
     {
-        if (excludeList.contains (*it))
+        if (excludeList.contains ((*it).str))
             it = list.remove (it);
         else
@@ -293 +330 @@
     }
 
-    KStorageBus getBus() const
-    {
-        QStringList list = QStringList::split (' ', text (0));
-        return vboxGlobal().toStorageBusType (list [0]);
-    }
-
-    LONG getChannel() const
-    {
-        QStringList list = QStringList::split (' ', text (0));
-        return vboxGlobal().toStorageChannelType (getBus(), list [1]);
-    }
-
-    LONG getDevice() const
-    {
-        QStringList list = QStringList::split (' ', text (0));
-        switch (getBus())
-        {
-            case KStorageBus_IDE:
-            {
-                return vboxGlobal()
-                    .toStorageDeviceType (KStorageBus_IDE, list [2]);
-            }
-            default:
-            {
-                return list [2].toLong();
-            }
-        }
+    KStorageBus bus() const
+    {
+        return static_cast <HDSlotItem *> (mVector [0])->currentBus();
+    }
+
+    LONG channel() const
+    {
+        return static_cast <HDSlotItem *> (mVector [0])->currentChannel();
+    }
+
+    LONG device() const
+    {
+        return static_cast <HDSlotItem *> (mVector [0])->currentDevice();
     }
 
@@ -349 +372 @@
     void setAttachment (const CHardDiskAttachment &aHda)
     {
-        QString device;
-        switch (aHda.GetBus())
-        {
-            case KStorageBus_IDE:
-            {
-                device = QString ("%1 %2 %3")
-                    .arg (vboxGlobal().toString (KStorageBus_IDE))
-                    .arg (vboxGlobal().toString (KStorageBus_IDE,
-                                                 aHda.GetChannel()))
-                    .arg (vboxGlobal().toString (KStorageBus_IDE,
-                                                 aHda.GetChannel(),
-                                                 aHda.GetDevice()));
-                break;
-            }
-            case KStorageBus_SATA:
-            {
-                device = QString ("%1 %2")
-                    .arg (vboxGlobal().toString (KStorageBus_SATA))
-                    .arg (vboxGlobal().toString (KStorageBus_SATA,
-                                                 0, aHda.GetDevice()));
-                break;
-            }
-            default:
-                break;
-        }
+        QString device = vboxGlobal()
+            .toFullString (aHda.GetBus(), aHda.GetChannel(), aHda.GetDevice());
 
         if (mVector [0]->listBox()->findItem (device, Qt::ExactMatch))
             mVector [0]->setCurrentText (device);
+
         static_cast<VBoxMediaComboBox*> (mVector [1])->
             setCurrentItem (aHda.GetHardDisk().GetId());
+
         mVector [0]->setHidden (true);
         mVector [1]->setHidden (true);
@@ -547 +549 @@
     {
         mMachine.AttachHardDisk (item->getId(),
-            item->getBus(), item->getChannel(), item->getDevice());
+            item->bus(), item->channel(), item->device());
         if (!mMachine.isOk())
             vboxProblem().cannotAttachHardDisk (this, mMachine, item->getId(),
-                item->getBus(), item->getChannel(), item->getDevice());
+                item->bus(), item->channel(), item->device());
         item = item->nextSibling();
     }
@@ -658 +660 @@
         while (sataItem)
         {
-            if (sataItem->getBus() == KStorageBus_SATA)
+            if (sataItem->bus() == KStorageBus_SATA)
                 break;
             sataItem = sataItem->nextSibling();
@@ -684 +686 @@
                     HDListItem *curIt = it;
                     it = it->nextSibling();
-                    if (curIt->getBus() == KStorageBus_SATA)
+                    if (curIt->bus() == KStorageBus_SATA)
                     {
                         if (curIt == mLvHD->currentItem())