Changeset 66677 in vbox

Timestamp:

Apr 26, 2017 3:04:53 PM (8 years ago)

Author:

vboxsync

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

115067

Message:

FE/Qt: Global preferences: Network page: Small changes for a couple of error messages.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (2 diffs)
• globals/UIMessageCenter.h (modified) (1 diff)
• settings/global/UIGlobalSettingsNetwork.cpp (modified) (4 diffs)

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

@@ -986 +986 @@
 }
 
-bool UIMessageCenter::confirmHostOnlyInterfaceRemoval(const QString &strName, QWidget *pParent /* = 0*/) const
+bool UIMessageCenter::confirmHostOnlyInterfaceRemoval(const QString &strName, QWidget *pParent /* = 0 */) const
 {
     return questionBinary(pParent, MessageType_Question,
@@ -1019 +1019 @@
 }
 
-void UIMessageCenter::cannotCreateDHCPServer(const CVirtualBox &vbox, QWidget *pParent /* = 0*/)
-{
-    error(pParent, MessageType_Error,
-          tr("Failed to create DHCP server."),
-          formatErrorInfo(vbox));
-}
-
-void UIMessageCenter::cannotRemoveDHCPServer(const CVirtualBox &vbox, const QString &strInterfaceName, QWidget *pParent /* = 0*/)
-{
-    error(pParent, MessageType_Error,
-          tr("Failed to remove DHCP server for network interface <b>%1</b>.")
+void UIMessageCenter::cannotCreateDHCPServer(const CVirtualBox &comVBox, const QString &strInterfaceName, QWidget *pParent /* = 0 */) const
+{
+    error(pParent, MessageType_Error,
+          tr("Failed to create a DHCP server for the network interface <b>%1</b>.")
              .arg(strInterfaceName),
-          formatErrorInfo(vbox));
-}
-
-void UIMessageCenter::cannotCreateHostInterface(const CHost &host, QWidget *pParent /* = 0*/)
-{
-    error(pParent, MessageType_Error,
-          tr("Failed to create the host network interface."),
-          formatErrorInfo(host));
-}
-
-void UIMessageCenter::cannotCreateHostInterface(const CProgress &progress, QWidget *pParent /* = 0*/)
-{
-    error(pParent, MessageType_Error,
-          tr("Failed to create the host network interface."),
-          formatErrorInfo(progress));
-}
-
-void UIMessageCenter::cannotRemoveHostInterface(const CHost &host, const QString &strInterfaceName, QWidget *pParent /* = 0*/)
+          formatErrorInfo(comVBox));
+}
+
+void UIMessageCenter::cannotRemoveDHCPServer(const CVirtualBox &comVBox, const QString &strInterfaceName, QWidget *pParent /* = 0 */) const
+{
+    error(pParent, MessageType_Error,
+          tr("Failed to remove the DHCP server for the network interface <b>%1</b>.")
+             .arg(strInterfaceName),
+          formatErrorInfo(comVBox));
+}
+
+void UIMessageCenter::cannotCreateHostNetworkInterface(const CHost &comHost, QWidget *pParent /* = 0 */) const
+{
+    error(pParent, MessageType_Error,
+          tr("Failed to create a host network interface."),
+          formatErrorInfo(comHost));
+}
+
+void UIMessageCenter::cannotCreateHostNetworkInterface(const CProgress &comProgress, QWidget *pParent /* = 0 */) const
+{
+    error(pParent, MessageType_Error,
+          tr("Failed to create a host network interface."),
+          formatErrorInfo(comProgress));
+}
+
+void UIMessageCenter::cannotRemoveHostNetworkInterface(const CHost &comHost, const QString &strInterfaceName, QWidget *pParent /* = 0 */) const
 {
     error(pParent, MessageType_Error,
           tr("Failed to remove the host network interface <b>%1</b>.")
              .arg(strInterfaceName),
-          formatErrorInfo(host));
-}
-
-void UIMessageCenter::cannotRemoveHostInterface(const CProgress &progress, const QString &strInterfaceName, QWidget *pParent /* = 0*/)
+          formatErrorInfo(comHost));
+}
+
+void UIMessageCenter::cannotRemoveHostNetworkInterface(const CProgress &comProgress, const QString &strInterfaceName, QWidget *pParent /* = 0 */) const
 {
     error(pParent, MessageType_Error,
           tr("Failed to remove the host network interface <b>%1</b>.")
              .arg(strInterfaceName),
-          formatErrorInfo(progress));
+          formatErrorInfo(comProgress));
 }
 

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

