sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-30 00:04:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

[pyqgis-console][ui] move find text tools to toolbar widget

Browse Source
This commit is contained in:
Salvatore Larosa 2017-11-28 23:39:16 +01:00
parent 5652501cc6
commit 77f5959a7a
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
python/console/console.py
View File

@ -433,20 +433,18 @@ class PythonConsoleWidget(QWidget):
placeHolderTxt = QCoreApplication.translate("PythonConsole", "Enter text to find...") placeHolderTxt = QCoreApplication.translate("PythonConsole", "Enter text to find...")
self.lineEditFind.setPlaceholderText(placeHolderTxt) self.lineEditFind.setPlaceholderText(placeHolderTxt)
self.findNextButton = QToolButton() self.toolBarFindText = QToolBar()
self.toolBarFindText.setIconSize(icon_size)
self.findNextButton = QAction(self)
self.findNextButton.setEnabled(False) self.findNextButton.setEnabled(False)
toolTipfindNext = QCoreApplication.translate("PythonConsole", "Find Next") toolTipfindNext = QCoreApplication.translate("PythonConsole", "Find Next")
self.findNextButton.setToolTip(toolTipfindNext) self.findNextButton.setToolTip(toolTipfindNext)
self.findNextButton.setIcon(QgsApplication.getThemeIcon("console/iconSearchNextEditorConsole.png")) self.findNextButton.setIcon(QgsApplication.getThemeIcon("console/iconSearchNextEditorConsole.png"))
self.findNextButton.setIconSize(QSize(24, 24)) self.findPrevButton = QAction(self)
self.findNextButton.setAutoRaise(True)
self.findPrevButton = QToolButton()
self.findPrevButton.setEnabled(False) self.findPrevButton.setEnabled(False)
toolTipfindPrev = QCoreApplication.translate("PythonConsole", "Find Previous") toolTipfindPrev = QCoreApplication.translate("PythonConsole", "Find Previous")
self.findPrevButton.setToolTip(toolTipfindPrev) self.findPrevButton.setToolTip(toolTipfindPrev)
self.findPrevButton.setIcon(QgsApplication.getThemeIcon("console/iconSearchPrevEditorConsole.png")) self.findPrevButton.setIcon(QgsApplication.getThemeIcon("console/iconSearchPrevEditorConsole.png"))
self.findPrevButton.setIconSize(QSize(24, 24))
self.findPrevButton.setAutoRaise(True)
self.caseSensitive = QCheckBox() self.caseSensitive = QCheckBox()
caseSensTr = QCoreApplication.translate("PythonConsole", "Case Sensitive") caseSensTr = QCoreApplication.translate("PythonConsole", "Case Sensitive")
self.caseSensitive.setText(caseSensTr) self.caseSensitive.setText(caseSensTr)
@ -457,12 +455,15 @@ class PythonConsoleWidget(QWidget):
self.wrapAround.setChecked(True) self.wrapAround.setChecked(True)
wrapAroundTr = QCoreApplication.translate("PythonConsole", "Wrap Around") wrapAroundTr = QCoreApplication.translate("PythonConsole", "Wrap Around")
self.wrapAround.setText(wrapAroundTr) self.wrapAround.setText(wrapAroundTr)
self.layoutFind.addWidget(self.lineEditFind, 0, 1, 1, 1)
self.layoutFind.addWidget(self.findPrevButton, 0, 2, 1, 1) self.toolBarFindText.addWidget(self.lineEditFind)
self.layoutFind.addWidget(self.findNextButton, 0, 3, 1, 1) self.toolBarFindText.addAction(self.findPrevButton)
self.layoutFind.addWidget(self.caseSensitive, 0, 4, 1, 1) self.toolBarFindText.addAction(self.findNextButton)
self.layoutFind.addWidget(self.wholeWord, 0, 5, 1, 1) self.toolBarFindText.addWidget(self.caseSensitive)
self.layoutFind.addWidget(self.wrapAround, 0, 6, 1, 1) self.toolBarFindText.addWidget(self.wholeWord)
self.toolBarFindText.addWidget(self.wrapAround)
self.layoutFind.addWidget(self.toolBarFindText, 0, 1, 1, 1)
# ------------ Add first Tab in Editor ------------------------------- # ------------ Add first Tab in Editor -------------------------------
@ -489,8 +490,8 @@ class PythonConsoleWidget(QWidget):
self.helpButton.triggered.connect(self.openHelp) self.helpButton.triggered.connect(self.openHelp)
self.listClassMethod.itemClicked.connect(self.onClickGoToLine) self.listClassMethod.itemClicked.connect(self.onClickGoToLine)
self.lineEditFind.returnPressed.connect(self._findNext) self.lineEditFind.returnPressed.connect(self._findNext)
self.findNextButton.clicked.connect(self._findNext) self.findNextButton.triggered.connect(self._findNext)
self.findPrevButton.clicked.connect(self._findPrev) self.findPrevButton.triggered.connect(self._findPrev)
self.lineEditFind.textChanged.connect(self._textFindChanged) self.lineEditFind.textChanged.connect(self._textFindChanged)
self.findScut = QShortcut(QKeySequence.Find, self.widgetEditor) self.findScut = QShortcut(QKeySequence.Find, self.widgetEditor)