Changeset 3802 in vbox for trunk/src

Timestamp:

Jul 24, 2007 9:12:30 AM (17 years ago)

Author:

vboxsync

Message:

2130: Improve Shared Folders UI:

Shared Folders Dialog improvements done:

1. Dialog made modal (all the title buttons made like in non-modal VDM).
2. [Help]....[Ok][Cancel] dialog's button configuration.
3. Permanent shared folder could be created during VM session runtime (through the discussed check-box).
4. Edit action opens on list-view's item double-click.

Note: Also all the GUI_ constants from the different *.cpp files moved into VBoxDefs.cpp

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• include/VBoxConsoleWnd.h (modified) (4 diffs)
• include/VBoxDefs.h (modified) (1 diff)
• src/VBoxConsoleWnd.cpp (modified) (17 diffs)
• src/VBoxProblemReporter.cpp (modified) (4 diffs)
• src/VBoxSelectorWnd.cpp (modified) (4 diffs)
• ui/VBoxNewVMWzd.ui.h (modified) (2 diffs)
• ui/VBoxSharedFoldersSettings.ui (modified) (5 diffs)
• ui/VBoxSharedFoldersSettings.ui.h (modified) (12 diffs)
• ui/VBoxVMSettingsDlg.ui.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -131 +131 @@
         src/QIMessageBox.cpp \
         src/QIRichLabel.cpp \
+        src/VBoxDefs.cpp \
         src/VBoxGlobalSettings.cpp \
         src/VBoxGlobal.cpp \

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

@@ -144 +144 @@
     void devicesUnmountDVD();
     void devicesSwitchVrdp (bool);
-    void devicesToggleSFDialog (bool);
+    void devicesOpenSFDialog();
     void devicesInstallGuestAdditions();
 
@@ -157 +157 @@
     void activateNetworkMenu (int aId);
     void switchUSB (int aId);
-    void activateSFMenu();
 
     void statusTipChanged (const QString &);
@@ -326 +325 @@
 public:
 
-    VBoxSFDialog (QWidget*, CSession&, QAction*);
-    ~VBoxSFDialog();
+    VBoxSFDialog (QWidget*, CSession&);
 
 protected slots:
 
     virtual void accept();
-    virtual void suicide (bool);
 
 protected:
@@ -342 +339 @@
     VBoxSharedFoldersSettings *mSettings;
     CSession &mSession;
-    QAction *mAction;
 };
 

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

@@ -146 +146 @@
 #endif
     };
+
+    static const char* GUI_LastWindowPosition;
+    static const char* GUI_LastWindowPosition_Max;
+    static const char* GUI_Fullscreen;
+    static const char* GUI_Seamless;
+    static const char* GUI_AutoresizeGuest;
+    static const char* GUI_FirstRun;
+    static const char* GUI_SaveMountedAtRuntime;
+    static const char* GUI_LastCloseAction;
+    static const char* GUI_SuppressMessages;
+    static const char* GUI_PermanentSharedFoldersAtRuntime;
 };
 

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

@@ -340 +340 @@
 
     devicesSFDialogAction = new QAction (runningActions, "devicesSFDialogAction");
-    devicesSFDialogAction->setToggleAction (true);
     devicesSFDialogAction->setIconSet (VBoxGlobal::iconSet ("shared_folder_16px.png",
                                                             "shared_folder_disabled_16px.png"));
@@ -583 +582 @@
     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 (devicesSFDialogAction, SIGNAL(activated()), this, SLOT(devicesOpenSFDialog()));
     connect (devicesInstallGuestToolsAction, SIGNAL(activated()), this, SLOT(devicesInstallGuestAdditions()));
 
@@ -596 +595 @@
     connect (devicesMountDVDMenu, SIGNAL(activated(int)), this, SLOT(captureDVD(int)));
     connect (devicesUSBMenu, SIGNAL(activated(int)), this, SLOT(switchUSB(int)));
