Changeset 1902 in vbox for trunk

Timestamp:

Apr 3, 2007 5:21:56 PM (18 years ago)

Author:

vboxsync

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

20151

Message:

FE/Qt: Spelling.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxGlobal.h (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (8 diffs)
• ui/VBoxGlobalSettingsDlg.ui.h (modified) (1 diff)
• ui/VBoxVMSettingsDlg.ui.h (modified) (1 diff)

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

@@ -407 +407 @@
                                     bool resolveSymLinks = true);
 
-    static QString getStartingDir (const QString &);
+    static QString getFirstExistingDir (const QString &);
 
 signals:

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

@@ -2198 +2198 @@
 
 /**
- *  Reimplementation of QFileDialog::getExistingDirectory() which is runs
- *  "open existing directory" dialog.
- *
- *  On Win32, this function makes sure a native dialog will be launched in
- *  another thread to avoid dialog visualization errors occured due to
+ *  Reimplementation of QFileDialog::getExistingDirectory() that removes some
+ *  oddities and limitations.
+ *
+ *  On Win32, this function makes sure a native dialog is launched in
+ *  another thread to avoid dialog visualization errors occuring due to
  *  multi-threaded COM apartment initialization on the main UI thread while
  *  the appropriate native dialog function expects a single-threaded one.
@@ -2245 +2245 @@
     public:
 
-        Thread (const WId &aId, QObject *aTarget,
+        Thread (QWidget *aParent, QObject *aTarget,
                 const QString &aDir, const QString &aCaption)
-            : mId (aId), mTarget (aTarget), mDir (aDir), mCaption (aCaption) {}
+            : mParent (aParent), mTarget (aTarget), mDir (aDir), mCaption (aCaption) {}
 
         virtual void run()
@@ -2253 +2253 @@
             QString result;
 
-            QWidget *parent = QWidget::find (mId);
-            QWidget *topParent = parent ? parent->topLevelWidget() : qApp->mainWidget();
-            QString title = mCaption.isNull() ? tr ("Select a Directory") : mCaption;
+            QWidget *topParent = mParent ? mParent->topLevelWidget() : qApp->mainWidget();
+            QString title = mCaption.isNull() ? tr ("Select a directory") : mCaption;
 
             TCHAR path[MAX_PATH];
@@ -2270 +2269 @@
             bi.lpfn = winGetExistDirCallbackProc;
             bi.lParam = Q_ULONG (&mDir);
-            if (parent) parent->setEnabled (false);
+            if (mParent) mParent->setEnabled (false);
             LPITEMIDLIST itemIdList = SHBrowseForFolder (&bi);
             if (itemIdList)
@@ -2288 +2287 @@
                 result = QString::null;
             QApplication::postEvent (mTarget, new VBoxGetExistDirectoryEvent (result));
-            if (parent) parent->setEnabled (true);
+            if (mParent) mParent->setEnabled (true);
         }
 
     private:
 
-        WId mId;
+        QWidget *mParent;
         QObject *mTarget;
         QString mDir;
@@ -2328 +2327 @@
     };
 
-    /* this dialog is proposed to be a modal */
-    if (!aParent) return QString::null;
     QString dir = QDir::convertSeparators (aDir);
     LoopObject loopObject;
-    Thread openDirThread (aParent->winId(), &loopObject, dir, aCaption);
+    Thread openDirThread (aParent, &loopObject, dir, aCaption);
     openDirThread.start();
     qApp->eventLoop()->enterLoop();
@@ -2391 +2388 @@
         workDir += "\\";
 
-    QString title = caption.isNull() ? tr ("Select file to open") : caption;
+    QString title = caption.isNull() ? tr ("Select a file") : caption;
 
     if (parent)
@@ -2453 +2450 @@
 
 /**
- *  Search for the first directory that exists starting from the passed one.
- *  In case of there is no directory (and all of its parent except root) exist
- *  the function returns QString::null.
+ *  Search for the first directory that exists starting from the passed one
+ *  and going up through its parents.  In case if none of the directories
+ *  exist (except the root one), the function returns QString::null.
  */
 /* static */
-QString VBoxGlobal::getStartingDir (const QString &aStartDir)
+QString VBoxGlobal::getFirstExistingDir (const QString &aStartDir)
 {
     QString result = QString::null;

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

@@ -501 +501 @@
     Assert (le);
 
-    QString initDir = VBoxGlobal::getStartingDir (le->text());
+    QString initDir = VBoxGlobal::getFirstExistingDir (le->text());
     if (initDir.isNull())
         initDir = vboxGlobal().virtualBox().GetHomeFolder();

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

@@ -1847 +1847 @@
 void VBoxVMSettingsDlg::tbSelectSavedStateFolder_clicked()
 {
-    QString settingsFolder = VBoxGlobal::getStartingDir (leSnapshotFolder->text());
+    QString settingsFolder = VBoxGlobal::getFirstExistingDir (leSnapshotFolder->text());
     if (settingsFolder.isNull())
         settingsFolder = QFileInfo (cmachine.GetSettingsFilePath()).dirPath (true);