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

Timestamp:

Feb 16, 2007 2:23:21 PM (18 years ago)

Author:

vboxsync

Message:

1758: Implement Shared Folders UI

Shared Folders List Dialog now can be invoked from working console menu. This dialog shows the list of Shared Folders available for current VM/Console and allows add/remove transient shared folders.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxConsoleWnd.h (modified) (5 diffs)
• src/VBoxConsoleWnd.cpp (modified) (9 diffs)
• ui/VBoxSharedFoldersSettings.ui (modified) (3 diffs)
• ui/VBoxSharedFoldersSettings.ui.h (modified) (5 diffs)
• ui/VBoxVMSettingsDlg.ui.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleWnd.h

@@ -31 +31 @@
 #include <qobjectlist.h>
 #include <qcolor.h>
+#include <qdialog.h>
 
 #ifdef VBOX_WITH_DEBUGGER_GUI
@@ -126 +127 @@
     void devicesUnmountDVD();
     void devicesSwitchVrdp (bool);
+    void devicesToggleSFDialog (bool);
     void devicesInstallGuestAdditions();
 
@@ -178 +180 @@
     QAction *devicesUnmountDVDAction;
     QAction *devicesSwitchVrdpAction;
+    QAction *devicesSFDialogAction;
     QAction *devicesInstallGuestToolsAction;
 
@@ -200 +203 @@
     int devicesUSBMenuSeparatorId;
     int devicesVRDPMenuSeparatorId;
+    int devicesSFMenuSeparatorId;
 
 #ifdef VBOX_WITH_DEBUGGER_GUI
@@ -258 +262 @@
 };
 
+
+class VBoxSharedFoldersSettings;
+class VBoxSFDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+
+    VBoxSFDialog (QWidget*, CSession&, QAction*);
+    ~VBoxSFDialog();
+
+protected slots:
+
+    virtual void accept();
+    virtual void suicide (bool);
+
+protected:
+
+    void showEvent (QShowEvent*);
+
+private:
+
+    VBoxSharedFoldersSettings *mSettings;
+    CSession &mSession;
+    QAction *mAction;
+};
+
+
 #endif // __VBoxConsoleWnd_h__

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -31 +31 @@
 #include "VBoxTakeSnapshotDlg.h"
 #include "VBoxDiskImageManagerDlg.h"
+#include "VBoxSharedFoldersSettings.h"
 #include "QIStateIndicator.h"
 #include "QIStatusBar.h"
@@ -46 +47 @@
 #include <qtooltip.h>
 #include <qdir.h>
+#include <qpushbutton.h>
 
 #include <qeventloop.h>
@@ -245 +247 @@
     devicesSwitchVrdpAction->setToggleAction (true);
 
+    devicesSFDialogAction = new QAction (runningActions, "devicesSFDialogAction");
+    devicesSFDialogAction->setToggleAction (true);
+    devicesSFDialogAction->setIconSet (VBoxGlobal::iconSet ("select_file_16px.png",
+                                                                 "select_file_dis_16px.png"));
+
     devicesInstallGuestToolsAction = new QAction (runningActions, "devicesInstallGuestToolsAction");
     devicesInstallGuestToolsAction->setIconSet (VBoxGlobal::iconSet ("guesttools_16px.png",
@@ -328 +335 @@
     devicesSwitchVrdpAction->addTo (devicesMenu);
     devicesVRDPMenuSeparatorId = devicesMenu->insertSeparator();
+    devicesSFDialogAction->addTo (devicesMenu);
+    devicesSFMenuSeparatorId = devicesMenu->insertSeparator();
     devicesInstallGuestToolsAction->addTo (devicesMenu);
     menuBar()->insertItem (QString::null, devicesMenu, devicesMenuId);
@@ -456 +465 @@
     connect (devicesUnmountDVDAction, SIGNAL(activated()), this, SLOT(devicesUnmountDVD()));
     connect (devicesSwitchVrdpAction, SIGNAL(toggled (bool)), this, SLOT(devicesSwitchVrdp (bool)));
+    connect (devicesSFDialogAction, SIGNAL(toggled (bool)), this, SLOT(devicesToggleSFDialog (bool)));
     connect (devicesInstallGuestToolsAction, SIGNAL(activated()), this, SLOT(devicesInstallGuestAdditions()));
 
@@ -643 +653 @@
         devicesMenu->setItemVisible (devicesVRDPMenuSeparatorId, false);
         vrdp_state->setHidden (true);
+    }
+
+    /* initialize shared folders stuff */
+    CSharedFolderCollection sfcoll = cconsole.GetSharedFolders();
+    if (sfcoll.isNull())
+    {
+        /* hide shared folders menu action & sf_separator & sf_status_icon */
+        devicesSFDialogAction->setVisible (false);
+        devicesMenu->setItemVisible (devicesSFMenuSeparatorId, false);
+        //vrdp_state->setHidden (true);
     }
 
@@ -1167 +1187 @@
         tr ("Enable or disable remote desktop (RDP) connections to this machine"));
 
