--- a/QScintilla/SearchReplaceWidget.py Fri Oct 18 23:00:41 2013 +0200 +++ b/QScintilla/SearchReplaceWidget.py Fri Nov 01 15:48:48 2013 +0100 @@ -54,8 +54,8 @@ from .Ui_ReplaceWidget import Ui_ReplaceWidget self.replaceHistory = vm.getSRHistory('replace') self.ui = Ui_ReplaceWidget() - whatsThis = self.trUtf8(r""" -<b>Find and Replace</b> + whatsThis = self.trUtf8( +r"""<b>Find and Replace</b> <p>This dialog is used to find some text and replace it with another text. By checking the various checkboxes, the search can be made more specific. The search string might be a regular expression. In a regular expression, @@ -65,8 +65,8 @@ else: from .Ui_SearchWidget import Ui_SearchWidget self.ui = Ui_SearchWidget() - whatsThis = self.trUtf8(r""" -<b>Find</b> + whatsThis = self.trUtf8( +r"""<b>Find</b> <p>This dialog is used to find some text. By checking the various checkboxes, the search can be made more specific. The search string might be a regular expression. In a regular expression, special characters interpreted are:</p> @@ -76,8 +76,8 @@ if not replace: self.ui.wrapCheckBox.setChecked(True) - whatsThis += self.trUtf8(r""" -<table border="0"> + whatsThis += self.trUtf8( +r"""<table border="0"> <tr><td><code>.</code></td><td>Matches any character</td></tr> <tr><td><code>\(</code></td><td>This marks the start of a region for tagging a match.</td></tr> @@ -141,16 +141,18 @@ self.ui.replacetextCombo.lineEdit().returnPressed.connect( self.on_replaceButton_clicked) - self.findNextAct = E5Action(self.trUtf8('Find Next'), - self.trUtf8('Find Next'), - 0, 0, self, 'search_widget_find_next') + self.findNextAct = E5Action( + self.trUtf8('Find Next'), + self.trUtf8('Find Next'), + 0, 0, self, 'search_widget_find_next') self.findNextAct.triggered[()].connect(self.on_findNextButton_clicked) self.findNextAct.setEnabled(False) self.ui.findtextCombo.addAction(self.findNextAct) - self.findPrevAct = E5Action(self.trUtf8('Find Prev'), - self.trUtf8('Find Prev'), - 0, 0, self, 'search_widget_find_prev') + self.findPrevAct = E5Action( + self.trUtf8('Find Prev'), + self.trUtf8('Find Prev'), + 0, 0, self, 'search_widget_find_prev') self.findPrevAct.triggered[()].connect(self.on_findPrevButton_clicked) self.findPrevAct.setEnabled(False) self.ui.findtextCombo.addAction(self.findPrevAct) @@ -243,7 +245,8 @@ self.ui.replaceButton.setEnabled(True) self.ui.replaceSearchButton.setEnabled(True) else: - E5MessageBox.information(self, self.windowTitle(), + E5MessageBox.information( + self, self.windowTitle(), self.trUtf8("'{0}' was not found.").format(txt)) @pyqtSlot() @@ -279,7 +282,8 @@ self.ui.replaceButton.setEnabled(True) self.ui.replaceSearchButton.setEnabled(True) else: - E5MessageBox.information(self, self.windowTitle(), + E5MessageBox.information( + self, self.windowTitle(), self.trUtf8("'{0}' was not found.").format(txt)) def __findByReturnPressed(self): @@ -307,11 +311,12 @@ lineFrom, indexFrom, lineTo, indexTo = self.__selectionBoundary() aw.clearSearchIndicators() - ok = aw.findFirstTarget(txt, - self.ui.regexpCheckBox.isChecked(), - self.ui.caseCheckBox.isChecked(), - self.ui.wordCheckBox.isChecked(), - lineFrom, indexFrom, lineTo, indexTo) + ok = aw.findFirstTarget( + txt, + self.ui.regexpCheckBox.isChecked(), + self.ui.caseCheckBox.isChecked(), + self.ui.wordCheckBox.isChecked(), + lineFrom, indexFrom, lineTo, indexTo) while ok: tgtPos, tgtLen = aw.getFoundTarget() if tgtLen == 0: @@ -400,7 +405,8 @@ index = indexTo if ok: - ok = aw.findFirst(txt, + ok = aw.findFirst( + txt, self.ui.regexpCheckBox.isChecked(), self.ui.caseCheckBox.isChecked(), self.ui.wordCheckBox.isChecked(), @@ -450,7 +456,8 @@ break else: break - ok = aw.findFirst(txt, + ok = aw.findFirst( + txt, self.ui.regexpCheckBox.isChecked(), self.ui.caseCheckBox.isChecked(), self.ui.wordCheckBox.isChecked(), @@ -475,7 +482,8 @@ line, index = boundary[2:] else: line, index = boundary[:2] - ok = aw.findFirst(txt, + ok = aw.findFirst( + txt, self.ui.regexpCheckBox.isChecked(), self.ui.caseCheckBox.isChecked(), self.ui.wordCheckBox.isChecked(), @@ -495,11 +503,11 @@ else: ok = False elif (lineFrom == boundary[0] and \ - indexFrom >= boundary[1]) or \ - (lineFrom > boundary[0] and \ - lineFrom < boundary[2]) or \ - (lineFrom == boundary[2] \ - and indexFrom <= boundary[3]): + indexFrom >= boundary[1]) or \ + (lineFrom > boundary[0] and \ + lineFrom < boundary[2]) or \ + (lineFrom == boundary[2] \ + and indexFrom <= boundary[3]): ok = True else: ok = False @@ -628,8 +636,9 @@ if not ok: self.ui.replaceButton.setEnabled(False) self.ui.replaceSearchButton.setEnabled(False) - E5MessageBox.information(self, self.windowTitle(), - self.trUtf8("'{0}' was not found.").format(ftxt)) + E5MessageBox.information( + self, self.windowTitle(), + self.trUtf8("'{0}' was not found.").format(ftxt)) else: self.ui.replaceButton.setEnabled(False) self.ui.replaceSearchButton.setEnabled(False) @@ -669,11 +678,12 @@ else: line = 0 index = 0 - ok = aw.findFirst(ftxt, - self.ui.regexpCheckBox.isChecked(), - self.ui.caseCheckBox.isChecked(), - self.ui.wordCheckBox.isChecked(), - False, True, line, index) + ok = aw.findFirst( + ftxt, + self.ui.regexpCheckBox.isChecked(), + self.ui.caseCheckBox.isChecked(), + self.ui.wordCheckBox.isChecked(), + False, True, line, index) if ok and self.ui.selectionCheckBox.isChecked(): lineFrom, indexFrom, lineTo, indexTo = aw.getSelection() @@ -707,11 +717,12 @@ break else: break - ok = aw.findFirst(ftxt, - self.ui.regexpCheckBox.isChecked(), - self.ui.caseCheckBox.isChecked(), - self.ui.wordCheckBox.isChecked(), - False, True, line, index) + ok = aw.findFirst( + ftxt, + self.ui.regexpCheckBox.isChecked(), + self.ui.caseCheckBox.isChecked(), + self.ui.wordCheckBox.isChecked(), + False, True, line, index) if ok: lineFrom, indexFrom, lineTo, indexTo = \ aw.getSelection() @@ -746,11 +757,13 @@ self.ui.replaceSearchButton.setEnabled(False) if found: - E5MessageBox.information(self, self.windowTitle(), + E5MessageBox.information( + self, self.windowTitle(), self.trUtf8("Replaced {0} occurrences.") .format(replacements)) else: - E5MessageBox.information(self, self.windowTitle(), + E5MessageBox.information( + self, self.windowTitle(), self.trUtf8("Nothing replaced because '{0}' was not found.") .format(ftxt))