Changeset 67452 in vbox

Timestamp:

Jun 16, 2017 3:45:36 PM (8 years ago)

Author:

vboxsync

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

116185

Message:

FE/Qt: bugref:8847: Host Network Manager: Renaming '[network] mask length' => 'prefix length'.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork

Files:

• UIHostNetworkDetailsDialog.cpp (modified) (6 diffs)
• UIHostNetworkDetailsDialog.h (modified) (3 diffs)
• UIHostNetworkManager.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkDetailsDialog.cpp

@@ -100 +100 @@
     m_pLabelIPv6->setText(tr("I&Pv6 Address:"));
     m_pEditorIPv6->setToolTip(tr("Holds the host IPv6 address for this adapter if IPv6 is supported."));
-    m_pLabelNMv6->setText(tr("IPv6 Network Mask &Length:"));
-    m_pEditorNMv6->setToolTip(tr("Holds the host IPv6 network mask prefix length for this adapter if IPv6 is supported."));
+    m_pLabelNMv6->setText(tr("IPv6 Prefix &Length:"));
+    m_pEditorNMv6->setToolTip(tr("Holds the host IPv6 prefix length for this adapter if IPv6 is supported."));
 
     /* Translate 'DHCP server' tab content: */
@@ -158 +158 @@
 void UIHostNetworkDetailsDialog::sltTextChangedNMv6(const QString &strText)
 {
-    m_newData.m_interface.m_strMaskLength6 = strText;
+    m_newData.m_interface.m_strPrefixLength6 = strText;
     revalidate(m_pErrorPaneNMv6);
     notify();
@@ -759 +759 @@
     /* Load IPv6 interface fields: */
     m_pEditorIPv6->setText(m_newData.m_interface.m_strAddress6);
-    m_pEditorNMv6->setText(m_newData.m_interface.m_strMaskLength6);
+    m_pEditorNMv6->setText(m_newData.m_interface.m_strPrefixLength6);
 }
 
@@ -845 +845 @@
     {
         bool fIsMaskPrefixLengthNumber = false;
-        const int iMaskPrefixLength = m_newData.m_interface.m_strMaskLength6.trimmed().toInt(&fIsMaskPrefixLengthNumber);
+        const int iMaskPrefixLength = m_newData.m_interface.m_strPrefixLength6.trimmed().toInt(&fIsMaskPrefixLengthNumber);
         const bool fError =    !m_newData.m_interface.m_fDHCPEnabled
                             && m_newData.m_interface.m_fSupportedIPv6
@@ -905 +905 @@
     if (!pWidget || pWidget == m_pErrorPaneNMv6)
         m_pErrorPaneNMv6->setToolTip(tr("Host interface <nobr><b>%1</b></nobr> does not currently have a valid "
-                                        "IPv6 network mask prefix length.").arg(m_newData.m_interface.m_strName));
+                                        "IPv6 prefix length.").arg(m_newData.m_interface.m_strName));
 
     /* Translate 'DHCP server' tab content: */
@@ -929 +929 @@
 //               m_newData.m_interface.m_strMask.toUtf8().constData(),
 //               m_newData.m_interface.m_strAddress6.toUtf8().constData(),
-//               m_newData.m_interface.m_strMaskLength6.toUtf8().constData(),
+//               m_newData.m_interface.m_strPrefixLength6.toUtf8().constData(),
 //               (int)m_newData.m_dhcpserver.m_fEnabled,
 //               m_newData.m_dhcpserver.m_strAddress.toUtf8().constData(),

trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkDetailsDialog.h

@@ -44 +44 @@
         , m_fSupportedIPv6(false)
         , m_strAddress6(QString())
-        , m_strMaskLength6(QString())
+        , m_strPrefixLength6(QString())
     {}
 
@@ -57 +57 @@
                && (m_fSupportedIPv6 == other.m_fSupportedIPv6)
                && (m_strAddress6 == other.m_strAddress6)
-               && (m_strMaskLength6 == other.m_strMaskLength6)
+               && (m_strPrefixLength6 == other.m_strPrefixLength6)
                ;
     }
@@ -78 +78 @@
     /** Holds IPv6 interface address. */
     QString m_strAddress6;
-    /** Holds IPv6 interface mask length. */
-    QString m_strMaskLength6;
+    /** Holds IPv6 interface prefix length. */
+    QString m_strPrefixLength6;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.cpp

@@ -90 +90 @@
                          QString("%1/%2").arg(m_interface.m_strAddress).arg(maskToCidr(m_interface.m_strMask)));
     setText(Column_IPv6, m_interface.m_strAddress6.isEmpty() || !m_interface.m_fSupportedIPv6 ? QString() :
-                         QString("%1/%2").arg(m_interface.m_strAddress6).arg(m_interface.m_strMaskLength6.toInt()));
+                         QString("%1/%2").arg(m_interface.m_strAddress6).arg(m_interface.m_strPrefixLength6.toInt()));
     setText(Column_DHCP, UIHostNetworkManager::tr("Enable", "DHCP Server"));
     setCheckState(Column_DHCP, m_dhcpserver.m_fEnabled ? Qt::Checked : Qt::Unchecked);
@@ -119 +119 @@
                                        UIHostNetworkManager::tr("Not set", "address") :
                                        m_interface.m_strAddress6) +
-                      strSubHeader.arg(UIHostNetworkManager::tr("IPv6 Network Mask Length"))
-                                  .arg(m_interface.m_strMaskLength6.isEmpty() ?
+                      strSubHeader.arg(UIHostNetworkManager::tr("IPv6 Prefix Length"))
+                                  .arg(m_interface.m_strPrefixLength6.isEmpty() ?
                                        UIHostNetworkManager::tr("Not set", "length") :
-                                       m_interface.m_strMaskLength6);
+                                       m_interface.m_strPrefixLength6);
     }
 
@@ -462 +462 @@
                 && (   oldData.m_interface.m_fDHCPEnabled
                     || newData.m_interface.m_strAddress6 != oldData.m_interface.m_strAddress6
-                    || newData.m_interface.m_strMaskLength6 != oldData.m_interface.m_strMaskLength6))
-                comInterface.EnableStaticIPConfigV6(newData.m_interface.m_strAddress6, newData.m_interface.m_strMaskLength6.toULong());
+                    || newData.m_interface.m_strPrefixLength6 != oldData.m_interface.m_strPrefixLength6))
+                comInterface.EnableStaticIPConfigV6(newData.m_interface.m_strAddress6, newData.m_interface.m_strPrefixLength6.toULong());
         }
 
@@ -950 +950 @@
         data.m_interface.m_strAddress6 = comInterface.GetIPV6Address();
     if (comInterface.isOk())
-        data.m_interface.m_strMaskLength6 = QString::number(comInterface.GetIPV6NetworkMaskPrefixLength());
+        data.m_interface.m_strPrefixLength6 = QString::number(comInterface.GetIPV6NetworkMaskPrefixLength());
 
     /* Get host interface network name for further activities: */