From 6c27d163090845241e3ab7f6a24ffbbbe08dc07c Mon Sep 17 00:00:00 2001 From: Salvatore Larosa Date: Fri, 3 May 2013 01:22:57 +0200 Subject: [PATCH] [pyqgis-console] some fix for find text in editor - changes tabs to north --- python/console/console.py | 12 ++++-------- python/console/console_editor.py | 6 +++--- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/python/console/console.py b/python/console/console.py index 9f16d9d8830..e4f2a8a1325 100644 --- a/python/console/console.py +++ b/python/console/console.py @@ -473,8 +473,8 @@ class PythonConsoleWidget(QWidget): self.layoutEditor.setMargin(0) self.layoutEditor.setSpacing(0) self.layoutEditor.addWidget(self.widgetButtonEditor, 0, 0, 2, 1) - self.layoutEditor.addWidget(self.tabEditorWidget, 1, 1, 1, 1) - self.layoutEditor.addWidget(self.widgetFind, 0, 1, 1, 1) + self.layoutEditor.addWidget(self.tabEditorWidget, 0, 1, 1, 1) + self.layoutEditor.addWidget(self.widgetFind, 1, 1, 1, 1) self.toolBarLayout = QGridLayout(self.widgetButton) self.toolBarLayout.setMargin(0) @@ -523,15 +523,11 @@ class PythonConsoleWidget(QWidget): self.tabEditorWidget.currentWidget().newEditor.findText() def _findNext(self, fromPrev=False): - if not fromPrev: - self._findText() - self.tabEditorWidget.currentWidget().newEditor.findNext() - else: - self.tabEditorWidget.currentWidget().newEditor.findNext() + self.tabEditorWidget.currentWidget().newEditor.findText() def _findPrev(self): self.tabEditorWidget.currentWidget().newEditor.findText(True) - self._findNext(True) + self.tabEditorWidget.currentWidget().newEditor.findNext() def _textFindChanged(self): if not self.lineEditFind.text().isEmpty(): diff --git a/python/console/console_editor.py b/python/console/console_editor.py index 54bd166a837..888cf8014dc 100644 --- a/python/console/console_editor.py +++ b/python/console/console_editor.py @@ -344,11 +344,11 @@ class Editor(QsciScintilla): if QApplication.clipboard().text() != "": pasteAction.setEnabled(True) action = menu.exec_(self.mapToGlobal(e.pos())) - + def findText(self, direction=False): line, index = self.getCursorPosition() text = self.parent.pc.lineEditFind.text() - if text: + if not text.isEmpty(): if direction: self.findFirst(text, 1, 0, line, index, forward=False) else: @@ -730,7 +730,7 @@ class EditorTabWidget(QTabWidget): self.setMovable(True) #self.setTabsClosable(True) - self.setTabPosition(QTabWidget.South) + self.setTabPosition(QTabWidget.North) # Menu button list tabs self.fileTabMenu = QMenu(self)