Changeset 92820 in vbox for trunk/src/VBox

Timestamp:

Dec 8, 2021 2:27:31 PM (3 years ago)

Author:

vboxsync

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

148741

Message:

FE/Qt: bugref:10163: Network Manager: Simplify layout for Cloud Networking page.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/networkmanager/UIDetailsWidgetCloudNetwork.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/networkmanager/UIDetailsWidgetCloudNetwork.cpp

@@ -213 +213 @@
 void UIDetailsWidgetCloudNetwork::prepareThis()
 {
-    /* Prepare main layout: */
-    QVBoxLayout *pLayoutMain = new QVBoxLayout(this);
-    if (pLayoutMain)
+    /* Prepare options widget layout: */
+    QGridLayout *pLayout = new QGridLayout(this);
+    if (pLayout)
     {
 #ifdef VBOX_WS_MAC
-        pLayoutMain->setSpacing(10);
-        pLayoutMain->setContentsMargins(10, 10, 10, 10);
+        pLayout->setSpacing(10);
+        pLayout->setContentsMargins(10, 10, 10, 10);
 #endif
 
-        /* Prepare options widget layout: */
-        QGridLayout *pLayoutOptions = new QGridLayout;
-        if (pLayoutOptions)
-        {
-            /* Prepare network name label: */
-            m_pLabelNetworkName = new QLabel(this);
+        /* Prepare network name label: */
+        m_pLabelNetworkName = new QLabel(this);
+        if (m_pLabelNetworkName)
+        {
+            m_pLabelNetworkName->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+            pLayout->addWidget(m_pLabelNetworkName, 0, 0);
+        }
+        /* Prepare network name editor: */
+        m_pEditorNetworkName = new QLineEdit(this);
+        if (m_pEditorNetworkName)
+        {
             if (m_pLabelNetworkName)
-            {
-                m_pLabelNetworkName->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                pLayoutOptions->addWidget(m_pLabelNetworkName, 0, 0);
-            }
-            /* Prepare network name editor: */
-            m_pEditorNetworkName = new QLineEdit(this);
-            if (m_pEditorNetworkName)
-            {
-                if (m_pLabelNetworkName)
-                    m_pLabelNetworkName->setBuddy(m_pEditorNetworkName);
-                connect(m_pEditorNetworkName, &QLineEdit::textEdited,
-                        this, &UIDetailsWidgetCloudNetwork::sltNetworkNameChanged);
-
-                pLayoutOptions->addWidget(m_pEditorNetworkName, 0, 1);
-            }
-
-            /* Prepare cloud provider name label: */
-            m_pLabelProviderName = new QLabel(this);
+                m_pLabelNetworkName->setBuddy(m_pEditorNetworkName);
+            connect(m_pEditorNetworkName, &QLineEdit::textEdited,
+                    this, &UIDetailsWidgetCloudNetwork::sltNetworkNameChanged);
+
+            pLayout->addWidget(m_pEditorNetworkName, 0, 1);
+        }
+
+        /* Prepare cloud provider name label: */
+        m_pLabelProviderName = new QLabel(this);
+        if (m_pLabelProviderName)
+        {
+            m_pLabelProviderName->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+            pLayout->addWidget(m_pLabelProviderName, 1, 0);
+        }
+        /* Prepare cloud provider name combo: */
+        m_pComboProviderName = new QIComboBox(this);
+        if (m_pComboProviderName)
+        {
             if (m_pLabelProviderName)
-            {
-                m_pLabelProviderName->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                pLayoutOptions->addWidget(m_pLabelProviderName, 1, 0);
-            }
-            /* Prepare cloud provider name combo: */
-            m_pComboProviderName = new QIComboBox(this);
-            if (m_pComboProviderName)
-            {
-                if (m_pLabelProviderName)
-                    m_pLabelProviderName->setBuddy(m_pComboProviderName);
-                connect(m_pComboProviderName, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::currentIndexChanged),
-                        this, &UIDetailsWidgetCloudNetwork::sltCloudProviderNameChanged);
-
-                pLayoutOptions->addWidget(m_pComboProviderName, 1, 1);
-            }
-
-            /* Prepare cloud profile name label: */
-            m_pLabelProfileName = new QLabel(this);
+                m_pLabelProviderName->setBuddy(m_pComboProviderName);
+            connect(m_pComboProviderName, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::currentIndexChanged),
+                    this, &UIDetailsWidgetCloudNetwork::sltCloudProviderNameChanged);
+
+            pLayout->addWidget(m_pComboProviderName, 1, 1);
+        }
+
+        /* Prepare cloud profile name label: */
+        m_pLabelProfileName = new QLabel(this);
+        if (m_pLabelProfileName)
+        {
+            m_pLabelProfileName->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+            pLayout->addWidget(m_pLabelProfileName, 2, 0);
+        }
+        /* Prepare cloud profile name combo: */
+        m_pComboProfileName = new QIComboBox(this);
+        if (m_pComboProfileName)
+        {
             if (m_pLabelProfileName)
-            {
-                m_pLabelProfileName->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                pLayoutOptions->addWidget(m_pLabelProfileName, 2, 0);
-            }
-            /* Prepare cloud profile name combo: */
-            m_pComboProfileName = new QIComboBox(this);
-            if (m_pComboProfileName)
-            {
-                if (m_pLabelProfileName)
-                    m_pLabelProfileName->setBuddy(m_pComboProfileName);
-                connect(m_pComboProfileName, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::currentIndexChanged),
-                        this, &UIDetailsWidgetCloudNetwork::sltCloudProfileNameChanged);
-
-                pLayoutOptions->addWidget(m_pComboProfileName, 2, 1);
-            }
-
-            /* Prepare network id label: */
-            m_pLabelNetworkId = new QLabel(this);
+                m_pLabelProfileName->setBuddy(m_pComboProfileName);
+            connect(m_pComboProfileName, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::currentIndexChanged),
+                    this, &UIDetailsWidgetCloudNetwork::sltCloudProfileNameChanged);
+
+            pLayout->addWidget(m_pComboProfileName, 2, 1);
+        }
+
+        /* Prepare network id label: */
+        m_pLabelNetworkId = new QLabel(this);
+        if (m_pLabelNetworkId)
+        {
+            m_pLabelNetworkId->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+            pLayout->addWidget(m_pLabelNetworkId, 3, 0);
+        }
+        /* Prepare network id editor: */
+        m_pEditorNetworkId = new QLineEdit(this);
+        if (m_pEditorNetworkId)
+        {
             if (m_pLabelNetworkId)
-            {
-                m_pLabelNetworkId->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                pLayoutOptions->addWidget(m_pLabelNetworkId, 3, 0);
-            }
-            /* Prepare network id editor: */
-            m_pEditorNetworkId = new QLineEdit(this);
-            if (m_pEditorNetworkId)
-            {
-                if (m_pLabelNetworkId)
-                    m_pLabelNetworkId->setBuddy(m_pEditorNetworkId);
-                connect(m_pEditorNetworkId, &QLineEdit::textEdited,
-                        this, &UIDetailsWidgetCloudNetwork::sltNetworkIdChanged);
-
-                pLayoutOptions->addWidget(m_pEditorNetworkId, 3, 1);
-            }
-
-            pLayoutMain->addLayout(pLayoutOptions);
+                m_pLabelNetworkId->setBuddy(m_pEditorNetworkId);
+            connect(m_pEditorNetworkId, &QLineEdit::textEdited,
+                    this, &UIDetailsWidgetCloudNetwork::sltNetworkIdChanged);
+
+            pLayout->addWidget(m_pEditorNetworkId, 3, 1);
         }
 
@@ -315 +308 @@
                 connect(m_pButtonBoxOptions, &QIDialogButtonBox::clicked, this, &UIDetailsWidgetCloudNetwork::sltHandleButtonBoxClick);
 
-                pLayoutMain->addWidget(m_pButtonBoxOptions);
+                pLayout->addWidget(m_pButtonBoxOptions, 4, 0, 1, 2);
             }
         }