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

Timestamp:

May 4, 2016 3:52:33 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: ​​​​​​​​​bugref:6769: Rework for New VM wizard (part 02): Initial implementation for the user's VM location control.

Location:

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

Files:

• UIWizardNewVM.cpp (modified) (1 diff)
• UIWizardNewVMPageBasic1.cpp (modified) (4 diffs)
• UIWizardNewVMPageBasic1.h (modified) (2 diffs)
• UIWizardNewVMPageExpert.cpp (modified) (2 diffs)
• UIWizardNewVMPageExpert.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() /* no file-path for now */,
+        m_machine = vbox.CreateMachine(field("machineFilePath").toString(),
                                        field("machineBaseName").toString(),
                                        groups, strTypeId, QString());

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

@@ -222 +222 @@
     /* Get default machine folder: */
     const QString strDefaultMachineFolder = vbox.GetSystemProperties().GetDefaultMachineFolder();
+    /* Fetch user's machine location: */
+    const QString strUserMachineLocation = m_pNameAndSystemEditor->name();
+    const QString strUserMachineFolder = QFileInfo(strUserMachineLocation).absolutePath();
+    const QString strUserMachineBaseName = QFileInfo(strUserMachineLocation).fileName();
+    const bool fUseDefaultPath = strUserMachineLocation == strUserMachineBaseName;
     /* Compose machine filename: */
-    const QString strMachineFilePath = vbox.ComposeMachineFilename(m_pNameAndSystemEditor->name(),
-                                                                   m_strGroup,
+    const QString strMachineFilePath = vbox.ComposeMachineFilename(strUserMachineBaseName,
+                                                                   fUseDefaultPath ? m_strGroup : QString() /* no group in that case */,
                                                                    QString(),
-                                                                   strDefaultMachineFolder);
+                                                                   fUseDefaultPath ? strDefaultMachineFolder : strUserMachineFolder);
     /* Compose machine folder/basename: */
     const QFileInfo fileInfo(strMachineFilePath);
@@ -250 +255 @@
     m_strMachineFolder = strMachineFolder;
     m_strMachineBaseName = strMachineBaseName;
+    m_strMachineFilePath = strMachineFilePath;
     return true;
 }
@@ -274 +280 @@
     {
         m_pLabel = new QIRichTextLabel(this);
-        m_pNameAndSystemEditor = new UINameAndSystemEditor(this);
+        m_pNameAndSystemEditor = new UINameAndSystemEditor(this, true);
         pMainLayout->addWidget(m_pLabel);
         pMainLayout->addWidget(m_pNameAndSystemEditor);
@@ -289 +295 @@
     registerField("machineFolder", this, "machineFolder");
     registerField("machineBaseName", this, "machineBaseName");
+    registerField("machineFilePath", this, "machineFilePath");
 }
 

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

@@ -53 +53 @@
     void setMachineBaseName(const QString &strMachineBaseName) { m_strMachineBaseName = strMachineBaseName; }
 
+    /** Returns the machine file-path value. */
+    QString machineFilePath() const { return m_strMachineFilePath; }
+    /** Defines the @a strMachineFilePath value. */
+    void setMachineFilePath(const QString &strMachineFilePath) { m_strMachineFilePath = strMachineFilePath; }
+
     /** Holds the machine folder value. */
     QString m_strMachineFolder;
     /** Holds the machine base-name value. */
     QString m_strMachineBaseName;
+    /** Holds the machine file-path value. */
+    QString m_strMachineFilePath;
 
     /* Widgets: */
@@ -73 +80 @@
     Q_PROPERTY(QString machineFolder READ machineFolder WRITE setMachineFolder);
     Q_PROPERTY(QString machineBaseName READ machineBaseName WRITE setMachineBaseName);
+    Q_PROPERTY(QString machineFilePath READ machineFilePath WRITE setMachineFilePath);
 
 public:

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

@@ -57 +57 @@
             QHBoxLayout *pNameAndSystemCntLayout = new QHBoxLayout(m_pNameAndSystemCnt);
             {
-                m_pNameAndSystemEditor = new UINameAndSystemEditor(m_pNameAndSystemCnt);
+                m_pNameAndSystemEditor = new UINameAndSystemEditor(m_pNameAndSystemCnt, true);
                 pNameAndSystemCntLayout->addWidget(m_pNameAndSystemEditor);
             }
@@ -155 +155 @@
     registerField("machineFolder", this, "machineFolder");
     registerField("machineBaseName", this, "machineBaseName");
+    registerField("machineFilePath", this, "machineFilePath");
     registerField("ram", m_pRamSlider, "value", SIGNAL(valueChanged(int)));
     registerField("virtualDisk", this, "virtualDisk");

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

@@ -36 +36 @@
     Q_PROPERTY(QString machineFolder READ machineFolder WRITE setMachineFolder);
     Q_PROPERTY(QString machineBaseName READ machineBaseName WRITE setMachineBaseName);
+    Q_PROPERTY(QString machineFilePath READ machineFilePath WRITE setMachineFilePath);
     Q_PROPERTY(CMedium virtualDisk READ virtualDisk WRITE setVirtualDisk);
     Q_PROPERTY(QString virtualDiskId READ virtualDiskId WRITE setVirtualDiskId);