+    devicesSFDialogAction->setMenuText (tr ("&Shared Folders List"));
+    devicesSFDialogAction->setStatusTip (
+        tr ("Open Shared Folders List"));
+
     devicesInstallGuestToolsAction->setMenuText (tr ("&Install Guest Additions..."));
     devicesInstallGuestToolsAction->setStatusTip (
@@ -1762 +1786 @@
 }
 
+void VBoxConsoleWnd::devicesToggleSFDialog (bool aOn)
+{
+    if (!console) return;
+
+    if (aOn)
+        (new VBoxSFDialog (console, csession, devicesSFDialogAction))->show();
+}
+
 void VBoxConsoleWnd::devicesInstallGuestAdditions()
 {
@@ -2254 +2286 @@
 
 #endif
+
+VBoxSFDialog::VBoxSFDialog (QWidget  *aParent, CSession &aSession, QAction *aAction)
+    : QDialog (aParent, "VBoxSFDialog", false /* modal */,
+               WStyle_Customize | WStyle_Title | WStyle_SysMenu |
+               WStyle_MinMax | WDestructiveClose)
+    , mSettings (0), mSession (aSession), mAction (aAction)
+{
+    /* Setup Dialog's title */
+    setCaption (tr ("Shared Folders List"));
+    setIcon (QPixmap::fromMimeSource ("select_file_16px.png"));
+
+    /* Setup main dialog's layout */
+    QVBoxLayout *mainLayout = new QVBoxLayout (this, 10, 10, "mainLayout");
+
+    /* Setup settings layout */
+    mSettings = new VBoxSharedFoldersSettings (this, "mSettings");
+    mSettings->setDialogType (VBoxSharedFoldersSettings::ConsoleType);
+    mSettings->getFromMachine (aSession.GetMachine());
+    mSettings->getFromConsole (aSession.GetConsole());
+    mainLayout->addWidget (mSettings);
+
+    /* Setup button's layout */
+    QHBoxLayout *buttonLayout = new QHBoxLayout (mainLayout, 10, "buttonLayout");
+    QPushButton *pbOk = new QPushButton ("OK", this, "pbOk");
+    QSpacerItem *spacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
+    QPushButton *pbCancel = new QPushButton ("Cancel", this, "pbCancel");
+    connect (pbOk, SIGNAL (clicked()), this, SLOT (accept()));
+    connect (pbCancel, SIGNAL (clicked()), this, SLOT (reject()));
+    buttonLayout->addWidget (pbOk);
+    buttonLayout->addItem (spacer);
+    buttonLayout->addWidget (pbCancel);
+
+    /* Setup destruction handler */
+    connect (mAction, SIGNAL (toggled (bool)), this, SLOT (suicide (bool)));
+}
+
+VBoxSFDialog::~VBoxSFDialog()
+{
+    mAction->setOn (false);
+}
+
+void VBoxSFDialog::accept()
+{
+    mSettings->putBackToConsole();
+    QDialog::accept();
+}
+
+void VBoxSFDialog::suicide (bool aNo)
+{
+    if (!aNo) close();
+}
+
+void VBoxSFDialog::showEvent (QShowEvent *aEvent)
+{
+    QDialog::showEvent (aEvent);
+    setMinimumWidth (400);
+    VBoxGlobal::centerWidget (this, parentWidget());
+}
+

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

@@ -186 +186 @@
     <variable access="private">bool mIsListViewChanged;</variable>
     <variable access="private">SFDialogType mDialogType;</variable>
+    <variable access="private">CMachine mMachine;</variable>
+    <variable access="private">CConsole mConsole;</variable>
 </variables>
 <slots>
@@ -196 +198 @@
     <function access="private">init()</function>
     <function>setDialogType( VBoxSharedFoldersSettings::SFDialogType )</function>
-    <function access="private" returnType="bool">isEditable( const QString &amp; )</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>
     <function>getFromGlobal()</function>
     <function>getFromMachine( const CMachine &amp; )</function>
@@ -202 +205 @@
     <function access="private">getFrom( const CSharedFolderEnumerator &amp;, QListViewItem* )</function>
     <function>putBackToGlobal()</function>
-    <function>putBackToMachine( CMachine &amp; )</function>
-    <function>putBackToConsole( CConsole &amp; )</function>
+    <function>putBackToMachine()</function>
+    <function>putBackToConsole()</function>
+    <function access="private">putBackTo( CSharedFolderEnumerator &amp;, QListViewItem* )</function>
+    <function access="private" returnType="bool">isEditable( const QString &amp; )</function>
 </functions>
 <pixmapinproject/>

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

@@ -274 +274 @@
 
 
+void VBoxSharedFoldersSettings::removeSharedFolder (const QString & aName,
+                                                    const QString & aPath,
+                                                    SFDialogType aType)
+{
+    switch (aType)
+    {
+        case GlobalType:
+        {
+            /* This feature is not implemented yet */
+            AssertMsgFailed (("Global shared folders are not implemented yet\n"));
+            break;
+        }
+        case MachineType:
+        {
+            Assert (!mMachine.isNull());
+            mMachine.RemoveSharedFolder (aName);
+            if (!mMachine.isOk())
+                vboxProblem().cannotRemoveSharedFolder (this, mMachine,
+                                                        aName, aPath);
+            break;
+        }
+        case ConsoleType:
+        {
+            Assert (!mConsole.isNull());
+            mConsole.RemoveSharedFolder (aName);
+            if (!mConsole.isOk())
+                vboxProblem().cannotRemoveSharedFolder (this, mConsole.GetMachine(),
+                                                        aName, aPath);
+            break;
+        }
+        default:
+        {
+            AssertMsgFailed (("Incorrect shared folder type\n"));
+        }
+    }
+}
+
+void VBoxSharedFoldersSettings::createSharedFolder (const QString & aName,
+                                                    const QString & aPath,
+                                                    SFDialogType aType)
+{
+    switch (aType)
+    {
+        case GlobalType:
+        {
+            /* This feature is not implemented yet */
+            AssertMsgFailed (("Global shared folders are not implemented yet\n"));
+            break;
+        }
+        case MachineType:
+        {
+            Assert (!mMachine.isNull());
+            mMachine.CreateSharedFolder (aName, aPath);
+            if (!mMachine.isOk())
+                vboxProblem().cannotCreateSharedFolder (this, mMachine,
+                                                        aName, aPath);
+            break;
+        }
+        case ConsoleType:
+        {
+            Assert (!mConsole.isNull());
+            mConsole.CreateSharedFolder (aName, aPath);
+            if (!mConsole.isOk())
+                vboxProblem().cannotCreateSharedFolder (this, mConsole.GetMachine(),
+                                                        aName, aPath);
+            break;
+        }
+        default:
+        {
+            AssertMsgFailed (("Incorrect shared folder type\n"));
+        }
+    }
+}
+
+
 void VBoxSharedFoldersSettings::getFromGlobal()
 {
+    /* This feature is not implemented yet */
+    AssertMsgFailed (("Global shared folders are not implemented yet\n"));
+
+    /*
     QString name = tr (" Global Shared Folders");
-    QString key ("1");
+    QString key (QString::number (GlobalType));
     VBoxRichListItem *root = new VBoxRichListItem (VBoxRichListItem::EllipsisEnd,
                                                    listView, name, QString::null, key);
     getFrom (vboxGlobal().virtualBox().GetSharedFolders().Enumerate(), root);
+    */
 }
 
 void VBoxSharedFoldersSettings::getFromMachine (const CMachine &aMachine)
 {
+    mMachine = aMachine;
     QString name = tr (" Machine Shared Folders");
-    QString key ("2");
+    QString key (QString::number (MachineType));
     VBoxRichListItem *root = new VBoxRichListItem (VBoxRichListItem::EllipsisEnd,
                                                    listView, name, QString::null, key);
-    getFrom (aMachine.GetSharedFolders().Enumerate(), root);
+    getFrom (mMachine.GetSharedFolders().Enumerate(), root);
 }
 
 void VBoxSharedFoldersSettings::getFromConsole (const CConsole &aConsole)
 {
+    mConsole = aConsole;
     QString name = tr (" Transient Shared Folders");
-    QString key ("3");
+    QString key (QString::number (ConsoleType));
     VBoxRichListItem *root = new VBoxRichListItem (VBoxRichListItem::EllipsisEnd,
                                                    listView, name, QString::null, key);
-    getFrom (aConsole.GetSharedFolders().Enumerate(), root);
+    getFrom (mConsole.GetSharedFolders().Enumerate(), root);
 }
 
@@ -312 +394 @@
     }
     listView->setOpen (aRoot, true);