-    connect (devicesSharedFolders, SIGNAL(activated(int)), this, SLOT(activateSFMenu()));
+    connect (devicesSharedFolders, SIGNAL(activated(int)), this, SLOT(devicesOpenSFDialog()));
     connect (devicesNetworkMenu, SIGNAL(activated(int)), this, SLOT(activateNetworkMenu(int)));
 
@@ -699 +698 @@
 /////////////////////////////////////////////////////////////////////////////
 
-static const char *GUI_LastWindowPosition = "GUI/LastWindowPostion";
-static const char *GUI_LastWindowPosition_Max = "max";
-
-static const char *GUI_Fullscreen = "GUI/Fullscreen";
-static const char *GUI_Seamless = "GUI/Seamless";
-static const char *GUI_AutoresizeGuest = "GUI/AutoresizeGuest";
-extern const char *GUI_FirstRun = "GUI/FirstRun";
-extern const char *GUI_SaveMountedAtRuntime = "GUI/SaveMountedAtRuntime";
-
 /**
  *  Opens a new console view to interact with a given VM.
@@ -751 +741 @@
     /* restore the position of the window and some options */
     {
-        QString str = cmachine.GetExtraData (GUI_Fullscreen);
+        QString str = cmachine.GetExtraData (VBoxDefs::GUI_Fullscreen);
         if (str == "on")
             vmFullscreenAction->setOn (true);
 
         vmSeamlessAction->setEnabled (false);
-        str = cmachine.GetExtraData (GUI_Seamless);
+        str = cmachine.GetExtraData (VBoxDefs::GUI_Seamless);
         if (str == "on")
             vmSeamlessAction->setOn (true);
 
-        str = cmachine.GetExtraData (GUI_AutoresizeGuest);
+        str = cmachine.GetExtraData (VBoxDefs::GUI_AutoresizeGuest);
         if (str != "off")
             vmAutoresizeGuestAction->setOn (true);
 
-        str = cmachine.GetExtraData (GUI_FirstRun);
+        str = cmachine.GetExtraData (VBoxDefs::GUI_FirstRun);
         if (str == "yes")
             mIsFirstTimeStarted = true;
         else if (!str.isEmpty())
-            cmachine.SetExtraData (GUI_FirstRun, QString::null);
-
-        str = cmachine.GetExtraData (GUI_SaveMountedAtRuntime);
+            cmachine.SetExtraData (VBoxDefs::GUI_FirstRun, QString::null);
+
+        str = cmachine.GetExtraData (VBoxDefs::GUI_SaveMountedAtRuntime);
         if (str == "no")
             mIsAutoSaveMedia = false;
 
-        str = cmachine.GetExtraData (GUI_LastWindowPosition);
+        str = cmachine.GetExtraData (VBoxDefs::GUI_LastWindowPosition);
 
         QRect ar = QApplication::desktop()->availableGeometry (this);
@@ -787 +777 @@
             h = str.section (',', 3, 3).toInt (&ok);
         if (ok)
-            max = str.section (',', 4, 4) == GUI_LastWindowPosition_Max;
+            max = str.section (',', 4, 4) == VBoxDefs::GUI_LastWindowPosition_Max;
         if (ok)
         {
@@ -950 +940 @@
         /* Remove GUI_FirstRun extra data key from the machine settings
          * file after showing the wizard once. */
-        cmachine.SetExtraData (GUI_FirstRun, QString::null);
+        cmachine.SetExtraData (VBoxDefs::GUI_FirstRun, QString::null);
     }
 
@@ -1047 +1037 @@
         if (isMaximized() || (mIsFullscreen && was_max)
                           || (mIsSeamless && was_max))
-            winPos += QString (",%1").arg (GUI_LastWindowPosition_Max);
-
-        machine.SetExtraData (GUI_LastWindowPosition, winPos);
-
-        machine.SetExtraData (GUI_Fullscreen,
+            winPos += QString (",%1").arg (VBoxDefs::GUI_LastWindowPosition_Max);
+
+        machine.SetExtraData (VBoxDefs::GUI_LastWindowPosition, winPos);
+
+        machine.SetExtraData (VBoxDefs::GUI_Fullscreen,
                               vmFullscreenAction->isOn() ? "on" : "off");
-        machine.SetExtraData (GUI_Seamless,
+        machine.SetExtraData (VBoxDefs::GUI_Seamless,
                               vmSeamlessAction->isOn() ? "on" : "off");
-        machine.SetExtraData (GUI_AutoresizeGuest,
+        machine.SetExtraData (VBoxDefs::GUI_AutoresizeGuest,
                               vmAutoresizeGuestAction->isOn() ? "on" : "off");
     }
@@ -1172 +1162 @@
     LogFlowFuncEnter();
 
-    static const char *GUI_LastCloseAction = "GUI/LastCloseAction";
     static const char *Save = "save";
     static const char *PowerOff = "powerOff";
@@ -1234 +1223 @@
             /* read the last user's choice for the given VM */
             QStringList lastAction = QStringList::split (',',
-                cmachine.GetExtraData (GUI_LastCloseAction));
+                cmachine.GetExtraData (VBoxDefs::GUI_LastCloseAction));
             AssertWrapperOk (cmachine);
             if (lastAction [0] == PowerOff)
@@ -1325 +1314 @@
                     if (dlg.cbDiscardCurState->isChecked())
                         (lastAction += ",") += DiscardCurState;
-                    cmachine.SetExtraData (GUI_LastCloseAction, lastAction);
+                    cmachine.SetExtraData (VBoxDefs::GUI_LastCloseAction, lastAction);
                     AssertWrapperOk (cmachine);
                 }
@@ -2293 +2282 @@
 }
 
