Changeset 53291 in vbox for trunk/src/VBox

Timestamp:

Nov 10, 2014 1:36:52 PM (10 years ago)

Author:

vboxsync

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

96870

Message:

FE/Qt: 7456: Global properties: Network page: Port-forwarding sub-dialog: Rule names should be unique.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIMessageCenter.h (modified) (1 diff)
• widgets/UIPortForwardingTable.cpp (modified) (2 diffs)

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

@@ -1104 +1104 @@
 }
 
-void UIMessageCenter::warnAboutIncorrectPort(QWidget *pParent /* = 0*/) const
+bool UIMessageCenter::warnAboutIncorrectPort(QWidget *pParent /* = 0*/) const
 {
     alert(pParent, MessageType_Error,
           tr("The current port forwarding rules are not valid. "
              "None of the host or guest port values may be set to zero."));
+    return false;
+}
+
+bool UIMessageCenter::warnAboutNameShouldBeUnique(QWidget *pParent /* = 0 */) const
+{
+    alert(pParent, MessageType_Error,
+          tr("The current port forwarding rules are not valid. "
+             "Rule names should be unique."));
+    return false;
 }
 

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

@@ -230 +230 @@
     int confirmRemovingOfLastDVDDevice(QWidget *pParent = 0) const;
     void cannotAttachDevice(const CMachine &machine, UIMediumType type, const QString &strLocation, const StorageSlot &storageSlot, QWidget *pParent = 0);
-    void warnAboutIncorrectPort(QWidget *pParent = 0) const;
+    bool warnAboutIncorrectPort(QWidget *pParent = 0) const;
+    bool warnAboutNameShouldBeUnique(QWidget *pParent = 0) const;
     bool confirmCancelingPortForwardingDialog(QWidget *pParent = 0) const;
     void cannotCreateSharedFolder(const CMachine &machine, const QString &strName, const QString &strPath, QWidget *pParent = 0);

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPortForwardingTable.cpp

@@ -640 +640 @@
 {
     /* Validate table: */
+    QSet<QString> usedNames;
     for (int i = 0; i < m_pModel->rowCount(); ++i)
     {
@@ -645 +646 @@
         if (m_pModel->data(m_pModel->index(i, UIPortForwardingModel::UIPortForwardingDataType_HostPort), Qt::EditRole).value<PortData>().value() == 0 ||
             m_pModel->data(m_pModel->index(i, UIPortForwardingModel::UIPortForwardingDataType_GuestPort), Qt::EditRole).value<PortData>().value() == 0)
-        {
-            msgCenter().warnAboutIncorrectPort(window());
-            return false;
-        }
+            return msgCenter().warnAboutIncorrectPort(window());
+
+        /* Make sure non of the names were previosly used: */
+        const QString strName = m_pModel->data(m_pModel->index(i, UIPortForwardingModel::UIPortForwardingDataType_Name), Qt::EditRole).value<NameData>();
+        if (!usedNames.contains(strName))
+            usedNames << strName;
+        else
+            return msgCenter().warnAboutNameShouldBeUnique(window());
     }
     /* True by default: */