eric: comparison eric6/QScintilla/MiniEditor.py

-:1f9f35f9be6d
+:dd54d33d21d2
 from PyQt5.QtCore import (
 QSignalMapper, QPoint, QTimer, QFileInfo, pyqtSignal, QSize, QRegExp, Qt,
 QCoreApplication
 )
-from PyQt5.QtGui import QCursor, QKeySequence, QPalette, QFont
+from PyQt5.QtGui import QCursor, QKeySequence, QPalette, QFont, QPixmap
 from PyQt5.QtWidgets import (
 QWidget, QWhatsThis, QActionGroup, QDialog, QInputDialog, QApplication,
 QMenu, QVBoxLayout, QHBoxLayout, QLabel
 )
 from PyQt5.QtPrintSupport import QPrinter, QPrintDialog, QAbstractPrintDialog
 from PyQt5.Qsci import QsciScintilla
 from E5Gui.E5Action import E5Action, createActionGroup
 from E5Gui import E5MessageBox, E5FileDialog
 from E5Gui.E5MainWindow import E5MainWindow
+from E5Gui.E5ClickableLabel import E5ClickableLabel
+from E5Gui.E5ZoomWidget import E5ZoomWidget
 from .QsciScintillaCompat import QsciScintillaCompat
 import UI.PixmapCache
 import UI.Config
 self.replaceTarget("")
 ok = self.findNextTarget()
 self.endUndoAction()
-# TODO: add language icon and menu to statusbar
+# TODO: add zoom actions and view menu
-# TODO: add cursor position to statusbar
-# TODO: add zoom functionality (?)
 class MiniEditor(E5MainWindow):
 """
 Class implementing a minimalistic editor for simple editing tasks.
 @signal editorSaved() emitted after the file has been saved
 self.__textEdit.setSearchIndicator = self.setSearchIndicator
 self.__textEdit.setUtf8(True)
 self.getCursorPosition = self.__textEdit.getCursorPosition
 self.text = self.__textEdit.text
+self.getZoom = self.__textEdit.getZoom
+self.zoomTo = self.__textEdit.zoomTo
 self.__curFile = filename
 self.__lastLine = 0
 self.srHistory = {
 self.undoAct.setEnabled(self.__textEdit.isUndoAvailable())
 self.redoAct.setEnabled(self.__textEdit.isRedoAvailable())
 if setSb:
-line, pos = self.__textEdit.getCursorPosition()
+line, pos = self.getCursorPosition()
-self.__setSbFile(line + 1, pos)
+lang = self.getLanguage()
+self.__setSbFile(line + 1, pos, lang)
-def __setSbFile(self, line=None, pos=None):
+def __setSbFile(self, line=None, pos=None, language=None, zoom=None):
 """
 Private method to set the file info in the status bar.
-@param line line number to display (int)
+@param line line number to display
-@param pos character position to display (int)
+@type int
+@param pos character position to display
+@type int
+@param language language to display
+@type str
+@param zoom zoom value
+@type int
 """
 if not self.__curFile:
 writ = '   '
 else:
 if QFileInfo(self.__curFile).isWritable():
 self.sbLine.setText(self.tr('Line: {0:5}').format(line))
 if pos is None:
 pos = ''
 self.sbPos.setText(self.tr('Pos: {0:5}').format(pos))
+if language is None:
+pixmap = QPixmap()
+elif language == "":
+pixmap = UI.PixmapCache.getPixmap("fileText")
+else:
+import QScintilla.Lexers
+pixmap = QScintilla.Lexers.getLanguageIcon(language, True)
+self.sbLanguage.setPixmap(pixmap)
+if pixmap.isNull():
+self.sbLanguage.setText(language)
+self.sbLanguage.setToolTip("")
+else:
+self.sbLanguage.setText("")
+self.sbLanguage.setToolTip(
+self.tr('Language: {0}').format(language))
+if zoom is None:
+self.sbZoom.setValue(self.getZoom())
+else:
+self.sbZoom.setValue(zoom)
 def __readShortcut(self, act, category):
 """
 Private function to read a single keyboard shortcut from the settings.
 """
 Private method to initialize the status bar.
 """
 self.__statusBar = self.statusBar()
 self.__statusBar.setSizeGripEnabled(True)
+self.sbLanguage = E5ClickableLabel(self.__statusBar)
+self.__statusBar.addPermanentWidget(self.sbLanguage)
+self.sbLanguage.setWhatsThis(self.tr(
+"""<p>This part of the status bar displays the"""
+""" editor language.</p>"""
+))
+self.sbLanguage.clicked.connect(self.__showLanguagesMenu)
 self.sbWritable = QLabel(self.__statusBar)
 self.__statusBar.addPermanentWidget(self.sbWritable)
 self.sbWritable.setWhatsThis(self.tr(
 """<p>This part of the status bar displays an indication of the"""
 self.sbPos.setWhatsThis(self.tr(
 """<p>This part of the status bar displays the cursor position"""
 """ of the editor.</p>"""
 ))
+self.sbZoom = E5ZoomWidget(
+UI.PixmapCache.getPixmap("zoomOut"),
+UI.PixmapCache.getPixmap("zoomIn"),
+UI.PixmapCache.getPixmap("zoomReset"),
+self.__statusBar)
+self.__statusBar.addPermanentWidget(self.sbZoom)
+self.sbZoom.setWhatsThis(self.tr(
+"""<p>This part of the status bar allows zooming the current"""
+""" editor or shell.</p>"""
+))
+self.sbZoom.valueChanged.connect(self.__zoomTo)
 self.__statusBar.showMessage(self.tr("Ready"))
 def __readSettings(self):
 """
 Private method to read the settings remembered last time.
 Private slot to handle the cursorPositionChanged signal.
 @param line line number of the cursor
 @param pos position in line of the cursor
 """
-self.__setSbFile(line + 1, pos)
+lang = self.getLanguage()
+self.__setSbFile(line + 1, pos, lang)
 if Preferences.getEditor("MarkOccurrencesEnabled"):
 self.__markOccurrencesTimer.stop()
 self.__markOccurrencesTimer.start()
 self.tr("Alternatives ({0})").format(
 self.getLanguage(normalized=False)))
 else:
 self.pygmentsSelAct.setText(self.tr("Alternatives"))
+def __showLanguagesMenu(self, pos):
+"""
+Private slot to show the Languages menu of the status bar.
+@param pos position the menu should be shown at (QPoint)
+"""
+self.languagesMenu.exec_(pos)
 def __selectPygmentsLexer(self):
 """
 Private method to select a specific pygments lexer.
 @return name of the selected pygments lexer
 """
 Private method to get the word at the current position.
 @return the word at that current position
 """
-line, index = self.__textEdit.getCursorPosition()
+line, index = self.getCursorPosition()
 return self.__getWord(line, index)
 def showSearchWidget(self):
 """
 Public method to show the search widget.
 """
 supported = self.__sourceOutline.isSupportedLanguage(
 self.getLanguage())
 self.__sourceOutline.setVisible(supported)
+line, pos = self.getCursorPosition()
+lang = self.getLanguage()
+self.__setSbFile(line + 1, pos, language=lang)
+#######################################################################
+## Methods supporting zooming
+#######################################################################
+def __zoomTo(self, value):
+"""
+Private slot to zoom to a given value.
+@param value zoom value to be set (integer)
+"""
+self.zoomTo(value)
+self.sbZoom.setValue(self.getZoom())

Mercurial Repositories > eric / file comparison

comparison: eric6/QScintilla/MiniEditor.py

eric6/QScintilla/MiniEditor.py