-void VBoxConsoleWnd::devicesToggleSFDialog (bool aOn)
+void VBoxConsoleWnd::devicesOpenSFDialog()
 {
     if (!console) return;
 
-    if (aOn)
-        (new VBoxSFDialog (console, csession, devicesSFDialogAction))->show();
+    VBoxSFDialog dlg (console, csession);
+    dlg.exec();
 }
 
@@ -2617 +2606 @@
         }
     }
-}
-
-/**
- *  Show Shared Folders list.
- */
-void VBoxConsoleWnd::activateSFMenu()
-{
-    if (!devicesSFDialogAction->isOn())
-        devicesSFDialogAction->setOn (true);
 }
 
@@ -2940 +2920 @@
 #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 */
+VBoxSFDialog::VBoxSFDialog (QWidget  *aParent, CSession &aSession)
+    : QDialog (aParent, "VBoxSFDialog", true /* modal */,
+               WType_Dialog | WShowModal)
+    , mSettings (0), mSession (aSession)
+{
+    /* Setup Dialog's options */
     setCaption (tr ("Shared Folders"));
     setIcon (QPixmap::fromMimeSource ("select_file_16px.png"));
+    setSizeGripEnabled (true);
 
     /* Setup main dialog's layout */
@@ -2955 +2935 @@
     /* Setup settings layout */
     mSettings = new VBoxSharedFoldersSettings (this, "mSettings");
-    mSettings->setDialogType (VBoxSharedFoldersSettings::ConsoleType);
+    mSettings->setDialogType (VBoxSharedFoldersSettings::MachineType |
+                              VBoxSharedFoldersSettings::ConsoleType);
     mSettings->getFromMachine (aSession.GetMachine());
     mSettings->getFromConsole (aSession.GetConsole());
@@ -2962 +2943 @@
     /* Setup button's layout */
     QHBoxLayout *buttonLayout = new QHBoxLayout (mainLayout, 10, "buttonLayout");
+    QPushButton *pbHelp = new QPushButton (tr ("Help"), this, "pbHelp");
+    QSpacerItem *spacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
     QPushButton *pbOk = new QPushButton (tr ("OK"), this, "pbOk");
-    QSpacerItem *spacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
     QPushButton *pbCancel = new QPushButton (tr ("Cancel"), this, "pbCancel");
+    connect (pbHelp, SIGNAL (clicked()), &vboxProblem(), SLOT (showHelpHelpDialog()));
     connect (pbOk, SIGNAL (clicked()), this, SLOT (accept()));
     connect (pbCancel, SIGNAL (clicked()), this, SLOT (reject()));
+    buttonLayout->addWidget (pbHelp);
+    buttonLayout->addItem (spacer);
     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);
