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

Timestamp:

Mar 6, 2009 2:43:38 PM (16 years ago)

Author:

vboxsync

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

43901

Message:

FE/Qt4: added support for GetSaveFileName

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxFilePathSelectorWidget.h (modified) (1 diff)
• include/VBoxGlobal.h (modified) (1 diff)
• include/VBoxProblemReporter.h (modified) (2 diffs)
• src/VBoxExportApplianceWzd.cpp (modified) (2 diffs)
• src/VBoxFilePathSelectorWidget.cpp (modified) (3 diffs)
• src/VBoxGLSettingsGeneral.cpp (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (1 diff)
• src/VBoxImportApplianceWzd.cpp (modified) (1 diff)
• src/VBoxProblemReporter.cpp (modified) (2 diffs)

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

@@ -41 +41 @@
     {
         Mode_Folder = 0,
-        Mode_File
+        Mode_File_Open,
+        Mode_File_Save
     };
 

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

@@ -689 +689 @@
                                          bool resolveSymlinks = TRUE);
 
+    static QString getSaveFileName (const QString &aStartWith, const QString &aFilters, QWidget *aParent,
+                                    const QString &aCaption, QString *aSelectedFilter = NULL,
+                                    bool aResolveSymLinks = true);
+
     static QString getOpenFileName (const QString &aStartWith, const QString &aFilters, QWidget *aParent,
                                     const QString &aCaption, QString *aSelectedFilter = NULL,

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

@@ -183 +183 @@
     QWidget *mainWindowShown() const;
 
-    // problem handlers
-
+    /* Generic problem handlers */
+    bool askForOverridingFileIfExists (const QString& path, QWidget *aParent = NULL) const;
+
+    /* Special problem handlers */
 #ifdef Q_WS_X11
     void cannotFindLicenseFiles (const QString &aPath);
@@ -375 +377 @@
     void cannotImportAppliance (const CProgress &aProgress, CAppliance *aAppliance, QWidget *aParent = NULL) const;
 
-
-    bool askForOverridingAppliance (const QString& path, QWidget *aParent = NULL) const;
     void cannotExportAppliance (CAppliance *aAppliance, QWidget *aParent = NULL) const;
     void cannotExportAppliance (const CProgress &aProgress, CAppliance *aAppliance, QWidget *aParent = NULL) const;

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

@@ -72 +72 @@
 
     /* Configure the file selector */
-    mFileSelector->setMode (VBoxFilePathSelectorWidget::Mode_File);
+    mFileSelector->setMode (VBoxFilePathSelectorWidget::Mode_File_Save);
     mFileSelector->setResetEnabled (false);
     mFileSelector->setFileDialogTitle (tr ("Select a file to export into"));
@@ -132 +132 @@
     /* Check if the file exists already, if yes get confirmation for
      * overwriting from the user. */
-    QFileInfo fi (mFileSelector->path());
-    if (fi.exists())
-        if (!vboxProblem().askForOverridingAppliance (mFileSelector->path(), this))
-            return;
+    if (!vboxProblem().askForOverridingFileIfExists (mFileSelector->path(), this))
+        return;
     /* Export the VMs, on success we are finished */
     if (exportVMs())

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

@@ -301 +301 @@
                          Qt::ToolTipRole);
             break;
