Changeset 101497 in vbox

Timestamp:

Oct 18, 2023 12:19:15 PM (19 months ago)

Author:

vboxsync

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

159569

Message:

FE/Qt: bugref:10513: Proper UIEditor hierarchy for Network and Serial editors having one page with clone tabs.

Location:

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

Files:

• editors/UINetworkSettingsEditor.cpp (modified) (1 diff)
• machine/UIMachineSettingsNetwork.cpp (modified) (9 diffs)
• machine/UIMachineSettingsSerial.cpp (modified) (10 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINetworkSettingsEditor.cpp

@@ -314 +314 @@
                 m_pEditorNetworkAttachment = new UINetworkAttachmentEditor(m_pWidgetSettings);
                 if (m_pEditorNetworkAttachment)
+                {
+                    addEditor(m_pEditorNetworkAttachment);
                     pLayoutAdapterSettings->addWidget(m_pEditorNetworkAttachment);
+                }
 
                 /* Prepare advanced settingseditor: */
                 m_pEditorNetworkFeatures = new UINetworkFeaturesEditor(m_pWidgetSettings);
                 if (m_pEditorNetworkFeatures)
+                {
+                    addEditor(m_pEditorNetworkFeatures);
                     pLayoutAdapterSettings->addWidget(m_pEditorNetworkFeatures);
+                }
             }
 

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

@@ -159 +159 @@
 
 /** Machine settings: Network Adapter tab. */