+    /* Setup the default push button */
+    pbOk->setAutoDefault (true);
+    pbOk->setDefault (true);
 }
 
@@ -2983 +2963 @@
 {
     mSettings->putBackToConsole();
+    mSettings->putBackToMachine();
+    CMachine machine = mSession.GetMachine();
+    machine.SaveSettings();
+    if (!machine.isOk())
+        vboxProblem().cannotSaveMachineSettings (machine);
     QDialog::accept();
 }
 
-void VBoxSFDialog::suicide (bool aNo)
-{
-    if (!aNo) close();
-}
-
 void VBoxSFDialog::showEvent (QShowEvent *aEvent)
 {
+    resize (600, 500);
+    VBoxGlobal::centerWidget (this, parentWidget());
+    setMinimumWidth (400);
     QDialog::showEvent (aEvent);
-    setMinimumWidth (400);
-    VBoxGlobal::centerWidget (this, parentWidget());
-}
+}

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

@@ -196 +196 @@
 }
 
-
-static const char *GUI_SuppressMessages = "GUI/SuppressMessages";
 
 /** @class VBoxProblemReporter
@@ -291 +289 @@
     {
         vbox = vboxGlobal().virtualBox();
-        msgs = QStringList::split (',', vbox.GetExtraData (GUI_SuppressMessages));
+        msgs = QStringList::split (',', vbox.GetExtraData (VBoxDefs::GUI_SuppressMessages));
         if (msgs.findIndex (autoConfirmId) >= 0) {
             int rc = AutoConfirmed;
@@ -352 +350 @@
         {
             msgs << autoConfirmId;
-            vbox.SetExtraData (GUI_SuppressMessages, msgs.join (","));
+            vbox.SetExtraData (VBoxDefs::GUI_SuppressMessages, msgs.join (","));
         }
     }
@@ -1745 +1743 @@
 {
     CVirtualBox vbox = vboxGlobal().virtualBox();
-    vbox.SetExtraData (GUI_SuppressMessages, QString::null);
+    vbox.SetExtraData (VBoxDefs::GUI_SuppressMessages, QString::null);
 }
 

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

@@ -48 +48 @@
 #include <qvbox.h>
 
-
-static const char *GUI_LastWindowPosition = "GUI/LastWindowPostion";
-static const char *GUI_LastWindowPosition_Max = "max";
 
 // VBoxVMDetailsView class
@@ -529 +526 @@
     {
         CVirtualBox vbox = vboxGlobal().virtualBox();
-        QString winPos = vbox.GetExtraData (GUI_LastWindowPosition);
+        QString winPos = vbox.GetExtraData (VBoxDefs::GUI_LastWindowPosition);
 
         QRect ar = QApplication::desktop()->availableGeometry (pos());
@@ -542 +539 @@
             h = winPos.section (',', 3, 3).toInt (&ok);
         if (ok)
-            max = winPos.section (',', 4, 4) == GUI_LastWindowPosition_Max;
+            max = winPos.section (',', 4, 4) == VBoxDefs::GUI_LastWindowPosition_Max;
         if (ok)
         {
@@ -621 +618 @@
                                  .arg (normal_size.height());
         if (isMaximized())
-            winPos += QString (",%1").arg (GUI_LastWindowPosition_Max);
-
-        vbox.SetExtraData (GUI_LastWindowPosition, winPos);
+            winPos += QString (",%1").arg (VBoxDefs::GUI_LastWindowPosition_Max);
+
+        vbox.SetExtraData (VBoxDefs::GUI_LastWindowPosition, winPos);
     }
 }

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

@@ -33 +33 @@
 *****************************************************************************/
 
