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

Merge branch 'master' of evefit.org:pyfa

Browse Source
This commit is contained in:
HomeWorld
2010-10-08 14:38:26 +03:00
parent 1ce3f4de24 8577fa617e
commit 1d78bf0a7b
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eos

Submodule eos updated: 8c108e3cb8...08a1ac6957

3
gui/builtinContextMenus/damagePattern.py
View File

@@ -11,7 +11,8 @@ class DamagePattern(ContextMenu):
return context in ("resistancesViewFull",)
def getText(self, context, selection):
return "%s stats" % context.capitalize()
sDP = service.DamagePattern.getInstance()
return map(lambda p: p.name, sDP.getDamagePatternList())
def activate(self, context, selection, i):
pass

12
gui/mainMenuBar.py
View File

@@ -23,6 +23,7 @@ import bitmapLoader
class MainMenuBar(wx.MenuBar):
def __init__(self):
self.characterEditorId = wx.NewId()
self.damagePatternEditorId = wx.NewId()
wx.MenuBar.__init__(self)
@@ -46,12 +47,15 @@ class MainMenuBar(wx.MenuBar):
fitMenu.Append(wx.ID_SAVEAS, "&Export", "Export the fit to another format.")
# Character menu
charMenu = wx.Menu()
self.Append(charMenu, "&Character")
windowMenu = wx.Menu()
self.Append(windowMenu, "&Windows")
charEditItem = wx.MenuItem(charMenu, self.characterEditorId, "Character &Editor\tCTRL+E")
charEditItem = wx.MenuItem(windowMenu, self.characterEditorId, "&Character Editor\tCTRL+E")
charEditItem.SetBitmap(bitmapLoader.getBitmap("character_small", "icons"))
charMenu.AppendItem(charEditItem)
windowMenu.AppendItem(charEditItem)
damagePatternEditItem = wx.MenuItem(windowMenu, self.damagePatternEditorId, "Damage Pattern Editor\tCTRL+D")
windowMenu.AppendItem(damagePatternEditItem)
# Help menu
helpMenu = wx.Menu()