-    listView->setCurrentItem (aRoot->firstChild());
-    processCurrentChanged (aRoot->firstChild());
+    listView->setCurrentItem (aRoot);
+    processCurrentChanged (aRoot);
 }
 
@@ -321 +403 @@
     /* This feature is not implemented yet */
     AssertMsgFailed (("Global shared folders are not implemented yet\n"));
-}
-
-void VBoxSharedFoldersSettings::putBackToMachine (CMachine &aMachine)
-{
-    /* first deleting all existing folders if the list is changed */
-    if (mIsListViewChanged)
-    {
-        CSharedFolderEnumerator en = aMachine.GetSharedFolders().Enumerate();
-        while (en.HasMore())
-        {
-            CSharedFolder sf = en.GetNext();
-            const QString &name = sf.GetName();
-            const QString &path = sf.GetHostPath();
-            aMachine.RemoveSharedFolder (name);
-            if (!aMachine.isOk())
-                vboxProblem().cannotRemoveSharedFolder (this, aMachine,
-                                                        name, path);
-        }
-    }
-    else return;
+
+    /*
+    if (!mIsListViewChanged) return;
+    // This function is only available for GlobalType dialog
+    Assert (mDialogType == GlobalType);
+    // Searching for GlobalType item's root
+    QListViewItem *root = listView->findItem (QString::number (GlobalType), 2);
+    Assert (root);
+    CSharedFolderEnumerator en = vboxGlobal().virtualBox().GetSharedFolders().Enumerate();
+    putBackTo (en, root);
+    */
+}
+
+void VBoxSharedFoldersSettings::putBackToMachine()
+{
+    if (!mIsListViewChanged)
+        return;
+
+    /* This function is only available for MachineType dialog */
+    Assert (mDialogType == MachineType);
+    /* Searching for MachineType item's root */
+    QListViewItem *root = listView->findItem (QString::number (MachineType), 2);
+    Assert (root);
+    CSharedFolderEnumerator en = mMachine.GetSharedFolders().Enumerate();
+    putBackTo (en, root);
+}
+
+void VBoxSharedFoldersSettings::putBackToConsole()
+{
+    if (!mIsListViewChanged)
+        return;
+
+    /* This function is only available for ConsoleType dialog */
+    Assert (mDialogType == ConsoleType);
+    /* Searching for ConsoleType item's root */
+    QListViewItem *root = listView->findItem (QString::number (ConsoleType), 2);
+    Assert (root);
+    CSharedFolderEnumerator en = mConsole.GetSharedFolders().Enumerate();
+    putBackTo (en, root);
+}
+
+void VBoxSharedFoldersSettings::putBackTo (CSharedFolderEnumerator &aEn,
+                                           QListViewItem *aRoot)
+{
+    SFDialogType type = (SFDialogType)aRoot->text (2).toInt();
+    Assert (type);
+
+    /* deleting all existing folders if the list */
+    while (aEn.HasMore())
+    {
+        CSharedFolder sf = aEn.GetNext();
+        removeSharedFolder (sf.GetName(), sf.GetHostPath(), type);
+    }
 
     /* saving all machine related list view items */
-        Assert (mDialogType == 2);
-    QListViewItem *root = listView->findItem (QString::number (mDialogType), 2);
-    Assert (root);
-    QListViewItem *iterator = root->firstChild();
+    QListViewItem *iterator = aRoot->firstChild();
     while (iterator)
     {
@@ -353 +465 @@
             item = static_cast<VBoxRichListItem*> (iterator);
         if (item)
-        {
-            aMachine.CreateSharedFolder (item->getText (0), item->getText (1));
-            if (!aMachine.isOk())
-                vboxProblem().cannotCreateSharedFolder (this, aMachine,
-                                                        item->getText (0),
-                                                        item->getText (1));
-        }
+            createSharedFolder (item->getText (0), item->getText (1), type);
         else
             AssertMsgFailed (("Incorrect listview item type\n"));
         iterator = iterator->nextSibling();
     }
-}
-
-void VBoxSharedFoldersSettings::putBackToConsole (CConsole &/*aConsole*/)
-{
-    /* This feature is not implemented yet */
-    AssertMsgFailed (("Transient shared folders are not implemented yet\n"));
 }
 
@@ -422 +522 @@
     if (aItem && listView->selectedItem() != aItem)
         listView->setSelected (aItem, true);
-    bool removeEnabled = aItem && aItem->parent();
+    bool removeEnabled = aItem && aItem->parent() &&
+                         isEditable (aItem->parent()->text (2));
     bool addEnabled = aItem &&
                       (isEditable (aItem->text (2)) ||

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

@@ -1535 +1535 @@
     /* shared folders */
     {
-        mSharedFolders->putBackToMachine (cmachine);
+        mSharedFolders->putBackToMachine();
     }