Merge pull request #2032 from astrofrog/fix-autoconnect

Fix bug in autoconnect_callbacks_to_qt

CHANGES.md

@@ -1,6 +1,13 @@
 Full changelog
 ==============
 
+v0.15.2 (unreleased)
+--------------------
+
+* Fixed a bug in ``autoconnect_callbacks_to_qt`` which caused some widgets
+  to not stay connect to state callback properties if a callback property
+  was linked to multiple widgets. [#2032]
+
 v0.15.1 (2019-06-24)
 --------------------
 

glue/dialogs/link_editor/qt/link_editor.py

@@ -122,7 +122,7 @@ def _set_up_combos(self):
     @avoid_circular
     def _on_attribute_combo_change(self, *args, **kwargs):
         # Force a re-sync of the choices
-        self._handlers['current_link'].update_widget(self.state.current_link, force=True)
+        self._handlers['listsel_current_link'].update_widget(self.state.current_link, force=True)
 
     @avoid_circular
     def _on_data_change_graph(self):

glue/external/echo/qt/autoconnect.py

@@ -1,7 +1,5 @@
 from __future__ import absolute_import, division, print_function
 
-from qtpy import QtWidgets
-
 from .connect import (connect_checkable_button,
                       connect_value,
                       connect_combo_data,
@@ -113,6 +111,8 @@ def autoconnect_callbacks_to_qt(instance, widget, connect_kwargs={}):
             if hasattr(instance, wname):
                 if wtype in HANDLERS:
                     child = getattr(widget, original_name)
-                    returned_handlers[wname] = HANDLERS[wtype](instance, wname, child, **kwargs)
+                    # NOTE: we need to use original_name here since we need a
+                    # unique key, and some wname values might be duplicate.
+                    returned_handlers[original_name] = HANDLERS[wtype](instance, wname, child, **kwargs)
 
     return returned_handlers