Changeset 102404 in vbox for trunk/src

Timestamp:

Nov 30, 2023 4:15:09 PM (14 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10561. Some more fixes mainly for VISO creator.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICustomFileSystemModel.cpp (modified) (1 diff)
• guestctrl/UIFileManagerGuestTable.cpp (modified) (1 diff)
• medium/viso/UIVisoCreator.cpp (modified) (2 diffs)
• medium/viso/UIVisoCreator.h (modified) (1 diff)

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

@@ -225 +225 @@
             strPath.remove(0, 1);
     }
-    return UIPathOperations::addTrailingDelimiters(strPath);
+    return UIPathOperations::removeTrailingDelimiters(strPath);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.cpp

@@ -686 +686 @@
         return;
     QVector<QString> sourcePaths = hostSourcePathList.toVector();
+    /* Remove empty source paths. Typically happens when up directory is selected: */
+    sourcePaths.removeAll(QString());
+
     QVector<QString> aFilters;
     QVector<QString> aFlags;
     QString strDestinationPath = UIPathOperations::addTrailingDelimiters(strDestination);
-
-    /* Remove empty source paths. Typically happens when up directory is selected: */
-    sourcePaths.removeAll(QString());
-
     if (strDestinationPath.isEmpty())
-        strDestinationPath = currentDirectoryPath();
+        strDestinationPath = UIPathOperations::addTrailingDelimiters(currentDirectoryPath());
 
     if (strDestinationPath.isEmpty())

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

@@ -343 +343 @@
 }
 
-void UIVisoCreatorWidget::sltAddObjectsToViso(QStringList pathList)
-{
-    if (m_pVISOContentBrowser)
-        m_pVISOContentBrowser->addObjectsToViso(pathList);
+void UIVisoCreatorWidget::sltAddObjectsToViso()
+{
+    AssertPtrReturnVoid(m_pHostFileBrowser);
+    AssertPtrReturnVoid(m_pVISOContentBrowser);
+    m_pVISOContentBrowser->addObjectsToViso(m_pHostFileBrowser->selectedItemPathList());
 }
 
@@ -541 +542 @@
     }
 
-    // if (m_pAddAction)
-    //     connect(m_pAddAction, &QAction::triggered,
-    //             m_pHostBrowser, &UIVisoHostBrowser::sltAddAction);
+    if (m_pAddAction)
+        connect(m_pAddAction, &QAction::triggered,
+                this, &UIVisoCreatorWidget::sltAddObjectsToViso);
     if (m_pOpenAction)
         connect(m_pOpenAction, &QAction::triggered,

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

@@ -109 +109 @@
 private slots:
 
-    void sltAddObjectsToViso(QStringList pathList);
+    void sltAddObjectsToViso();
     void sltSettingsActionToggled(bool fChecked);
     void sltHostBrowserTableSelectionChanged(bool fHasSelection);