ui: allow to open multiple rules editors

now you can open multiple rules editor dialogs from the rules list.
Right click on the rules list to edit the selected rule, then right
click on another rule to edit a new rule.

When editing a rule from the detailed view (after double clicking on a
rule), it'll only allow to open one dialog.

Closes #1455.

Author: gustavo-iniguez-goya

ui/opensnitch/dialogs/ruleseditor.py

@@ -54,7 +54,7 @@ class RulesEditorDialog(QtWidgets.QDialog, uic.loadUiType(DIALOG_UI_PATH)[0]):
 
     _notification_callback = QtCore.pyqtSignal(str, ui_pb2.NotificationReply)
 
-    def __init__(self, parent=None, _rule=None, appicon=None):
+    def __init__(self, parent=None, modal=True, appicon=None):
         super(RulesEditorDialog, self).__init__(parent)
 
         self._notifications_sent = {}
@@ -65,8 +65,10 @@ def __init__(self, parent=None, _rule=None, appicon=None):
         self._old_rule_name = None
 
         self.setupUi(self)
+        self.setModal(modal)
         self.load_aliases_into_menu()
-        self.setWindowIcon(appicon)
+        if appicon != None:
+            self.setWindowIcon(appicon)
 
         self.ruleNameValidator = qvalidator.RestrictChars(RulesEditorDialog.INVALID_RULE_NAME_CHARS)
         self.ruleNameValidator.result.connect(self._cb_rule_name_validator_result)
@@ -119,9 +121,6 @@ def __init__(self, parent=None, _rule=None, appicon=None):
         self.selectNetsListButton.setIcon(openIcon)
         self.selectIPsListButton.setIcon(openIcon)
 
-        if _rule != None:
-            self._load_rule(rule=_rule)
-
     def load_aliases_into_menu(self):
         aliases = NetworkAliases.get_alias_all()
 
@@ -1244,7 +1243,9 @@ def edit_rule(self, records, _addr=None):
         self._old_rule_name = records.value(RuleFields.Name)
 
         if self._load_rule(addr=_addr, rule=self.rule):
+            # show() is needed to open the dialog
             self.show()
+            self.exec()
 
     def new_rule(self):
         self.WORK_MODE = self.ADD_RULE

ui/opensnitch/dialogs/stats.py

@@ -1629,7 +1629,8 @@ def _table_menu_edit(self, cur_idx, model, selection):
                             QC.translate("stats", "Rule not found by that name and node"),
                             QtWidgets.QMessageBox.Icon.Warning)
                     return
-                self._rules_dialog.edit_rule(records, node)
+                r = RulesEditorDialog(modal=False)
+                r.edit_rule(records, node)
                 break
 
         elif cur_idx == self.TAB_RULES and self.fwTable.isVisible():