Changeset 17714 in vbox

Timestamp:

Mar 11, 2009 5:33:35 PM (16 years ago)

Author:

vboxsync

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

44226

Message:

FE/Qt4-OVF: make stuff a little bit more user friendly

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

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

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

@@ -63 +63 @@
     QString fileFilters() const;
 
+    void setDefaultSaveExt (const QString &aExt);
+    QString defaultSaveExt() const;
+
     void resetModified();
     bool isModified() const;
@@ -107 +110 @@
     QString mHomeDir;
     QString mFileFilters;
+    QString mDefaultSaveExt;
     QString mFileDialogTitle;
     QString mNoneStr;

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

@@ -36 +36 @@
 #include <QProcess>
 #include <QHash>
+#include <QDesktopServices>
+#include <QDir>
 
 class QAction;
@@ -731 +733 @@
     }
 
+    static inline QString documentsPath()
+    {
+        QString path;
+#if QT_VERSION < 0x040400
+        path = QDir::homePath();
+#else
+        path = QDesktopServices::storageLocation (QDesktopServices::DocumentsLocation);
+#endif
+        return QDir::cleanPath (path);
+    }
+
 signals:
 

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

@@ -26 +26 @@
 #include "VBoxProblemReporter.h"
 
-/* Qt includes */
-#include <QDir>
-
 class VMListWidgetItems: public QListWidgetItem
 {
@@ -76 +73 @@
     mFileSelector->setFileDialogTitle (tr ("Select a file to export into"));
     mFileSelector->setFileFilters (tr ("Open Virtualization Format (%1)").arg ("*.ovf"));
+    mFileSelector->setDefaultSaveExt ("ovf");
 #ifdef Q_WS_MAC
     /* Editable boxes are uncommon on the Mac */
@@ -151 +149 @@
                 name = mVMListWidget->selectedItems().first()->text();
 
-            mFileSelector->setPath (QDir::toNativeSeparators (QString ("%1/%2.ovf").arg (QDir::currentPath())
+            mFileSelector->setPath (QDir::toNativeSeparators (QString ("%1/%2.ovf").arg (vboxGlobal().documentsPath())
                                                                                    .arg (name)));
             mWValFileSelector->revalidate();

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

@@ -190 +190 @@
 }
 
+void VBoxFilePathSelectorWidget::setDefaultSaveExt (const QString &aExt)
+{
+    mDefaultSaveExt = aExt;
+}
+
+QString VBoxFilePathSelectorWidget::defaultSaveExt() const
+{
+    return mDefaultSaveExt;
+}
+
 /**
  * Returns @c true if the selected (active) combobox item is a path item.
@@ -377 +387 @@
             path = VBoxGlobal::getOpenFileName (initDir, mFileFilters, parentWidget(), mFileDialogTitle); break;
         case Mode_File_Save:
-            path = VBoxGlobal::getSaveFileName (initDir, mFileFilters, parentWidget(), mFileDialogTitle); break;
+            {
+                path = VBoxGlobal::getSaveFileName (initDir, mFileFilters, parentWidget(), mFileDialogTitle); 
+                if (QFileInfo (path).suffix().isEmpty())
+                    path = QString ("%1.%2").arg (path).arg (mDefaultSaveExt);
+                break;
+            }
         case Mode_Folder:
             path = VBoxGlobal::getExistingDirectory (initDir, parentWidget(), mFileDialogTitle); break;

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

@@ -45 +45 @@
     mFileSelector->setFileDialogTitle (tr ("Select an appliance to import"));
     mFileSelector->setFileFilters (tr ("Open Virtualization Format (%1)").arg ("*.ovf"));
+    mFileSelector->setHomeDir (vboxGlobal().documentsPath());
 #ifdef Q_WS_MAC
     /* Editable boxes are uncommon on the Mac */