Changeset 106084 in vbox

Timestamp:

Sep 18, 2024 6:20:15 PM (7 months ago)

Author:

vboxsync

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

164856

Message:

FE/Qt: ​bugref:10765. More layout fixes in Additional Options group box of the new vm wizard.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors

Files:

• UIHostnameDomainNameEditor.cpp (modified) (7 diffs)
• UIHostnameDomainNameEditor.h (modified) (3 diffs)
• UIWizardNewVMEditors.cpp (modified) (4 diffs)
• UIWizardNewVMEditors.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIHostnameDomainNameEditor.cpp

@@ -27 +27 @@
 
 /* Qt includes: */
+#include <QCheckBox>
 #include <QGridLayout>
 #include <QLabel>
@@ -56 +57 @@
     , m_pProductKeyLabel(0)
     , m_pMainLayout(0)
+    , m_pStartHeadlessCheckBox(0)
 {
     prepare();
@@ -127 +129 @@
     if (m_pProductKeyLineEdit)
         m_pProductKeyLineEdit->setToolTip(UIWizardNewVM::tr("Holds the product key."));
+
+    if (m_pStartHeadlessCheckBox)
+    {
+        m_pStartHeadlessCheckBox->setText(UIWizardNewVM::tr("&Install in Background"));
+        m_pStartHeadlessCheckBox->setToolTip(UIWizardNewVM::tr("When checked, headless boot (with no GUI) will be enabled for "
+                                                               "unattended guest OS installation of newly created virtual machine."));
+    }
 }
 
@@ -152 +161 @@
 {
     m_pMainLayout = new QGridLayout;
-    m_pMainLayout->setColumnStretch(0, 0);
-    m_pMainLayout->setColumnStretch(1, 1);
     if (!m_pMainLayout)
         return;
@@ -159 +166 @@
     int iRow = 0;
 
-
-
     addLineEdit(iRow, m_pProductKeyLabel, m_pProductKeyLineEdit, m_pMainLayout);
     addLineEdit(iRow, m_pHostnameLabel, m_pHostnameLineEdit, m_pMainLayout);
@@ -168 +173 @@
     {
         m_pProductKeyLineEdit->setInputMask(">NNNNN-NNNNN-NNNNN-NNNNN-NNNNN;#");
-        m_pProductKeyLineEdit->setMinimumWidth(fontMetrics().horizontalAdvance("NNNNN-NNNNN-NNNNN-NNNNN-NNNNN"));
+        m_pProductKeyLineEdit->setMinimumWidthByText("NNNNN-NNNNN-NNNNN-NNNNN-NNNNN");
     }
 
@@ -186 +191 @@
     connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
             this, &UIHostnameDomainNameEditor::sltRetranslateUI);
+
+    m_pStartHeadlessCheckBox = new QCheckBox;
+    if (m_pStartHeadlessCheckBox)
+        m_pMainLayout->addWidget(m_pStartHeadlessCheckBox, iRow, 1, 1, 3);
+
+    if (m_pStartHeadlessCheckBox)
+        connect(m_pStartHeadlessCheckBox, &QCheckBox::toggled,
+                this, &UIHostnameDomainNameEditor::sigStartHeadlessChanged);
+
+    sltRetranslateUI();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIHostnameDomainNameEditor.h

@@ -37 +37 @@
 
 /* Forward declarations: */
+class QCheckBox;
 class QGridLayout;
 class QLabel;
@@ -51 +52 @@
     void sigHostnameDomainNameChanged(const QString &strHostNameDomain, bool fIsComplete);
     void sigProductKeyChanged(const QString &strProductKey);
+    void sigStartHeadlessChanged(bool fChecked);
 
 public:
@@ -88 +90 @@
     QLabel *m_pProductKeyLabel;
     QGridLayout *m_pMainLayout;
+    QCheckBox *m_pStartHeadlessCheckBox;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardNewVMEditors.cpp

@@ -225 +225 @@
     : QGroupBox(pParent)
     , m_pHostnameDomainNameEditor(0)
-    , m_pStartHeadlessCheckBox(0)
 {
     prepare();
@@ -232 +231 @@
 void UIAdditionalUnattendedOptions::prepare()
 {
-    m_pMainLayout = new QGridLayout(this);
-    m_pMainLayout->setColumnStretch(0, 0);
-    m_pMainLayout->setColumnStretch(1, 1);
-
+    m_pMainLayout = new QHBoxLayout(this);
     m_pHostnameDomainNameEditor = new UIHostnameDomainNameEditor;
     if (m_pHostnameDomainNameEditor)
-        m_pMainLayout->addWidget(m_pHostnameDomainNameEditor, 1, 0, 2, 3);
-
-    m_pStartHeadlessCheckBox = new QCheckBox;
-    if (m_pStartHeadlessCheckBox)
-        m_pMainLayout->addWidget(m_pStartHeadlessCheckBox, 3, 1);
+        m_pMainLayout->addWidget(m_pHostnameDomainNameEditor);
 
     if (m_pHostnameDomainNameEditor)
@@ -250 +242 @@
         connect(m_pHostnameDomainNameEditor, &UIHostnameDomainNameEditor::sigProductKeyChanged,
                 this, &UIAdditionalUnattendedOptions::sigProductKeyChanged);
+        connect(m_pHostnameDomainNameEditor, &UIHostnameDomainNameEditor::sigStartHeadlessChanged,
+                this, &UIAdditionalUnattendedOptions::sigStartHeadlessChanged);
     }
-    if (m_pStartHeadlessCheckBox)
-        connect(m_pStartHeadlessCheckBox, &QCheckBox::toggled,
-                this, &UIAdditionalUnattendedOptions::sigStartHeadlessChanged);
 
     sltRetranslateUI();
@@ -263 +254 @@
 {
     setTitle(UIWizardNewVM::tr("Additional Options"));
-
-    if (m_pStartHeadlessCheckBox)
-    {
-        m_pStartHeadlessCheckBox->setText(UIWizardNewVM::tr("&Install in Background"));
-        m_pStartHeadlessCheckBox->setToolTip(UIWizardNewVM::tr("When checked, headless boot (with no GUI) will be enabled for "
-                                                               "unattended guest OS installation of newly created virtual machine."));
-    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardNewVMEditors.h

@@ -38 +38 @@
 /* Forward declarations: */
 class QCheckBox;
-class QGridLayout;
+class QHBoxLayout;
 class QLabel;
 class QILineEdit;
@@ -152 +152 @@
     void prepare();
 
-
-
     UIHostnameDomainNameEditor *m_pHostnameDomainNameEditor;
-    QCheckBox *m_pStartHeadlessCheckBox;
-    QGridLayout *m_pMainLayout;
+    QHBoxLayout *m_pMainLayout;
 };