diff -r 95a0a427f3ef -r 131ea7f237b9 dialogs/SearchInProjectDialog.py --- a/dialogs/SearchInProjectDialog.py Fri Jun 15 18:03:25 2012 +0200 +++ b/dialogs/SearchInProjectDialog.py Mon Jun 25 20:03:53 2012 +0200 @@ -46,119 +46,70 @@ ("program", _("Program")), ("configuration", _("Configuration"))] -[ID_SEARCHINPROJECTDIALOG, ID_SEARCHINPROJECTDIALOGPATTERNLABEL, - ID_SEARCHINPROJECTDIALOGPATTERN, ID_SEARCHINPROJECTDIALOGCASESENSITIVE, - ID_SEARCHINPROJECTDIALOGREGULAREXPRESSION, ID_SEARCHINPROJECTDIALOGSCOPESTATICBOX, - ID_SEARCHINPROJECTDIALOGWHOLEPROJECT, ID_SEARCHINPROJECTDIALOGONLYELEMENTS, - ID_SEARCHINPROJECTDIALOGELEMENTSLIST, -] = [wx.NewId() for _init_ctrls in range(9)] - class SearchInProjectDialog(wx.Dialog): - if wx.VERSION < (2, 6, 0): - def Bind(self, event, function, id = None): - if id is not None: - event(self, id, function) - else: - event(self, function) - - def _init_coll_MainSizer_Items(self, parent): - parent.AddSizer(self.PatternSizer, 0, border=20, flag=wx.GROW|wx.TOP|wx.LEFT|wx.RIGHT) - parent.AddSizer(self.ScopeSizer, 0, border=20, flag=wx.GROW|wx.LEFT|wx.RIGHT) - parent.AddSizer(self.ButtonSizer, 0, border=20, flag=wx.ALIGN_RIGHT|wx.BOTTOM|wx.LEFT|wx.RIGHT) - - def _init_coll_MainSizer_Growables(self, parent): - parent.AddGrowableCol(0) - parent.AddGrowableRow(1) - - def _init_coll_PatternSizer_Items(self, parent): - parent.AddWindow(self.PatternLabel, 0, border=0, flag=wx.ALIGN_BOTTOM) - parent.AddWindow(self.CaseSensitive, 0, border=0, flag=wx.GROW) - parent.AddWindow(self.Pattern, 0, border=0, flag=wx.GROW) - parent.AddWindow(self.RegularExpression, 0, border=0, flag=wx.GROW) - - def _init_coll_PatternSizer_Growables(self, parent): - parent.AddGrowableCol(0) - - def _init_coll_ScopeSizer_Items(self, parent): - parent.AddSizer(self.ScopeSelectionSizer, 1, border=5, flag=wx.GROW|wx.TOP|wx.LEFT|wx.BOTTOM) - parent.AddWindow(self.ElementsList, 1, border=5, flag=wx.GROW|wx.TOP|wx.RIGHT|wx.BOTTOM) - - def _init_coll_ScopeSelectionSizer_Items(self, parent): - parent.AddWindow(self.WholeProject, 0, border=5, flag=wx.GROW|wx.BOTTOM) - parent.AddWindow(self.OnlyElements, 0, border=0, flag=wx.GROW) - - def _init_sizers(self): - self.MainSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=3, vgap=10) - self.PatternSizer = wx.FlexGridSizer(cols=2, hgap=5, rows=2, vgap=5) - self.ScopeSizer = wx.StaticBoxSizer(self.ScopeStaticBox, wx.HORIZONTAL) - self.ScopeSelectionSizer = wx.BoxSizer(wx.VERTICAL) + def __init__(self, parent): + wx.Dialog.__init__(self, parent, title=_('Search in Project'), + size=wx.Size(600, 300), style=wx.DEFAULT_DIALOG_STYLE| + wx.RESIZE_BORDER) - self._init_coll_MainSizer_Items(self.MainSizer) - self._init_coll_MainSizer_Growables(self.MainSizer) - self._init_coll_PatternSizer_Items(self.PatternSizer) - self._init_coll_PatternSizer_Growables(self.PatternSizer) - self._init_coll_ScopeSizer_Items(self.ScopeSizer) - self._init_coll_ScopeSelectionSizer_Items(self.ScopeSelectionSizer) + main_sizer = wx.FlexGridSizer(cols=1, hgap=0, rows=3, vgap=10) + main_sizer.AddGrowableCol(0) + main_sizer.AddGrowableRow(1) - self.SetSizer(self.MainSizer) - - def _init_ctrls(self, prnt): - wx.Dialog.__init__(self, id=ID_SEARCHINPROJECTDIALOG, - name='SearchInProjectDialog', parent=prnt, - size=wx.Size(600, 300), style=wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER, - title=_('Search in Project')) + pattern_sizer = wx.FlexGridSizer(cols=2, hgap=5, rows=2, vgap=5) + pattern_sizer.AddGrowableCol(0) + main_sizer.AddSizer(pattern_sizer, border=20, + flag=wx.GROW|wx.TOP|wx.LEFT|wx.RIGHT) - self.PatternLabel = wx.StaticText(id=ID_SEARCHINPROJECTDIALOGPATTERNLABEL, - label=_('Pattern to search:'), name='PatternLabel', parent=self, - pos=wx.Point(0, 0), size=wx.DefaultSize, style=0) - - self.Pattern = wx.TextCtrl(id=ID_SEARCHINPROJECTDIALOGPATTERN, - name='Pattern', parent=self, pos=wx.Point(0, 0), - size=wx.Size(0, 24), style=0) - - self.CaseSensitive = wx.CheckBox(id=ID_SEARCHINPROJECTDIALOGCASESENSITIVE, - label=_('Case sensitive'), name='CaseSensitive', parent=self, - pos=wx.Point(0, 0), size=wx.DefaultSize, style=0) + pattern_label = wx.StaticText(self, label=_('Pattern to search:')) + pattern_sizer.AddWindow(pattern_label, flag=wx.ALIGN_BOTTOM) - self.RegularExpression = wx.CheckBox(id=ID_SEARCHINPROJECTDIALOGREGULAREXPRESSION, - label=_('Regular expression'), name='RegularExpression', parent=self, - pos=wx.Point(0, 0), size=wx.DefaultSize, style=0) + self.CaseSensitive = wx.CheckBox(self, label=_('Case sensitive')) + pattern_sizer.AddWindow(self.CaseSensitive, flag=wx.GROW) - self.ScopeStaticBox = wx.StaticBox(id=ID_SEARCHINPROJECTDIALOGSCOPESTATICBOX, - label=_('Scope'), name='ScopeStaticBox', parent=self, - pos=wx.Point(0, 0), size=wx.Size(0, 0), style=0) + self.Pattern = wx.TextCtrl(self, size=wx.Size(0, 24)) + pattern_sizer.AddWindow(self.Pattern, flag=wx.GROW) - self.WholeProject = wx.RadioButton(id=ID_SEARCHINPROJECTDIALOGWHOLEPROJECT, - label=_('Whole Project'), name='WholeProject', parent=self, - pos=wx.Point(0, 0), size=wx.Size(0, 24), style=wx.RB_GROUP) - self.Bind(wx.EVT_RADIOBUTTON, self.OnScopeChanged, id=ID_SEARCHINPROJECTDIALOGWHOLEPROJECT) + self.RegularExpression = wx.CheckBox(self, label=_('Regular expression')) + pattern_sizer.AddWindow(self.RegularExpression, flag=wx.GROW) + + scope_staticbox = wx.StaticBox(self, label=_('Scope')) + scope_sizer = wx.StaticBoxSizer(scope_staticbox, wx.HORIZONTAL) + main_sizer.AddSizer(scope_sizer, border=20, + flag=wx.GROW|wx.LEFT|wx.RIGHT) + + scope_selection_sizer = wx.BoxSizer(wx.VERTICAL) + scope_sizer.AddSizer(scope_selection_sizer, 1, border=5, + flag=wx.GROW|wx.TOP|wx.LEFT|wx.BOTTOM) + + self.WholeProject = wx.RadioButton(self, label=_('Whole Project'), + size=wx.Size(0, 24), style=wx.RB_GROUP) self.WholeProject.SetValue(True) + self.Bind(wx.EVT_RADIOBUTTON, self.OnScopeChanged, self.WholeProject) + scope_selection_sizer.AddWindow(self.WholeProject, border=5, + flag=wx.GROW|wx.BOTTOM) - self.OnlyElements = wx.RadioButton(id=ID_SEARCHINPROJECTDIALOGONLYELEMENTS, - label=_('Only Elements'), name='OnlyElements', parent=self, - pos=wx.Point(0, 0), size=wx.Size(0, 24), style=0) - self.Bind(wx.EVT_RADIOBUTTON, self.OnScopeChanged, id=ID_SEARCHINPROJECTDIALOGONLYELEMENTS) + self.OnlyElements = wx.RadioButton(self, + label=_('Only Elements'), size=wx.Size(0, 24)) + self.Bind(wx.EVT_RADIOBUTTON, self.OnScopeChanged, self.OnlyElements) self.OnlyElements.SetValue(False) + scope_selection_sizer.AddWindow(self.OnlyElements, flag=wx.GROW) - self.ElementsList = wx.CheckListBox(id=ID_SEARCHINPROJECTDIALOGELEMENTSLIST, - name='ElementsList', parent=self, pos=wx.Point(0, 0), - size=wx.Size(0, 0), style=0) + self.ElementsList = wx.CheckListBox(self) self.ElementsList.Enable(False) + scope_sizer.AddWindow(self.ElementsList, 1, border=5, + flag=wx.GROW|wx.TOP|wx.RIGHT|wx.BOTTOM) self.ButtonSizer = self.CreateButtonSizer(wx.OK|wx.CANCEL|wx.CENTRE) - if wx.VERSION >= (2, 5, 0): - ok_button = self.ButtonSizer.GetAffirmativeButton() - else: - ok_button = self.ButtonSizer.GetChildren()[0].GetSizer().GetChildren()[0].GetWindow() + ok_button = self.ButtonSizer.GetAffirmativeButton() ok_button.SetLabel(_('Search')) - self.Bind(wx.EVT_BUTTON, self.OnOK, id=ok_button.GetId()) + self.Bind(wx.EVT_BUTTON, self.OnOK, ok_button) + main_sizer.AddSizer(self.ButtonSizer, border=20, + flag=wx.ALIGN_RIGHT|wx.BOTTOM|wx.LEFT|wx.RIGHT) - self._init_sizers() - - def __init__(self, parent): - self._init_ctrls(parent) - + self.SetSizer(main_sizer) + for name, label in GetElementsChoices(): self.ElementsList.Append(_(label)) @@ -191,9 +142,7 @@ def OnOK(self, event): if self.Pattern.GetValue() == "": - message = wx.MessageDialog(self, _("Form isn't complete. Pattern to search must be filled!"), _("Error"), wx.OK|wx.ICON_ERROR) - message.ShowModal() - message.Destroy() + message = _("Form isn't complete. Pattern to search must be filled!") else: wrong_pattern = False if self.RegularExpression.GetValue(): @@ -202,8 +151,11 @@ except: wrong_pattern = True if wrong_pattern: - message = wx.MessageDialog(self, _("Syntax error in regular expression of pattern to search!"), _("Error"), wx.OK|wx.ICON_ERROR) - message.ShowModal() - message.Destroy() - else: - self.EndModal(wx.ID_OK) + message = _("Syntax error in regular expression of pattern to search!") + + if message is not None: + dialog = wx.MessageDialog(self, message, _("Error"), wx.OK|wx.ICON_ERROR) + dialog.ShowModal() + dialog.Destroy() + else: + self.EndModal(wx.ID_OK)