Changeset 34822 in vbox

Timestamp:

Dec 8, 2010 9:19:56 AM (14 years ago)

Author:

vboxsync

Message:

FE/Qt: File-open window called from running VM device menu (cd/floppy) remembers last folder.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (2 diffs)
• globals/VBoxGlobal.h (modified) (2 diffs)
• runtime/UIMachineLogic.cpp (modified) (1 diff)

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

@@ -2563 +2563 @@
 /* Open some external medium using file open dialog
  * and temporary cache (enumerate) it in GUI inner mediums cache: */
-QString VBoxGlobal::openMediumWithFileOpenDialog(VBoxDefs::MediumType mediumType, QWidget *pParent, const QString &strDefaultFolder) const
+QString VBoxGlobal::openMediumWithFileOpenDialog(VBoxDefs::MediumType mediumType, QWidget *pParent,
+                                                 const QString &strDefaultFolder /* = QString() */,
+                                                 bool fUseLastFolder /* = false */) const
 {
     /* Initialize variables: */
     CVirtualBox vbox = vboxGlobal().virtualBox();
-    QString strHomeFolder = strDefaultFolder.isEmpty() ? vbox.GetHomeFolder() : strDefaultFolder;
+    QString strHomeFolder = fUseLastFolder && !m_strLastFolder.isEmpty() ? m_strLastFolder :
+                            strDefaultFolder.isEmpty() ? vbox.GetHomeFolder() : strDefaultFolder;
     QList < QPair <QString, QString> > filters;
     QStringList backends;
@@ -2626 +2629 @@
         /* Get location: */
         QString strLocation = files[0];
+
+        /* Remember absolute path: */
+        m_strLastFolder = QFileInfo(strLocation).absolutePath();
 
         /* Open corresponding medium: */

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

@@ -590 +590 @@
     }
 
-    QString openMediumWithFileOpenDialog(VBoxDefs::MediumType mediumType, QWidget *pParent = 0, const QString &strDefaultFolder = QString()) const;
+    QString openMediumWithFileOpenDialog(VBoxDefs::MediumType mediumType, QWidget *pParent = 0,
+                                         const QString &strDefaultFolder = QString(), bool fUseLastFolder = false) const;
 
     /* Returns the number of current running Fe/Qt4 main windows. */
@@ -851 +852 @@
     QString mUserDefinedPortName;
 
+    mutable QString m_strLastFolder;
+
     QPixmap mWarningIcon, mErrorIcon;
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -1292 +1292 @@
                 usedImages << medium.GetId();
         }
-        /* Open VMM Dialog: */
-        QString strMediumId = vboxGlobal().openMediumWithFileOpenDialog(target.type, defaultMachineWindow()->machineWindow());
+        /* Call for file-open window: */
+        QString strMediumId = vboxGlobal().openMediumWithFileOpenDialog(target.type, defaultMachineWindow()->machineWindow(),
+                                                                        QString(), true);
         defaultMachineWindow()->machineView()->setFocus();
         if (!strMediumId.isNull())