Changeset 4062 in vbox for trunk

Timestamp:

Aug 7, 2007 1:23:00 PM (17 years ago)

Author:

vboxsync

Message:

Shared Folders improvements/bug fixes:

1. Update only the edited and newly created folders on Shared Folders Dialog accepting.
2. Strict the user to enter only the non-existing (for this group: Global, Machine, Transient) folder's name during the Add&Edit operations. Note: user allowed to enter the same name for the edit operation.
3. Keeps exact order of precedence for the folders groups (Permanent, Transient) in all languages.

Location:

trunk/src/VBox/Frontends/VirtualBox/ui

Files:

• VBoxSharedFoldersSettings.ui (modified) (1 diff)
• VBoxSharedFoldersSettings.ui.h (modified) (16 diffs)

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

@@ -243 +243 @@
     <function access="private">init()</function>
     <function>setDialogType( int )</function>
+    <function returnType="int">dialogType() {return mDialogType;}</function>
     <function access="private">removeSharedFolder( const QString &amp;, const QString &amp;, VBoxSharedFoldersSettings::SFDialogType )</function>
     <function access="private">createSharedFolder( const QString &amp;, const QString &amp;, VBoxSharedFoldersSettings::SFDialogType )</function>

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

@@ -34 +34 @@
 
 
+typedef QPair<QString, VBoxSharedFoldersSettings::SFDialogType> SFolderName;
+typedef QValueList<SFolderName> SFoldersNameList;
+
+
 class VBoxRichListItem : public QListViewItem
 {
@@ -57 +61 @@
 
     VBoxRichListItem (FormatType aFormat, QListViewItem *aParent,
-                      const QString& aName, const QString& aPath) :
-        QListViewItem (aParent, aName, aPath), mFormat (aFormat)
-    {
-        mTextList << aName << aPath;
+                      const QString& aName, const QString& aPath,
+                      const QString& aEdited) :
+        QListViewItem (aParent, aName, aPath, aEdited), mFormat (aFormat)
+    {
+        mTextList << aName << aPath << aEdited;
     }
 
     int rtti() const { return QIRichListItemId; }
+
+    VBoxRichListItem* nextSibling() const
+    {
+        QListViewItem *item = QListViewItem::nextSibling();
+        return item && item->rtti() == QIRichListItemId ?
+            static_cast<VBoxRichListItem*> (item) : 0;
+    }
 
     QString getText (int aIndex)
@@ -156 +168 @@
     enum DialogType { AddDialogType, EditDialogType };
 
-    VBoxAddSFDialog (QWidget *aParent, VBoxAddSFDialog::DialogType aType,
-                     bool aEnableSelector /* for "permanent" checkbox */) :
-        QDialog (aParent, "VBoxAddSFDialog", true /* modal */),
-        mLePath (0), mLeName (0), mCbPermanent (0)
+    VBoxAddSFDialog (VBoxSharedFoldersSettings *aParent,
+                     VBoxAddSFDialog::DialogType aType,
+                     bool aEnableSelector /* for "permanent" checkbox */,
+                     const SFoldersNameList &aUsedNames)
+        : QDialog (aParent, "VBoxAddSFDialog", true /* modal */)
+        , mLePath (0), mLeName (0), mCbPermanent (0)
+        , mUsedNames (aUsedNames)
     {
         switch (aType)
@@ -205 +220 @@
             mCbPermanent->setChecked (true);
             inputLayout->addMultiCellWidget (mCbPermanent, 2, 2, 0, 2);
+            connect (mCbPermanent, SIGNAL (toggled (bool)),
+                     this, SLOT (validate()));
         }
 
         /* Setup Button layout */
         QHBoxLayout *buttonLayout = new QHBoxLayout (mainLayout, 10, "buttonLayout");
-        mBtOk = new QPushButton (tr ("OK"), this, "btOk");
+        mBtOk = new QPushButton (tr ("&OK"), this, "btOk");
         QSpacerItem *spacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
         QPushButton *btCancel = new QPushButton (tr ("Cancel"), this, "btCancel");
@@ -247 +264 @@
     void validate()
     {
-        mBtOk->setEnabled (!mLePath->text().isEmpty() && !mLeName->text().isEmpty());
+        VBoxSharedFoldersSettings::SFDialogType dlgType =
+            (VBoxSharedFoldersSettings::SFDialogType)
+            static_cast<VBoxSharedFoldersSettings*> (parent())->dialogType();
+        VBoxSharedFoldersSettings::SFDialogType resultType =
+            mCbPermanent && !mCbPermanent->isChecked() ?
+            VBoxSharedFoldersSettings::ConsoleType :
+            dlgType & VBoxSharedFoldersSettings::MachineType ?
+            VBoxSharedFoldersSettings::MachineType :
+            VBoxSharedFoldersSettings::GlobalType;
+        SFolderName pair = qMakePair (mLeName->text(), resultType);
+
+        mBtOk->setEnabled (!mLePath->text().isEmpty() &&
+                           !mLeName->text().isEmpty() &&
+                           !mUsedNames.contains (pair));
     }
 
@@ -293 +323 @@
     QLineEdit *mLeName;
     QCheckBox *mCbPermanent;
+    SFoldersNameList mUsedNames;
 };
 
