Merge pull request #88 from p4vv37/my_branch

A quick fix for an issue #87
pyblish · Jan 14, 2017 · 6fe8181 · 6fe8181
2 parents 4f14d28 + b03898c
commit 6fe8181
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/pyblish_lite/model.py b/pyblish_lite/model.py
@@ -528,6 +528,11 @@ def item(self, index):
         model = self.sourceModel()
         return model.items[index.row()]
 
+    def reset(self):
+        self.beginResetModel()
+        self.includes = {'families': ['*']}
+        self.endResetModel()
+
     def add_exclusion(self, role, value):
         """Exclude item if `role` equals `value`
 
@@ -586,7 +591,6 @@ def set_inclusion(self, rules):
 
     def clear_inclusion(self):
         self._clear_group(self.includes)
-        self.add_inclusion(role="families", value="*")
 
     def _add_rule(self, group, role, value):
         """Implementation detail"""

diff --git a/pyblish_lite/version.py b/pyblish_lite/version.py
@@ -1,7 +1,7 @@
 
 VERSION_MAJOR = 0
 VERSION_MINOR = 7
-VERSION_PATCH = 2
+VERSION_PATCH = 3
 
 version_info = (VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH)
 version = '%i.%i.%i' % version_info

diff --git a/pyblish_lite/window.py b/pyblish_lite/window.py
@@ -356,10 +356,11 @@ def __init__(self, controller, parent=None):
         plugin_model = model.Plugin()
         terminal_model = model.Terminal()
 
+        filter_model = model.ProxyModel(plugin_model)
+
         artist_view.setModel(instance_model)
         left_view.setModel(instance_model)
-        plugins_filter = model.ProxyModel(plugin_model)
-        right_view.setModel(plugins_filter)
+        right_view.setModel(filter_model)
         terminal_view.setModel(terminal_model)
 
         instance_combo.setModel(instance_model)
@@ -429,6 +430,7 @@ def __init__(self, controller, parent=None):
             "models": {
                 "instances": instance_model,
                 "plugins": plugin_model,
+                "filter": filter_model,
                 "terminal": terminal_model,
             },
             "terminal_toggles": {
@@ -735,7 +737,8 @@ def on_plugin_action_menu_requested(self, pos):
             return
 
         menu = QtWidgets.QMenu(self)
-        plugin = self.data["models"]["plugins"].items[index.row()]
+        plugins_index = self.data["models"]["filter"].mapToSource(index)
+        plugin = self.data["models"]["plugins"].items[plugins_index.row()]
         print("plugin is: %s" % plugin)
 
         for action in actions:
@@ -832,13 +835,13 @@ def on_was_processed(self, result):
 
             family = instance.data["family"]
             if family:
-                plugins_filter = self.data["views"]["right"].model()
+                plugins_filter = self.data["models"]["filter"]
                 plugins_filter.add_inclusion(role="families", value=family)
 
             families = instance.data.get("families")
             if families:
                 for f in families:
-                    plugins_filter = self.data["views"]["right"].model()
+                    plugins_filter = self.data["models"]["filter"]
                     plugins_filter.add_inclusion(role="families", value=f)
 
         models["plugins"].update_with_result(result)
@@ -884,9 +887,6 @@ def reset(self):
         """Prepare GUI for reset"""
         self.info("About to reset..")
 
-        plugins_filter = self.data["views"]["right"].model()
-        plugins_filter.clear_inclusion()
-
         models = self.data["models"]
 
         models["instances"].store_checkstate()