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

Start work on the ship browser, the ship browser part is ready. Missing a fit listing and buttons to create, rename, duplicate, etc. a fit

Browse Source
This commit is contained in:
cncfanatics
2010-08-19 15:43:51 +02:00
parent a4f19f83bb
commit af71cdc626
16 changed files with 153 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gui/fittingView.py
View File

@@ -32,6 +32,8 @@ class FittingView(wx.ListCtrl):
self.SetImageList(self.imageList, wx.IMAGE_LIST_SMALL)
self.activeColumns = []
self.Bind(wx.EVT_LIST_COL_BEGIN_DRAG, self.resizeChecker)
self.Bind(wx.EVT_LIST_COL_CLICK, self.dragCheck)
self.Bind(wx.EVT_LIST_COL_END_DRAG, self.dragCheck)
i = 0
for colName in FittingView.DEFAULT_COLS:
col = gui.builtinViewColumns.getColumn(colName)(self, None)
@@ -48,3 +50,9 @@ class FittingView(wx.ListCtrl):
def resizeChecker(self, event):
if self.activeColumns[event.Column].resizable is False:
event.Veto()
def dragCheck(self, event):
print event
def dragEnd(self, event):
print event

32
gui/mainFrame.py
View File

@@ -23,25 +23,39 @@ from gui.mainToolBar import MainToolBar
from gui.marketBrowser import MarketBrowser
from gui.fitMultiSwitch import FitMultiSwitch
from gui.statsPane import StatsPane
from gui.shipBrowser import ShipBrowser
from wx.lib.wordwrap import wordwrap
import aboutData
class MainFrame(wx.Frame):
__instance = None
@classmethod
def getInstance(cls):
return cls.__instance if cls.__instance is not None else MainFrame()
def __init__(self):
wx.Frame.__init__(self, None, wx.ID_ANY, title="pyfa - Python Fitting Assistant")
MainFrame.__instance = self
self.SetMinSize((1000, 700))
#Add menu
self.SetMenuBar(MainMenuBar())
self.SetToolBar(MainToolBar(self))
#Register menubar events / only quit for now
#Register menubar events / only quit for now
self.Bind(wx.EVT_MENU, self.ExitApp, id=wx.ID_EXIT)
self.Bind(wx.EVT_MENU, self.ShowAboutBox, id=wx.ID_ABOUT)
self.splitter = wx.SplitterWindow(self, style = wx.SP_LIVE_UPDATE)
self.marketBrowser = MarketBrowser(self.splitter)
marketShipBrowserPanel = wx.Panel(self.splitter)
self.marketShipBrowserSizer = wx.BoxSizer(wx.VERTICAL)
marketShipBrowserPanel.SetSizer(self.marketShipBrowserSizer)
self.marketBrowser = MarketBrowser(marketShipBrowserPanel)
self.marketShipBrowserSizer.Add(self.marketBrowser, 1, wx.EXPAND)
self.shipBrowser = ShipBrowser(marketShipBrowserPanel)
self.marketShipBrowserSizer.Add(self.shipBrowser, 1, wx.EXPAND)
statsFitviewPanel = wx.Panel(self.splitter)
sizer = wx.BoxSizer(wx.HORIZONTAL)
statsFitviewPanel.SetSizer(sizer)
@@ -54,10 +68,14 @@ class MainFrame(wx.Frame):
sizer.Add(self.fitMultiSwitch, 1, wx.EXPAND)
sizer.Add(self.statsPane, 0, wx.EXPAND)
self.splitter.SplitVertically(self.marketBrowser, statsFitviewPanel)
self.splitter.SplitVertically(marketShipBrowserPanel, statsFitviewPanel)
self.splitter.SetMinimumPaneSize(10)
self.splitter.SetSashPosition(300)
#Add menu
self.SetMenuBar(MainMenuBar())
self.SetToolBar(MainToolBar(self))
#Show ourselves
self.Show()

23
gui/mainToolBar.py
View File

