Changeset 57384 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Aug 17, 2015 12:24:04 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Port-forwarding dialog: Do not ask user for rejection twice.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• settings/global/UIGlobalSettingsPortForwardingDlg.cpp (modified) (2 diffs)
• settings/machine/UIMachineSettingsPortForwardingDlg.cpp (modified) (2 diffs)
• widgets/UIPortForwardingTable.cpp (modified) (2 diffs)
• widgets/UIPortForwardingTable.h (modified) (3 diffs)

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

@@ -28 +28 @@
 # include "UIGlobalSettingsPortForwardingDlg.h"
 # include "UIIconPool.h"
+# include "UIMessageCenter.h"
 # include "QIDialogButtonBox.h"
 
@@ -95 +96 @@
 void UIGlobalSettingsPortForwardingDlg::reject()
 {
-    /* Discard table: */
-    bool fPassed = m_pIPv4Table->discard() && m_pIPv6Table->discard();
-    if (!fPassed)
+    /* Ask user to discard table changes if necessary: */
+    if (   (m_pIPv4Table->isChanged() || m_pIPv6Table->isChanged())
+        && !msgCenter().confirmCancelingPortForwardingDialog(window()))
         return;
     /* Call to base-class: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp

@@ -27 +27 @@
 # include "UIMachineSettingsPortForwardingDlg.h"
 # include "UIIconPool.h"
+# include "UIMessageCenter.h"
 # include "QIDialogButtonBox.h"
 
@@ -79 +80 @@
 void UIMachineSettingsPortForwardingDlg::reject()
 {
-    /* Discard table: */
-    bool fPassed = m_pTable->discard();
-    if (!fPassed)
+    /* Ask user to discard table changes if necessary: */
+    if (   m_pTable->isChanged()
+        && !msgCenter().confirmCancelingPortForwardingDialog(window()))
         return;
     /* Call to base-class: */

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

@@ -754 +754 @@
 }
 
-bool UIPortForwardingTable::discard() const
-{
-    /* Check if table data was changed and user do not want to loose it: */
-    if (m_fIsTableDataChanged && !msgCenter().confirmCancelingPortForwardingDialog(window()))
-        return false;
-    /* True by default: */
-    return true;
-}
-
 void UIPortForwardingTable::sltAddRule()
 {
@@ -787 +778 @@
     sltCurrentChanged();
     sltAdjustTable();
-}
-
-void UIPortForwardingTable::sltTableDataChanged()
-{
-    m_fIsTableDataChanged = true;
 }
 

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

@@ -135 +135 @@
     const UIPortForwardingDataList& rules() const;
     bool validate() const;
-    bool discard() const;
+
+    /** Returns whether the table data was changed. */
+    bool isChanged() const { return m_fIsTableDataChanged; }
 
 private slots:
@@ -144 +146 @@
     void sltDelRule();
 
+    /** Marks table data as changed. */
+    void sltTableDataChanged() { m_fIsTableDataChanged = true; }
+
     /* Handlers: Table stuff: */
-    void sltTableDataChanged();
     void sltCurrentChanged();
     void sltShowTableContexMenu(const QPoint &position);
@@ -160 +164 @@
     /* Flags: */
     bool m_fAllowEmptyGuestIPs;
+
+    /** Holds whether the table data was changed. */
     bool m_fIsTableDataChanged;