Changeset 92762 in vbox

Timestamp:

Dec 6, 2021 12:22:53 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10163: UINetworkManager: Subnet id stuff for Cloud Network page; Committed separately and probably temporary.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/networkmanager

Files:

• UIDetailsWidgetCloudNetwork.cpp (modified) (6 diffs)
• UIDetailsWidgetCloudNetwork.h (modified) (5 diffs)
• UINetworkManager.cpp (modified) (4 diffs)

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

@@ -49 +49 @@
     , m_pLabelProfileName(0)
     , m_pComboProfileName(0)
+    , m_pLabelNetworkId(0)
+    , m_pEditorNetworkId(0)
     , m_pButtonBoxOptions(0)
 {
@@ -126 +128 @@
     if (m_pComboProfileName)
         m_pComboProfileName->setToolTip(tr("Holds the cloud profile for this network."));
+    if (m_pLabelNetworkId)
+        m_pLabelNetworkId->setText(tr("&Id:"));
+    if (m_pEditorNetworkId)
+        m_pEditorNetworkId->setToolTip(tr("Holds the id for this network."));
     if (m_pButtonBoxOptions)
     {
@@ -170 +176 @@
 }
 
+void UIDetailsWidgetCloudNetwork::sltNetworkIdChanged(const QString &strText)
+{
+    m_newData.m_strId = strText;
+    updateButtonStates();
+}
+
 void UIDetailsWidgetCloudNetwork::sltHandleButtonBoxClick(QAbstractButton *pButton)
 {
@@ -272 +284 @@
 
                 pLayoutOptions->addWidget(m_pComboProfileName, 2, 1);
+            }
+
+            /* Prepare network id label: */
+            m_pLabelNetworkId = new QLabel(this);
+            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);
             }
 
@@ -416 +447 @@
     m_pLabelProfileName->setEnabled(fIsNetworkExists);
     m_pComboProfileName->setEnabled(fIsNetworkExists);
+    m_pLabelNetworkId->setEnabled(fIsNetworkExists);
+    m_pEditorNetworkId->setEnabled(fIsNetworkExists);
 
     /* Load fields: */
@@ -423 +456 @@
     const int iProfileIndex = m_pComboProfileName->findData(m_newData.m_strProfile);
     m_pComboProfileName->setCurrentIndex(iProfileIndex == -1 ? 0 : iProfileIndex);
-}
+    m_pEditorNetworkId->setText(m_newData.m_strId);
+}

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

@@ -54 +54 @@
         , m_strProvider(QString())
         , m_strProfile(QString())
+        , m_strId(QString())
     {}
 
@@ -65 +66 @@
                && (m_strProvider == other.m_strProvider)
                && (m_strProfile == other.m_strProfile)
+               && (m_strId == other.m_strId)
                ;
     }
@@ -83 +85 @@
     /** Holds cloud profile name. */
     QString  m_strProfile;
+    /** Holds network id. */
+    QString  m_strId;
 };
 
@@ -139 +143 @@
         /** Handles cloud profile name index change. */
         void sltCloudProfileNameChanged(int iIndex);
+        /** Handles network id text change. */
+        void sltNetworkIdChanged(const QString &strText);
 
         /** Handles button-box button click. */
@@ -189 +195 @@
         /** Holds the cloud profile name combo instance. */
         QIComboBox *m_pComboProfileName;
+        /** Holds the network id label instance. */
+        QLabel     *m_pLabelNetworkId;
+        /** Holds the network id editor instance. */
+        QLineEdit  *m_pEditorNetworkId;
 
         /** Holds the 'Options' button-box instance. */

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

@@ -783 +783 @@
     oldData.m_strProvider = QString();
     oldData.m_strProfile = QString();
+    oldData.m_strId = QString();
 
     /* Get VirtualBox for further activities: */
@@ -808 +809 @@
         if (comNetwork.isOk())
             comNetwork.SetProfile(oldData.m_strProfile);
+        /* Save cloud network id: */
+        if (comNetwork.isOk())
+            comNetwork.SetNetworkId(oldData.m_strId);
 
         /* Show error message if necessary: */
@@ -1472 +1476 @@
             if (comNetwork.isOk() && newData.m_strProfile != oldData.m_strProfile)
                 comNetwork.SetProfile(newData.m_strProfile);
+            /* Save cloud network id: */
+            if (comNetwork.isOk() && newData.m_strId != oldData.m_strId)
+                comNetwork.SetNetworkId(newData.m_strId);
 
             /* Show error message if necessary: */
@@ -2068 +2075 @@
     if (comNetwork.isOk())
         data.m_strProfile = comNetwork.GetProfile();
+    if (comNetwork.isOk())
+        data.m_strId = comNetwork.GetNetworkId();
 
     /* Show error message if necessary: */