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

Timestamp:

Feb 8, 2011 1:25:30 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt4: Remember the folder recently used when selecting a HD/CD/FD.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• VBoxDefs.cpp (modified) (1 diff)
• VBoxDefs.h (modified) (1 diff)
• VBoxGlobal.cpp (modified) (7 diffs)
• VBoxGlobal.h (modified) (1 diff)

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

@@ -79 +79 @@
 const char* VBoxDefs::GUI_Export_Bucket = "GUI/Export/Bucket";
 const char* VBoxDefs::GUI_PreventBetaWarning = "GUI/PreventBetaWarning";
+const char* VBoxDefs::GUI_RecentFolderHD = "GUI/RecentFolderHD";
+const char* VBoxDefs::GUI_RecentFolderCD = "GUI/RecentFolderCD";
+const char* VBoxDefs::GUI_RecentFolderFD = "GUI/RecentFolderFD";
 const char* VBoxDefs::GUI_RecentListHD = "GUI/RecentListHD";
 const char* VBoxDefs::GUI_RecentListCD = "GUI/RecentListCD";

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

@@ -155 +155 @@
     static const char* GUI_PreventBetaWarning;
 
+    static const char* GUI_RecentFolderHD;
+    static const char* GUI_RecentFolderCD;
+    static const char* GUI_RecentFolderFD;
     static const char* GUI_RecentListHD;
     static const char* GUI_RecentListCD;

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

@@ -2634 +2634 @@
 {
     /* Initialize variables: */
-    QString strHomeFolder = fUseLastFolder && !m_strLastFolder.isEmpty() ? m_strLastFolder :
-                            strDefaultFolder.isEmpty() ? vboxGlobal().virtualBox().GetHomeFolder() : strDefaultFolder;
     QList < QPair <QString, QString> > filters;
     QStringList backends;
@@ -2642 +2640 @@
     QString strTitle;
     QString allType;
+    QString strLastFolder;
     switch (mediumType)
     {
@@ -2649 +2648 @@
             strTitle = tr ("Choose a virtual hard disk file");
             allType = tr ("hard disk");
+            strLastFolder = virtualBox().GetExtraData(VBoxDefs::GUI_RecentFolderHD);
+            if (strLastFolder.isEmpty())
+                strLastFolder = virtualBox().GetExtraData(VBoxDefs::GUI_RecentFolderCD);
+            if (strLastFolder.isEmpty())
+                strLastFolder = virtualBox().GetExtraData(VBoxDefs::GUI_RecentFolderFD);
             break;
         }
@@ -2656 +2660 @@
             strTitle = tr ("Choose a virtual CD/DVD disk file");
             allType = tr ("CD/DVD-ROM disk");
+            strLastFolder = virtualBox().GetExtraData(VBoxDefs::GUI_RecentFolderCD);
+            if (strLastFolder.isEmpty())
+                strLastFolder = virtualBox().GetExtraData(VBoxDefs::GUI_RecentFolderHD);
+            if (strLastFolder.isEmpty())
+                strLastFolder = virtualBox().GetExtraData(VBoxDefs::GUI_RecentFolderFD);
             break;
         }
@@ -2663 +2672 @@
             strTitle = tr ("Choose a virtual floppy disk file");
             allType = tr ("floppy disk");
+            strLastFolder = virtualBox().GetExtraData(VBoxDefs::GUI_RecentFolderFD);
+            if (strLastFolder.isEmpty())
+                strLastFolder = virtualBox().GetExtraData(VBoxDefs::GUI_RecentFolderCD);
+            if (strLastFolder.isEmpty())
+                strLastFolder = virtualBox().GetExtraData(VBoxDefs::GUI_RecentFolderHD);
             break;
         }
@@ -2668 +2682 @@
             break;
     }
+    QString strHomeFolder = fUseLastFolder && !strLastFolder.isEmpty() ? strLastFolder :
+                            strDefaultFolder.isEmpty() ? vboxGlobal().virtualBox().GetHomeFolder() : strDefaultFolder;
 
     /* Prepare filters and backends: */
@@ -2703 +2719 @@
 
     /* Remember the path of the last chosen medium: */
-    m_strLastFolder = QFileInfo(strMediumLocation).absolutePath();
+    QString strRecentFolderKey = mediumType == VBoxDefs::MediumType_HardDisk ? VBoxDefs::GUI_RecentFolderHD :
+                                 mediumType == VBoxDefs::MediumType_DVD ? VBoxDefs::GUI_RecentFolderCD :
+                                 mediumType == VBoxDefs::MediumType_Floppy ? VBoxDefs::GUI_RecentFolderFD :
+                                 QString();
+    vbox.SetExtraData(strRecentFolderKey, QFileInfo(strMediumLocation).absolutePath());
 
     /* Update recently used list: */
-    QString strRecentAddress = mediumType == VBoxDefs::MediumType_HardDisk ? VBoxDefs::GUI_RecentListHD :
+    QString strRecentListKey = mediumType == VBoxDefs::MediumType_HardDisk ? VBoxDefs::GUI_RecentListHD :
                                mediumType == VBoxDefs::MediumType_DVD ? VBoxDefs::GUI_RecentListCD :
                                mediumType == VBoxDefs::MediumType_Floppy ? VBoxDefs::GUI_RecentListFD :
                                QString();
-    QStringList recentMediumList = virtualBox().GetExtraData(strRecentAddress).split(';');
+    QStringList recentMediumList = vbox.GetExtraData(strRecentListKey).split(';');
     if (recentMediumList.contains(strMediumLocation))
         recentMediumList.removeAll(strMediumLocation);
     recentMediumList.prepend(strMediumLocation);
     while(recentMediumList.size() > 5) recentMediumList.removeLast();
-    virtualBox().SetExtraData(strRecentAddress, recentMediumList.join(";"));
+    vbox.SetExtraData(strRecentListKey, recentMediumList.join(";"));
 
     /* Open corresponding medium: */

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

@@ -862 +862 @@
     QString mUserDefinedPortName;
 
-    mutable QString m_strLastFolder;
-
     QPixmap mWarningIcon, mErrorIcon;