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

Timestamp:

May 4, 2016 3:29:56 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: ​​​​​​​​​bugref:6769: Rework for New VM wizard (part 01): 1. Use the normalized machine base-name instead of user's machine name; 2. Small cleanup simplifying further changes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm

Files:

• UIWizardNewVM.cpp (modified) (1 diff)
• UIWizardNewVMPageBasic1.cpp (modified) (1 diff)
• UIWizardNewVMPageBasic1.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

@@ -104 +104 @@
         if (!m_strGroup.isEmpty())
             groups << m_strGroup;
-        m_machine = vbox.CreateMachine(QString(), field("name").toString(), groups, strTypeId, QString::null);
+        m_machine = vbox.CreateMachine(QString() /* no file-path for now */,
+                                       field("machineBaseName").toString(),
+                                       groups, strTypeId, QString());
         if (!vbox.isOk())
         {

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp

@@ -220 +220 @@
     /* Get VBox: */
     CVirtualBox vbox = vboxGlobal().virtualBox();
-    /* Get default machines directory: */
-    QString strDefaultMachinesFolder = vbox.GetSystemProperties().GetDefaultMachineFolder();
+    /* Get default machine folder: */
+    const QString strDefaultMachineFolder = vbox.GetSystemProperties().GetDefaultMachineFolder();
     /* Compose machine filename: */
-    QString strMachineFilename = vbox.ComposeMachineFilename(m_pNameAndSystemEditor->name(), m_strGroup, QString::null, strDefaultMachinesFolder);
+    const QString strMachineFilePath = vbox.ComposeMachineFilename(m_pNameAndSystemEditor->name(),
+                                                                   m_strGroup,
+                                                                   QString(),
+                                                                   strDefaultMachineFolder);
     /* Compose machine folder/basename: */
-    QFileInfo fileInfo(strMachineFilename);
-    QString strMachineFolder = fileInfo.absolutePath();
-    QString strMachineBaseName = fileInfo.completeBaseName();
+    const QFileInfo fileInfo(strMachineFilePath);
+    const QString strMachineFolder = fileInfo.absolutePath();
+    const QString strMachineBaseName = fileInfo.completeBaseName();
 
     /* Make sure that folder doesn't exists: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.h

@@ -43 +43 @@
     bool cleanupMachineFolder();
 
-    /* Stuff for 'machineFolder' field: */
+    /** Returns the machine folder value. */
     QString machineFolder() const { return m_strMachineFolder; }
+    /** Defines the @a strMachineFolder value. */
     void setMachineFolder(const QString &strMachineFolder) { m_strMachineFolder = strMachineFolder; }
 
-    /* Stuff for 'machineBaseName' field: */
+    /** Returns the machine base-name value. */
     QString machineBaseName() const { return m_strMachineBaseName; }
+    /** Defines the @a strMachineBaseName value. */
     void setMachineBaseName(const QString &strMachineBaseName) { m_strMachineBaseName = strMachineBaseName; }
 
-    /* Variables: */
+    /** Holds the machine folder value. */
     QString m_strMachineFolder;
+    /** Holds the machine base-name value. */
     QString m_strMachineBaseName;