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

More deprecation fixes

Browse Source
This commit is contained in:
blitzmann
2017-11-13 00:18:24 -05:00
parent 8cbb327659
commit cc9b6ea04b
9 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/builtinContextMenus/commandFits.py
View File

@@ -64,7 +64,7 @@ class CommandFits(ContextMenu):
for fit in sorted(self.__class__.commandFits, key=lambda x: x.name): for fit in sorted(self.__class__.commandFits, key=lambda x: x.name):
print(fit) print(fit)
menuItem = self.addFit(rootMenu if msw else sub, fit, True) menuItem = self.addFit(rootMenu if msw else sub, fit, True)
sub.AppendItem(menuItem) sub.Append(menuItem)
else: else:
typeDict = {} typeDict = {}

2
gui/builtinContextMenus/damagePattern.py
View File

@@ -96,7 +96,7 @@ class DamagePattern(ContextMenu):
# Items that have a parent # Items that have a parent
for pattern in self.subMenus[self.m[i]]: for pattern in self.subMenus[self.m[i]]:
sub.AppendItem(self.addPattern(rootMenu if msw else sub, pattern)) sub.Append(self.addPattern(rootMenu if msw else sub, pattern))
return sub return sub

2
gui/builtinContextMenus/fighterAbilities.py
View File

@@ -44,7 +44,7 @@ class FighterAbility(ContextMenu):
if not ability.effect.isImplemented: if not ability.effect.isImplemented:
continue continue
menuItem = self.addAbility(rootMenu if msw else sub, ability) menuItem = self.addAbility(rootMenu if msw else sub, ability)
sub.AppendItem(menuItem) sub.Append(menuItem)
menuItem.Check(ability.active) menuItem.Check(ability.active)
return sub return sub

2
gui/builtinContextMenus/implantSets.py
View File

@@ -61,7 +61,7 @@ class ImplantSets(ContextMenu):
mitem = wx.MenuItem(rootMenu, id, set.name) mitem = wx.MenuItem(rootMenu, id, set.name)
bindmenu.Bind(wx.EVT_MENU, self.handleSelection, mitem) bindmenu.Bind(wx.EVT_MENU, self.handleSelection, mitem)
self.idmap[id] = set self.idmap[id] = set
m.AppendItem(mitem) m.Append(mitem)
return m return m

2
gui/builtinContextMenus/tacticalMode.py
View File

@@ -49,7 +49,7 @@ class TacticalMode(ContextMenu):
for mode in self.modes: for mode in self.modes:
menuItem = self.addMode(rootMenu if msw else sub, mode) menuItem = self.addMode(rootMenu if msw else sub, mode)
sub.AppendItem(menuItem) sub.Append(menuItem)
menuItem.Check(self.currMode.item == mode.item) menuItem.Check(self.currMode.item == mode.item)
return sub return sub

8
gui/builtinContextMenus/targetResists.py
View File

@@ -87,12 +87,12 @@ class TargetResists(ContextMenu):
else: else:
self.singles.append(pattern) self.singles.append(pattern)
sub.AppendItem(self.addPattern(rootMenu if msw else sub, None)) # Add reset sub.Append(self.addPattern(rootMenu if msw else sub, None)) # Add reset
sub.AppendSeparator() sub.AppendSeparator()
# Single items, no parent # Single items, no parent
for pattern in self.singles: for pattern in self.singles:
sub.AppendItem(self.addPattern(rootMenu if msw else sub, pattern)) sub.Append(self.addPattern(rootMenu if msw else sub, pattern))
# Items that have a parent # Items that have a parent
for menuName, patterns in list(self.subMenus.items()): for menuName, patterns in list(self.subMenus.items()):
@@ -108,8 +108,8 @@ class TargetResists(ContextMenu):
# Append child items to child menu # Append child items to child menu
for pattern in patterns: for pattern in patterns:
grandSub.AppendItem(self.addPattern(rootMenu if msw else grandSub, pattern)) grandSub.Append(self.addPattern(rootMenu if msw else grandSub, pattern))
sub.AppendItem(item) # finally, append parent item to root menu sub.Append(item) # finally, append parent item to root menu
return sub return sub

2
gui/builtinContextMenus/whProjector.py
View File

@@ -45,7 +45,7 @@ class WhProjector(ContextMenu):
rootMenu.Bind(wx.EVT_MENU, self.handleSelection, grandSubItem) rootMenu.Bind(wx.EVT_MENU, self.handleSelection, grandSubItem)
else: else:
grandSub.Bind(wx.EVT_MENU, self.handleSelection, grandSubItem) grandSub.Bind(wx.EVT_MENU, self.handleSelection, grandSubItem)
grandSub.AppendItem(grandSubItem) grandSub.Append(grandSubItem)
return sub return sub
def handleSelection(self, event): def handleSelection(self, event):

2
gui/crestFittings.py
View File

@@ -403,7 +403,7 @@ class FittingsTreeView(wx.Panel):
shipID = tree.AppendItem(root, name) shipID = tree.AppendItem(root, name)
for fit in fits: for fit in fits:
fitId = tree.AppendItem(shipID, fit['name']) fitId = tree.AppendItem(shipID, fit['name'])
tree.SetPyData(fitId, json.dumps(fit)) tree.SetItemData(fitId, json.dumps(fit))
tree.SortChildren(root) tree.SortChildren(root)

8
gui/itemStats.py
View File

@@ -776,7 +776,7 @@ class ItemDependents(wx.Panel):
self.SetSizer(mainSizer) self.SetSizer(mainSizer)
self.root = self.reqTree.AddRoot("WINRARZOR") self.root = self.reqTree.AddRoot("WINRARZOR")
self.reqTree.SetPyData(self.root, None) self.reqTree.SetItemData(self.root, None)
self.imageList = wx.ImageList(16, 16) self.imageList = wx.ImageList(16, 16)
self.reqTree.SetImageList(self.imageList) self.reqTree.SetImageList(self.imageList)
@@ -1026,7 +1026,7 @@ class ItemAffectedBy(wx.Panel):
change = self.affectedBy.GetItemData(item) change = self.affectedBy.GetItemData(item)
display = self.affectedBy.GetItemText(item) display = self.affectedBy.GetItemText(item)
self.affectedBy.SetItemText(item, change) self.affectedBy.SetItemText(item, change)
self.affectedBy.SetPyData(item, display) self.affectedBy.SetItemData(item, display)
self.Thaw() self.Thaw()
@@ -1171,7 +1171,7 @@ class ItemAffectedBy(wx.Panel):
# this is the attribute node # this is the attribute node
child = self.affectedBy.AppendItem(parent, display, attrIcon) child = self.affectedBy.AppendItem(parent, display, attrIcon)
self.affectedBy.SetPyData(child, saved) self.affectedBy.SetItemData(child, saved)
self.treeItems.append(child) self.treeItems.append(child)
items = attributes[attrName] items = attributes[attrName]
@@ -1203,7 +1203,7 @@ class ItemAffectedBy(wx.Panel):
# this is the Module node, the attribute will be attached to this # this is the Module node, the attribute will be attached to this
display = "%s %s %.2f %s" % (displayStr, attrModifier, attrAmount, penalized) display = "%s %s %.2f %s" % (displayStr, attrModifier, attrAmount, penalized)
treeItem = self.affectedBy.AppendItem(child, display, itemIcon) treeItem = self.affectedBy.AppendItem(child, display, itemIcon)
self.affectedBy.SetPyData(treeItem, afflictor) self.affectedBy.SetItemData(treeItem, afflictor)
def buildModuleView(self, root): def buildModuleView(self, root):
""" """