From 49b1e2ee36bad16dd81c951b19a1e9038168cf0d Mon Sep 17 00:00:00 2001 From: Maru Maru Date: Thu, 5 Apr 2018 02:35:12 -0400 Subject: [PATCH] Added option to copy EFFS stats to the clipboard via the CopySelectDialog UI --- gui/copySelectDialog.py | 6 ++++-- gui/mainFrame.py | 10 ++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/gui/copySelectDialog.py b/gui/copySelectDialog.py index 57ce48f47..95f6db57b 100644 --- a/gui/copySelectDialog.py +++ b/gui/copySelectDialog.py @@ -29,19 +29,21 @@ class CopySelectDialog(wx.Dialog): copyFormatDna = 3 copyFormatCrest = 4 copyFormatMultiBuy = 5 + copyFormatEffs = 6 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"EFT (Implants)", u"XML", u"DNA", u"CREST", u"MultiBuy"] + copyFormats = [u"EFT", u"EFT (Implants)", u"XML", u"DNA", u"CREST", u"MultiBuy", u"EFFS"] copyFormatTooltips = {CopySelectDialog.copyFormatEft: u"EFT text format", CopySelectDialog.copyFormatEftImps: u"EFT text format", CopySelectDialog.copyFormatXml: u"EVE native XML format", CopySelectDialog.copyFormatDna: u"A one-line text format", CopySelectDialog.copyFormatCrest: u"A JSON format used for EVE CREST", - CopySelectDialog.copyFormatMultiBuy: u"MultiBuy text format"} + CopySelectDialog.copyFormatMultiBuy: u"MultiBuy text format", + CopySelectDialog.copyFormatEffs: u"EFFS json stats format"} selector = wx.RadioBox(self, wx.ID_ANY, label=u"Copy to the clipboard using:", choices=copyFormats, style=wx.RA_SPECIFY_ROWS) selector.Bind(wx.EVT_RADIOBOX, self.Selected) diff --git a/gui/mainFrame.py b/gui/mainFrame.py index d4b23f3a4..fbd814670 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -77,6 +77,8 @@ from eos.db.saveddata.queries import getFit as db_getFit from service.port import Port, IPortUser from service.settings import HTMLExportSettings +from effs_stat_export import parseNeededFitDetails as exportEffsStats + from time import gmtime, strftime import threading @@ -754,6 +756,10 @@ class MainFrame(wx.Frame, IPortUser): fit = db_getFit(self.getActiveFit()) toClipboard(Port.exportMultiBuy(fit)) + def clipboardEffs(self): + fit = db_getFit(self.getActiveFit()) + toClipboard(exportEffsStats(fit, 0)) + def importFromClipboard(self, event): clipboard = fromClipboard() try: @@ -769,11 +775,11 @@ class MainFrame(wx.Frame, IPortUser): CopySelectDialog.copyFormatXml: self.clipboardXml, CopySelectDialog.copyFormatDna: self.clipboardDna, CopySelectDialog.copyFormatCrest: self.clipboardCrest, - CopySelectDialog.copyFormatMultiBuy: self.clipboardMultiBuy} + CopySelectDialog.copyFormatMultiBuy: self.clipboardMultiBuy, + CopySelectDialog.copyFormatEffs: self.clipboardEffs} dlg = CopySelectDialog(self) dlg.ShowModal() selected = dlg.GetSelected() - CopySelectDict[selected]() try: