Changeset 92811 in vbox for trunk/src/VBox

Timestamp:

Dec 8, 2021 1:41:20 PM (3 years ago)

Author:

vboxsync

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

148731

Message:

FE/Qt: bugref:9871: A bit of cleanup for Network Manager and Host Network Interface stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIMessageCenter.h (modified) (1 diff)
• networkmanager/UIDetailsWidgetHostNetwork.cpp (modified) (8 diffs)
• networkmanager/UIDetailsWidgetHostNetwork.h (modified) (2 diffs)
• networkmanager/UINetworkManager.cpp (modified) (4 diffs)

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

@@ -1323 +1323 @@
 }
 
-bool UIMessageCenter::confirmHostOnlyInterfaceRemoval(const QString &strName, QWidget *pParent /* = 0 */) const
+bool UIMessageCenter::confirmHostNetworkInterfaceRemoval(const QString &strName, QWidget *pParent /* = 0 */) const
 {
     return questionBinary(pParent, MessageType_Question,

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

@@ -357 +357 @@
       * @{ */
         bool confirmCloudNetworkRemoval(const QString &strName, QWidget *pParent = 0) const;
-        bool confirmHostOnlyInterfaceRemoval(const QString &strName, QWidget *pParent = 0) const;
+        bool confirmHostNetworkInterfaceRemoval(const QString &strName, QWidget *pParent = 0) const;
         bool confirmNATNetworkRemoval(const QString &strName, QWidget *pParent = 0) const;
     /** @} */

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

@@ -458 +458 @@
             if (m_pLabelIPv4)
             {
-                m_pLabelIPv4->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
+                m_pLabelIPv4->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
                 pLayoutInterface->addWidget(m_pLabelIPv4, 2, 1);
             }
@@ -485 +485 @@
             if (m_pLabelNMv4)
             {
-                m_pLabelNMv4->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
+                m_pLabelNMv4->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
                 pLayoutInterface->addWidget(m_pLabelNMv4, 3, 1);
             }
@@ -512 +512 @@
             if (m_pLabelIPv6)
             {
-                m_pLabelIPv6->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
+                m_pLabelIPv6->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
                 pLayoutInterface->addWidget(m_pLabelIPv6, 4, 1);
             }
@@ -539 +539 @@
             if (m_pLabelNMv6)
             {
-                m_pLabelNMv6->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
+                m_pLabelNMv6->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
                 pLayoutInterface->addWidget(m_pLabelNMv6, 5, 1);
             }
@@ -626 +626 @@
             if (m_pLabelDHCPAddress)
             {
-                m_pLabelDHCPAddress->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
+                m_pLabelDHCPAddress->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
                 pLayoutDHCPServer->addWidget(m_pLabelDHCPAddress, 1, 1);
             }
@@ -653 +653 @@
             if (m_pLabelDHCPMask)
             {
-                m_pLabelDHCPMask->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
+                m_pLabelDHCPMask->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
                 pLayoutDHCPServer->addWidget(m_pLabelDHCPMask, 2, 1);
             }
@@ -680 +680 @@
             if (m_pLabelDHCPLowerAddress)
             {
-                m_pLabelDHCPLowerAddress->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
+                m_pLabelDHCPLowerAddress->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
                 pLayoutDHCPServer->addWidget(m_pLabelDHCPLowerAddress, 3, 1);
             }
@@ -707 +707 @@
             if (m_pLabelDHCPUpperAddress)
             {
-                m_pLabelDHCPUpperAddress->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
+                m_pLabelDHCPUpperAddress->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
                 pLayoutDHCPServer->addWidget(m_pLabelDHCPUpperAddress, 4, 1);
             }

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

@@ -92 +92 @@
 };
 
-
 /** Network Manager: DHCP Server data structure. */
 struct UIDataDHCPServer
@@ -133 +132 @@
     QString  m_strUpperAddress;
 };
-
 
 /** Network Manager: Host network data structure. */

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

@@ -40 +40 @@
 #ifdef VBOX_WS_MAC
 # include "UIWindowMenuManager.h"
-#endif /* VBOX_WS_MAC */
+#endif
 #include "UICommon.h"
 
@@ -374 +374 @@
     if (m_pToolBar)
         m_pToolBar->updateLayout();
-#endif
+#endif /* VBOX_WS_MAC */
 
     /* Translate tab-widget: */
@@ -532 +532 @@
 
     /* Confirm host network removal: */
-    if (!msgCenter().confirmHostOnlyInterfaceRemoval(strInterfaceName, this))
+    if (!msgCenter().confirmHostNetworkInterfaceRemoval(strInterfaceName, this))
         return;
 
@@ -1587 +1587 @@
             layout()->addWidget(m_pToolBar);
         }
-#else
+#else /* !VBOX_WS_MAC */
         /* Add into layout: */
         layout()->addWidget(m_pToolBar);
-#endif
+#endif /* !VBOX_WS_MAC */
     }
 }