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

Deprecation stuff

Browse Source
This commit is contained in:
Ryan Holmes
2017-06-14 01:03:59 -04:00
parent 8c5c7fba29
commit 4b8f2ce9e7
10 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/builtinMarketBrowser/itemView.py
View File

@@ -103,7 +103,7 @@ class ItemView(Display):
sel = self.marketView.GetSelection()
if sel.IsOk():
# Get data field of the selected item (which is a marketGroup ID if anything was selected)
seldata = self.marketView.GetPyData(sel)
seldata = self.marketView.GetItemData(sel)
if seldata is not None and seldata != RECENTLY_USED_MODULES:
# If market group treeview item doesn't have children (other market groups or dummies),
# then it should have items in it and we want to request them

8
gui/builtinMarketBrowser/marketTree.py
View File

@@ -24,7 +24,7 @@ class MarketTree(wx.TreeCtrl):
sMkt = self.sMkt
for mktGrp in sMkt.getMarketRoot():
iconId = self.addImage(sMkt.getIconByMarketGroup(mktGrp))
childId = self.AppendItem(self.root, mktGrp.name, iconId, data=wx.TreeItemData(mktGrp.ID))
childId = self.AppendItem(self.root, mktGrp.name, iconId, data=mktGrp.ID)
# All market groups which were never expanded are dummies, here we assume
# that all root market groups are expandable
self.AppendItem(childId, "dummy")
@@ -32,7 +32,7 @@ class MarketTree(wx.TreeCtrl):
# Add recently used modules node
rumIconId = self.addImage("market_small", "gui")
self.AppendItem(self.root, "Recently Used Modules", rumIconId, data=wx.TreeItemData(RECENTLY_USED_MODULES))
self.AppendItem(self.root, "Recently Used Modules", rumIconId, data=RECENTLY_USED_MODULES)
# Bind our lookup method to when the tree gets expanded
self.Bind(wx.EVT_TREE_ITEM_EXPANDING, self.expandLookup)
@@ -52,14 +52,14 @@ class MarketTree(wx.TreeCtrl):
self.Delete(child)
# And add real market group contents
sMkt = self.sMkt
currentMktGrp = sMkt.getMarketGroup(self.GetPyData(root), eager="children")
currentMktGrp = sMkt.getMarketGroup(self.GetItemData(root), eager="children")
for childMktGrp in sMkt.getMarketGroupChildren(currentMktGrp):
# If market should have items but it doesn't, do not show it
if sMkt.marketGroupValidityCheck(childMktGrp) is False:
continue
iconId = self.addImage(sMkt.getIconByMarketGroup(childMktGrp))
try:
childId = self.AppendItem(root, childMktGrp.name, iconId, data=wx.TreeItemData(childMktGrp.ID))
childId = self.AppendItem(root, childMktGrp.name, iconId, data=childMktGrp.ID)
except Exception as e:
pyfalog.debug("Error appending item.")
pyfalog.debug(e)

2
gui/builtinPreferenceViews/pyfaEnginePreferences.py
View File

@@ -24,7 +24,7 @@ class PFFittingEnginePref(PreferenceView):
mainSizer = wx.BoxSizer(wx.VERTICAL)
helpCursor = wx.StockCursor(wx.CURSOR_QUESTION_ARROW)
helpCursor = wx.Cursor(wx.CURSOR_QUESTION_ARROW)
self.engine_settings = EOSSettings.getInstance()

2
gui/builtinPreferenceViews/pyfaGeneralPreferences.py
View File

@@ -21,7 +21,7 @@ class PFGeneralPref(PreferenceView):
self.openFitsSettings = SettingsProvider.getInstance().getSettings("pyfaPrevOpenFits",
{"enabled": False, "pyfaOpenFits": []})
helpCursor = wx.StockCursor(wx.CURSOR_QUESTION_ARROW)
helpCursor = wx.Cursor(wx.CURSOR_QUESTION_ARROW)
mainSizer = wx.BoxSizer(wx.VERTICAL)

6
gui/builtinShipBrowser/raceSelector.py
View File

@@ -92,9 +92,9 @@ class RaceSelector(wx.Window):
self.hoveredItem = location
self.Refresh()
if location is not None:
self.SetCursor(wx.StockCursor(wx.CURSOR_HAND))
self.SetCursor(wx.Cursor(wx.CURSOR_HAND))
else:
self.SetCursor(wx.StockCursor(wx.CURSOR_ARROW))
self.SetCursor(wx.Cursor(wx.CURSOR_ARROW))
def OnSizeUpdate(self, event):
self.CalcButtonsBarPos()
@@ -253,7 +253,7 @@ class RaceSelector(wx.Window):
def OnWindowLeave(self, event):
if self.hoveredItem is not None:
self.hoveredItem = None
self.SetCursor(wx.StockCursor(wx.CURSOR_ARROW))
self.SetCursor(wx.Cursor(wx.CURSOR_ARROW))
self.Refresh()
if not self.animate:

