Changeset 87544 in vbox for trunk/src

Timestamp:

Feb 2, 2021 5:08:33 PM (4 years ago)

Author:

vboxsync

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

142570

Message:

FE/Qt: bugref:9871: Network Manager: It appeared to be much more than I expected in r142566.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIMessageCenter.h (modified) (1 diff)
• networkmanager/UIDetailsWidgetNATNetwork.cpp (modified) (9 diffs)
• networkmanager/UIDetailsWidgetNATNetwork.h (modified) (5 diffs)
• networkmanager/UINetworkManager.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

@@ -1986 +1986 @@
 }
 
-void UIMessageCenter::warnAboutNoCIDRSpecified(const QString &strName, QWidget *pParent /* = 0 */)
+void UIMessageCenter::warnAboutNoIPv4PrefixSpecified(const QString &strName, QWidget *pParent /* = 0 */)
 {
     alert(pParent, MessageType_Error,
-          tr("No CIDR specified for the NAT network <b>%1</b>.").arg(strName));
+          tr("No IPv4 prefix specified for the NAT network <b>%1</b>.").arg(strName));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h

@@ -411 +411 @@
     void warnAboutNoNameSpecified(const QString &strName, QWidget *pParent = 0);
     void warnAboutNameAlreadyBusy(const QString &strName, QWidget *pParent = 0);
-    void warnAboutNoCIDRSpecified(const QString &strName, QWidget *pParent = 0);
+    void warnAboutNoIPv4PrefixSpecified(const QString &strName, QWidget *pParent = 0);
     void warnAboutInvalidCIDRSpecified(const QString &strCIDR, const QString &strName, QWidget *pParent = 0);
 

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

@@ -46 +46 @@
     , m_pLabelNetworkName(0)
     , m_pEditorNetworkName(0)
-    , m_pLabelNetworkCIDR(0)
-    , m_pEditorNetworkCIDR(0)
+    , m_pLabelNetworkIPv4Prefix(0)
+    , m_pEditorNetworkIPv4Prefix(0)
     , m_pLabelExtended(0)
     , m_pCheckboxSupportsDHCP(0)
@@ -96 +96 @@
     }
 
-    /* Make sure network CIDR isn't empty: */
-    if (m_newData.m_strCIDR.isEmpty())
-    {
-        msgCenter().warnAboutNoCIDRSpecified(m_newData.m_strName);
+    /* Make sure IPv4 prefix isn't empty: */
+    if (m_newData.m_strPrefixIPv4.isEmpty())
+    {
+        msgCenter().warnAboutNoIPv4PrefixSpecified(m_newData.m_strName);
         return false;
     }
@@ -113 +113 @@
 //               m_newData.m_fEnabled,
 //               m_newData.m_strName.toUtf8().constData(),
-//               m_newData.m_strCIDR.toUtf8().constData(),
+//               m_newData.m_strPrefixIPv4.toUtf8().constData(),
 //               m_newData.m_fSupportsDHCP,
 //               m_newData.m_fSupportsIPv6,
@@ -153 +153 @@
     if (m_pEditorNetworkName)
         m_pEditorNetworkName->setToolTip(tr("Holds the name for this network."));
-    if (m_pLabelNetworkCIDR)
-        m_pLabelNetworkCIDR->setText(tr("IPv&4 Prefix:"));
-    if (m_pEditorNetworkCIDR)
-        m_pEditorNetworkCIDR->setToolTip(tr("Holds the CIDR for this network."));
+    if (m_pLabelNetworkIPv4Prefix)
+        m_pLabelNetworkIPv4Prefix->setText(tr("IPv&4 Prefix:"));
+    if (m_pEditorNetworkIPv4Prefix)
+        m_pEditorNetworkIPv4Prefix->setToolTip(tr("Holds the IPv4 prefix for this network."));
     if (m_pLabelExtended)
         m_pLabelExtended->setText(tr("Extended Features:"));
@@ -222 +222 @@
 }
 
-void UIDetailsWidgetNATNetwork::sltNetworkCIDRChanged(const QString &strText)
-{
-    m_newData.m_strCIDR = strText;
+void UIDetailsWidgetNATNetwork::sltNetworkIPv4PrefixChanged(const QString &strText)
+{
+    m_newData.m_strPrefixIPv4 = strText;
     updateButtonStates();
 }
@@ -377 +377 @@
                 }
 
