Changeset 36922 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

May 3, 2011 7:15:23 AM (14 years ago)

Author:

vboxsync

Message:

FE/Qt: VM Settings / Storage page: Validation updated, its now NOT possible to use already used or empty controller name.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp

@@ -2036 +2036 @@
     QModelIndex rootIndex = mStorageModel->root();
     QMap <QString, QString> config;
+    QMap<int, QString> names;
+    /* For each controller: */
     for (int i = 0; i < mStorageModel->rowCount (rootIndex); ++ i)
     {
         QModelIndex ctrIndex = rootIndex.child (i, 0);
         QString ctrName = mStorageModel->data (ctrIndex, StorageModel::R_CtrName).toString();
+        /* Check for name emptiness: */
+        if (ctrName.isEmpty())
+        {
+            aWarning = tr("no name specified for controller at position <b>%1</b>.").arg(i + 1);
+            return aWarning.isNull();
+        }
+        /* Check for name coincidence: */
+        if (names.values().contains(ctrName))
+        {
+            aWarning = tr("controller at position <b>%1</b> uses the name that is "
+                          "already used by controller at position <b>%2</b>.")
+                          .arg(i + 1).arg(names.key(ctrName) + 1);
+            return aWarning.isNull();
+        }
+        else names.insert(i, ctrName);
+        /* For each attachment: */
         for (int j = 0; j < mStorageModel->rowCount (ctrIndex); ++ j)
         {
@@ -2050 +2068 @@
             if (vboxGlobal().findMedium (key).isNull() && attDevice == KDeviceType_HardDisk)
             {
-                aWarning = tr ("No hard disk is selected for <i>%1</i>.").arg (value);
+                aWarning = tr ("no hard disk is selected for <i>%1</i>.").arg (value);
                 return aWarning.isNull();
             }