4
gui/builtinShipBrowser/sfBrowserItem.py
View File

@@ -122,7 +122,7 @@ class PFToolbar(object):
if not state & BTN_HOVER:
button.SetState(state | BTN_HOVER)
self.hoverLabel = button.GetLabel()
self.Parent.SetCursor(wx.StockCursor(wx.CURSOR_HAND))
self.Parent.SetCursor(wx.Cursor(wx.CURSOR_HAND))
doRefresh = True
else:
if state & BTN_HOVER:
@@ -133,7 +133,7 @@ class PFToolbar(object):
bx += bwidth + self.padding
if not changeCursor:
self.Parent.SetCursor(wx.StockCursor(wx.CURSOR_ARROW))
self.Parent.SetCursor(wx.Cursor(wx.CURSOR_ARROW))
return doRefresh
def MouseClick(self, event):

12
gui/builtinViews/implantEditor.py
View File

@@ -79,7 +79,7 @@ class BaseImplantEditorView(wx.Panel):
sMkt = Market.getInstance()
for mktGrp in sMkt.getImplantTree():
iconId = self.addMarketViewImage(sMkt.getIconByMarketGroup(mktGrp))
childId = self.availableImplantsTree.AppendItem(root, mktGrp.name, iconId, data=wx.TreeItemData(mktGrp.ID))
childId = self.availableImplantsTree.AppendItem(root, mktGrp.name, iconId, data=mktGrp.ID)
if sMkt.marketGroupHasTypesCheck(mktGrp) is False:
self.availableImplantsTree.AppendItem(childId, "dummy")
@@ -142,10 +142,10 @@ class BaseImplantEditorView(wx.Panel):
# if the dummy item is a market group, replace with actual market groups
if text == "dummy":
# Add 'real stoof!' instead
currentMktGrp = sMkt.getMarketGroup(tree.GetPyData(parent), eager="children")
currentMktGrp = sMkt.getMarketGroup(tree.GetItemData(parent), eager="children")
for childMktGrp in sMkt.getMarketGroupChildren(currentMktGrp):
iconId = self.addMarketViewImage(sMkt.getIconByMarketGroup(childMktGrp))
childId = tree.AppendItem(parent, childMktGrp.name, iconId, data=wx.TreeItemData(childMktGrp.ID))
childId = tree.AppendItem(parent, childMktGrp.name, iconId, data=childMktGrp.ID)
if sMkt.marketGroupHasTypesCheck(childMktGrp) is False:
tree.AppendItem(childId, "dummy")
else:
@@ -153,11 +153,11 @@ class BaseImplantEditorView(wx.Panel):
# replace dummy with actual items
if text == "itemdummy":
currentMktGrp = sMkt.getMarketGroup(tree.GetPyData(parent))
currentMktGrp = sMkt.getMarketGroup(tree.GetItemData(parent))
items = sMkt.getItemsByMarketGroup(currentMktGrp)
for item in items:
iconId = self.addMarketViewImage(item.icon.iconFile)
tree.AppendItem(parent, item.name, iconId, data=wx.TreeItemData(item))
tree.AppendItem(parent, item.name, iconId, data=item)
tree.SortChildren(parent)
@@ -185,7 +185,7 @@ class BaseImplantEditorView(wx.Panel):
nchilds = self.availableImplantsTree.GetChildrenCount(root)
if nchilds == 0:
item = self.availableImplantsTree.GetPyData(root)
item = self.availableImplantsTree.GetItemData(root)
self.addImplantToContext(item)
else:
event.Skip()

16
gui/characterEditor.py
View File

