Changeset 1863 in vbox for trunk/src/VBox/Frontends/VirtualBox/ui/VBoxSharedFoldersSettings.ui.h

Timestamp:

Apr 2, 2007 2:55:09 PM (18 years ago)

Author:

vboxsync

Message:

1902: "Select Directory" dialogs are not native:

Own Win32 API native folders list dialog implemented. Dialog implemented as designed in parallel thread to avoid errors caused by COM initialization.
Change get-existing-directory to native in three places:

1. Machine & VDI default location selection in Global Settings.
2. Default snapshot location selection in VM Settings.
3. Shared folder selection.

File:

• trunk/src/VBox/Frontends/VirtualBox/ui/VBoxSharedFoldersSettings.ui.h (modified) (2 diffs)

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

@@ -188 +188 @@
                  this, SLOT (validate()));
         connect (tbPath, SIGNAL (clicked()), this, SLOT (showFileDialog()));
+        connect (&vboxGlobal(), SIGNAL (existingDirectoryResult (const QString&)),
+                 this, SLOT (folderSelected (const QString&)));
         QWhatsThis::add (mLePath, tr ("Enter existing path for the shared folder here"));
         QWhatsThis::add (mLeName, tr ("Enter name for the shared folder to be created"));
@@ -231 +233 @@
     void showFileDialog()
     {
-        QFileDialog dlg (QDir::rootDirPath(), QString::null, this);
-        dlg.setMode (QFileDialog::DirectoryOnly);
-        dlg.setCaption (tr ("Select a folder to share"));
-        if (dlg.exec() == QDialog::Accepted)
-        {
-            QString folderName = QDir::convertSeparators (dlg.selectedFile());
-            QRegExp commonRule ("[\\\\/]([^\\\\^/]+)[\\\\/]?$");
-            QRegExp rootRule ("(([a-zA-Z])[^\\\\^/])?[\\\\/]$");
-            if (commonRule.search (folderName) != -1)
-            {
-                /* processing non-root folder */
-                mLePath->setText (folderName.remove (QRegExp ("[\\\\/]$")));
-                mLeName->setText (commonRule.cap (1));
-            }
-            else if (rootRule.search (folderName) != -1)
-            {
-                /* processing root folder */
-                mLePath->setText (folderName);
+        vboxGlobal().getExistingDirectory (QDir::convertSeparators (
+                                           QDir::rootDirPath()),
+                                           this, "addSharedFolderDialog",
+                                           tr ("Select a folder to share"));
+    }
+
+    void folderSelected (const QString &aFolder)
+    {
+        if (aFolder.isNull())
+            return;
+
+        QString folderName = QDir::convertSeparators (aFolder);
+        QRegExp commonRule ("[\\\\/]([^\\\\^/]+)[\\\\/]?$");
+        QRegExp rootRule ("(([a-zA-Z])[^\\\\^/])?[\\\\/]$");
+        if (commonRule.search (folderName) != -1)
+        {
+            /* processing non-root folder */
+            mLePath->setText (folderName.remove (QRegExp ("[\\\\/]$")));
+            mLeName->setText (commonRule.cap (1));
+        }
+        else if (rootRule.search (folderName) != -1)
+        {
+            /* processing root folder */
+            mLePath->setText (folderName);
 #if defined(Q_WS_WIN32)
-                mLeName->setText (rootRule.cap (2) + "_DRIVE");
+            mLeName->setText (rootRule.cap (2) + "_DRIVE");
 #elif defined(Q_WS_X11)
-                mLeName->setText ("ROOT");
+            mLeName->setText ("ROOT");
 #endif
-            }
-            else
-                return; /* hm, what type of folder it was? */
-        }
+        }
+        else
+            return; /* hm, what type of folder it was? */
     }