-        case Mode_File:
+        case Mode_File_Open:
+        case Mode_File_Save:
             setItemData (SelectId,
                          tr ("Opens a dialog to select a different file."),
@@ -370 +371 @@
         initDir = mHomeDir;
 
-    /* Open existing file or directory. */
-    QString path = mMode == Mode_File ?
-        VBoxGlobal::getOpenFileName (initDir, mFileFilters, parentWidget(), mFileDialogTitle) :
-        VBoxGlobal::getExistingDirectory (initDir, parentWidget(), mFileDialogTitle);
+    QString path;
+    switch (mMode)
+    {
+        case Mode_File_Open:
+            path = VBoxGlobal::getOpenFileName (initDir, mFileFilters, parentWidget(), mFileDialogTitle); break;
+        case Mode_File_Save:
+            path = VBoxGlobal::getSaveFileName (initDir, mFileFilters, parentWidget(), mFileDialogTitle); break;
+        case Mode_Folder:
+            path = VBoxGlobal::getExistingDirectory (initDir, parentWidget(), mFileDialogTitle); break;
+    }
+
     if (path.isNull())
         return;
@@ -401 +409 @@
                                  QDir (mPath).path();
             break;
-        case Mode_File:
+        case Mode_File_Open:
+        case Mode_File_Save:
             result = aAbsolute ? QFileInfo (mPath).absoluteFilePath() :
                                  QFileInfo (mPath).filePath();

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

@@ -41 +41 @@
     mPsMach->setHomeDir (vboxGlobal().virtualBox().GetHomeFolder());
     mPsVRDP->setHomeDir (vboxGlobal().virtualBox().GetHomeFolder());
-    mPsVRDP->setMode (VBoxFilePathSelectorWidget::Mode_File);
+    mPsVRDP->setMode (VBoxFilePathSelectorWidget::Mode_File_Open);
 
     /* Applying language settings */

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

@@ -4104 +4104 @@
 
 /**
+ *  Reimplementation of QFileDialog::getSaveFileName() that removes some
+ *  oddities and limitations.
+ *
+ *  On Win32, this function makes sure a file filter is applied automatically
+ *  right after it is selected from the drop-down list, to conform to common
+ *  experience in other applications. Note that currently, @a selectedFilter
+ *  is always set to null on return.
+ *
+ *  On all other platforms, this function is equivalent to
+ *  QFileDialog::getSaveFileName().
+ */
+/* static */
+QString VBoxGlobal::getSaveFileName (const QString &aStartWith,
+                                     const QString &aFilters,
+                                     QWidget       *aParent,
+                                     const QString &aCaption,
+                                     QString       *aSelectedFilter /* = NULL */,
+                                     bool           aResolveSymlinks /* = true */)
+{
+#if defined Q_WS_WIN
+
+    /**
+     *  QEvent class reimplementation to carry Win32 API native dialog's
+     *  result folder information
+     */
+    class GetOpenFileNameEvent : public OpenNativeDialogEvent
+    {
+    public:
+
+        enum { TypeId = QEvent::User + 301 };
+
+        GetOpenFileNameEvent (const QString &aResult)
+            : OpenNativeDialogEvent (aResult, (QEvent::Type) TypeId) {}
+    };
+
+    /**
+     *  QThread class reimplementation to open Win32 API native file dialog
+     */
+    class Thread : public QThread
+    {
+    public:
+
+        Thread (QWidget *aParent, QObject *aTarget,
+                const QString &aStartWith, const QString &aFilters,
+                const QString &aCaption) :
+                mParent (aParent), mTarget (aTarget),
+                mStartWith (aStartWith), mFilters (aFilters),
+                mCaption (aCaption) {}
+
+        virtual void run()
+        {
+            QString result;
+
+            QString workDir;
+            QString initSel;
+            QFileInfo fi (mStartWith);
+
+            if (fi.isDir())
+                workDir = mStartWith;
+            else
+            {
+                workDir = fi.absolutePath();
+                initSel = fi.fileName();
+            }
+
+            workDir = QDir::toNativeSeparators (workDir);
+            if (!workDir.endsWith ("\\"))
+                workDir += "\\";
+
+            QString title = mCaption.isNull() ? tr ("Select a file") : mCaption;
+
+            QWidget *topParent = mParent ? mParent->window() : vboxGlobal().mainWindow();
+            QString winFilters = winFilter (mFilters);
+            AssertCompile (sizeof (TCHAR) == sizeof (QChar));
+            TCHAR buf [1024];
+            if (initSel.length() > 0 && initSel.length() < sizeof (buf))
+                memcpy (buf, initSel.isNull() ? 0 : initSel.utf16(),
+                        (initSel.length() + 1) * sizeof (TCHAR));
+            else
+                buf [0] = 0;
+
+            OPENFILENAME ofn;
+            memset (&ofn, 0, sizeof (OPENFILENAME));
+
+            ofn.lStructSize = sizeof (OPENFILENAME);
+            ofn.hwndOwner = topParent ? topParent->winId() : 0;
+            ofn.lpstrFilter = (TCHAR *) winFilters.isNull() ? 0 : winFilters.utf16();
+            ofn.lpstrFile = buf;
+            ofn.nMaxFile = sizeof (buf) - 1;
+            ofn.lpstrInitialDir = (TCHAR *) workDir.isNull() ? 0 : workDir.utf16();
+            ofn.lpstrTitle = (TCHAR *) title.isNull() ? 0 : title.utf16();
+            ofn.Flags = (OFN_NOCHANGEDIR | OFN_HIDEREADONLY |
+                         OFN_EXPLORER | OFN_ENABLEHOOK |
+                         OFN_NOTESTFILECREATE);
+            ofn.lpfnHook = OFNHookProc;
+
+            if (GetSaveFileName (&ofn))
+            {
+                result = QString::fromUtf16 ((ushort *) ofn.lpstrFile);
+            }
+
+            // qt_win_eatMouseMove();
+            MSG msg = {0, 0, 0, 0, 0, 0, 0};
+            while (PeekMessage (&msg, 0, WM_MOUSEMOVE, WM_MOUSEMOVE, PM_REMOVE));
+            if (msg.message == WM_MOUSEMOVE)
+                PostMessage (msg.hwnd, msg.message, 0, msg.lParam);
+
+            result = result.isEmpty() ? result : QFileInfo (result).absoluteFilePath();
+
+            QApplication::postEvent (mTarget, new GetOpenFileNameEvent (result));
+        }
+
+    private:
+
+        QWidget *mParent;
+        QObject *mTarget;
+        QString mStartWith;
+        QString mFilters;
+        QString mCaption;
+    };
+
+    if (aSelectedFilter)
+        *aSelectedFilter = QString::null;
+
+    /* Local event loop to run while waiting for the result from another
+     * thread */
+    QEventLoop loop;
+
+    QString startWith = QDir::toNativeSeparators (aStartWith);
+    LoopObject loopObject ((QEvent::Type) GetOpenFileNameEvent::TypeId, loop);
+
+//#warning check me!
+    if (aParent)
+        aParent->setWindowModality (Qt::WindowModal);
+
+    Thread openDirThread (aParent, &loopObject, startWith, aFilters, aCaption);
+    openDirThread.start();
+    loop.exec();
+    openDirThread.wait();
+
+//#warning check me!
+    if (aParent)
+        aParent->setWindowModality (Qt::NonModal);
+
+    return QStringList() << loopObject.result();
+
+#elif defined (Q_WS_X11) && (QT_VERSION < 0x040400)
+
+    /* Here is workaround for Qt4.3 bug with QFileDialog which crushes when
+     * gets initial path as hidden directory if no hidden files are shown.
+     * See http://trolltech.com/developer/task-tracker/index_html?method=entry&id=193483
+     * for details */
+    QFileDialog dlg (aParent);
+    dlg.setWindowTitle (aCaption);
+    dlg.setDirectory (aStartWith);
+    dlg.setFilter (aFilters);
+    dlg.setFileMode (QFileDialog::QFileDialog::AnyFile);
+    dlg.setAcceptMode (QFileDialog::AcceptSave);
+    if (aSelectedFilter)
+        dlg.selectFilter (*aSelectedFilter);
+    dlg.setResolveSymlinks (aResolveSymlinks);
+    dlg.setConfirmOverwrite (false);
+    QAction *hidden = dlg.findChild <QAction*> ("qt_show_hidden_action");
+    if (hidden)
+    {
+        hidden->trigger();
+        hidden->setVisible (false);
+    }
+    return dlg.exec() == QDialog::Accepted ? dlg.selectedFiles().value (0, "") : QString::null;
+
+#else
+
+    QFileDialog::Options o;
+    if (!aResolveSymlinks)
+        o |= QFileDialog::DontResolveSymlinks;
+    o |= QFileDialog::DontConfirmOverwrite;
+    return QFileDialog::getSaveFileName (aParent, aCaption, aStartWith,
+                                         aFilters, aSelectedFilter, o);
+#endif
+}
+
+/**
  *  Reimplementation of QFileDialog::getOpenFileName() that removes some
  *  oddities and limitations.

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

@@ -41 +41 @@
 
     /* Configure the file selector */
-    mFileSelector->setMode (VBoxFilePathSelectorWidget::Mode_File);
+    mFileSelector->setMode (VBoxFilePathSelectorWidget::Mode_File_Open);
     mFileSelector->setResetEnabled (false);
     mFileSelector->setFileDialogTitle (tr ("Select an appliance to import"));

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

@@ -548 +548 @@
 }
 
-// Problem handlers
+// Generic Problem handlers
+/////////////////////////////////////////////////////////////////////////////
+
+bool VBoxProblemReporter::askForOverridingFileIfExists (const QString& aPath, QWidget *aParent /* = NULL */) const
+{
+    QFileInfo fi (aPath);
+    if (fi.exists())
+        return messageYesNo (aParent, Question, tr ("A file named <b>%1</b> already exists. Are you sure you want to replace it?<br /><br />The file already exists in \"%2\". Replacing it will overwrite its contents.").arg (fi.fileName()). arg (fi.absolutePath()));
+    else
+        return true;
+}
+
+// Special Problem handlers
 /////////////////////////////////////////////////////////////////////////////
 
@@ -2144 +2156 @@
 }
 
-bool VBoxProblemReporter::askForOverridingAppliance (const QString& aPath, QWidget *aParent /* = NULL */) const
-{
-    return messageYesNo (aParent, Question, tr ("The file <b>%1</b> exists already. Are you sure you want override it?").arg (aPath), NULL);
-}
-
 void VBoxProblemReporter::cannotExportAppliance (CAppliance *aAppliance, QWidget *aParent /* = NULL */) const
 {