Changeset 101604 in vbox for trunk

Timestamp:

Oct 26, 2023 12:56:21 PM (15 months ago)

Author:

vboxsync

Message:

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

Location:

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

Files:

• UIMachineSettingsSerial.cpp (modified) (12 diffs)
• UIMachineSettingsSerial.h (modified) (3 diffs)

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

@@ -125 +125 @@
     /** Constructs tab passing @a pParent to the base-class.
       * @param  pParentPage  Holds the parent page reference allowing to access some of API there. */
-    UIMachineSettingsSerial(QITabWidget *pParent, UIMachineSettingsSerialPage *pParentPage);
+    UIMachineSettingsSerial(UIEditor *pParent, UIMachineSettingsSerialPage *pParentPage);
 
     /** Loads port data from @a portCache. */
@@ -181 +181 @@
 *********************************************************************************************************************************/
 
-UIMachineSettingsSerial::UIMachineSettingsSerial(QITabWidget *pParent, UIMachineSettingsSerialPage *pParentPage)
+UIMachineSettingsSerial::UIMachineSettingsSerial(UIEditor *pParent, UIMachineSettingsSerialPage *pParentPage)
     : UIEditor(pParent)
     , m_pParentPage(pParentPage)
@@ -379 +379 @@
     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: */
@@ -508 +503 @@
     {
         /* Get port page: */
-        UIMachineSettingsSerial *pTab = qobject_cast<UIMachineSettingsSerial*>(m_pTabWidget->widget(iSlot));
-        AssertPtrReturnVoid(pTab);
+        UIMachineSettingsSerial *pTabEditor = m_tabEditors.at(iSlot);
+        AssertPtrReturnVoid(pTabEditor);
 
         /* Load old data from cache: */
-        pTab->getPortDataFromCache(m_pCache->child(iSlot));
+        pTabEditor->getPortDataFromCache(m_pCache->child(iSlot));
 
         /* Setup tab order: */
-        pLastFocusWidget = pTab->setOrderAfter(pLastFocusWidget);
+        pLastFocusWidget = pTabEditor->setOrderAfter(pLastFocusWidget);
     }
 
@@ -542 +537 @@
     {
         /* Getting port page: */
-        UIMachineSettingsSerial *pTab = qobject_cast<UIMachineSettingsSerial*>(m_pTabWidget->widget(iSlot));
-        AssertPtrReturnVoid(pTab);
+        UIMachineSettingsSerial *pTabEditor = m_tabEditors.at(iSlot);
+        AssertPtrReturnVoid(pTabEditor);
 
         /* Gather new data: */
-        pTab->putPortDataToCache(m_pCache->child(iSlot));
+        pTabEditor->putPortDataToCache(m_pCache->child(iSlot));
     }
 
@@ -575 +570 @@
 
     /* Delegate validation to adapter tabs: */
-    for (int iIndex = 0; iIndex < m_pTabWidget->count(); ++iIndex)
-    {
-        UIMachineSettingsSerial *pTab = qobject_cast<UIMachineSettingsSerial*>(m_pTabWidget->widget(iIndex));
-        AssertPtrReturn(pTab, false);
-        if (!pTab->validate(messages))
+    for (int iSlot = 0; iSlot < m_pTabWidget->count(); ++iSlot)
+    {
+        UIMachineSettingsSerial *pTabEditor = m_tabEditors.at(iSlot);
+        AssertPtrReturn(pTabEditor, false);
+        if (!pTabEditor->validate(messages))
             fValid = false;
     }
@@ -595 +590 @@
     for (int iSlot = 0; iSlot < m_pTabWidget->count(); ++iSlot)
     {
-        UIMachineSettingsSerial *pTab = qobject_cast<UIMachineSettingsSerial*>(m_pTabWidget->widget(iSlot));
-        AssertPtrReturnVoid(pTab);
-        m_pTabWidget->setTabText(iSlot, pTab->tabTitle());
+        UIMachineSettingsSerial *pTabEditor = m_tabEditors.at(iSlot);
+        AssertPtrReturnVoid(pTabEditor);
+        m_pTabWidget->setTabText(iSlot, pTabEditor->tabTitle());
     }
 }
@@ -615 +610 @@
                                      m_pCache->childCount() > iSlot &&
                                      m_pCache->child(iSlot).base().m_fPortEnabled));
-        UIMachineSettingsSerial *pTab = qobject_cast<UIMachineSettingsSerial*>(m_pTabWidget->widget(iSlot));
-        AssertPtrReturnVoid(pTab);
-        pTab->polishTab();
+        UIMachineSettingsSerial *pTabEditor = m_tabEditors.at(iSlot);
+        AssertPtrReturnVoid(pTabEditor);
+        pTabEditor->polishTab();
     }
 }
