Changeset 101591 in vbox

Timestamp:

Oct 25, 2023 1:41:05 PM (18 months ago)

Author:

vboxsync

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

159673

Message:

FE/Qt: bugref:10513: Machine settings / Network page: Reworking prepare/cleanup cascade a bit.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine

Files:

• UIMachineSettingsNetwork.cpp (modified) (13 diffs)
• UIMachineSettingsNetwork.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp

@@ -175 +175 @@
     /** Constructs tab passing @a pParent to the base-class.
       * @param  pParentPage  Holds the parent page reference allowing to access some of API there. */
-    UIMachineSettingsNetwork(QITabWidget *pParent, UIMachineSettingsNetworkPage *pParentPage);
+    UIMachineSettingsNetwork(UIEditor *pParent, UIMachineSettingsNetworkPage *pParentPage);
 
     /** Loads adapter data from @a adapterCache. */
@@ -234 +234 @@
 *********************************************************************************************************************************/
 
-UIMachineSettingsNetwork::UIMachineSettingsNetwork(QITabWidget *pParent, UIMachineSettingsNetworkPage *pParentPage)
+UIMachineSettingsNetwork::UIMachineSettingsNetwork(UIEditor *pParent, UIMachineSettingsNetworkPage *pParentPage)
     : UIEditor(pParent)
     , m_pParentPage(pParentPage)
@@ -564 +564 @@
     if (pLayout)
     {
-#ifdef VBOX_WS_MAC
-            /* On Mac OS X we can do a bit of smoothness: */
-            int iLeft, iTop, iRight, iBottom;
-            pLayout->getContentsMargins(&iLeft, &iTop, &iRight, &iBottom);
-            pLayout->setContentsMargins(iLeft / 2, iTop / 2, iRight / 2, iBottom / 2);
-#endif
+        pLayout->setContentsMargins(0, 0, 0, 0);
 
         /* Prepare settings editor: */
@@ -726 +721 @@
     {
         /* Get adapter page: */
-        UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTabWidget->widget(iSlot));
+        UIMachineSettingsNetwork *pTab = m_tabEditors.at(iSlot);
         AssertPtrReturnVoid(pTab);
 
@@ -760 +755 @@
     {
         /* Get adapter page: */
-        UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTabWidget->widget(iSlot));
+        UIMachineSettingsNetwork *pTab = m_tabEditors.at(iSlot);
         AssertPtrReturnVoid(pTab);
 
@@ -793 +788 @@
 
     /* Delegate validation to adapter tabs: */
-    for (int iIndex = 0; iIndex < m_pTabWidget->count(); ++iIndex)
-    {
-        UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTabWidget->widget(iIndex));
+    for (int iSlot = 0; iSlot < m_pTabWidget->count(); ++iSlot)
+    {
+        UIMachineSettingsNetwork *pTab = m_tabEditors.at(iSlot);
         AssertPtrReturn(pTab, false);
         if (!pTab->validate(messages))
@@ -813 +808 @@
     for (int iSlot = 0; iSlot < m_pTabWidget->count(); ++iSlot)
     {
-        UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTabWidget->widget(iSlot));
+        UIMachineSettingsNetwork *pTab = m_tabEditors.at(iSlot);
         AssertPtrReturnVoid(pTab);
         m_pTabWidget->setTabText(iSlot, pTab->tabTitle());
@@ -833 +828 @@
                                      m_pCache->childCount() > iSlot &&
                                      m_pCache->child(iSlot).base().m_fAdapterEnabled));
-        UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTabWidget->widget(iSlot));
+        UIMachineSettingsNetwork *pTab = m_tabEditors.at(iSlot);
         AssertPtrReturnVoid(pTab);
         pTab->polishTab();
@@ -872 +867 @@
     {
         /* Get the iterated tab: */
-        UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTabWidget->widget(iSlot));
+        UIMachineSettingsNetwork *pTab = m_tabEditors.at(iSlot);
         AssertPtrReturnVoid(pTab);
 
@@ -887 +882 @@
     AssertPtrReturnVoid(m_pCache);
 
