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

Timestamp:

Feb 11, 2019 2:29:48 PM (6 years ago)

Author:

vboxsync

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

128772

Message:

FE/Qt: bugref:9340. some refactoring in viso creation dialog

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -2688 +2688 @@
 
 
-QUuid VBoxGlobal::createVisoMediumWithVisoCreator(QWidget *pParent, const QString &strMachineName, const QString &strFolder)
+QUuid VBoxGlobal::createVisoMediumWithVisoCreator(QWidget *pParent, const QString &strFolder, const QString &strMachineName /* = QString */)
 {
     QWidget *pDialogParent = windowManager().realParentWindow(pParent);
@@ -3049 +3049 @@
                     uMediumID = openMediumWithFileOpenDialog(target.mediumType, windowManager().mainWindowShown(), strMachineFolder);
                 else if(target.type == UIMediumTarget::UIMediumTargetType_CreateAdHocVISO)
-                    uMediumID = createVisoMediumWithVisoCreator(windowManager().mainWindowShown(), comConstMachine.GetName(), strMachineFolder);
+                    uMediumID = createVisoMediumWithVisoCreator(windowManager().mainWindowShown(), strMachineFolder, comConstMachine.GetName());
 
                 else if(target.type == UIMediumTarget::UIMediumTargetType_CreateFloppyDisk)

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

@@ -504 +504 @@
         /** Creates a VISO by using the VISO creator dialog.
           * @param  pParent    Brings the dialog parent.
-          * @param  strMachineName    Passes the name of the machine,
-          * @param  strFolder  Brings the folder to save the VISO file. */
-        QUuid createVisoMediumWithVisoCreator(QWidget *pParent, const QString &strMachineName, const QString &strFolder);
+          * @param  strFolder  Brings the folder to save the VISO file.
+          * @param  strMachineName    Passes the name of the machine, */
+        QUuid createVisoMediumWithVisoCreator(QWidget *pParent, const QString &strFolder, const QString &strMachineName = QString());
 
         /** Creates and shows a dialog thru which user can create a new floppy disk a VISO using the file-open dialog.

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp

@@ -455 +455 @@
             break;
         case UIMediumDeviceType_DVD:
-            uMediumId = vboxGlobal().createVisoMediumWithVisoCreator(this, m_strMachineName, m_strMachineFolder);
+            uMediumId = vboxGlobal().createVisoMediumWithVisoCreator(this, m_strMachineFolder, m_strMachineName);
             break;
         default:

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

@@ -52 +52 @@
     , m_pConfigurationPanel(0)
 {
-    m_visoOptions.m_strVisoName = strMachineName;
+    m_visoOptions.m_strVisoName = !strMachineName.isEmpty() ? strMachineName : "ad-hoc";
     prepareActions();
     prepareObjects();
@@ -96 +96 @@
 void UIVisoCreator::retranslateUi()
 {
-    setWindowTitle(QString("%1 - %2").arg(m_strMachineName).arg(tr("VISO Creator")));
+    if (!m_strMachineName.isEmpty())
+        setWindowTitle(QString("%1 - %2").arg(m_strMachineName).arg(tr("VISO Creator")));
+    else
+        setWindowTitle(QString("%1").arg(tr("VISO Creator")));
     if (m_pActionConfiguration)
     {