dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Merge branch 'effsExpBack' into py3EFFS

Browse Source
This commit is contained in:
Maru Maru
2018-05-01 00:03:42 -04:00
parent d52c249921 090065ddd4
commit e2d8a3a4e8
6 changed files with 738 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gui/copySelectDialog.py
View File

@@ -29,19 +29,21 @@ class CopySelectDialog(wx.Dialog):
copyFormatDna = 3
copyFormatEsi = 4
copyFormatMultiBuy = 5
copyFormatEffs = 6
def __init__(self, parent):
wx.Dialog.__init__(self, parent, id=wx.ID_ANY, title="Select a format", size=(-1, -1),
style=wx.DEFAULT_DIALOG_STYLE)
mainSizer = wx.BoxSizer(wx.VERTICAL)
copyFormats = ["EFT", "EFT (Implants)", "XML", "DNA", "CREST", "MultiBuy"]
copyFormats = ["EFT", "EFT (Implants)", "XML", "DNA", "CREST", "MultiBuy", "EFFS"]
copyFormatTooltips = {CopySelectDialog.copyFormatEft: "EFT text format",
CopySelectDialog.copyFormatEftImps: "EFT text format",
CopySelectDialog.copyFormatXml: "EVE native XML format",
CopySelectDialog.copyFormatDna: "A one-line text format",
CopySelectDialog.copyFormatEsi: "A JSON format used for EVE CREST",
CopySelectDialog.copyFormatMultiBuy: "MultiBuy text format"}
CopySelectDialog.copyFormatMultiBuy: "MultiBuy text format",
CopySelectDialog.copyFormatEffs: u"EFFS json stats format"}
selector = wx.RadioBox(self, wx.ID_ANY, label="Copy to the clipboard using:", choices=copyFormats,
style=wx.RA_SPECIFY_ROWS)
selector.Bind(wx.EVT_RADIOBOX, self.Selected)

9
gui/mainFrame.py
View File

@@ -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
@@ -721,6 +723,10 @@ class MainFrame(wx.Frame):
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:
@@ -736,7 +742,8 @@ class MainFrame(wx.Frame):
CopySelectDialog.copyFormatXml: self.clipboardXml,
CopySelectDialog.copyFormatDna: self.clipboardDna,
CopySelectDialog.copyFormatEsi: self.clipboardEsi,
CopySelectDialog.copyFormatMultiBuy: self.clipboardMultiBuy}
CopySelectDialog.copyFormatMultiBuy: self.clipboardMultiBuy,
CopySelectDialog.copyFormatEffs: self.clipboardEffs}
dlg = CopySelectDialog(self)
dlg.ShowModal()
selected = dlg.GetSelected()