From 38393ad2b9906c1740a93cf69d74e4eef360d06e Mon Sep 17 00:00:00 2001
From: DarkPhoenix <phoenix@mail.ru>
Date: Sat, 12 May 2012 15:29:22 +0400
Subject: [PATCH] Update eos, staticdata in pyfa & make UI adjustments to add
 implants export

---
 eos                     | 2 +-
 gui/copySelectDialog.py | 8 +++++---
 gui/mainFrame.py        | 5 +++++
 service/fit.py          | 4 ++++
 staticdata              | 2 +-
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/eos b/eos
index 25d620a29..7a4cbc409 160000
--- a/eos
+++ b/eos
@@ -1 +1 @@
-Subproject commit 25d620a29c9e7bf9cfbf3c1eda25e82d5e5cd174
+Subproject commit 7a4cbc409d5e2fce21fd905f62eb74712df96c6a
diff --git a/gui/copySelectDialog.py b/gui/copySelectDialog.py
index 45fb91d10..d14a5ebb0 100644
--- a/gui/copySelectDialog.py
+++ b/gui/copySelectDialog.py
@@ -22,15 +22,17 @@ import wx
 
 class CopySelectDialog(wx.Dialog):
     copyFormatEft = 0
-    copyFormatXml = 1
-    copyFormatDna = 2
+    copyFormatEftImps = 1
+    copyFormatXml = 2
+    copyFormatDna = 3
 
     def __init__(self, parent):
         wx.Dialog.__init__(self, parent, id = wx.ID_ANY, title = u"Select a format", size = (-1,-1), style = wx.DEFAULT_DIALOG_STYLE)
         mainSizer = wx.BoxSizer(wx.VERTICAL)
 
-        copyFormats = [u"EFT", u"XML", u"DNA"]
+        copyFormats = [u"EFT", u"EFT (Implants)", u"XML", u"DNA"]
         copyFormatTooltips = {CopySelectDialog.copyFormatEft: u"Eve Fitting Tool text format",
+                              CopySelectDialog.copyFormatEftImps: u"Eve Fitting Tool text format",
                               CopySelectDialog.copyFormatXml: u"EvE native XML format",
                               CopySelectDialog.copyFormatDna: u"A one-line text format"}
         selector = wx.RadioBox(self, wx.ID_ANY, label = u"Copy to the clipboard using:", choices = copyFormats, style = wx.RA_SPECIFY_ROWS)
diff --git a/gui/mainFrame.py b/gui/mainFrame.py
index 76ae8cd27..24212c207 100644
--- a/gui/mainFrame.py
+++ b/gui/mainFrame.py
@@ -423,6 +423,10 @@ class MainFrame(wx.Frame):
         sFit = service.Fit.getInstance()
         toClipboard(sFit.exportFit(self.getActiveFit()))
 
+    def clipboardEftImps(self):
+        sFit = service.Fit.getInstance()
+        toClipboard(sFit.exportEftImps(self.getActiveFit()))
+
     def clipboardDna(self):
         sFit = service.Fit.getInstance()
         toClipboard(sFit.exportDna(self.getActiveFit()))
@@ -442,6 +446,7 @@ class MainFrame(wx.Frame):
 
     def exportToClipboard(self, event):
         CopySelectDict = {CopySelectDialog.copyFormatEft: self.clipboardEft,
+                          CopySelectDialog.copyFormatEftImps: self.clipboardEftImps,
                           CopySelectDialog.copyFormatXml: self.clipboardXml,
                           CopySelectDialog.copyFormatDna: self.clipboardDna}
         dlg = CopySelectDialog(self)
diff --git a/service/fit.py b/service/fit.py
index 1d0631458..4df5fb2f2 100644
--- a/service/fit.py
+++ b/service/fit.py
@@ -547,6 +547,10 @@ class Fit(object):
         fit = eos.db.getFit(fitID)
         return fit.exportEft()
 
+    def exportEftImps(self, fitID):
+        fit = eos.db.getFit(fitID)
+        return fit.exportEftImps()
+
     def exportDna(self, fitID):
         fit = eos.db.getFit(fitID)
         return fit.exportDna()
diff --git a/staticdata b/staticdata
index 521ae56d5..eef02e8e3 160000
--- a/staticdata
+++ b/staticdata
@@ -1 +1 @@
-Subproject commit 521ae56d574f167abe3d9ff95874436e7cd2f5d3
+Subproject commit eef02e8e3f7507faadec4fc9abe2816b3495e84f