@@ -639 +634 @@
     AssertPtrReturnVoid(m_pCache);
 
-    /* Create main layout: */
+    /* Prepare everything: */
+    prepareWidgets();
+
+    /* Apply language settings: */
+    retranslateUi();
+}
+
+void UIMachineSettingsSerialPage::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)
         {
@@ -652 +656 @@
             /* Create corresponding port tabs: */
             for (ulong uSlot = 0; uSlot < uCount; ++uSlot)
-            {
-                /* Create port tab: */
-                UIMachineSettingsSerial *pTab = new UIMachineSettingsSerial(m_pTabWidget, this);
-                if (pTab)
-                {
-                    /* Tab connections: */
-                    connect(pTab, &UIMachineSettingsSerial::sigPortChanged,
-                            this, &UIMachineSettingsSerialPage::sltHandlePortChange);
-                    connect(pTab, &UIMachineSettingsSerial::sigPathChanged,
-                            this, &UIMachineSettingsSerialPage::sltHandlePathChange);
-                    connect(pTab, &UIMachineSettingsSerial::sigValidityChanged,
-                            this, &UIMachineSettingsSerialPage::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 UIMachineSettingsSerialPage::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
+
+            /* Create port tab-editor: */
+            UIMachineSettingsSerial *pEditor = new UIMachineSettingsSerial(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 UIMachineSettingsSerialPage::prepareConnections(UIMachineSettingsSerial *pTabEditor)
+{
+    /* Tab connections: */
+    connect(pTabEditor, &UIMachineSettingsSerial::sigPortChanged,
+            this, &UIMachineSettingsSerialPage::sltHandlePortChange);
+    connect(pTabEditor, &UIMachineSettingsSerial::sigPathChanged,
+            this, &UIMachineSettingsSerialPage::sltHandlePathChange);
+    connect(pTabEditor, &UIMachineSettingsSerial::sigValidityChanged,
+            this, &UIMachineSettingsSerialPage::revalidate);
 }
 
@@ -696 +728 @@
     for (int iSlot = 0; iSlot < m_pTabWidget->count(); ++iSlot)
     {
-        UIMachineSettingsSerial *pTab = qobject_cast<UIMachineSettingsSerial*>(m_pTabWidget->widget(iSlot));
-        AssertPtrReturnVoid(pTab);
-        m_ports[iSlot] = pTab->isPortEnabled() ? qMakePair(pTab->irq(), pTab->ioAddress()) : qMakePair(QString(), QString());
+        UIMachineSettingsSerial *pTabEditor = m_tabEditors.at(iSlot);
+        AssertPtrReturnVoid(pTabEditor);
+        m_ports[iSlot] = pTabEditor->isPortEnabled() ? qMakePair(pTabEditor->irq(), pTabEditor->ioAddress()) : qMakePair(QString(), QString());
     }
 }
@@ -714 +746 @@
     for (int iSlot = 0; iSlot < m_pTabWidget->count(); ++iSlot)
     {
-        UIMachineSettingsSerial *pTab = qobject_cast<UIMachineSettingsSerial*>(m_pTabWidget->widget(iSlot));
-        AssertPtrReturnVoid(pTab);
-        m_paths[iSlot] = pTab->isPortEnabled() ? pTab->path() : QString();
+        UIMachineSettingsSerial *pTabEditor = m_tabEditors.at(iSlot);
+        AssertPtrReturnVoid(pTabEditor);
+        m_paths[iSlot] = pTabEditor->isPortEnabled() ? pTabEditor->path() : QString();
     }
 }

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

@@ -37 +37 @@
 /* Forward declarations: */
 class QITabWidget;
-class UIMachineSettingsSerialPage;
+class UIMachineSettingsSerial;
 struct UIDataSettingsMachineSerial;
 struct UIDataSettingsMachineSerialPort;
@@ -99 +99 @@
     /** Prepares all. */
     void prepare();
+    /** Prepares widgets. */
+    void prepareWidgets();
+    /** Prepare tab. */
+    void prepareTab();
+    /** Prepares connections. */
+    void prepareConnections(UIMachineSettingsSerial *pTabEditor);
     /** Cleanups all. */
     void cleanup();
@@ -122 +128 @@
     /** Holds the tab-widget instance. */
     QITabWidget *m_pTabWidget;
+
+    /** Holds the list of tab-editors. */
+    QList<UIMachineSettingsSerial*>  m_tabEditors;
 };