equal
deleted
inserted
replaced
762 self.Editor.CmdKeyExecute(wx.stc.STC_CMD_PASTE) |
762 self.Editor.CmdKeyExecute(wx.stc.STC_CMD_PASTE) |
763 self.DisableEvents = False |
763 self.DisableEvents = False |
764 self.RefreshModel() |
764 self.RefreshModel() |
765 self.RefreshBuffer() |
765 self.RefreshBuffer() |
766 |
766 |
|
767 def Search(self, criteria): |
|
768 return self.Controler.SearchInPou(self.TagName, criteria, self.Debug) |
|
769 |
767 def Find(self, direction, search_params): |
770 def Find(self, direction, search_params): |
768 if self.SearchParams != search_params: |
771 if self.SearchParams != search_params: |
769 self.ClearHighlights(SEARCH_RESULT_HIGHLIGHT) |
772 self.ClearHighlights(SEARCH_RESULT_HIGHLIGHT) |
770 |
773 |
771 self.SearchParams = search_params |
774 self.SearchParams = search_params |
777 "filter": "all"} |
780 "filter": "all"} |
778 |
781 |
779 self.SearchResults = [ |
782 self.SearchResults = [ |
780 (infos[1:], start, end, SEARCH_RESULT_HIGHLIGHT) |
783 (infos[1:], start, end, SEARCH_RESULT_HIGHLIGHT) |
781 for infos, start, end, text in |
784 for infos, start, end, text in |
782 self.Controler.SearchInPou(self.TagName, criteria, self.Debug)] |
785 self.Search(criteria)] |
|
786 self.CurrentFindHighlight = None |
783 |
787 |
784 if len(self.SearchResults) > 0: |
788 if len(self.SearchResults) > 0: |
785 if self.CurrentFindHighlight is not None: |
789 if self.CurrentFindHighlight is not None: |
786 old_idx = self.SearchResults.index(self.CurrentFindHighlight) |
790 old_idx = self.SearchResults.index(self.CurrentFindHighlight) |
787 if self.SearchParams["wrap"]: |
791 if self.SearchParams["wrap"]: |
798 |
802 |
799 else: |
803 else: |
800 if self.CurrentFindHighlight is not None: |
804 if self.CurrentFindHighlight is not None: |
801 self.RemoveHighlight(*self.CurrentFindHighlight) |
805 self.RemoveHighlight(*self.CurrentFindHighlight) |
802 self.CurrentFindHighlight = None |
806 self.CurrentFindHighlight = None |
|
807 |
|
808 print self.CurrentFindHighlight |
803 |
809 |
804 def RefreshModel(self): |
810 def RefreshModel(self): |
805 self.RefreshJumpList() |
811 self.RefreshJumpList() |
806 self.Controler.SetEditedElementText(self.TagName, self.GetText()) |
812 self.Controler.SetEditedElementText(self.TagName, self.GetText()) |
807 |
813 |