@@ -19,12 +19,29 @@
import wx
from gui import bitmapLoader
import gui.mainFrame
class MainToolBar(wx.ToolBar):
def __init__(self, parent):
wx.ToolBar.__init__(self, parent, wx.ID_ANY)
style = wx.TB_HORIZONTAL | wx.NO_BORDER | wx.TB_FLAT
wx.ToolBar.__init__(self, parent, wx.ID_ANY, style=style)
self.AddCheckLabelTool(wx.ID_ANY, "Ship Browser", bitmapLoader.getBitmap("ship_big", "icons"))
self.AddLabelTool(wx.ID_ANY, "Character Editor", bitmapLoader.getBitmap("character_big", "icons"))
self.AddCheckLabelTool(10, "Ship Browser", bitmapLoader.getBitmap("ship_big", "icons"), shortHelp="Ship browser")
self.AddCheckLabelTool(20, "Character Editor", bitmapLoader.getBitmap("character_big", "icons"), shortHelp="Character editor")
self.Bind(wx.EVT_TOOL, self.shipBrowserToggle, id=10)
self.Bind(wx.EVT_TOOL, self.characterEditor, id=20)
self.Realize()
gui.mainFrame.MainFrame.getInstance().shipBrowser.Hide()
def shipBrowserToggle(self, event):
newState = self.GetToolState(10)
mainFrame = gui.mainFrame.MainFrame.getInstance()
mainFrame.shipBrowser.Show(newState)
mainFrame.marketBrowser.Show(not newState)
mainFrame.marketShipBrowserSizer.Layout()
def characterEditor(self, event):
print event

2
gui/marketBrowser.py
View File

@@ -28,7 +28,7 @@ class MarketBrowser(wx.Panel):
vbox = wx.BoxSizer(wx.VERTICAL)
self.splitter = wx.SplitterWindow(self, style = wx.SP_LIVE_UPDATE)
vbox.Add(self.splitter, 1, wx.EXPAND)
self.SetSizer(vbox)

80
gui/shipBrowser.py Normal file
View File

@@ -0,0 +1,80 @@
import wx
import controller
import bitmapLoader
class ShipBrowser(wx.Panel):
def __init__(self, parent):
wx.Panel.__init__(self, parent)
vbox = wx.BoxSizer(wx.VERTICAL)
self.splitter = wx.SplitterWindow(self, style = wx.SP_LIVE_UPDATE)
vbox.Add(self.splitter, 1, wx.EXPAND)
self.SetSizer(vbox)
self.shipView = ShipView(self.splitter)
listStyle = wx.LC_REPORT | wx.BORDER_NONE | wx.LC_NO_HEADER | wx.LC_SINGLE_SEL
self.fitView = wx.ListCtrl(self.splitter, style = listStyle)
self.shipImageList = wx.ImageList(16, 16)
self.shipView.SetImageList(self.shipImageList)
self.splitter.SplitHorizontally(self.shipView, self.fitView)
self.splitter.SetMinimumPaneSize(250)
self.shipRoot = self.shipView.AddRoot("Ships")
iconId = self.shipImageList.Add(bitmapLoader.getBitmap("ship_small", "icons"))
cMarket = controller.Market.getInstance()
shipRoot = cMarket.getShipRoot()
for id, name in shipRoot:
childId = self.shipView.AppendItem(self.shipRoot, name, iconId, data=wx.TreeItemData(id))
self.shipView.AppendItem(childId, "dummy")
self.shipView.SortChildren(self.shipRoot)
self.raceImageIds = {}
self.races = ["amarr", "caldari", "gallente", "minmatar", "ore", "serpentis", "angel", "blood", "sansha", "guristas"]
for race in self.races:
imageId = self.shipImageList.Add(bitmapLoader.getBitmap("race_%s_small" % race, "icons"))
self.raceImageIds[race] = imageId
#Bind our lookup method to when the tree gets expanded
self.shipView.Bind(wx.EVT_TREE_ITEM_EXPANDING, self.expandLookup)
self.idRaceMap = {}
self.shipView.races = self.races
self.shipView.idRaceMap = self.idRaceMap
def expandLookup(self, event):
root = event.Item
child, cookie = self.shipView.GetFirstChild(root)
self.idRaceMap.clear()
if self.shipView.GetItemText(child) == "dummy":
self.shipView.Delete(child)
cMarket = controller.Market.getInstance()
for id, name, race in cMarket.getShipList(self.shipView.GetPyData(root)):
iconId = self.raceImageIds[race] if race in self.raceImageIds else -1
self.idRaceMap[id] = race
self.shipView.AppendItem(root, name, iconId, data=wx.TreeItemData(id))
self.shipView.SortChildren(root)
class ShipView(wx.TreeCtrl):
def __init__(self, parent):
wx.TreeCtrl.__init__(self, parent)
treeStyle = self.GetWindowStyleFlag()
treeStyle |= wx.TR_HIDE_ROOT
self.SetWindowStyleFlag(treeStyle)
def OnCompareItems(self, treeId1, treeId2):
child, cookie = self.GetFirstChild(treeId1)
if child.IsOk():
return cmp(self.GetItemText(treeId1), self.GetItemText(treeId2))
else:
id1 = self.GetPyData(treeId1)
id2 = self.GetPyData(treeId2)
return cmp(self.races.index(self.idRaceMap[id1]), self.races.index(self.idRaceMap[id2]))