-/* defined in VBoxConsoleWnd.cpp */
-extern const char *GUI_FirstRun;
 
 /**
@@ -317 +315 @@
         }
         if (uuidHD.isNull() || !chd.isNull())
-            cmachine.SetExtraData (GUI_FirstRun, "yes");
+            cmachine.SetExtraData (VBoxDefs::GUI_FirstRun, "yes");
     }
 

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

@@ -40 +40 @@
     </property>
     <property name="caption">
-        <string>VBoxUSBFilterSettings</string>
+        <string>VBoxSharedFoldersSettings</string>
         <comment>don't translate</comment>
     </property>
@@ -190 +190 @@
     </vbox>
 </widget>
+<connections>
+    <connection>
+        <sender>listView</sender>
+        <signal>doubleClicked(QListViewItem*)</signal>
+        <receiver>VBoxSharedFoldersSettings</receiver>
+        <slot>processDoubleClick(QListViewItem*)</slot>
+    </connection>
+</connections>
 <includes>
     <include location="local" impldecl="in declaration">VBoxGlobal.h</include>
@@ -200 +208 @@
 </includes>
 <variables>
-    <variable access="public">enum SFDialogType { WrongType = 0, GlobalType = 1, MachineType = 2, ConsoleType = 3 };</variable>
+    <variable access="public">enum SFDialogType { WrongType, GlobalType = 0x01, MachineType = 0x02, ConsoleType = 0x04 };</variable>
     <variable access="private">bool mIsListViewChanged;</variable>
-    <variable access="private">SFDialogType mDialogType;</variable>
+    <variable access="private">int mDialogType;</variable>
     <variable access="private">CMachine mMachine;</variable>
     <variable access="private">CConsole mConsole;</variable>
@@ -212 +220 @@
     <slot>processOnItem( QListViewItem* )</slot>
     <slot>processCurrentChanged( QListViewItem* )</slot>
+    <slot>processDoubleClick( QListViewItem* )</slot>
 </slots>
 <functions>
     <function access="private">init()</function>
-    <function>setDialogType( VBoxSharedFoldersSettings::SFDialogType )</function>
+    <function>setDialogType( int )</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>
@@ -226 +235 @@
     <function>putBackToConsole()</function>
     <function access="private">putBackTo( CSharedFolderEnumerator &amp;, QListViewItem* )</function>
+    <function access="private" returnType="QListViewItem*">searchRoot( bool )</function>
     <function access="private" returnType="bool">isEditable( const QString &amp; )</function>
 </functions>

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

@@ -154 +154 @@
 public:
 
-    enum DialogType { AddDType, EditDType };
-
-    VBoxAddSFDialog (QWidget *aParent, VBoxAddSFDialog::DialogType aType) :
+    enum DialogType { AddDialogType, EditDialogType };
+
+    VBoxAddSFDialog (QWidget *aParent, VBoxAddSFDialog::DialogType aType,
+                     bool aEnableSelector /* for "permanent" checkbox */) :
         QDialog (aParent, "VBoxAddSFDialog", true /* modal */),
