# HG changeset patch # User Sergey Surkov # Date 1477668490 -10800 # Node ID d75cc9ad328e103fee7d876b808945e21d1530b3 # Parent 52a78c90870ff85626ec3c3f1ed44489d16b16f9 now dialogs Find and Search in Project can be closed with ESC button diff -r 52a78c90870f -r d75cc9ad328e dialogs/FindInPouDialog.py --- a/dialogs/FindInPouDialog.py Fri Oct 28 18:17:35 2016 +0300 +++ b/dialogs/FindInPouDialog.py Fri Oct 28 18:28:10 2016 +0300 @@ -61,6 +61,7 @@ self.FindPattern = wx.TextCtrl(panel) self.Bind(wx.EVT_TEXT, self.OnFindPatternChanged, self.FindPattern) + self.Bind(wx.EVT_CHAR_HOOK, self.OnEscapeKey) patterns_sizer.AddWindow(self.FindPattern, flag=wx.GROW) params_sizer = wx.BoxSizer(wx.HORIZONTAL) @@ -135,6 +136,13 @@ self.Hide() event.Skip() + def OnEscapeKey(self, event): + keycode = event.GetKeyCode() + if keycode == wx.WXK_ESCAPE: + self.OnCloseButton(event) + else: + event.Skip() + def OnFindPatternChanged(self, event): self.RefreshButtonsState() event.Skip() diff -r 52a78c90870f -r d75cc9ad328e dialogs/SearchInProjectDialog.py --- a/dialogs/SearchInProjectDialog.py Fri Oct 28 18:17:35 2016 +0300 +++ b/dialogs/SearchInProjectDialog.py Fri Oct 28 18:28:10 2016 +0300 @@ -62,7 +62,7 @@ self.Pattern = wx.TextCtrl(self) self.Bind(wx.EVT_TEXT, self.FindPatternChanged, self.Pattern) pattern_sizer.AddWindow(self.Pattern, flag=wx.GROW) - + self.Bind(wx.EVT_CHAR_HOOK, self.OnEscapeKey) self.RegularExpression = wx.CheckBox(self, label=_('Regular expression')) pattern_sizer.AddWindow(self.RegularExpression, flag=wx.GROW) @@ -125,12 +125,20 @@ def FindPatternChanged(self, event): self.RefreshButtonsState() event.Skip() + def OnScopeChanged(self, event): self.ElementsList.Enable(self.OnlyElements.GetValue()) event.Skip() def OnCloseButton(self, event): self.EndModal(wx.ID_CANCEL) + + def OnEscapeKey(self, event): + keycode = event.GetKeyCode() + if keycode == wx.WXK_ESCAPE: + self.OnCloseButton(event) + else: + event.Skip() def OnFindButton(self, event): message = None