@@ -299 +330 @@
 {
     mDialogType = WrongType;
+    listView->setSorting (-1);
     new QIListViewSelectionPreserver (this, listView);
     listView->setShowToolTips (false);
@@ -442 +474 @@
         CSharedFolder sf = aEn.GetNext();
         new VBoxRichListItem (VBoxRichListItem::EllipsisFile, aRoot,
-                              sf.GetName(), sf.GetHostPath());
+                              sf.GetName(), sf.GetHostPath(), "not edited");
     }
     listView->setOpen (aRoot, true);
@@ -501 +533 @@
     SFDialogType type = (SFDialogType)aRoot->text (2).toInt();
 
-    /* deleting all existing folders if the list */
+    /* deleting all changed folders of the list */
     while (aEn.HasMore())
     {
         CSharedFolder sf = aEn.GetNext();
+
+        /* Search for this root's items */
+        QListViewItem *firstItem = aRoot->firstChild();
+        VBoxRichListItem *item = firstItem &&
+            firstItem->rtti() == VBoxRichListItem::QIRichListItemId ?
+            static_cast<VBoxRichListItem*> (firstItem) : 0;
+        while (item)
+        {
+            if (item->getText (0) == sf.GetName() &&
+                item->getText (1) == sf.GetHostPath() &&
+                item->getText (2) == "not edited")
+                break;
+            item = item->nextSibling();
+        }
+        if (item)
+            continue;
         removeSharedFolder (sf.GetName(), sf.GetHostPath(), type);
     }
@@ -515 +563 @@
         if (iterator->rtti() == VBoxRichListItem::QIRichListItemId)
             item = static_cast<VBoxRichListItem*> (iterator);
-        if (item && !item->getText (0).isNull() && !item->getText (1).isNull())
+        if (item && !item->getText (0).isNull() && !item->getText (1).isNull()
+            && item->getText (2) == "edited")
             createSharedFolder (item->getText (0), item->getText (1), type);
-        else
-            AssertMsgFailed (("Incorrect listview item type\n"));
         iterator = iterator->nextSibling();
     }
@@ -536 +583 @@
 void VBoxSharedFoldersSettings::tbAddPressed()
 {
+    /* Make the used names list: */
+    SFoldersNameList usedList;
+    QListViewItemIterator it (listView);
+    while (*it)
+    {
+        if ((*it)->parent() && (*it)->rtti() == VBoxRichListItem::QIRichListItemId)
+        {
+            VBoxRichListItem *item = static_cast<VBoxRichListItem*> (*it);
+            SFDialogType type = (SFDialogType)item->parent()->text (2).toInt();
+            usedList << qMakePair (item->getText (0), type);
+        }
+        ++ it;
+    }
+
     /* Invoke Add-Box Dialog */
     VBoxAddSFDialog dlg (this, VBoxAddSFDialog::AddDialogType,
-                         mDialogType & ConsoleType);
+                         mDialogType & ConsoleType, usedList);
     if (dlg.exec() != QDialog::Accepted)
         return;
@@ -551 +612 @@
     /* Appending a new listview item to the root */
     VBoxRichListItem *item = new VBoxRichListItem (
-        VBoxRichListItem::EllipsisFile, root, name, path);
+        VBoxRichListItem::EllipsisFile, root, name, path, "edited");
     /* Make the created item selected */
     listView->ensureItemVisible (item);
@@ -563 +624 @@
 void VBoxSharedFoldersSettings::tbEditPressed()
 {
+    /* Make the used names list: */
+    SFoldersNameList usedList;
+    QListViewItemIterator it (listView);
+    while (*it)
+    {
+        if ((*it)->parent() && !(*it)->isSelected() &&
+            (*it)->rtti() == VBoxRichListItem::QIRichListItemId)
+        {
+            VBoxRichListItem *item = static_cast<VBoxRichListItem*> (*it);
+            SFDialogType type = (SFDialogType)item->parent()->text (2).toInt();
+            usedList << qMakePair (item->getText (0), type);
+        }
+        ++ it;
+    }
+
     /* Check selected item */
     QListViewItem *selectedItem = listView->selectedItem();
@@ -572 +648 @@
     /* Invoke Edit-Box Dialog */
     VBoxAddSFDialog dlg (this, VBoxAddSFDialog::EditDialogType,
-                         mDialogType & ConsoleType);
+                         mDialogType & ConsoleType, usedList);
     dlg.setPath (item->getText (1));
     dlg.setName (item->getText (0));
@@ -588 +664 @@
     Assert (root);
     /* Updating an edited listview item */
+    item->updateText (2, "edited");
     item->updateText (1, path);
     item->updateText (0, name);
@@ -653 +730 @@
 bool VBoxSharedFoldersSettings::isEditable (const QString &aKey)
 {
-    /* mDialogType should be sutup already */
+    /* mDialogType should be setup already */
     Assert (mDialogType);
-    /* simple item has no key information */
-    if (aKey.isEmpty())
-        return false;
+
     SFDialogType type = (SFDialogType)aKey.toInt();
-    if (!type)
-        AssertMsgFailed (("Incorrect listview item key value\n"));
+    if (!type) return false;
     return mDialogType & type;
 }