-        mLePath (0), mLeName (0)
+        mLePath (0), mLeName (0), mCbPermanent (0)
     {
         switch (aType)
         {
-            case AddDType:
+            case AddDialogType:
                 setCaption (tr ("Add Share"));
                 break;
-            case EditDType:
+            case EditDialogType:
                 setCaption (tr ("Edit Share"));
                 break;
@@ -174 +175 @@
 
         /* Setup Input layout */
-        QGridLayout *inputLayout = new QGridLayout (mainLayout, 2, 3, 10, "inputLayout");
+        QGridLayout *inputLayout = new QGridLayout (mainLayout, 3, 3, 10, "inputLayout");
         QLabel *lbPath = new QLabel (tr ("Folder Path"), this);
         mLePath = new QLineEdit (this);
@@ -199 +200 @@
         inputLayout->addMultiCellWidget (mLeName, 1, 1, 1, 2);
 
+        if (aEnableSelector)
+        {
+            mCbPermanent = new QCheckBox ("&Make Permanent", this);
+            mCbPermanent->setChecked (true);
+            inputLayout->addMultiCellWidget (mCbPermanent, 2, 2, 0, 2);
+        }
+
         /* Setup Button layout */
         QHBoxLayout *buttonLayout = new QHBoxLayout (mainLayout, 10, "buttonLayout");
@@ -219 +227 @@
     QString getPath() { return mLePath->text(); }
     QString getName() { return mLeName->text(); }
+    bool getPermanent()
+    {
+        return mCbPermanent ? mCbPermanent->isChecked() : true;
+    }
 
     void setPath (const QString &aPath) { mLePath->setText (aPath); }
     void setName (const QString &aName) { mLeName->setText (aName); }
+    void setPermanent (bool aPermanent)
+    {
+        if (mCbPermanent)
+        {
+            mCbPermanent->setChecked (aPermanent);
+            mCbPermanent->setEnabled (!aPermanent);
+        }
+    }
 
 private slots:
@@ -272 +292 @@
     QLineEdit *mLePath;
     QLineEdit *mLeName;
+    QCheckBox *mCbPermanent;
 };
 
@@ -301 +322 @@
 }
 
-void VBoxSharedFoldersSettings::setDialogType (
-     VBoxSharedFoldersSettings::SFDialogType aType)
+void VBoxSharedFoldersSettings::setDialogType (int aType)
 {
     mDialogType = aType;
@@ -456 +476 @@
 
     /* This function is only available for MachineType dialog */
-    Assert (mDialogType == MachineType);
+    Assert (mDialogType & MachineType);
     /* Searching for MachineType item's root */
     QListViewItem *root = listView->findItem (QString::number (MachineType), 2);
@@ -470 +490 @@
 
     /* This function is only available for ConsoleType dialog */
-    Assert (mDialogType == ConsoleType);
+    Assert (mDialogType & ConsoleType);
     /* Searching for ConsoleType item's root */
     QListViewItem *root = listView->findItem (QString::number (ConsoleType), 2);
@@ -507 +527 @@
 
 
+QListViewItem* VBoxSharedFoldersSettings::searchRoot (bool aIsPermanent)
+{
+    if (!aIsPermanent)
+        return listView->findItem (QString::number (ConsoleType), 2);
+    else if (mDialogType & MachineType)
+        return listView->findItem (QString::number (MachineType), 2);
+    else
+        return listView->findItem (QString::number (GlobalType), 2);
+}
+
 void VBoxSharedFoldersSettings::tbAddPressed()
 {
     /* Invoke Add-Box Dialog */
-    VBoxAddSFDialog dlg (this, VBoxAddSFDialog::AddDType);
+    VBoxAddSFDialog dlg (this, VBoxAddSFDialog::AddDialogType,
+                         mDialogType & ConsoleType);
     if (dlg.exec() != QDialog::Accepted)
         return;
     QString name = dlg.getName();
     QString path = dlg.getPath();
+    bool isPermanent = dlg.getPermanent();
     /* 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);
+    QListViewItem *root = searchRoot (isPermanent);
     Assert (root);
     /* Appending a new listview item to the root */
-    VBoxRichListItem *item = new VBoxRichListItem (VBoxRichListItem::EllipsisFile,
-                                                   root, name, path);
+    VBoxRichListItem *item = new VBoxRichListItem (
+        VBoxRichListItem::EllipsisFile, root, name, path);
+    /* Make the created item selected */
     listView->ensureItemVisible (item);
     listView->setCurrentItem (item);
     processCurrentChanged (item);
     listView->setFocus();
+
     mIsListViewChanged = true;
 }
@@ -534 +568 @@
     /* Check selected item */
     QListViewItem *selectedItem = listView->selectedItem();
-    VBoxRichListItem *item = 0;
-    if (selectedItem->rtti() == VBoxRichListItem::QIRichListItemId)
-        item = static_cast<VBoxRichListItem*> (selectedItem);
+    VBoxRichListItem *item =
+        selectedItem->rtti() == VBoxRichListItem::QIRichListItemId ?
+        static_cast<VBoxRichListItem*> (selectedItem) : 0;
     Assert (item);
-    /* Invoke Add-Box Dialog */
-    VBoxAddSFDialog dlg (this, VBoxAddSFDialog::EditDType);
+    Assert (item->parent());
+    /* Invoke Edit-Box Dialog */
+    VBoxAddSFDialog dlg (this, VBoxAddSFDialog::EditDialogType,
+                         mDialogType & ConsoleType);
     dlg.setPath (item->getText (1));
     dlg.setName (item->getText (0));
+    dlg.setPermanent ((SFDialogType)item->parent()->text (2).toInt()
+                      != ConsoleType);
     if (dlg.exec() != QDialog::Accepted)
         return;
     QString name = dlg.getName();
     QString path = dlg.getPath();
+    bool isPermanent = dlg.getPermanent();
     /* Shared folder's name & path could not be empty */
     Assert (!name.isEmpty() && !path.isEmpty());
+    /* Searching new root for the selected listview item */
+    QListViewItem *root = searchRoot (isPermanent);
+    Assert (root);
     /* Updating an edited listview item */
     item->updateText (1, path);
     item->updateText (0, name);
+    if (item->parent() != root)
+    {
+        /* Move the selected item into new location */
+        item->parent()->takeItem (item);
+        root->insertItem (item);
+
+        /* Make the created item selected */
+        listView->ensureItemVisible (item);
+        listView->setCurrentItem (item);
+        processCurrentChanged (item);
+        listView->setFocus();
+    }
+
     mIsListViewChanged = true;
 }
