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

Timestamp:

Feb 16, 2007 7:52:29 AM (18 years ago)

Author:

vboxsync

Message:

1758: Implement Shared Folders UI

Shared Folders Dialog now suitable for displaying three types of shared folders – global, machine and console under different root list-views items.

Location:

trunk/src/VBox/Frontends/VirtualBox/ui

Files:

• VBoxSharedFoldersSettings.ui (modified) (2 diffs)
• VBoxSharedFoldersSettings.ui.h (modified) (9 diffs)
• VBoxVMSettingsDlg.ui.h (modified) (1 diff)

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

@@ -183 +183 @@
 </includes>
 <variables>
+    <variable access="public">enum SFDialogType { WrongType = 0, GlobalType = 1, MachineType = 2, ConsoleType = 3 };</variable>
     <variable access="private">bool mIsListViewChanged;</variable>
+    <variable access="private">SFDialogType mDialogType;</variable>
 </variables>
 <slots>
@@ -193 +195 @@
 <functions>
     <function access="private">init()</function>
+    <function>setDialogType( VBoxSharedFoldersSettings::SFDialogType )</function>
+    <function access="private" returnType="bool">isEditable( const QString &amp; )</function>
     <function>getFromGlobal()</function>
     <function>getFromMachine( const CMachine &amp; )</function>
     <function>getFromConsole( const CConsole &amp; )</function>
-    <function access="private">getFrom( const CSharedFolderEnumerator &amp; )</function>
+    <function access="private">getFrom( const CSharedFolderEnumerator &amp;, QListViewItem* )</function>
     <function>putBackToGlobal()</function>
     <function>putBackToMachine( CMachine &amp; )</function>

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

@@ -50 +50 @@
 
     VBoxRichListItem (FormatType aFormat, QListView *aParent,
-                      const QString& aLabel1, const QString& aLabel2) :
-        QListViewItem (aParent, aLabel1, aLabel2), mFormat (aFormat)
-    {
-        mTextList << aLabel1 << aLabel2;
+                      const QString& aName, const QString& aNull,
+                      const QString& aKey) :
+        QListViewItem (aParent, aName, aNull, aKey), mFormat (aFormat)
+    {
+    }
+
+    VBoxRichListItem (FormatType aFormat, QListViewItem *aParent,
+                      const QString& aName, const QString& aPath) :
+        QListViewItem (aParent, aName, aPath), mFormat (aFormat)
+    {
+        mTextList << aName << aPath;
     }
 
