Changeset 47833 in vbox for trunk/src/VBox

Timestamp:

Aug 19, 2013 8:08:42 AM (11 years ago)

Author:

vboxsync

Message:

pr6905. Fixed the wrong disk's renaming when VM's name is changed by the user.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp

@@ -26 +26 @@
 #include <QSpinBox>
 #include <QComboBox>
+#include <QDir>
 
 /* GUI includes: */
@@ -621 +622 @@
                 /* Query all items with the type HardDiskImage and which
                  * are child's of this item. */
-                QModelIndexList list = pModel->match(c0Index, HardwareItem::TypeRole, KVirtualSystemDescriptionType_HardDiskImage, -1, Qt::MatchExactly | Qt::MatchWrap | Qt::MatchRecursive);
+                QModelIndexList list = pModel->match(c0Index,
+                                                     HardwareItem::TypeRole,
+                                                     KVirtualSystemDescriptionType_HardDiskImage,
+                                                     -1,
+                                                     Qt::MatchExactly | Qt::MatchWrap | Qt::MatchRecursive);
                 for (int i = 0; i < list.count(); ++i)
                 {
@@ -630 +635 @@
                         /* Replace any occurrence of the old VM name with
                          * the new VM name. */
-                        pModel->setData(hdIndex, hdIndex.data(Qt::EditRole).toString().replace(m_strConfigValue, e->text()), Qt::EditRole);
+                    {
+                        QStringList splittedOriginalPath = hdIndex.data(Qt::EditRole).toString().split(QDir::separator());
+                        QStringList splittedNewPath;
+
+                        foreach (QString a, splittedOriginalPath)
+                        {
+                            (a.compare(m_strConfigValue) == 0) ? splittedNewPath << e->text() : splittedNewPath << a;
+                        }
+
+                        QString newPath = splittedNewPath.join(QDir::separator());
+
+                        pModel->setData(hdIndex,
+                                        newPath,
+                                        Qt::EditRole);
+                    }
                 }
                 m_strConfigValue = e->text();