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

Timestamp:

May 24, 2018 9:16:58 AM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: ​bugref:6769 Hiding the path selector in general machine settings dialog

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -121 +121 @@
     m_pLabelType->setText(tr("&Version:"));
     m_pNameLabel->setText(tr("Name:"));
-    m_pPathLabel->setText(tr("Path:"));
+    if (m_pPathLabel)
+        m_pPathLabel->setText(tr("Path:"));
 
     m_pComboFamily->setWhatsThis(tr("Selects the operating system family that "
@@ -232 +233 @@
 
         m_pNameLabel = new QLabel;
+        int iRow = 0;
         if (m_pNameLabel)
         {
             m_pNameLabel->setAlignment(Qt::AlignRight);
             m_pNameLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-            pMainLayout->addWidget(m_pNameLabel, 0, 0, 1, 1);
+            pMainLayout->addWidget(m_pNameLabel, iRow, 0, 1, 1);
         }
         m_pNameLineEdit = new QILineEdit;
         if (m_pNameLineEdit)
         {
-            pMainLayout->addWidget(m_pNameLineEdit, 0, 1, 1, 2);
-        }
-
-        m_pPathLabel = new QLabel;
-        if (m_pPathLabel)
-        {
-            m_pPathLabel->setAlignment(Qt::AlignRight);
-            m_pPathLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-            pMainLayout->addWidget(m_pPathLabel, 1, 0, 1, 1);
-        }
-
-        m_pPathSelector = new UIFilePathSelector;
-        if (m_pPathSelector)
-        {
-            pMainLayout->addWidget(m_pPathSelector, 1, 1, 1, 2);
-            QString strDefaultMachineFolder = vboxGlobal().virtualBox().GetSystemProperties().GetDefaultMachineFolder();
-            m_pPathSelector->setPath(strDefaultMachineFolder);
-            m_pPathSelector->setDefaultPath(strDefaultMachineFolder);
+            pMainLayout->addWidget(m_pNameLineEdit, iRow++, 1, 1, 2);
+        }
+
+        if (m_fChooseLocation)
+        {
+            m_pPathLabel = new QLabel;
+            if (m_pPathLabel)
+            {
+                m_pPathLabel->setAlignment(Qt::AlignRight);
+                m_pPathLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+                pMainLayout->addWidget(m_pPathLabel, iRow, 0, 1, 1);
+            }
+
+            m_pPathSelector = new UIFilePathSelector;
+            if (m_pPathSelector)
+            {
+                pMainLayout->addWidget(m_pPathSelector, iRow++, 1, 1, 2);
+                QString strDefaultMachineFolder = vboxGlobal().virtualBox().GetSystemProperties().GetDefaultMachineFolder();
+                m_pPathSelector->setPath(strDefaultMachineFolder);
+                m_pPathSelector->setDefaultPath(strDefaultMachineFolder);
+            }
         }
 
@@ -269 +274 @@
             m_pLabelFamily->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
             /* Add VM OS family label into main-layout: */
-            pMainLayout->addWidget(m_pLabelFamily, 2, 0);
-        }
-
+            pMainLayout->addWidget(m_pLabelFamily, iRow, 0);
+        }
+        int iIconRow = iRow;
         /* Create VM OS family combo: */
         m_pComboFamily = new QComboBox;
@@ -280 +285 @@
             m_pLabelFamily->setBuddy(m_pComboFamily);
             /* Add VM OS family combo into main-layout: */
-            pMainLayout->addWidget(m_pComboFamily, 2, 1);
+            pMainLayout->addWidget(m_pComboFamily, iRow++, 1);
         }
 
@@ -291 +296 @@
             m_pLabelType->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
             /* Add VM OS type label into main-layout: */
-            pMainLayout->addWidget(m_pLabelType, 3, 0);
+            pMainLayout->addWidget(m_pLabelType, iRow, 0);
         }
 
@@ -302 +307 @@
             m_pLabelType->setBuddy(m_pComboType);
             /* Add VM OS type combo into main-layout: */
-            pMainLayout->addWidget(m_pComboType, 3, 1);
+            pMainLayout->addWidget(m_pComboType, iRow++, 1);
         }
 
@@ -321 +326 @@
             pLayoutIcon->addStretch();
             /* Add sub-layout into main-layout: */
-            pMainLayout->addLayout(pLayoutIcon, 2, 2, 2, 1);
+            pMainLayout->addLayout(pLayoutIcon, iIconRow, 2, 2, 1);
         }
     }
@@ -352 +357 @@
     connect(m_pNameLineEdit, &QILineEdit::textChanged,
             this, &UINameAndSystemEditor::sigNameChanged);
-    connect(m_pPathSelector, &UIFilePathSelector::pathChanged,
-            this, &UINameAndSystemEditor::sigPathChanged);
+    if (m_pPathSelector)
+        connect(m_pPathSelector, &UIFilePathSelector::pathChanged,
+                this, &UINameAndSystemEditor::sigPathChanged);
     connect(m_pComboFamily, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
             this, &UINameAndSystemEditor::sltFamilyChanged);

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

@@ -328 +328 @@
     {
         m_pLabel = new QIRichTextLabel(this);
-        m_pNameAndSystemEditor = new UINameAndSystemEditor(this);
+        m_pNameAndSystemEditor = new UINameAndSystemEditor(this, true);
         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);
+                m_pNameAndSystemEditor = new UINameAndSystemEditor(m_pNameAndSystemCnt, true);
                 pNameAndSystemCntLayout->addWidget(m_pNameAndSystemEditor);
             }