-    /* Create main layout: */
+    /* Prepare everything: */
+    prepareWidgets();
+
+    /* Apply language settings: */
+    retranslateUi();
+}
+
+void UIMachineSettingsNetworkPage::prepareWidgets()
+{
+    /* Prepare main layout: */
     QVBoxLayout *pLayoutMain = new QVBoxLayout(this);
     if (pLayoutMain)
     {
-        /* Creating tab-widget: */
-        m_pTabWidget = new QITabWidget;
+        /* Prepare tab-widget: */
+        m_pTabWidget = new QITabWidget(this);
         if (m_pTabWidget)
         {
@@ -904 +908 @@
             /* Create corresponding adapter tabs: */
             for (ulong uSlot = 0; uSlot < uCount; ++uSlot)
-            {
-                /* Create adapter tab: */
-                UIMachineSettingsNetwork *pTab = new UIMachineSettingsNetwork(m_pTabWidget, this);
-                if (pTab)
-                {
-                    /* Tab connections: */
-                    connect(pTab, &UIMachineSettingsNetwork::sigAlternativeNameChanged,
-                            this, &UIMachineSettingsNetworkPage::sltHandleAlternativeNameChange);
-                    connect(pTab, &UIMachineSettingsNetwork::sigValidityChanged,
-                            this, &UIMachineSettingsNetworkPage::revalidate);
-
-                    /* Add tab into tab-widget: */
-                    addEditor(pTab);
-                    m_pTabWidget->addTab(pTab, pTab->tabTitle());
-                }
-            }
-
-            /* Add tab-widget into layout: */
+                prepareTab();
+
             pLayoutMain->addWidget(m_pTabWidget);
         }
     }
+}
+
+void UIMachineSettingsNetworkPage::prepareTab()
+{
+    /* Prepare tab: */
+    UIEditor *pTab = new UIEditor(m_pTabWidget);
+    if (pTab)
+    {
+        /* Prepare tab layout: */
+        QVBoxLayout *pLayout = new QVBoxLayout(pTab);
+        if (pLayout)
+        {
+#ifdef VBOX_WS_MAC
+            /* On Mac OS X we can do a bit of smoothness: */
+            int iLeft, iTop, iRight, iBottom;
+            pLayout->getContentsMargins(&iLeft, &iTop, &iRight, &iBottom);
+            pLayout->setContentsMargins(iLeft / 2, iTop / 2, iRight / 2, iBottom / 2);
+#endif
+
+            /* Prepare name and system editor: */
+            UIMachineSettingsNetwork *pEditor = new UIMachineSettingsNetwork(pTab, this);
+            if (pEditor)
+            {
+                m_tabEditors << pEditor;
+                prepareConnections(pEditor);
+                pTab->addEditor(pEditor);
+                pLayout->addWidget(pEditor);
+            }
+
+            pLayout->addStretch();
+        }
+
+        addEditor(pTab);
+        m_pTabWidget->addTab(pTab, QString());
+    }
+}
+
+void UIMachineSettingsNetworkPage::prepareConnections(UIMachineSettingsNetwork *pTabEditor)
+{
+    /* Tab connections: */
+    connect(pTabEditor, &UIMachineSettingsNetwork::sigAlternativeNameChanged,
+            this, &UIMachineSettingsNetworkPage::sltHandleAlternativeNameChange);
+    connect(pTabEditor, &UIMachineSettingsNetwork::sigValidityChanged,
+            this, &UIMachineSettingsNetworkPage::revalidate);
 }
 
@@ -955 +987 @@
     for (int iSlot = 0; iSlot < m_pTabWidget->count(); ++iSlot)
     {
-        UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTabWidget->widget(iSlot));
+        UIMachineSettingsNetwork *pTab = m_tabEditors.at(iSlot);
         AssertPtrReturnVoid(pTab);
         const QString strName = pTab->alternativeName(KNetworkAttachmentType_Internal);
@@ -1000 +1032 @@
     for (int iSlot = 0; iSlot < m_pTabWidget->count(); ++iSlot)
     {
-        UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTabWidget->widget(iSlot));
+        UIMachineSettingsNetwork *pTab = m_tabEditors.at(iSlot);
         AssertPtrReturnVoid(pTab);
         const QString strName = pTab->alternativeName(KNetworkAttachmentType_Generic);

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.h

@@ -38 +38 @@
 /* Forward declarations: */
 class QITabWidget;
+class UIMachineSettingsNetwork;
 struct UIDataSettingsMachineNetwork;
 struct UIDataSettingsMachineNetworkAdapter;
@@ -117 +118 @@
     /** Prepares all. */
     void prepare();
+    /** Prepares widgets. */
+    void prepareWidgets();
+    /** Prepare tab. */
+    void prepareTab();
+    /** Prepares connections. */
+    void prepareConnections(UIMachineSettingsNetwork *pTabEditor);
     /** Cleanups all. */
     void cleanup();
@@ -177 +184 @@
     /** Holds the tab-widget instance. */
     QITabWidget *m_pTabWidget;
+
+    /** Holds the list of tab editors. */
+    QList<UIMachineSettingsNetwork*>  m_tabEditors;
 };