diff -r d51af006fa6b -r 64d8f52bc8c8 dialogs/FindInPouDialog.py --- a/dialogs/FindInPouDialog.py Fri Aug 11 15:18:19 2017 +0300 +++ b/dialogs/FindInPouDialog.py Mon Aug 14 19:13:01 2017 +0300 @@ -32,80 +32,80 @@ if parent and parent.icon: self.SetIcon(parent.icon) - + def __init__(self, parent): - wx.Dialog.__init__(self, parent, title=_("Find"), + wx.Dialog.__init__(self, parent, title=_("Find"), style=wx.CAPTION|wx.CLOSE_BOX|wx.CLIP_CHILDREN|wx.RESIZE_BORDER) - + self._init_icon(parent) panel = wx.Panel(self, style=wx.TAB_TRAVERSAL) - + main_sizer = wx.FlexGridSizer(cols=1, hgap=5, rows=2, vgap=5) main_sizer.AddGrowableCol(0) main_sizer.AddGrowableRow(0) - + controls_sizer = wx.BoxSizer(wx.VERTICAL) - main_sizer.AddSizer(controls_sizer, border=20, + main_sizer.AddSizer(controls_sizer, border=20, flag=wx.GROW|wx.TOP|wx.LEFT|wx.RIGHT) - + patterns_sizer = wx.FlexGridSizer(cols=2, hgap=5, rows=1, vgap=5) patterns_sizer.AddGrowableCol(1) controls_sizer.AddSizer(patterns_sizer, border=5, flag=wx.GROW|wx.BOTTOM) - + find_label = wx.StaticText(panel, label=_("Find:")) patterns_sizer.AddWindow(find_label, flag=wx.ALIGN_CENTER_VERTICAL) - + 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) controls_sizer.AddSizer(params_sizer, border=5, flag=wx.GROW|wx.BOTTOM) - + direction_staticbox = wx.StaticBox(panel, label=_("Direction")) direction_staticboxsizer = wx.StaticBoxSizer( direction_staticbox, wx.VERTICAL) - params_sizer.AddSizer(direction_staticboxsizer, 1, border=5, + params_sizer.AddSizer(direction_staticboxsizer, 1, border=5, flag=wx.GROW|wx.RIGHT) - - self.Forward = wx.RadioButton(panel, label=_("Forward"), + + self.Forward = wx.RadioButton(panel, label=_("Forward"), style=wx.RB_GROUP) - direction_staticboxsizer.AddWindow(self.Forward, border=5, + direction_staticboxsizer.AddWindow(self.Forward, border=5, flag=wx.ALL|wx.GROW) - + self.Backward = wx.RadioButton(panel, label=_("Backward")) - direction_staticboxsizer.AddWindow(self.Backward, border=5, + direction_staticboxsizer.AddWindow(self.Backward, border=5, flag=wx.ALL|wx.GROW) - + options_staticbox = wx.StaticBox(panel, label=_("Options")) options_staticboxsizer = wx.StaticBoxSizer( options_staticbox, wx.VERTICAL) params_sizer.AddSizer(options_staticboxsizer, 1, flag=wx.GROW) - + self.CaseSensitive = wx.CheckBox(panel, label=_("Case sensitive")) self.CaseSensitive.SetValue(True) - options_staticboxsizer.AddWindow(self.CaseSensitive, border=5, + options_staticboxsizer.AddWindow(self.CaseSensitive, border=5, flag=wx.ALL|wx.GROW) - + self.WrapSearch = wx.CheckBox(panel, label=_("Wrap search")) self.WrapSearch.SetValue(True) - options_staticboxsizer.AddWindow(self.WrapSearch, border=5, + options_staticboxsizer.AddWindow(self.WrapSearch, border=5, flag=wx.LEFT|wx.RIGHT|wx.BOTTOM|wx.GROW) - + self.RegularExpressions = wx.CheckBox(panel, label=_("Regular expressions")) - options_staticboxsizer.AddWindow(self.RegularExpressions, border=5, + options_staticboxsizer.AddWindow(self.RegularExpressions, border=5, flag=wx.LEFT|wx.RIGHT|wx.BOTTOM|wx.GROW) - + buttons_sizer = wx.BoxSizer(wx.HORIZONTAL) - main_sizer.AddSizer(buttons_sizer, border=20, + main_sizer.AddSizer(buttons_sizer, border=20, flag=wx.LEFT|wx.RIGHT|wx.BOTTOM|wx.ALIGN_RIGHT) - + self.FindButton = wx.Button(panel, label=_("Find")) self.FindButton.SetDefault() self.Bind(wx.EVT_BUTTON, self.OnFindButton, self.FindButton) buttons_sizer.AddWindow(self.FindButton, border=5, flag=wx.RIGHT) - + self.CloseButton = wx.Button(panel, label=_("Close")) self.Bind(wx.EVT_BUTTON, self.OnCloseButton, self.CloseButton) buttons_sizer.AddWindow(self.CloseButton) @@ -115,30 +115,30 @@ self.RegExpSyntaxErrMsg = _("Syntax error in regular expression of pattern to search!") self.StatusLabel = wx.StaticText(panel, label= self.RegExpSyntaxErrMsg) controls_sizer.AddWindow(self.StatusLabel, flag=wx.ALIGN_CENTER_VERTICAL) - + panel.SetSizer(main_sizer) main_sizer.Fit(self) # clear message after dialog size calculation self.SetStatusText("") - + self.ParentWindow = parent - + self.Bind(wx.EVT_CLOSE, self.OnCloseFrame) self.infosPrev = {} self.criteria = {} self.FindPattern.SetFocus() self.RefreshButtonsState() - + def RefreshButtonsState(self): find_pattern = self.FindPattern.GetValue() self.FindButton.Enable(find_pattern != "") - + def OnCloseFrame(self, event): self.Hide() event.Veto() - + def OnCloseButton(self, event): self.Hide() event.Skip() @@ -157,7 +157,7 @@ def SetStatusText(self, msg): self.StatusLabel.SetLabel(msg) self.Layout() - + def OnFindButton(self, event): infos = { "find_pattern": self.FindPattern.GetValue(),