Changeset 72594 in vbox for trunk

Timestamp:

Jun 18, 2018 12:46:05 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt bugref:9183 Make sure new vm wizards path fields respects group name

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• widgets/UINameAndSystemEditor.cpp (modified) (3 diffs)
• widgets/UINameAndSystemEditor.h (modified) (2 diffs)
• wizards/newvm/UIWizardNewVMPageBasic1.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVMPageExpert.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp

@@ -45 +45 @@
 
 
-UINameAndSystemEditor::UINameAndSystemEditor(QWidget *pParent, bool fChooseLocation /* = false */)
+UINameAndSystemEditor::UINameAndSystemEditor(QWidget *pParent, bool fChooseLocation /* = false */, const QString &strGroupName /* = QString() */)
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_fChooseLocation(fChooseLocation)
@@ -59 +59 @@
     , m_pComboFamily(0)
     , m_pComboType(0)
+    , m_strGroupName(strGroupName)
 {
     /* Prepare: */
@@ -261 +262 @@
                 pMainLayout->addWidget(m_pPathSelector, iRow++, 1, 1, 2);
                 QString strDefaultMachineFolder = vboxGlobal().virtualBox().GetSystemProperties().GetDefaultMachineFolder();
+                /* Add the group name to the default machine path: */
+                // if (!m_strGroupName.isEmpty() && m_strGroupName != "/")
+                //     strDefaultMachineFolder += m_strGroupName;
+
                 m_pPathSelector->setPath(strDefaultMachineFolder);
                 m_pPathSelector->setDefaultPath(strDefaultMachineFolder);

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h

@@ -56 +56 @@
 
     /** Constructs VM parameters editor passing @a pParent to the base-class.
-      * @param  fChooseFullPath  Brings whether we should propose to choose location. */
-    UINameAndSystemEditor(QWidget *pParent, bool fChooseLocation = false);
+      * @param  fChooseFullPath  Controls whether we should propose to choose location.
+      * @param  strGroupName  is used while setting the path and defaultPath of the path selection widget. */
+    UINameAndSystemEditor(QWidget *pParent, bool fChooseLocation = false, const QString &strGroupName = QString());
 
     /** Returns the VM name. */
@@ -129 +130 @@
     /** Holds the VM OS type combo instance. */
     QComboBox              *m_pComboType;
+    QString                 m_strGroupName;
 };
 

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

@@ -328 +328 @@
     {
         m_pLabel = new QIRichTextLabel(this);
-        m_pNameAndSystemEditor = new UINameAndSystemEditor(this, true);
+        m_pNameAndSystemEditor = new UINameAndSystemEditor(this, true, strGroup);
         pMainLayout->addWidget(m_pLabel);
         pMainLayout->addWidget(m_pNameAndSystemEditor);

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

@@ -55 +55 @@
             QHBoxLayout *pNameAndSystemCntLayout = new QHBoxLayout(m_pNameAndSystemCnt);
             {
-                m_pNameAndSystemEditor = new UINameAndSystemEditor(m_pNameAndSystemCnt, true);
+                m_pNameAndSystemEditor = new UINameAndSystemEditor(m_pNameAndSystemCnt, true, strGroup);
                 pNameAndSystemCntLayout->addWidget(m_pNameAndSystemEditor);
             }