@@ -222 +222 @@
     void cannotCreateNATNetwork(const CVirtualBox &vbox, QWidget *pParent = 0);
     void cannotRemoveNATNetwork(const CVirtualBox &vbox, const QString &strNetworkName, QWidget *pParent = 0);
-    void cannotCreateDHCPServer(const CVirtualBox &vbox, QWidget *pParent = 0);
-    void cannotRemoveDHCPServer(const CVirtualBox &vbox, const QString &strInterfaceName, QWidget *pParent = 0);
-    void cannotCreateHostInterface(const CHost &host, QWidget *pParent = 0);
-    void cannotCreateHostInterface(const CProgress &progress, QWidget *pParent = 0);
-    void cannotRemoveHostInterface(const CHost &host, const QString &strInterfaceName, QWidget *pParent = 0);
-    void cannotRemoveHostInterface(const CProgress &progress, const QString &strInterfaceName, QWidget *pParent = 0);
+    void cannotCreateDHCPServer(const CVirtualBox &comVBox, const QString &strInterfaceName, QWidget *pParent = 0) const;
+    void cannotRemoveDHCPServer(const CVirtualBox &comVBox, const QString &strInterfaceName, QWidget *pParent = 0) const;
+    void cannotCreateHostNetworkInterface(const CHost &comHost, QWidget *pParent = 0) const;
+    void cannotCreateHostNetworkInterface(const CProgress &comProgress, QWidget *pParent = 0) const;
+    void cannotRemoveHostNetworkInterface(const CHost &comHost, const QString &strInterfaceName, QWidget *pParent = 0) const;
+    void cannotRemoveHostNetworkInterface(const CProgress &comProgress, const QString &strInterfaceName, QWidget *pParent = 0) const;
     void cannotSetSystemProperties(const CSystemProperties &properties, QWidget *pParent = 0) const;
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp

@@ -720 +720 @@
     CProgress progress = host.CreateHostOnlyNetworkInterface(iface);
     if (!host.isOk())
-        return msgCenter().cannotCreateHostInterface(host, this);
+        return msgCenter().cannotCreateHostNetworkInterface(host, this);
     msgCenter().showModalProgressDialog(progress, tr("Networking"), ":/progress_network_interface_90px.png", this, 0);
     if (!progress.isOk() || progress.GetResultCode() != 0)
-        return msgCenter().cannotCreateHostInterface(progress, this);
+        return msgCenter().cannotCreateHostNetworkInterface(progress, this);
 
     /* Make sure DHCP server is created too: */
@@ -731 +731 @@
         vbox.CreateDHCPServer(iface.GetNetworkName());
         if (!vbox.isOk())
-            return msgCenter().cannotCreateDHCPServer(vbox, this);
+            return msgCenter().cannotCreateDHCPServer(vbox, iface.GetNetworkName(), this);
         dhcp = vbox.FindDHCPServerByNetworkName(iface.GetNetworkName());
     }
@@ -795 +795 @@
     CProgress progress = host.RemoveHostOnlyNetworkInterface(iface.GetId());
     if (!host.isOk())
-        return msgCenter().cannotRemoveHostInterface(host, strInterfaceName, this);
+        return msgCenter().cannotRemoveHostNetworkInterface(host, strInterfaceName, this);
     msgCenter().showModalProgressDialog(progress, tr("Networking"), ":/progress_network_interface_90px.png", this, 0);
     if (!progress.isOk() || progress.GetResultCode() != 0)
-        return msgCenter().cannotRemoveHostInterface(progress, strInterfaceName, this);
+        return msgCenter().cannotRemoveHostNetworkInterface(progress, strInterfaceName, this);
 
     /* Update tree: */
@@ -1451 +1451 @@
         if (!vbox.isOk())
         {
-            msgCenter().cannotCreateDHCPServer(vbox, this);
+            msgCenter().cannotCreateDHCPServer(vbox, iface.GetNetworkName(), this);
             return;
         }