@@ -591 +646 @@
 }
 
+void VBoxSharedFoldersSettings::processDoubleClick (QListViewItem *aItem)
+{
+    bool editEnabled = aItem && aItem->parent() &&
+        isEditable (aItem->parent()->text (2));
+    if (editEnabled)
+        tbEditPressed();
+}
+
 bool VBoxSharedFoldersSettings::isEditable (const QString &aKey)
 {
@@ -601 +664 @@
     if (!type)
         AssertMsgFailed (("Incorrect listview item key value\n"));
-    return type == mDialogType;
+    return mDialogType & type;
 }
 

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

@@ -29 +29 @@
 ** place of a destructor.
 *****************************************************************************/
-
-
-extern const char *GUI_SaveMountedAtRuntime;
-extern const char *GUI_FirstRun;
 
 
@@ -1524 +1520 @@
 
     /* other features */
-    QString saveRtimeImages = cmachine.GetExtraData (GUI_SaveMountedAtRuntime);
+    QString saveRtimeImages = cmachine.GetExtraData (VBoxDefs::GUI_SaveMountedAtRuntime);
     chbRememberMedia->setChecked (saveRtimeImages != "no");
 
@@ -1867 +1863 @@
 
     /* other features */
-    cmachine.SetExtraData (GUI_SaveMountedAtRuntime,
+    cmachine.SetExtraData (VBoxDefs::GUI_SaveMountedAtRuntime,
                            chbRememberMedia->isChecked() ? "yes" : "no");
 
@@ -1980 +1976 @@
      * and/or disk configuration were changed */
     if (mResetFirstRunFlag)
-        cmachine.SetExtraData (GUI_FirstRun, QString::null);
+        cmachine.SetExtraData (VBoxDefs::GUI_FirstRun, QString::null);
 
     /* audio */