andr3/scyther
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added standard keyboard shortcuts for closing windows

Browse Source
This commit is contained in:
Christophe Kamphaus 2016-02-28 23:18:21 +01:00
parent 457c68580f
commit 94f7b2ce43
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gui/Gui/Attackwindow.py
View File

@ -248,6 +248,13 @@ class AttackWindow(wx.Frame):
# reasons. # reasons.
self.fit = False self.fit = False
aTable = wx.AcceleratorTable([
(wx.ACCEL_CTRL, ord('W'), wx.ID_CLOSE),
(wx.ACCEL_NORMAL, wx.WXK_ESCAPE, wx.ID_CLOSE),
])
self.SetAcceleratorTable(aTable)
self.Bind(wx.EVT_CLOSE, self.onCloseWindow)
self.Bind(wx.EVT_MENU, self.onCloseWindow, id=wx.ID_CLOSE)
self.CreateInteriorWindowComponents() self.CreateInteriorWindowComponents()
Icon.ScytherIcon(self) Icon.ScytherIcon(self)
@ -326,5 +333,8 @@ class AttackWindow(wx.Frame):
self.update(True) self.update(True)
self.Refresh() self.Refresh()
def onCloseWindow(self,evt):
self.Destroy()
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# vim: set ts=4 sw=4 et list lcs=tab\:>-: # vim: set ts=4 sw=4 et list lcs=tab\:>-:

1
gui/Gui/Mainwindow.py
View File

@ -84,6 +84,7 @@ class MainWindow(wx.Frame):
aTable = wx.AcceleratorTable([ aTable = wx.AcceleratorTable([
(wx.ACCEL_CTRL, ord('Q'), wx.ID_EXIT), (wx.ACCEL_CTRL, ord('Q'), wx.ID_EXIT),
(wx.ACCEL_CTRL, ord('W'), wx.ID_EXIT),
(wx.ACCEL_NORMAL, wx.WXK_F1, (wx.ACCEL_NORMAL, wx.WXK_F1,
ID_VERIFY), ID_VERIFY),
(wx.ACCEL_NORMAL, wx.WXK_F2, (wx.ACCEL_NORMAL, wx.WXK_F2,

7
gui/Gui/Scytherthread.py
View File

@ -263,7 +263,14 @@ class ResultWindow(wx.Frame):
self.parent = parent self.parent = parent
self.thread = None self.thread = None
aTable = wx.AcceleratorTable([
(wx.ACCEL_CTRL, ord('W'), wx.ID_CLOSE),
(wx.ACCEL_NORMAL, wx.WXK_ESCAPE, wx.ID_CLOSE),
])
self.SetAcceleratorTable(aTable)
self.Bind(wx.EVT_CLOSE, self.onCloseWindow) self.Bind(wx.EVT_CLOSE, self.onCloseWindow)
self.Bind(wx.EVT_MENU, self.onCloseWindow, id=wx.ID_CLOSE)
self.CreateStatusBar() self.CreateStatusBar()
self.BuildTable() self.BuildTable()