Changeset 3802 in vbox for trunk/src/VBox/Frontends/VirtualBox/ui

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

23142

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/ui

Files:

• VBoxNewVMWzd.ui.h (modified) (2 diffs)
• VBoxSharedFoldersSettings.ui (modified) (5 diffs)
• VBoxSharedFoldersSettings.ui.h (modified) (12 diffs)
• VBoxVMSettingsDlg.ui.h (modified) (4 diffs)

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 */