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

Some tweaks and + in import dlg

Browse Source
This commit is contained in:
HomeWorld
2010-10-13 17:11:03 +03:00
parent 8f3f762823
commit a79416c435
2 changed files with 50 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
gui/importExport.py
View File

@@ -19,47 +19,84 @@
import wx
import service
import config
class ImportDialog(wx.Dialog):
def __init__(self, parent):
wx.Dialog.__init__ (self, parent, id=wx.ID_ANY, title=u"Import fitting from ...", pos=wx.DefaultPosition, size=wx.Size(500, 300), style=wx.DEFAULT_DIALOG_STYLE)
self._toggleEdit = -1
self.SetSizeHintsSz(wx.DefaultSize, wx.DefaultSize)
self.SetMinSize((500,300))
mainSizer = wx.BoxSizer(wx.VERTICAL)
headerSizer = wx.BoxSizer(wx.HORIZONTAL)
self.cFilePicker = wx.FilePickerCtrl(self, wx.ID_ANY, wx.EmptyString, u"Select a fit file", u"*.*", style=wx.FLP_DEFAULT_STYLE | wx.FLP_FILE_MUST_EXIST)
self.cFilePicker = wx.FilePickerCtrl(self, wx.ID_ANY, wx.EmptyString, u"Select a fit file", u"*.*", style=wx.FLP_DEFAULT_STYLE | wx.FLP_FILE_MUST_EXIST | wx.FLP_CHANGE_DIR)
headerSizer.Add(self.cFilePicker, 1, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5)
mainSizer.Add(headerSizer, 0, wx.EXPAND, 5)
self.tbtnEdit = wx.ToggleButton( self, wx.ID_ANY, u"Live Edit", wx.DefaultPosition, wx.DefaultSize, 0 )
headerSizer.Add( self.tbtnEdit, 0, wx.ALIGN_CENTER_VERTICAL|wx.RIGHT, 5 )
mainSizer.Add(headerSizer, 0, wx.EXPAND, 5)
self.m_staticline2 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL )
self.m_staticline2.SetMinSize( wx.Size( 480,1 ) )
mainSizer.Add( self.m_staticline2, 0, wx.EXPAND, 5 )
contentSizer = wx.BoxSizer(wx.VERTICAL)
self.tcPreview = wx.TextCtrl(self, wx.ID_ANY, u"", style=wx.TE_READONLY)
contentSizer.Add(self.tcPreview, 1, wx.EXPAND, 5)
self.tcEdit = wx.TextCtrl(self, wx.ID_ANY, u"", style=wx.TE_READONLY|wx.TE_MULTILINE)
self.tcEdit.SetMinSize( wx.Size( -1,250 ) )
contentSizer.Add(self.tcEdit, 1, wx.EXPAND, 5)
mainSizer.Add(contentSizer, 1, wx.EXPAND, 5)
footerSizer = wx.BoxSizer(wx.HORIZONTAL)
self.ckbPreview = wx.CheckBox(self, wx.ID_ANY, u"Preview")
footerSizer.Add(self.ckbPreview, 1, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5)
self.btnOK = wx.Button(self, wx.ID_ANY, u"OK", wx.DefaultPosition, wx.DefaultSize, 0)
self.stStatus = wx.StaticText( self, wx.ID_ANY, u"Status:", wx.DefaultPosition, wx.DefaultSize, 0 )
self.stStatus.Wrap( -1 )
footerSizer.Add( self.stStatus, 1, wx.ALIGN_CENTER_VERTICAL|wx.LEFT, 5 )
self.btnOK = wx.Button(self, wx.ID_OK, u"OK", wx.DefaultPosition, wx.DefaultSize, 0)
footerSizer.Add(self.btnOK, 0, wx.ALL, 5)
mainSizer.Add(footerSizer, 0, wx.EXPAND, 5)
self.SetSizer(mainSizer)
self.tbtnEdit.SetValue( True )
self.tcEdit.Show(False)
self.Layout()
self.Fit()
self.Bind( wx.EVT_CLOSE, self.CloseDlg )
self.btnOK.Bind( wx.EVT_BUTTON, self.CloseDlg )
self.cFilePicker.Bind( wx.EVT_FILEPICKER_CHANGED, self.importFits )
self.tbtnEdit.Bind( wx.EVT_TOGGLEBUTTON, self.SwitchEditCtrl )
self.Centre(wx.BOTH)
def importFits(self, event):
sFit = service.Fit.getInstance()
self.tcPreview.SetLabel(sFit.importFit(event.Path))
self.stStatus.SetLabel("Imported %d fit(s)" % (sFit.importFit(event.Path)))
def ImportFromFile( self, event ):
print event.Path
event.Skip()
def CloseDlg( self, event ):
event.Skip()
def SwitchEditCtrl( self, event ):
self._toggleEdit *= -1
if self._toggleEdit == -1:
self.tcEdit.Show(False)
else:
self.tcEdit.Show(True)
self.Layout()
self.Fit()
event.Skip()
class ExportDialog(wx.Dialog):
def __init__(self, parent):

5
service/fit.py
View File

@@ -269,8 +269,9 @@ class Fit(object):
f = file(path)
type, fits = eos.types.Fit.importAuto(f.read())
output = ""
for fit in fits:
eos.db.save(fit)
output += "Importing %s (%s)" % (fit.name, fit.ship.item.name)
output += "Importing %s (%s)\n" % (fit.name, fit.ship.item.name)
return output
return len(fits)