fix PEP78, rename help->help_entries; if a help dialog is already open, just raise it

DietmarSchwertberger · DietmarSchwertberger · commit 48da3f1674c6 · 2018-04-19T19:34:56.000+02:00
diff --git a/lib/matplotlib/backend_tools.py b/lib/matplotlib/backend_tools.py
@@ -1063,7 +1063,6 @@ def _get_help_html(self):
                 "<tbody>".join(rows[1:]) + "</tbody></table>")
 
 
-
 default_tools = {'home': ToolHome, 'back': ToolBack, 'forward': ToolForward,
                  'zoom': ToolZoom, 'pan': ToolPan,
                  'subplots': 'ToolConfigureSubplots',
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -1826,8 +1826,8 @@ def remove_rubberband(self, dc=None):
             self._rect = None
 
 
-class _TableDialog(wx.Dialog):
-    def __init__(self, parent, help, title="Help"):
+class _HelpDialog(wx.Dialog):
+    def __init__(self, parent, help_entries, title="Help"):
         wx.Dialog.__init__(self, parent, title=title,
                            style=wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER)
 
@@ -1836,7 +1836,7 @@ def __init__(self, parent, help, title="Help"):
         # create and add the entries
         widths = [100, 140, 300]
         bold = self.GetFont().MakeBold()
-        for r, row in enumerate(help):
+        for r, row in enumerate(help_entries):
             for (col, width) in zip(row, widths):
                 label = wx.StaticText(self, label=col)
                 if r == 0:
@@ -1851,18 +1851,25 @@ def __init__(self, parent, help, title="Help"):
         sizer.Fit(self)
         self.Layout()
         self.Bind(wx.EVT_CLOSE, self.OnClose)
+        OK.Bind(wx.EVT_BUTTON, self.OnClose)
 
     def OnClose(self, evt):
+        HelpWx.dlg = None
         self.DestroyLater()
         evt.Skip()
 
 
 class HelpWx(backend_tools.ToolHelpBase):
+    dlg = None
     def trigger(self, *args):
-        help = [("Action","Shortcuts", "Description")]
-        help += self._get_help_entries()
-        dlg = _TableDialog(self.figure.canvas.GetTopLevelParent(), help)
-        dlg.Show()
+        if self.dlg:
+            self.dlg.Raise()
+            return
+        help_entries = [("Action", "Shortcuts", "Description")]
+        help_entries += self._get_help_entries()
+        self.dlg = _HelpDialog(self.figure.canvas.GetTopLevelParent(),
+                                help_entries)
+        self.dlg.Show()
 
 
 backend_tools.ToolSaveFigure = SaveFigureWx
