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

Timestamp:

Feb 4, 2021 2:54:27 PM (4 years ago)

Author:

vboxsync

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

142643

Message:

FE/Qt: Some small refactoring in UIFilePathSelector class

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• settings/editors/UIDefaultMachineFolderEditor.cpp (modified) (1 diff)
• settings/editors/UIVRDEAuthLibraryEditor.cpp (modified) (1 diff)
• settings/machine/UIMachineSettingsDisplay.cpp (modified) (1 diff)
• settings/machine/UIMachineSettingsGeneral.cpp (modified) (1 diff)
• settings/machine/UIMachineSettingsSFDetails.cpp (modified) (1 diff)
• widgets/UIFilePathSelector.cpp (modified) (6 diffs)
• widgets/UIFilePathSelector.h (modified) (2 diffs)
• wizards/newvm/UIWizardNewVMPageBasic1.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVMPageExpert.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDefaultMachineFolderEditor.cpp

@@ -93 +93 @@
             if (m_pLabel)
                 m_pLabel->setBuddy(m_pSelector);
-            m_pSelector->setHomeDir(uiCommon().homeFolder());
+            m_pSelector->setInitialPath(uiCommon().homeFolder());
             connect(m_pSelector, &UIFilePathSelector::pathChanged,
                     this, &UIDefaultMachineFolderEditor::sltHandleSelectorPathChanged);

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVRDEAuthLibraryEditor.cpp

@@ -93 +93 @@
             if (m_pLabel)
                 m_pLabel->setBuddy(m_pSelector);
