Changeset 76959 in vbox

Timestamp:

Jan 23, 2019 6:45:09 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9080: Save and load the most recently used host directory in viso creator dialog

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (2 diffs)
• medium/viso/UIVisoCreator.cpp (modified) (1 diff)
• medium/viso/UIVisoCreator.h (modified) (1 diff)
• medium/viso/UIVisoHostBrowser.cpp (modified) (2 diffs)
• medium/viso/UIVisoHostBrowser.h (modified) (1 diff)

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

@@ -2642 +2642 @@
         return QString();
     windowManager().registerNewParent(pVisoCreator, pDialogParent);
+    pVisoCreator->setCurrentPath(gEDataManager->recentFolderForVISOContent());
 
     if (pVisoCreator->exec(false /* not application modal */))
@@ -2650 +2651 @@
         if (files.empty() || files[0].isEmpty())
             return QUuid();
+
+        gEDataManager->setRecentFolderForVISOContent(pVisoCreator->currentPath());
 
         /* Produce the VISO. */

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp

@@ -79 +79 @@
 }
 
+QString UIVisoCreator::currentPath() const
+{
+    if (!m_pHostBrowser)
+        return QString();
+    return m_pHostBrowser->currentPath();
+}
+
+void UIVisoCreator::setCurrentPath(const QString &strPath)
+{
+    if (!m_pHostBrowser)
+        return;
+    m_pHostBrowser->setCurrentPath(strPath);
+}
+
 void UIVisoCreator::retranslateUi()
 {

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.h

@@ -59 +59 @@
     const QString &visoName() const;
     const QStringList &customOptions() const;
+    /** Returns the current path that the host browser is listing. */
+    QString currentPath() const;
+    void setCurrentPath(const QString &strPath);
 
 #ifdef VBOX_WS_MAC

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoHostBrowser.cpp

@@ -271 +271 @@
 }
 
+QString UIVisoHostBrowser::currentPath() const
+{
+    if (!m_pTreeView || !m_pTreeModel)
+        return QString();
+    QModelIndex currentTreeIndex = m_pTreeView->selectionModel()->currentIndex();
+    return QDir::fromNativeSeparators(m_pTreeModel->filePath(currentTreeIndex));
+}
+
+void UIVisoHostBrowser::setCurrentPath(const QString &strPath)
+{
+    if (strPath.isEmpty() || !m_pTreeModel)
+        return;
+    QModelIndex index = m_pTreeModel->index(strPath);
+    setTreeCurrentIndex(index);
+}
+
 void UIVisoHostBrowser::sltHandleAddAction()
 {
@@ -316 +332 @@
     else
         strCurrentTablePath = m_pTableModel->filePath(index);
-    m_pTreeView->setCurrentIndex(m_pTreeModel->index(strCurrentTablePath));
+    QModelIndex treeIndex = m_pTreeModel->index(strCurrentTablePath);
+    m_pTreeView->setCurrentIndex(treeIndex);
+    m_pTreeView->setExpanded(treeIndex, true);
+    m_pTreeView->scrollTo(treeIndex, QAbstractItemView::PositionAtCenter);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoHostBrowser.h

@@ -46 +46 @@
     ~UIVisoHostBrowser();
     virtual void showHideHiddenObjects(bool bShow) /* override */;
+    QString currentPath() const;
+    void setCurrentPath(const QString &strPath);
 
 protected: