Changeset 88150 in vbox for trunk

Timestamp:

Mar 17, 2021 11:41:46 AM (4 years ago)

Author:

vboxsync

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

143299

Message:

FE/Qt: bugref:9515: New VM wizard: Few more layout fixes for 1st page; Labels of Name and Type OS editor now properly indents check-box.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• settings/editors/UINameAndSystemEditor.cpp (modified) (1 diff)
• settings/editors/UINameAndSystemEditor.h (modified) (1 diff)
• wizards/newvm/UIWizardNewVMPageBasic1.cpp (modified) (5 diffs)
• wizards/newvm/UIWizardNewVMPageBasic1.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp

@@ -277 +277 @@
 }
 
+int UINameAndSystemEditor::firstColumnWidth() const
+{
+    int iWidth = 0;
+    if (m_pNameLabel)
+        iWidth = qMax(iWidth, m_pNameLabel->width());
+    if (m_pPathLabel)
+        iWidth = qMax(iWidth, m_pPathLabel->width());
+    if (m_pImageLabel)
+        iWidth = qMax(iWidth, m_pImageLabel->width());
+    if (m_pLabelFamily)
+        iWidth = qMax(iWidth, m_pLabelFamily->width());
+    if (m_pLabelType)
+        iWidth = qMax(iWidth, m_pLabelType->width());
+    return iWidth;
+}
+
 void UINameAndSystemEditor::retranslateUi()
 {

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.h

@@ -128 +128 @@
       *  effectively changing the background color and error-text. */
     void markImageEditor(bool fError, const QString &strErrorMessage);
+
+    /** Returns 1st column width. */
+    int firstColumnWidth() const;
 
 protected:

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

@@ -180 +180 @@
 UIWizardNewVMPage1::UIWizardNewVMPage1(const QString &strGroup)
     : m_pNameAndSystemEditor(0)
-    , m_pISOPathSelectorLabel(0)
     , m_pSkipUnattendedCheckBox(0)
     , m_strGroup(strGroup)
@@ -240 +239 @@
     {
         /* Prepare layout: */
-        QVBoxLayout *pLayout = new QVBoxLayout(pContainerWidget);
-        if (pLayout)
+        m_pNameAndSystemLayout = new QGridLayout(pContainerWidget);
+        if (m_pNameAndSystemLayout)
         {
-            pLayout->setContentsMargins(0, 0, 0, 0);
+            m_pNameAndSystemLayout->setContentsMargins(0, 0, 0, 0);
 
             /* Prepare Name and OS Type editor: */
@@ -252 +251 @@
                                                                true /* fChooseType? */);
             if (m_pNameAndSystemEditor)
-                pLayout->addWidget(m_pNameAndSystemEditor);
+                m_pNameAndSystemLayout->addWidget(m_pNameAndSystemEditor, 0, 0, 1, 2);
 
             /* Prepare Skip Unattended checkbox: */
             m_pSkipUnattendedCheckBox = new QCheckBox;
             if (m_pSkipUnattendedCheckBox)
-                pLayout->addWidget(m_pSkipUnattendedCheckBox);
+                m_pNameAndSystemLayout->addWidget(m_pSkipUnattendedCheckBox, 1, 1);
         }
     }
@@ -373 +372 @@
     {
         m_pSkipUnattendedCheckBox->setText(UIWizardNewVM::tr("Skip unattended installation"));
-        m_pSkipUnattendedCheckBox->setToolTip(UIWizardNewVM::tr("<p>When checked selected ISO file will be mounted to the CD drive "
-                                                                "of the virtual machine but the unattended installation will "
-                                                                "not start.</p>"));
+        m_pSkipUnattendedCheckBox->setToolTip(UIWizardNewVM::tr("<p>When checked selected ISO file will be mounted to the CD "
+                                                                "drive of the virtual machine but the unattended installation "
+                                                                "will not start.</p>"));
     }
 }
@@ -546 +545 @@
 
     if (m_pNameOSTypeLabel)
-        m_pNameOSTypeLabel->setText(UIWizardNewVM::tr("Please choose a descriptive name and destination folder for the new virtual machine. "
-                                             "The name you choose will be used throughout VirtualBox "
-                                             "to identify this machine."));
-    if (m_pISOPathSelectorLabel)
-        m_pISOPathSelectorLabel->setText(UIWizardNewVM::tr("&Installation ISO:"));
-
-    if (m_pNameAndSystemEditor && m_pISOPathSelectorLabel)
-        m_pNameAndSystemEditor->setMinimumLayoutIndent(m_pISOPathSelectorLabel->width());
+        m_pNameOSTypeLabel->setText(UIWizardNewVM::tr("Please choose a descriptive name and destination folder for the new "
+                                                      "virtual machine. The name you choose will be used throughout VirtualBox "
+                                                      "to identify this machine."));
+
+    if (m_pNameAndSystemLayout && m_pNameAndSystemEditor)
+        m_pNameAndSystemLayout->setColumnMinimumWidth(0, m_pNameAndSystemEditor->firstColumnWidth());
 }
 

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

@@ -89 +89 @@
     /** @name Widgets
      * @{ */
+        QGridLayout           *m_pNameAndSystemLayout;
         UINameAndSystemEditor *m_pNameAndSystemEditor;
-        QLabel                *m_pISOPathSelectorLabel;
         QCheckBox             *m_pSkipUnattendedCheckBox;
     /** @} */