-                /* Prepare network CIDR label: */
-                m_pLabelNetworkCIDR = new QLabel(pTabOptions);
-                if (m_pLabelNetworkCIDR)
-                {
-                    m_pLabelNetworkCIDR->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                    pLayoutSettings->addWidget(m_pLabelNetworkCIDR, 1, 0);
-                }
-                /* Prepare network CIDR editor: */
-                m_pEditorNetworkCIDR = new QLineEdit(pTabOptions);
-                if (m_pEditorNetworkCIDR)
-                {
-                    if (m_pLabelNetworkCIDR)
-                        m_pLabelNetworkCIDR->setBuddy(m_pEditorNetworkCIDR);
-                    connect(m_pEditorNetworkCIDR, &QLineEdit::textEdited,
-                            this, &UIDetailsWidgetNATNetwork::sltNetworkCIDRChanged);
-
-                    pLayoutSettings->addWidget(m_pEditorNetworkCIDR, 1, 1, 1, 3);
+                /* Prepare network IPv4 prefix label: */
+                m_pLabelNetworkIPv4Prefix = new QLabel(pTabOptions);
+                if (m_pLabelNetworkIPv4Prefix)
+                {
+                    m_pLabelNetworkIPv4Prefix->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+                    pLayoutSettings->addWidget(m_pLabelNetworkIPv4Prefix, 1, 0);
+                }
+                /* Prepare network IPv4 prefix editor: */
+                m_pEditorNetworkIPv4Prefix = new QLineEdit(pTabOptions);
+                if (m_pEditorNetworkIPv4Prefix)
+                {
+                    if (m_pLabelNetworkIPv4Prefix)
+                        m_pLabelNetworkIPv4Prefix->setBuddy(m_pEditorNetworkIPv4Prefix);
+                    connect(m_pEditorNetworkIPv4Prefix, &QLineEdit::textEdited,
+                            this, &UIDetailsWidgetNATNetwork::sltNetworkIPv4PrefixChanged);
+
+                    pLayoutSettings->addWidget(m_pEditorNetworkIPv4Prefix, 1, 1, 1, 3);
                 }
 
@@ -523 +523 @@
     m_pLabelNetworkName->setEnabled(fIsNetworkExists && fIsNetworkEnabled);
     m_pEditorNetworkName->setEnabled(fIsNetworkExists && fIsNetworkEnabled);
-    m_pLabelNetworkCIDR->setEnabled(fIsNetworkExists && fIsNetworkEnabled);
-    m_pEditorNetworkCIDR->setEnabled(fIsNetworkExists && fIsNetworkEnabled);
+    m_pLabelNetworkIPv4Prefix->setEnabled(fIsNetworkExists && fIsNetworkEnabled);
+    m_pEditorNetworkIPv4Prefix->setEnabled(fIsNetworkExists && fIsNetworkEnabled);
     m_pLabelExtended->setEnabled(fIsNetworkExists && fIsNetworkEnabled);
     m_pCheckboxSupportsDHCP->setEnabled(fIsNetworkExists && fIsNetworkEnabled);
@@ -533 +533 @@
     m_pCheckboxNetworkAvailable->setChecked(fIsNetworkEnabled);
     m_pEditorNetworkName->setText(m_newData.m_strName);
-    m_pEditorNetworkCIDR->setText(m_newData.m_strCIDR);
+    m_pEditorNetworkIPv4Prefix->setText(m_newData.m_strPrefixIPv4);
     m_pCheckboxSupportsDHCP->setChecked(m_newData.m_fSupportsDHCP);
     m_pCheckboxSupportsIPv6->setChecked(m_newData.m_fSupportsIPv6);
@@ -553 +553 @@
     RTNETADDRIPV4 rtNetwork4;
     int iPrefix4;
-    const int rc = RTNetStrToIPv4Cidr(m_newData.m_strCIDR.toUtf8().constData(), &rtNetwork4, &iPrefix4);
+    const int rc = RTNetStrToIPv4Cidr(m_newData.m_strPrefixIPv4.toUtf8().constData(), &rtNetwork4, &iPrefix4);
     RTStrPrintf(szTmpIp, sizeof(szTmpIp), "%RTnaipv4", rtNetwork4);
     if (RT_SUCCESS(rc))

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

@@ -49 +49 @@
         , m_fEnabled(false)
         , m_strName(QString())
-        , m_strCIDR(QString())
+        , m_strPrefixIPv4(QString())
         , m_fSupportsDHCP(false)
         , m_fSupportsIPv6(false)
@@ -62 +62 @@
                && (m_fEnabled == other.m_fEnabled)
                && (m_strName == other.m_strName)
-               && (m_strCIDR == other.m_strCIDR)
+               && (m_strPrefixIPv4 == other.m_strPrefixIPv4)
                && (m_fSupportsDHCP == other.m_fSupportsDHCP)
                && (m_fSupportsIPv6 == other.m_fSupportsIPv6)
@@ -82 +82 @@
     /** Holds network name. */
     QString                   m_strName;
-    /** Holds network CIDR. */
-    QString                   m_strCIDR;
+    /** Holds network IPv4 prefix. */
+    QString                   m_strPrefixIPv4;
     /** Holds whether this network supports DHCP. */
     bool                      m_fSupportsDHCP;
@@ -151 +151 @@
         /** Handles network name text change. */
         void sltNetworkNameChanged(const QString &strText);
-        /** Handles network CIDR text change. */
-        void sltNetworkCIDRChanged(const QString &strText);
+        /** Handles network IPv4 prefix text change. */
+        void sltNetworkIPv4PrefixChanged(const QString &strText);
         /** Handles network supports DHCP choice change. */
         void sltSupportsDHCPChanged(bool fChecked);
@@ -215 +215 @@
         /** Holds the network name editor instance. */
         QLineEdit         *m_pEditorNetworkName;
-        /** Holds the network CIDR label instance. */
-        QLabel            *m_pLabelNetworkCIDR;
-        /** Holds the network CIDR editor instance. */
-        QLineEdit         *m_pEditorNetworkCIDR;
+        /** Holds the network IPv4 prefix label instance. */
+        QLabel            *m_pLabelNetworkIPv4Prefix;
+        /** Holds the network IPv4 prefix editor instance. */
+        QLineEdit         *m_pEditorNetworkIPv4Prefix;
         /** Holds the extended label instance. */
         QLabel            *m_pLabelExtended;

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

@@ -244 +244 @@
     /* Network information: */
     strToolTip += strHeader.arg(tr("Network Name"), m_strName);
-    strToolTip += strHeader.arg(tr("Network CIDR"), m_strCIDR);
+    strToolTip += strHeader.arg(tr("Network IPv4 Prefix"), m_strPrefixIPv4);
     strToolTip += strHeader.arg(tr("Supports DHCP"), m_fSupportsDHCP ? tr("yes") : tr("no"));
     strToolTip += strHeader.arg(tr("Supports IPv6"), m_fSupportsIPv6 ? tr("yes") : tr("no"));
@@ -557 +557 @@
     oldData.m_fEnabled = true;
     oldData.m_strName = strNetworkName;
-    oldData.m_strCIDR = "10.0.2.0/24";
+    oldData.m_strPrefixIPv4 = "10.0.2.0/24";
     oldData.m_fSupportsDHCP = true;
     oldData.m_fSupportsIPv6 = false;
@@ -579 +579 @@
         if (comNetwork.isOk())
             comNetwork.SetNetworkName(oldData.m_strName);
-        /* Save NAT network CIDR: */
+        /* Save NAT network IPv4 prefix: */
         if (comNetwork.isOk())
-            comNetwork.SetNetwork(oldData.m_strCIDR);
+            comNetwork.SetNetwork(oldData.m_strPrefixIPv4);
         /* Save whether NAT network needs DHCP server: */
         if (comNetwork.isOk())
@@ -1153 +1153 @@
             if (comNetwork.isOk() && newData.m_strName != oldData.m_strName)
                 comNetwork.SetNetworkName(newData.m_strName);
-            /* Save NAT network CIDR: */
-            if (comNetwork.isOk() && newData.m_strCIDR != oldData.m_strCIDR)
-                comNetwork.SetNetwork(newData.m_strCIDR);
+            /* Save NAT network IPv4: */
+            if (comNetwork.isOk() && newData.m_strPrefixIPv4 != oldData.m_strPrefixIPv4)
+                comNetwork.SetNetwork(newData.m_strPrefixIPv4);
             /* Save whether NAT network needs DHCP server: */
             if (comNetwork.isOk() && newData.m_fSupportsDHCP != oldData.m_fSupportsDHCP)
@@ -1628 +1628 @@
         data.m_strName = comNetwork.GetNetworkName();
     if (comNetwork.isOk())
-        data.m_strCIDR = comNetwork.GetNetwork();
+        data.m_strPrefixIPv4 = comNetwork.GetNetwork();
     if (comNetwork.isOk())
         data.m_fSupportsDHCP = comNetwork.GetNeedDhcpServer();