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

Merge branch 'ammo_graph' into singularity

Browse Source 
# Conflicts:
#	gui/targetProfileEditor.py
This commit is contained in:
DarkPhoenix
2020-06-09 19:04:20 +03:00
parent 7eaeea325d aec5a46452
commit 27d3bea8d8
28 changed files with 582 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gui/builtinItemStatsViews/itemDescription.py
View File

@@ -35,7 +35,7 @@ class ItemDescription(wx.Panel):
self.Layout()
self.description.Bind(wx.EVT_CONTEXT_MENU, self.onPopupMenu)
self.description.Bind(wx.EVT_KEY_DOWN, self.onKeyDown)
self.description.Bind(wx.EVT_KEY_UP, self.onKeyUp)
self.popupMenu = wx.Menu()
copyItem = wx.MenuItem(self.popupMenu, 1, 'Copy')
@@ -50,7 +50,7 @@ class ItemDescription(wx.Panel):
if selectedMenuItem == 1: # Copy was chosen
self.copySelectionToClipboard()
def onKeyDown(self, event):
def onKeyUp(self, event):
keyCode = event.GetKeyCode()
# Ctrl + C
if keyCode == 67 and event.ControlDown():

4
gui/builtinItemStatsViews/itemTraits.py
View File

@@ -14,7 +14,7 @@ class ItemTraits(wx.Panel):
self.traits.SetPage(item.traits.traitText)
self.traits.Bind(wx.EVT_CONTEXT_MENU, self.onPopupMenu)
self.traits.Bind(wx.EVT_KEY_DOWN, self.onKeyDown)
self.traits.Bind(wx.EVT_KEY_UP, self.onKeyUp)
mainSizer.Add(self.traits, 1, wx.ALL | wx.EXPAND, 0)
self.Layout()
@@ -32,7 +32,7 @@ class ItemTraits(wx.Panel):
if selectedMenuItem == 1: # Copy was chosen
self.copySelectionToClipboard()
def onKeyDown(self, event):
def onKeyUp(self, event):
keyCode = event.GetKeyCode()
# Ctrl + C
if keyCode == 67 and event.ControlDown():