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

Timestamp:

Dec 13, 2017 3:02:26 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9080 Some adjustments to the ad hoc VISO mockup.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• extradata/UIExtraDataManager.cpp (modified) (3 diffs)
• extradata/UIExtraDataManager.h (modified) (2 diffs)
• globals/VBoxGlobal.cpp (modified) (4 diffs)
• globals/VBoxGlobal.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp

@@ -75 +75 @@
 const char* UIExtraDataDefs::GUI_RecentFolderCD = "GUI/RecentFolderCD";
 const char* UIExtraDataDefs::GUI_RecentFolderFD = "GUI/RecentFolderFD";
+const char* UIExtraDataDefs::GUI_RecentFolderVISOContent = "GUI/RecentFolderVISOContent";
 const char* UIExtraDataDefs::GUI_RecentListHD = "GUI/RecentListHD";
 const char* UIExtraDataDefs::GUI_RecentListCD = "GUI/RecentListCD";

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -124 +124 @@
         /** Holds recent folder for floppy-disks. */
         extern const char* GUI_RecentFolderFD;
+        /** Holds recent folder for VISO creation content. */
+        extern const char* GUI_RecentFolderVISOContent;
         /** Holds the list of recently used hard-drives. */
         extern const char* GUI_RecentListHD;

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -1950 +1950 @@
            << GUI_ActivateHoveredMachineWindow
            << GUI_Input_SelectorShortcuts << GUI_Input_MachineShortcuts
-           << GUI_RecentFolderHD << GUI_RecentFolderCD << GUI_RecentFolderFD
+           << GUI_RecentFolderHD << GUI_RecentFolderCD << GUI_RecentFolderFD << GUI_RecentFolderVISOContent
            << GUI_RecentListHD << GUI_RecentListCD << GUI_RecentListFD
            << GUI_LastSelectorWindowPosition << GUI_SplitterSizes
@@ -2536 +2536 @@
 }
 
+QString UIExtraDataManager::recentFolderForVISOContent()
+{
+    return extraDataString(GUI_RecentFolderVISOContent);
+}
+
 void UIExtraDataManager::setRecentFolderForHardDrives(const QString &strValue)
 {
@@ -2549 +2554 @@
 {
     setExtraDataString(GUI_RecentFolderFD, strValue);
+}
+
+void UIExtraDataManager::setRecentFolderForVISOContent(const QString &strValue)
+{
+    setExtraDataString(GUI_RecentFolderVISOContent, strValue);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h

@@ -263 +263 @@
         /** Returns recent folder for floppy-disks. */
         QString recentFolderForFloppyDisks();
+        /** Returns recent folder for VISO creation content. */
+        QString recentFolderForVISOContent();
         /** Defines recent folder for hard-drives as @a strValue. */
         void setRecentFolderForHardDrives(const QString &strValue);
@@ -269 +271 @@
         /** Defines recent folder for floppy-disk as @a strValue. */
         void setRecentFolderForFloppyDisks(const QString &strValue);
+        /** Defines recent folder for VISO creation content as @a strValue. */
+        void setRecentFolderForVISOContent(const QString &strValue);
 
         /** Returns the list of recently used hard-drives. */

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

@@ -1042 +1042 @@
  * @returns Medium ID string, empty on abort.
  */
-QString VBoxGlobal::createVisoMediumWithFileOpenDialog(QWidget *pParent, const QString &strMachineFolder, bool fUseLastFolder)
+QString VBoxGlobal::createVisoMediumWithFileOpenDialog(QWidget *pParent, const QString &strMachineFolder)
 {
     AssertReturn(!strMachineFolder.isEmpty(), QString());
 
-    /* Where to start browsing for content. */
-    QString strLastFolder = gEDataManager->recentFolderForOpticalDisks();
-    if (strLastFolder.isEmpty())
-        strLastFolder = gEDataManager->recentFolderForFloppyDisks();
-    if (strLastFolder.isEmpty())
-        strLastFolder = gEDataManager->recentFolderForHardDrives();
-    QString strHomeFolder = fUseLastFolder && !strLastFolder.isEmpty() ? strLastFolder : strMachineFolder;
-
-    /* Execute the open file dialog: */
+    /* Figure out where to start browsing for content. */
+    QString strDirectory = gEDataManager->recentFolderForVISOContent();
+    if (strDirectory.isEmpty())
+        strDirectory = QDir::homePath();
+    if (strDirectory.isEmpty())
+        strDirectory = homeFolder();
+
+    /* Execute the open file dialog, getting a list of files & dirs back. */
     /** @todo make it possible to select directories... */
-    QStringList files = QIFileDialog::getOpenFileNames(strHomeFolder, tr("All files (*)"), pParent,
+    QStringList files = QIFileDialog::getOpenFileNames(strDirectory, tr("All files (*)"), pParent,
                                                        /// @todo tr("Please select files and directories to be on the VISO"),
                                                        tr("Please select files to be on the VISO"),
@@ -1064 +1063 @@
     if (files.empty() || files[0].isEmpty())
         return QString();
+
+    /* Remember folder for the next time. */
+    gEDataManager->setRecentFolderForVISOContent(QFileInfo(files[0]).absolutePath());
 
     /* Produce the VISO. */
@@ -1108 +1110 @@
         return openMedium(UIMediumType_DVD, QString(szVisoPath), pParent);
 
-    /** @todo error message.   */
+    /** @todo error message. */
     return QString();
 }
@@ -1514 +1516 @@
                                                                                       strMachineFolder)
                                           : vboxGlobal().createVisoMediumWithFileOpenDialog(windowManager().mainWindowShown(),
-                                                                                            strMachineFolder, true /*fUseLastFolder*/);
+                                                                                            strMachineFolder);
                 /* Return focus back: */
                 if (pLastFocusedWidget)

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

@@ -313 +313 @@
     void createMedium(const UIMedium &medium);
     void deleteMedium(const QString &strMediumID);
-    QString createVisoMediumWithFileOpenDialog(QWidget *pParent, const QString &strMachineFolder, bool fUseLastFolder);
+    QString createVisoMediumWithFileOpenDialog(QWidget *pParent, const QString &strMachineFolder);
     QString openMediumWithFileOpenDialog(UIMediumType mediumType, QWidget *pParent = 0,
                                          const QString &strDefaultFolder = QString(), bool fUseLastFolder = true);