-class UIMachineSettingsNetwork : public QIWithRetranslateUI<QWidget>
+class UIMachineSettingsNetwork : public UIEditor
 {
     Q_OBJECT;
@@ -176 +176 @@
 public:
 
-    /** Constructs tab passing @a pParent to the base-class. */
-    UIMachineSettingsNetwork(UIMachineSettingsNetworkPage *pParent);
+    /** 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);
 
     /** Loads adapter data from @a adapterCache. */
@@ -225 +226 @@
 
     /** Holds parent page reference. */
-    UIMachineSettingsNetworkPage *m_pParent;
+    UIMachineSettingsNetworkPage *m_pParentPage;
 
     /** Holds tab slot number. */
@@ -239 +240 @@
 *********************************************************************************************************************************/
 
-UIMachineSettingsNetwork::UIMachineSettingsNetwork(UIMachineSettingsNetworkPage *pParent)
-    : QIWithRetranslateUI<QWidget>(0)
-    , m_pParent(pParent)
+UIMachineSettingsNetwork::UIMachineSettingsNetwork(QITabWidget *pParent, UIMachineSettingsNetworkPage *pParentPage)
+    : UIEditor(pParent)
+    , m_pParentPage(pParentPage)
     , m_iSlot(-1)
     , m_pEditorNetworkSettings(0)
@@ -485 +486 @@
 {
     if (   m_pEditorNetworkSettings
-        && m_pParent)
+        && m_pParentPage)
     {
         /* General stuff: */
-        m_pEditorNetworkSettings->setFeatureAvailable(m_pParent->isMachineOffline());
+        m_pEditorNetworkSettings->setFeatureAvailable(m_pParentPage->isMachineOffline());
 
         /* Attachment stuff: */
-        m_pEditorNetworkSettings->setAttachmentOptionsAvailable(m_pParent->isMachineInValidMode());
+        m_pEditorNetworkSettings->setAttachmentOptionsAvailable(m_pParentPage->isMachineInValidMode());
 
         /* Advanced stuff: */
-        m_pEditorNetworkSettings->setAdvancedOptionsAvailable(m_pParent->isMachineInValidMode());
-        m_pEditorNetworkSettings->setAdapterOptionsAvailable(m_pParent->isMachineOffline());
+        m_pEditorNetworkSettings->setAdvancedOptionsAvailable(m_pParentPage->isMachineInValidMode());
+        m_pEditorNetworkSettings->setAdapterOptionsAvailable(m_pParentPage->isMachineOffline());
         m_pEditorNetworkSettings->setPromiscuousOptionsAvailable(   attachmentType() != KNetworkAttachmentType_Null
                                                                  && attachmentType() != KNetworkAttachmentType_Generic
                                                                  && attachmentType() != KNetworkAttachmentType_NAT);
-        m_pEditorNetworkSettings->setMACOptionsAvailable(m_pParent->isMachineOffline());
+        m_pEditorNetworkSettings->setMACOptionsAvailable(m_pParentPage->isMachineOffline());
         m_pEditorNetworkSettings->setGenericPropertiesAvailable(attachmentType() == KNetworkAttachmentType_Generic);
-        m_pEditorNetworkSettings->setCableOptionsAvailable(m_pParent->isMachineInValidMode());
+        m_pEditorNetworkSettings->setCableOptionsAvailable(m_pParentPage->isMachineInValidMode());
         m_pEditorNetworkSettings->setForwardingOptionsAvailable(attachmentType() == KNetworkAttachmentType_NAT);
     }
@@ -509 +510 @@
 {
     if (   m_pEditorNetworkSettings
-        && m_pParent)
-    {
-        m_pEditorNetworkSettings->setValueNames(KNetworkAttachmentType_Bridged, m_pParent->bridgedAdapterList());
-        m_pEditorNetworkSettings->setValueNames(KNetworkAttachmentType_Internal, m_pParent->internalNetworkList());
-        m_pEditorNetworkSettings->setValueNames(KNetworkAttachmentType_HostOnly, m_pParent->hostInterfaceList());
-        m_pEditorNetworkSettings->setValueNames(KNetworkAttachmentType_Generic, m_pParent->genericDriverList());
-        m_pEditorNetworkSettings->setValueNames(KNetworkAttachmentType_NATNetwork, m_pParent->natNetworkList());
+        && m_pParentPage)
+    {
+        m_pEditorNetworkSettings->setValueNames(KNetworkAttachmentType_Bridged, m_pParentPage->bridgedAdapterList());
+        m_pEditorNetworkSettings->setValueNames(KNetworkAttachmentType_Internal, m_pParentPage->internalNetworkList());
+        m_pEditorNetworkSettings->setValueNames(KNetworkAttachmentType_HostOnly, m_pParentPage->hostInterfaceList());
+        m_pEditorNetworkSettings->setValueNames(KNetworkAttachmentType_Generic, m_pParentPage->genericDriverList());
+        m_pEditorNetworkSettings->setValueNames(KNetworkAttachmentType_NATNetwork, m_pParentPage->natNetworkList());
 #ifdef VBOX_WITH_CLOUD_NET
-        m_pEditorNetworkSettings->setValueNames(KNetworkAttachmentType_Cloud, m_pParent->cloudNetworkList());
+        m_pEditorNetworkSettings->setValueNames(KNetworkAttachmentType_Cloud, m_pParentPage->cloudNetworkList());
 #endif
 #ifdef VBOX_WITH_VMNET
-        m_pEditorNetworkSettings->setValueNames(KNetworkAttachmentType_HostOnlyNetwork, m_pParent->hostOnlyNetworkList());
+        m_pEditorNetworkSettings->setValueNames(KNetworkAttachmentType_HostOnlyNetwork, m_pParentPage->hostOnlyNetworkList());
 #endif
     }
@@ -586 +587 @@
         m_pEditorNetworkSettings = new UINetworkSettingsEditor(this);
         if (m_pEditorNetworkSettings)
+        {
+            addEditor(m_pEditorNetworkSettings);
             pLayout->addWidget(m_pEditorNetworkSettings);
+        }
 
         pLayout->addStretch();
@@ -921 +925 @@
             {
                 /* Create adapter tab: */
-                UIMachineSettingsNetwork *pTab = new UIMachineSettingsNetwork(this);
+                UIMachineSettingsNetwork *pTab = new UIMachineSettingsNetwork(m_pTabWidget, this);
                 if (pTab)
                 {
@@ -933 +937 @@
 
                     /* Add tab into tab-widget: */
+                    addEditor(pTab);
                     m_pTabWidget->addTab(pTab, pTab->tabTitle());
                 }

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

@@ -106 +106 @@
 
 /** Machine settings: Serial Port tab. */
-class UIMachineSettingsSerial : public QIWithRetranslateUI<QWidget>
+class UIMachineSettingsSerial : public UIEditor
 {
     Q_OBJECT;
@@ -123 +123 @@
 public:
 
-    /** Constructs tab passing @a pParent to the base-class. */
-    UIMachineSettingsSerial(UIMachineSettingsSerialPage *pParent);
+    /** 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);
 
     /** Loads port data from @a portCache. */
@@ -166 +167 @@
 
     /** Holds the parent page reference. */
-    UIMachineSettingsSerialPage *m_pParent;
+    UIMachineSettingsSerialPage *m_pParentPage;
 
     /** Holds the port slot number. */
@@ -180 +181 @@
 *********************************************************************************************************************************/
 
-UIMachineSettingsSerial::UIMachineSettingsSerial(UIMachineSettingsSerialPage *pParent)
-    : QIWithRetranslateUI<QWidget>(0)
-    , m_pParent(pParent)
+UIMachineSettingsSerial::UIMachineSettingsSerial(QITabWidget *pParent, UIMachineSettingsSerialPage *pParentPage)
+    : UIEditor(pParent)
+    , m_pParentPage(pParentPage)
     , m_iSlot(-1)
     , m_pEditorSerialSettings(0)
@@ -266 +267 @@
         {
             QVector<QPair<QString, QString> > ports;
-            if (m_pParent)
-            {
-                ports = m_pParent->ports();
+            if (m_pParentPage)
+            {
+                ports = m_pParentPage->ports();
                 ports.removeAt(m_iSlot);
             }
@@ -291 +292 @@
             {
                 QVector<QString> paths;
-                if (m_pParent)
+                if (m_pParentPage)
                 {
-                    paths = m_pParent->paths();
+                    paths = m_pParentPage->paths();
                     paths.removeAt(m_iSlot);
                 }
@@ -347 +348 @@
 {
     if (   m_pEditorSerialSettings
-        && m_pParent)
+        && m_pParentPage)
     {
         /* Polish port page: */
         const bool fStd = m_pEditorSerialSettings->isPortStandardOne();
         const KPortMode enmMode = m_pEditorSerialSettings->hostMode();
-        m_pEditorSerialSettings->setPortOptionsAvailable(m_pParent->isMachineOffline());
-        m_pEditorSerialSettings->setIRQAndIOAddressOptionsAvailable(!fStd && m_pParent->isMachineOffline());
-        m_pEditorSerialSettings->setHostModeOptionsAvailable(m_pParent->isMachineOffline());
+        m_pEditorSerialSettings->setPortOptionsAvailable(m_pParentPage->isMachineOffline());
+        m_pEditorSerialSettings->setIRQAndIOAddressOptionsAvailable(!fStd && m_pParentPage->isMachineOffline());
+        m_pEditorSerialSettings->setHostModeOptionsAvailable(m_pParentPage->isMachineOffline());
         m_pEditorSerialSettings->setPipeOptionsAvailable(   (enmMode == KPortMode_HostPipe || enmMode == KPortMode_TCP)
-                                                         && m_pParent->isMachineOffline());
+                                                         && m_pParentPage->isMachineOffline());
         m_pEditorSerialSettings->setPathOptionsAvailable(   enmMode != KPortMode_Disconnected
-                                                         && m_pParent->isMachineOffline());
+                                                         && m_pParentPage->isMachineOffline());
     }
 }
@@ -388 +389 @@
         m_pEditorSerialSettings = new UISerialSettingsEditor(this);
         if (m_pEditorSerialSettings)
+        {
+            addEditor(m_pEditorSerialSettings);
             pLayout->addWidget(m_pEditorSerialSettings);
+        }
 
         pLayout->addStretch();
@@ -650 +654 @@
             {
                 /* Create port tab: */
-                UIMachineSettingsSerial *pTab = new UIMachineSettingsSerial(this);
+                UIMachineSettingsSerial *pTab = new UIMachineSettingsSerial(m_pTabWidget, this);
                 if (pTab)
                 {
@@ -662 +666 @@
 
                     /* Add tab into tab-widget: */
+                    addEditor(pTab);
                     m_pTabWidget->addTab(pTab, pTab->tabTitle());
                 }