Changeset 100333 in vbox for trunk/src

Timestamp:

Jun 29, 2023 5:15:20 PM (18 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9080. Now we add imported ISO file path to VISO content.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso

Files:

• UIVisoContentBrowser.cpp (modified) (3 diffs)
• UIVisoContentBrowser.h (modified) (3 diffs)
• UIVisoCreator.cpp (modified) (4 diffs)
• UIVisoCreator.h (modified) (2 diffs)

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

@@ -282 +282 @@
     QList<ISOFileObject> objectList = openAndReadISODir(strISOFilePath, strDirPath);
 
+    /* Update import ISO path and effectively add it to VISO file content if ISO reading has succeeds: */
+    if (!objectList.isEmpty())
+        setImportedISOPath(strISOFilePath);
+
     for (int i = 0; i < objectList.size(); ++i)
     {
@@ -304 +308 @@
         //     pAddedItem->setIsSymLinkToADirectory(QFileInfo(fileInfo.symLinkTarget()).isDir());
         // }
-        createVisoEntry(pAddedItem);
+        //createVisoEntry(pAddedItem);
     }
     if (m_pTableProxyModel)
@@ -595 +599 @@
 }
 
+const QString &UIVisoContentBrowser::importedISOPath() const
+{
+    return m_strImportedISOPath;
+}
+
+void UIVisoContentBrowser::setImportedISOPath(const QString &strPath)
+{
+    if (m_strImportedISOPath == strPath)
+        return;
+    m_strImportedISOPath = strPath;
+}
+
 void UIVisoContentBrowser::prepareConnections()
 {

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

@@ -76 +76 @@
     void prepareMainMenu(QMenu *pMenu);
 
+    const QString &importedISOPath() const;
+    void setImportedISOPath(const QString &strPath);
+
 public slots:
 
@@ -111 +114 @@
     UICustomFileSystemItem *startItem();
 
-    /** @name Index conversion functions. These are half-smart and tries to determine the source model before conversion.
-      * @{ */
-        QModelIndex         convertIndexToTableIndex(const QModelIndex &index);
-    /** @} */
+    QModelIndex             convertIndexToTableIndex(const QModelIndex &index);
     /** Lists the content of the host file system directory by using Qt file system API. */
     void                    scanHostDirectory(UICustomFileSystemItem *directory);
@@ -133 +133 @@
     bool                           onStartItem();
     void                           goUp();
-    UIVisoContentTableView       *m_pTableView;
-    UICustomFileSystemModel      *m_pModel;
-    UICustomFileSystemProxyModel *m_pTableProxyModel;
+    UIVisoContentTableView        *m_pTableView;
+    UICustomFileSystemModel       *m_pModel;
+    UICustomFileSystemProxyModel  *m_pTableProxyModel;
 
     QString                       m_strVisoName;
+    QString                       m_strImportedISOPath;
     /** keys of m_entryMap are iso locations and values are
      *  local location of file objects. these keys and values are

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

@@ -288 +288 @@
 }
 
+QString UIVisoCreatorWidget::importedISOPath() const
+{
+    if (!m_pVISOContentBrowser)
+        return QString();
+    return m_pVISOContentBrowser->importedISOPath();
+}
+
 const QString &UIVisoCreatorWidget::visoName() const
 {
@@ -656 +663 @@
     {
         QStringList VisoEntryList = pVisoCreator->entryList();
-
-        if (VisoEntryList.empty() || VisoEntryList[0].isEmpty())
+        QString strImportedISOPath = pVisoCreator->importedISOPath();
+        if ((VisoEntryList.empty() || VisoEntryList[0].isEmpty()) && strImportedISOPath.isEmpty())
         {
             delete pVisoCreator;
@@ -673 +680 @@
             stream << QString("%1 %2").arg("--iprt-iso-maker-file-marker-bourne-sh").arg(QUuid::createUuid().toString()) << "\n";
             stream<< "--volume-id=" << strVisoName << "\n";
+            if (!strImportedISOPath.isEmpty())
+                stream << "--import-iso=" << strImportedISOPath;
             stream << VisoEntryList.join("\n");
             if (!pVisoCreator->customOptions().isEmpty())
@@ -725 +734 @@
 }
 
+QString UIVisoCreatorDialog::importedISOPath() const
+{
+    if (m_pVisoCreatorWidget)
+        return m_pVisoCreatorWidget->importedISOPath();
+    return QString();
+}
+
 QStringList UIVisoCreatorDialog::customOptions() const
 {

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

@@ -90 +90 @@
     /** Returns the content of the .viso file. Each element of the list corresponds to a line in the .viso file. */
     QStringList       entryList() const;
+    QString           importedISOPath() const;
     const QString    &visoName() const;
     /** Returns custom ISO options (if any). */
@@ -174 +175 @@
     QStringList  entryList() const;
     QString visoName() const;
+    QString importedISOPath() const;
     QStringList customOptions() const;
     QString currentPath() const;