@@ -414,7 +414,7 @@ class SkillTreeView(wx.Panel):
for id, name in sChar.getSkillsByName(search):
iconId = self.skillBookImageId
childId = tree.AppendItem(root, name, iconId, data=wx.TreeItemData(('skill', id)))
childId = tree.AppendItem(root, name, iconId, data=('skill', id))
level, dirty = sChar.getSkillLevel(char.ID, id)
tree.SetItemText(childId, "Level %d" % int(level) if isinstance(level, float) else level, 1)
if dirty:
@@ -460,10 +460,10 @@ class SkillTreeView(wx.Panel):
# Get the real intrestin' stuff
sChar = Character.getInstance()
char = self.charEditor.entityEditor.getActiveEntity()
data = tree.GetPyData(root)
data = tree.GetItemData(root)
for id, name in sChar.getSkills(data[1]):
iconId = self.skillBookImageId
childId = tree.AppendItem(root, name, iconId, data=wx.TreeItemData(('skill', id)))
childId = tree.AppendItem(root, name, iconId, data=('skill', id))
level, dirty = sChar.getSkillLevel(char.ID, id)
tree.SetItemText(childId, "Level %d" % int(level) if isinstance(level, float) else level, 1)
if dirty:
@@ -482,7 +482,7 @@ class SkillTreeView(wx.Panel):
char = self.charEditor.entityEditor.getActiveEntity()
sMkt = Market.getInstance()
id = self.skillTreeListCtrl.GetPyData(item)[1]
id = self.skillTreeListCtrl.GetItemData(item)[1]
if char.name not in ("All 0", "All 5"):
self.levelChangeMenu.selection = sMkt.getItem(id)
self.PopupMenu(self.levelChangeMenu)
@@ -496,7 +496,7 @@ class SkillTreeView(wx.Panel):
sChar = Character.getInstance()
char = self.charEditor.entityEditor.getActiveEntity()
selection = self.skillTreeListCtrl.GetSelection()
dataType, skillID = self.skillTreeListCtrl.GetPyData(selection)
dataType, skillID = self.skillTreeListCtrl.GetItemData(selection)
if level is not None:
sChar.changeLevel(char.ID, skillID, level, persist=True)
@@ -521,7 +521,7 @@ class SkillTreeView(wx.Panel):
while child.IsOk():
# child = Skill category
dataType, id = self.skillTreeListCtrl.GetPyData(child)
dataType, id = self.skillTreeListCtrl.GetItemData(child)
if dataType == 'skill':
_setTreeSkillLevel(child, id)
else:
@@ -529,7 +529,7 @@ class SkillTreeView(wx.Panel):
while grand.IsOk():
if self.skillTreeListCtrl.GetItemText(grand) != "dummy":
_, skillID = self.skillTreeListCtrl.GetPyData(grand)
_, skillID = self.skillTreeListCtrl.GetItemData(grand)
_setTreeSkillLevel(grand, skillID)
grand, cookie2 = self.skillTreeListCtrl.GetNextChild(child, cookie2)
@@ -539,7 +539,7 @@ class SkillTreeView(wx.Panel):
dirtyGroups = set([skill.item.group.ID for skill in dirtySkills])
parentID = self.skillTreeListCtrl.GetItemParent(selection)
parent = self.skillTreeListCtrl.GetPyData(parentID)
parent = self.skillTreeListCtrl.GetItemData(parentID)
if parent:
if parent[1] in dirtyGroups:

6
gui/crestFittings.py
View File

@@ -158,7 +158,7 @@ class CrestFittings(wx.Frame):
selection = self.fitView.fitSelection
if not selection:
return
data = self.fitTree.fittingsTreeCtrl.GetPyData(selection)
data = self.fitTree.fittingsTreeCtrl.GetItemData(selection)
sPort = Port.getInstance()
fits = sPort.importFitFromBuffer(data)
self.mainFrame._openAfterImport(fits)
@@ -168,7 +168,7 @@ class CrestFittings(wx.Frame):
selection = self.fitView.fitSelection
if not selection:
return
data = json.loads(self.fitTree.fittingsTreeCtrl.GetPyData(selection))
data = json.loads(self.fitTree.fittingsTreeCtrl.GetItemData(selection))
dlg = wx.MessageDialog(self,
"Do you really want to delete %s (%s) from EVE?" % (data['name'], data['ship']['name']),
@@ -407,7 +407,7 @@ class FittingsTreeView(wx.Panel):
def displayFit(self, event):
selection = self.fittingsTreeCtrl.GetSelection()
data = self.fittingsTreeCtrl.GetPyData(selection)
data = self.fittingsTreeCtrl.GetItemData(selection)
if data is None:
event.Skip()

4
gui/itemStats.py
View File

@@ -993,7 +993,7 @@ class ItemAffectedBy(wx.Panel):
def spawnMenu(self, item):
self.affectedBy.SelectItem(item)
stuff = self.affectedBy.GetPyData(item)
stuff = self.affectedBy.GetItemData(item)
# String is set as data when we are dealing with attributes, not stuff containers
if stuff is None or isinstance(stuff, str):
return
@@ -1028,7 +1028,7 @@ class ItemAffectedBy(wx.Panel):
self.Freeze()
for item in self.treeItems:
change = self.affectedBy.GetPyData(item)
change = self.affectedBy.GetItemData(item)
display = self.affectedBy.GetItemText(item)
self.affectedBy.SetItemText(item, change)
self.affectedBy.SetPyData(item, display)