Changeset 76737 in vbox for trunk/src

Timestamp:

Jan 9, 2019 1:40:57 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9080: Passing the iso name to ad-hoc.viso file

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)

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

@@ -2725 +2725 @@
     {
         QStringList files = pVisoCreator->entryList();
+        QString strVisoName = pVisoCreator->visoName();
         if (files.empty() || files[0].isEmpty())
             return QUuid();
@@ -2742 +2743 @@
                 {
                     RTStrmPrintf(pStrmViso, "--iprt-iso-maker-file-marker-bourne-sh %RTuuid\n", &Uuid);
+                    if (!strVisoName.isEmpty())
+                        RTStrmPrintf(pStrmViso, "--volume-id=%s\n", strVisoName.toUtf8().constData());
 
                     for (int iFile = 0; iFile < files.size(); iFile++)

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

@@ -52 +52 @@
 }
 
-QStringList UIVisoCreator::entryList()
+QStringList UIVisoCreator::entryList() const
 {
     if (!m_pVisoBrowser)
         return QStringList();
     return m_pVisoBrowser->entryList();
+}
+
+const QString &UIVisoCreator::visoName() const
+{
+    return m_visoOptions.m_strVisoName;
 }
 

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

@@ -53 +53 @@
     UIVisoCreator(QWidget *pParent = 0);
     ~UIVisoCreator();
-    QStringList entryList();
+    QStringList entryList() const;
+    const QString &visoName() const;
 
 #ifdef VBOX_WS_MAC