Changeset 100876 in vbox for trunk

Timestamp:

Aug 15, 2023 5:25:45 AM (20 months ago)

Author:

vboxsync

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

158793

Message:

FE/Qt: bugref:10496, bugref:9080. Some layout changes.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp (modified) (8 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp

@@ -94 +94 @@
     QCheckBox    *m_pShowHiddenObjectsCheckBox;
     QILabel      *m_pShowHiddenObjectsLabel;
+    QGridLayout  *m_pVisoOptionsGridLayout;
 };
 
@@ -110 +111 @@
     , m_pShowHiddenObjectsCheckBox(0)
     , m_pShowHiddenObjectsLabel(0)
+    , m_pVisoOptionsGridLayout(0)
 {
     prepareObjects();
@@ -125 +127 @@
     QWidget *pVisoOptionsContainerWidget = new QWidget;
     AssertReturnVoid(pVisoOptionsContainerWidget);
-    QGridLayout *pVisoOptionsGridLayout = new QGridLayout(pVisoOptionsContainerWidget);
-    AssertReturnVoid(pVisoOptionsGridLayout);
+    m_pVisoOptionsGridLayout = new QGridLayout(pVisoOptionsContainerWidget);
+    AssertReturnVoid(m_pVisoOptionsGridLayout);
     //pVisoOptionsGridLayout->setSpacing(0);
     //pVisoOptionsGridLayout->setContentsMargins(0, 0, 0, 0);
@@ -136 +138 @@
     m_pVisoNameLineEdit = new QILineEdit;
     int iRow = 0;
-    if (m_pVisoNameLabel && m_pVisoNameLineEdit)
-    {
-        m_pVisoNameLabel->setBuddy(m_pVisoNameLineEdit);
-        pVisoOptionsGridLayout->addWidget(m_pVisoNameLabel,    iRow, 0, 1, 1, Qt::AlignTop);
-        pVisoOptionsGridLayout->addWidget(m_pVisoNameLineEdit, iRow, 1, 1, 1, Qt::AlignTop);
-    }
+    AssertReturnVoid(m_pVisoNameLabel);
+    AssertReturnVoid(m_pVisoNameLineEdit);
+    m_pVisoNameLabel->setBuddy(m_pVisoNameLineEdit);
+    m_pVisoNameLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+    //m_pVisoNameLineEdit->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
+    m_pVisoOptionsGridLayout->addWidget(m_pVisoNameLabel, iRow, 0, 1, 1, Qt::AlignTop);
+    m_pVisoOptionsGridLayout->addWidget(m_pVisoNameLineEdit, iRow, 1, 1, 1, Qt::AlignTop);
+    m_pVisoOptionsGridLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum), iRow, 2, 1, 3);
 
     /* Custom Viso options stuff: */
@@ -150 +154 @@
     AssertReturnVoid(m_pCustomOptionsLineEdit);
     m_pCustomOptionsLabel->setBuddy(m_pCustomOptionsLineEdit);
-    pVisoOptionsGridLayout->addWidget(m_pCustomOptionsLabel,    iRow, 0, 1, 1, Qt::AlignTop);
-    pVisoOptionsGridLayout->addWidget(m_pCustomOptionsLineEdit, iRow, 1, 1, 1, Qt::AlignTop);
+    //m_pCustomOptionsLineEdit->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
+    m_pCustomOptionsLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+    m_pVisoOptionsGridLayout->addWidget(m_pCustomOptionsLabel, iRow, 0, 1, 1, Qt::AlignTop);
+    m_pVisoOptionsGridLayout->addWidget(m_pCustomOptionsLineEdit, iRow, 1, 1, 1, Qt::AlignTop);
+    m_pVisoOptionsGridLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum), iRow, 2, 1, 3);
 
     ++iRow;
-    pVisoOptionsGridLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding), iRow, 0, 1, 2);
-
+    m_pVisoOptionsGridLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding), iRow, 0, 1, 2);
     QWidget *pDialogSettingsContainerWidget = new QWidget;
     AssertReturnVoid(pDialogSettingsContainerWidget);
@@ -164 +170 @@
 
     iRow = 0;
+    QHBoxLayout *pShowHiddenObjectsLayout = new QHBoxLayout;
     m_pShowHiddenObjectsCheckBox = new QCheckBox;
     m_pShowHiddenObjectsLabel = new QILabel(QApplication::translate("UIVisoCreatorWidget", "Show Hidden Objects:"));
     m_pShowHiddenObjectsLabel->setBuddy(m_pShowHiddenObjectsCheckBox);
-    pDialogSettingsContainerLayout->addWidget(m_pShowHiddenObjectsLabel,    iRow, 0, 1, 1, Qt::AlignTop);
-    pDialogSettingsContainerLayout ->addWidget(m_pShowHiddenObjectsCheckBox, iRow, 1, 1, 1, Qt::AlignTop);
+    pShowHiddenObjectsLayout->addWidget(m_pShowHiddenObjectsLabel);
+    pShowHiddenObjectsLayout->addWidget(m_pShowHiddenObjectsCheckBox);
+    pShowHiddenObjectsLayout->addStretch(1);
+    pDialogSettingsContainerLayout->addLayout(pShowHiddenObjectsLayout, iRow, 0, 1, 2, Qt::AlignTop);
 
     ++iRow;
@@ -177 +186 @@
 void UIVisoSettingWidget::retranslateUi()
 {
+    int iLabelWidth = 0;
     if (m_pVisoNameLabel)
+    {
         m_pVisoNameLabel->setText(QApplication::translate("UIVisoCreatorWidget", "VISO Name:"));
+        iLabelWidth = m_pVisoNameLabel->width();
+    }
     if (m_pCustomOptionsLabel)
+    {
         m_pCustomOptionsLabel->setText(QApplication::translate("UIVisoCreatorWidget", "Custom VISO options:"));
+        iLabelWidth = qMax(iLabelWidth, m_pCustomOptionsLabel->width());
+    }
 
     if (m_pVisoNameLineEdit)
@@ -191 +207 @@
         m_pShowHiddenObjectsCheckBox->setToolTip(QApplication::translate("UIVisoCreatorWidget", "When checked, "
                                                                          "multiple hidden objects are shown in the file browser"));
+
+    //m_pVisoOptionsGridLayout->setColumnMinimumWidth(0, iLabelWidth);
 }