@@ -72 +79 @@
     {
         QString oneString = mTextList [aColumn];
+        if (oneString.isEmpty())
+            return;
         int oldSize = listView()->fontMetrics().width (oneString);
         int indentSize = listView()->fontMetrics().width ("...x");
@@ -241 +250 @@
 void VBoxSharedFoldersSettings::init()
 {
+    mDialogType = WrongType;
     new QIListViewSelectionPreserver (this, listView);
     listView->setShowToolTips (false);
@@ -257 +267 @@
 }
 
+void VBoxSharedFoldersSettings::setDialogType (
+     VBoxSharedFoldersSettings::SFDialogType aType)
+{
+    mDialogType = aType;
+}
+
 
 void VBoxSharedFoldersSettings::getFromGlobal()
 {
-    getFrom (vboxGlobal().virtualBox().GetSharedFolders().Enumerate());
+    QString name = tr (" Global Shared Folders");
+    QString key ("1");
+    VBoxRichListItem *root = new VBoxRichListItem (VBoxRichListItem::EllipsisEnd,
+                                                   listView, name, QString::null, key);
+    getFrom (vboxGlobal().virtualBox().GetSharedFolders().Enumerate(), root);
 }
 
 void VBoxSharedFoldersSettings::getFromMachine (const CMachine &aMachine)
 {
-    getFrom (aMachine.GetSharedFolders().Enumerate());
+    QString name = tr (" Machine Shared Folders");
+    QString key ("2");
+    VBoxRichListItem *root = new VBoxRichListItem (VBoxRichListItem::EllipsisEnd,
+                                                   listView, name, QString::null, key);
+    getFrom (aMachine.GetSharedFolders().Enumerate(), root);
 }
 
 void VBoxSharedFoldersSettings::getFromConsole (const CConsole &aConsole)
 {
-    getFrom (aConsole.GetSharedFolders().Enumerate());
-}
-
-void VBoxSharedFoldersSettings::getFrom (const CSharedFolderEnumerator &aEn)
-{
+    QString name = tr (" Transient Shared Folders");
+    QString key ("3");
+    VBoxRichListItem *root = new VBoxRichListItem (VBoxRichListItem::EllipsisEnd,
+                                                   listView, name, QString::null, key);
+    getFrom (aConsole.GetSharedFolders().Enumerate(), root);
+}
+
+void VBoxSharedFoldersSettings::getFrom (const CSharedFolderEnumerator &aEn,
+                                         QListViewItem *aRoot)
+{
+    aRoot->setSelectable (false);
     while (aEn.HasMore())
     {
         CSharedFolder sf = aEn.GetNext();
-        new VBoxRichListItem (VBoxRichListItem::EllipsisFile, listView,
+        new VBoxRichListItem (VBoxRichListItem::EllipsisFile, aRoot,
                               sf.GetName(), sf.GetHostPath());
     }
-    listView->setCurrentItem (listView->firstChild());
-    processCurrentChanged (listView->firstChild());
+    listView->setOpen (aRoot, true);
+    listView->setCurrentItem (aRoot->firstChild());
+    processCurrentChanged (aRoot->firstChild());
 }
 
@@ -311 +342 @@
     else return;
 
-    /* saving all created list view items */
-    QListViewItemIterator it (listView);
-    while (it.current())
+    /* saving all machine related list view items */
+        Assert (mDialogType == 2);
+    QListViewItem *root = listView->findItem (QString::number (mDialogType), 2);
+    Assert (root);
+    QListViewItem *iterator = root->firstChild();
+    while (iterator)
     {
         VBoxRichListItem *item = 0;
-        if (it.current()->rtti() == VBoxRichListItem::QIRichListItemId)
-            item = static_cast<VBoxRichListItem*> (it.current());
+        if (iterator->rtti() == VBoxRichListItem::QIRichListItemId)
+            item = static_cast<VBoxRichListItem*> (iterator);
         if (item)
         {
@@ -328 +362 @@
         else
             AssertMsgFailed (("Incorrect listview item type\n"));
-        ++it;
+        iterator = iterator->nextSibling();
     }
 }
@@ -349 +383 @@
     /* Shared folder's name & path could not be empty */
     Assert (!name.isEmpty() && !path.isEmpty());
-
+    /* Searching root for the new listview item */
+    QListViewItem *root = listView->findItem (QString::number (mDialogType), 2);
+    Assert (root);
+    /* Appending a new listview item to the root */
     VBoxRichListItem *item = new VBoxRichListItem (VBoxRichListItem::EllipsisFile,
-                                                   listView, name, path);
+                                                   root, name, path);
     listView->ensureItemVisible (item);
     listView->setCurrentItem (item);
@@ -375 +412 @@
     QString tip = tr ("<nobr>Name: %1</nobr><br><nobr>Path: %2</nobr>")
                       .arg (item->getText (0)).arg (item->getText (1));
-    QToolTip::add (listView->viewport(), listView->itemRect (aItem), tip);
+    if (!item->getText (0).isEmpty() && !item->getText (1).isEmpty())
+        QToolTip::add (listView->viewport(), listView->itemRect (aItem), tip);
+    else
+        QToolTip::remove (listView->viewport());
 }
 
@@ -382 +422 @@
     if (aItem && listView->selectedItem() != aItem)
         listView->setSelected (aItem, true);
-    tbRemove->setEnabled (!!aItem);
+    bool removeEnabled = aItem && aItem->parent();
+    bool addEnabled = aItem &&
+                      (isEditable (aItem->text (2)) ||
+                       aItem->parent() && isEditable (aItem->parent()->text (2)));
+    tbRemove->setEnabled (removeEnabled);
+    tbAdd->setEnabled (addEnabled);
+}
+
+bool VBoxSharedFoldersSettings::isEditable (const QString &aKey)
+{
+    /* mDialogType should be sutup 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"));
+    return type == mDialogType;
 }
 

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

@@ -490 +490 @@
     QVBoxLayout* pageFoldersLayout = new QVBoxLayout (pageFolders, 0, 10, "pageFoldersLayout");
     mSharedFolders = new VBoxSharedFoldersSettings (pageFolders, "sharedFolders");
+    mSharedFolders->setDialogType (VBoxSharedFoldersSettings::MachineType);
     pageFoldersLayout->addWidget (mSharedFolders);