Fix damage profile / target resists editor (#587)

pyfa-org · May 3, 2016 · d4e5f8d · d4e5f8d
1 parent b9dad60
commit d4e5f8d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/gui/patternEditor.py b/gui/patternEditor.py
@@ -177,6 +177,7 @@ def __init__(self, parent):
                 btn.Enable(True)
                 btn.SetToolTipString("%s patterns %s clipboard" % (name, direction) )
                 footerSizer.Add(btn, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALIGN_RIGHT)
+                btn.Bind(wx.EVT_BUTTON, getattr(self, "{}Patterns".format(name.lower())))
 
         self.Layout()
         bsize = self.GetBestSize()
@@ -259,7 +260,7 @@ def importPatterns(self, event):
             except Exception, e:
                 self.stNotice.SetLabel("Could not import from clipboard: unknown errors")
             finally:
-                self.updateChoices()
+                self.entityEditor.refreshEntityList()
         else:
             self.stNotice.SetLabel("Could not import from clipboard")
 

diff --git a/gui/resistsEditor.py b/gui/resistsEditor.py
@@ -157,17 +157,18 @@ def __init__(self, parent):
                         ("Export", wx.ART_FILE_SAVE_AS, "to"))
 
         for name, art, direction in importExport:
-                bitmap = wx.ArtProvider.GetBitmap(art, wx.ART_BUTTON)
-                btn = wx.BitmapButton(self, wx.ID_ANY, bitmap)
+            bitmap = wx.ArtProvider.GetBitmap(art, wx.ART_BUTTON)
+            btn = wx.BitmapButton(self, wx.ID_ANY, bitmap)
 
-                btn.SetMinSize( btn.GetSize() )
-                btn.SetMaxSize( btn.GetSize() )
+            btn.SetMinSize( btn.GetSize() )
+            btn.SetMaxSize( btn.GetSize() )
 
-                btn.Layout()
-                setattr(self, name, btn)
-                btn.Enable(True)
-                btn.SetToolTipString("%s patterns %s clipboard" % (name, direction) )
-                footerSizer.Add(btn, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALIGN_RIGHT)
+            btn.Layout()
+            setattr(self, name, btn)
+            btn.Enable(True)
+            btn.SetToolTipString("%s patterns %s clipboard" % (name, direction) )
+            footerSizer.Add(btn, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALIGN_RIGHT)
+            btn.Bind(wx.EVT_BUTTON, getattr(self, "{}Patterns".format(name.lower())))
 
         if not self.entityEditor.checkEntitiesExist():
             self.Destroy()
@@ -267,19 +268,17 @@ def importPatterns(self, event):
             try:
                 sTR.importPatterns(text)
                 self.stNotice.SetLabel("Patterns successfully imported from clipboard")
-                self.showInput(False)
             except service.targetResists.ImportError, e:
                 self.stNotice.SetLabel(str(e))
             except Exception, e:
                 self.stNotice.SetLabel("Could not import from clipboard: unknown errors")
             finally:
-                self.updateChoices()
+                self.entityEditor.refreshEntityList()
         else:
             self.stNotice.SetLabel("Could not import from clipboard")
 
     def exportPatterns(self, event):
         "Event fired when export to clipboard button is clicked"
-
         sTR = service.TargetResists.getInstance()
         toClipboard( sTR.exportPatterns() )
         self.stNotice.SetLabel("Patterns exported to clipboard")