-            m_pSelector->setHomeDir(uiCommon().homeFolder());
+            m_pSelector->setInitialPath(uiCommon().homeFolder());
             m_pSelector->setMode(UIFilePathSelector::Mode_File_Open);
             connect(m_pSelector, &UIFilePathSelector::pathChanged,

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp

@@ -528 +528 @@
     /* Load old 'Recording' data from the cache: */
     m_pCheckboxRecording->setChecked(oldDisplayData.m_fRecordingEnabled);
-    m_pEditorRecordingFilePath->setHomeDir(oldDisplayData.m_strRecordingFolder);
+    m_pEditorRecordingFilePath->setInitialPath(oldDisplayData.m_strRecordingFolder);
     m_pEditorRecordingFilePath->setPath(oldDisplayData.m_strRecordingFilePath);
     m_pSpinboxRecordingFrameWidth->setValue(oldDisplayData.m_iRecordingVideoFrameWidth);

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp

@@ -277 +277 @@
     AssertPtrReturnVoid(m_pComboDragAndDrop);
     m_pEditorSnapshotFolder->setPath(oldGeneralData.m_strSnapshotsFolder);
-    m_pEditorSnapshotFolder->setHomeDir(oldGeneralData.m_strSnapshotsHomeDir);
+    m_pEditorSnapshotFolder->setInitialPath(oldGeneralData.m_strSnapshotsHomeDir);
     const int iClipboardModePosition = m_pComboClipboard->findData(oldGeneralData.m_clipboardMode);
     m_pComboClipboard->setCurrentIndex(iClipboardModePosition == -1 ? 0 : iClipboardModePosition);

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSFDetails.cpp

@@ -225 +225 @@
         {
             m_pSelectorPath->setResetEnabled(false);
-            m_pSelectorPath->setHomeDir(QDir::homePath());
+            m_pSelectorPath->setInitialPath(QDir::homePath());
 
             pLayoutMain->addWidget(m_pSelectorPath, 0, 1);

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp

@@ -58 +58 @@
     : QIWithRetranslateUI<QIComboBox>(pParent)
     , m_enmMode(Mode_Folder)
-    , m_strHomeDir(QDir::current().absolutePath())
+    , m_strInitialPath(QDir::current().absolutePath())
     , m_fEditable(true)
     , m_fModified(false)
@@ -379 +379 @@
 {
     /* Prepare initial directory: */
-    QString strInitDir;
+    QString strInitPath;
     /* If something already chosen: */
     if (!m_strPath.isEmpty())
@@ -387 +387 @@
         if (strObjectName == m_strPath)
         {
-            /* Use the home directory: */
-            strInitDir = m_strHomeDir;
+            /* Use the initial path: */
+            strInitPath = m_strInitialPath;
         }
         /* If that is full file/folder (object) path: */
@@ -394 +394 @@
         {
             /* Use the first existing dir of m_strPath: */
-            strInitDir = QIFileDialog::getFirstExistingDir(m_strPath);
+            strInitPath = QIFileDialog::getFirstExistingDir(m_strPath);
         }
         /* Finally, append object name itself: */
-        strInitDir = QDir(strInitDir).absoluteFilePath(strObjectName);
-    }
-    /* Use the home directory by default: */
-    if (strInitDir.isNull())
-        strInitDir = m_strHomeDir;
+        strInitPath = QDir(strInitPath).absoluteFilePath(strObjectName);
+    }
+    /* Use the initial path by default: */
+    if (strInitPath.isNull())
+        strInitPath = m_strInitialPath;
 
     /* Open the choose-file/folder dialog: */
@@ -408 +408 @@
     {
         case Mode_File_Open:
-            strSelPath = QIFileDialog::getOpenFileName(strInitDir, m_strFileDialogFilters, parentWidget(), m_strFileDialogTitle); break;
+            strSelPath = QIFileDialog::getOpenFileName(strInitPath, m_strFileDialogFilters, parentWidget(), m_strFileDialogTitle); break;
         case Mode_File_Save:
         {
-            strSelPath = QIFileDialog::getSaveFileName(strInitDir, m_strFileDialogFilters, parentWidget(), m_strFileDialogTitle);
+            strSelPath = QIFileDialog::getSaveFileName(strInitPath, m_strFileDialogFilters, parentWidget(), m_strFileDialogTitle);
             if (!strSelPath.isEmpty() && QFileInfo(strSelPath).suffix().isEmpty())
             {
@@ -422 +422 @@
         }
         case Mode_Folder:
-            strSelPath = QIFileDialog::getExistingDirectory(strInitDir, parentWidget(), m_strFileDialogTitle); break;
+            strSelPath = QIFileDialog::getExistingDirectory(strInitPath, parentWidget(), m_strFileDialogTitle); break;
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.h

@@ -126 +126 @@
     void setPath(const QString &strPath, bool fRefreshText = true);
 
-    /** Defines the @a strHomeDir. */
-    void setHomeDir(const QString &strHomeDir) { m_strHomeDir = strHomeDir; }
+    /** Defines the @a strInitialPath. */
+    void setInitialPath(const QString &strInitialPath) { m_strInitialPath = strInitialPath; }
 
 protected:
@@ -181 +181 @@
     /** Holds the path. */
     QString  m_strPath;
-    /** Holds the home dir. */
-    QString  m_strHomeDir;
+    /** Holds the path which we pass to QFileDialog as initial path. */
+    QString  m_strInitialPath;
 
     /** Holds the file-dialog title. */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp

@@ -449 +449 @@
         m_pISOFilePathSelector->setFileDialogFilters("*.iso *.ISO");
         m_pISOFilePathSelector->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-        m_pISOFilePathSelector->setHomeDir(uiCommon().defaultFolderPathForType(UIMediumDeviceType_DVD));
+        m_pISOFilePathSelector->setInitialPath(uiCommon().defaultFolderPathForType(UIMediumDeviceType_DVD));
         pISOSelectorLayout->addWidget(m_pISOFilePathSelector);
     }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp

@@ -330 +330 @@
             m_pISOFilePathSelector->setMode(UIFilePathSelector::Mode_File_Open);
             m_pISOFilePathSelector->setFileDialogFilters("*.iso *.ISO");
-            m_pISOFilePathSelector->setHomeDir(uiCommon().defaultFolderPathForType(UIMediumDeviceType_DVD));
+            m_pISOFilePathSelector->setInitialPath(uiCommon().defaultFolderPathForType(UIMediumDeviceType_DVD));
             pInstallationISOContainerLayout->addWidget(m_pISOFilePathSelector);
         }