Changeset 66377 in vbox

Timestamp:

Mar 31, 2017 10:54:32 AM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: Machine settings: Shared Folders page: Folder names should be unique among both folder types, not just among each of them.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine

Files:

• UIMachineSettingsSF.cpp (modified) (1 diff)
• UIMachineSettingsSF.h (modified) (2 diffs)
• UIMachineSettingsSFDetails.cpp (modified) (2 diffs)
• UIMachineSettingsSFDetails.h (modified) (2 diffs)

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

@@ -751 +751 @@
 }
 
-SFoldersNameList UIMachineSettingsSF::usedList(bool fIncludeSelected)
+QStringList UIMachineSettingsSF::usedList(bool fIncludeSelected)
 {
     /* Make the used names list: */
-    SFoldersNameList list;
+    QStringList list;
     QTreeWidgetItemIterator it(mTwFolders);
     while (*it)
     {
         if ((*it)->parent() && (fIncludeSelected || !(*it)->isSelected()))
-        {
-            SFTreeViewItem *pItem = static_cast <SFTreeViewItem*>(*it);
-            UISharedFolderType type = (UISharedFolderType)pItem->parentItem()->text(1).toInt();
-            list << qMakePair(pItem->getText(0), type);
-        }
+            list << static_cast<SFTreeViewItem*>(*it)->getText(0);
         ++it;
     }

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.h

@@ -33 +33 @@
 typedef UISettingsCache<UIDataSettingsSharedFolder> UISettingsCacheSharedFolder;
 typedef UISettingsCachePool<UIDataSettingsSharedFolders, UISettingsCacheSharedFolder> UISettingsCacheSharedFolders;
-typedef QPair<QString, UISharedFolderType> SFolderName;
-typedef QList<SFolderName> SFoldersNameList;
 
 
@@ -121 +119 @@
     /** Returns the tree-view root item for corresponding shared folder @a type. */
     SFTreeViewItem *root(UISharedFolderType type);
-    /** Returns a list of used shared folder names paired with their types. */
-    SFoldersNameList usedList(bool aIncludeSelected);
+    /** Returns a list of used shared folder names. */
+    QStringList usedList(bool fIncludeSelected);
 
     /** Returns whether the corresponding @a sharedFolderType supported. */

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

@@ -33 +33 @@
 UIMachineSettingsSFDetails::UIMachineSettingsSFDetails(DialogType type,
                                                        bool fEnableSelector, /* for "permanent" checkbox */
-                                                       const SFoldersNameList &usedNames,
+                                                       const QStringList &usedNames,
                                                        QWidget *pParent /* = 0 */)
    : QIWithRetranslateUI2<QIDialog>(pParent)
@@ -140 +140 @@
 void UIMachineSettingsSFDetails::sltValidate()
 {
-    UISharedFolderType resultType = m_fUsePermanent && !mCbPermanent->isChecked() ? ConsoleType : MachineType;
-    SFolderName pair = qMakePair(mLeName->text(), resultType);
-
     mButtonBox->button(QDialogButtonBox::Ok)->setEnabled(!mPsPath->path().isEmpty() &&
                                                          QDir(mPsPath->path()).exists() &&
                                                          !mLeName->text().trimmed().isEmpty() &&
                                                          !mLeName->text().contains(" ") &&
-                                                         !m_usedNames.contains (pair));
+                                                         !m_usedNames.contains(mLeName->text()));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSFDetails.h

@@ -41 +41 @@
     UIMachineSettingsSFDetails(DialogType type,
                                bool fEnableSelector, /* for "permanent" checkbox */
-                               const SFoldersNameList &usedNames,
+                               const QStringList &usedNames,
                                QWidget *pParent = 0);
 
@@ -70 +70 @@
 private:
 
-    DialogType       m_type;
-    bool             m_fUsePermanent;
-    SFoldersNameList m_usedNames;
+    DialogType   m_type;
+    bool         m_fUsePermanent;
+    QStringList  m_usedNames;
 };