eric: comparison HexEdit/HexEditWidget.py

-:ec546bd4ec56
+:d760763dcc4a
 from .HexEditUndoStack import HexEditUndoStack
 import Globals
-# TODO: implement cursor in ASCII area
 # TODO: implement editing in ASCII area
 class HexEditWidget(QAbstractScrollArea):
 """
 self.__embedded = embedded
 # Properties
 self.__addressArea = True
 # switch the address area on/off
-self.__addressAreaColor = QColor()
+self.__addressAreaBrush = QBrush()
-# color of the address area
+self.__addressAreaPen = QPen()
+# background and pen of the address area
 self.__addressOffset = 0
 # offset into the shown address range
 self.__addressWidth = 4
 # address area width in characters
 self.__asciiArea = True
 if Globals.isWindowsPlatform():
 self.setFont(QFont("Courier", 10))
 else:
 self.setFont(QFont("Monospace", 10))
-self.setAddressAreaColor(self.palette().alternateBase().color())
+self.setAddressAreaColors(
-self.setHighlightColor(QColor(0xff, 0xff, 0x99, 0xff))
+self.palette().color(QPalette.WindowText),
-self.setSelectionColor(self.palette().highlight().color())
+self.palette().alternateBase().color())
+self.setHighlightColors(
+self.palette().color(QPalette.WindowText),
+QColor(0xff, 0xff, 0x99, 0xff))
+self.setSelectionColors(
+self.palette().highlightedText().color(),
+self.palette().highlight().color())
 self.__cursorTimer = QTimer()
 self.__cursorTimer.timeout.connect(self.__updateCursor)
 self.verticalScrollBar().valueChanged.connect(self.__adjust)
 self.__addressArea = on
 self.__adjust()
 self.setCursorPosition(self.__cursorPosition)
 self.viewport().update()
-def addressAreaColor(self):
+def addressAreaColors(self):
 """
-Public method to get the address area color.
+Public method to get the address area colors.
-@return address area color
+@return address area foreground and background colors
-@rtype QColor
+@rtype tuple of 2 QColor
 """
-return QColor(self.__addressAreaColor)
+return self.__addressAreaPen.color(), self.__addressAreaBrush.color()
-def setAddressAreaColor(self, color):
+def setAddressAreaColors(self, foreground, background):
 """
-Public method to set the address area color.
+Public method to set the address area colors.
-@param color address area color
+@param foreground address area foreground color
 @type QColor
-"""
+@param background address area background color
-self.__addressAreaColor = QColor(color)
+@type QColor
+"""
+self.__addressAreaPen = QPen(foreground)
+self.__addressAreaBrush = QBrush(background)
 self.viewport().update()
 def addressOffset(self):
 """
 Public method to get the address offset.
 @type bool
 """
 self.__highlighting = on
 self.viewport().update()
-def highlightingColor(self):
+def highlightColors(self):
 """
-Public method to get the highlighting color.
+Public method to get the highlight colors.
-@return highlighting color
+@return highlight foreground and background colors
-@rtype QColor
+@rtype tuple of 2 QColor
 """
-return self.__highlightingBrush.color()
+return self.__highlightingPen.color(), self.__highlightingBrush.color()
-def setHighlightColor(self, color):
+def setHighlightColors(self, foreground, background):
 """
-Public method to set the highlight color.
+Public method to set the highlight colors.
-@param color new highlight color
+@param foreground highlight foreground color
 @type QColor
-"""
+@param background highlight background color
-self.__highlightingBrush = QBrush(color)
+@type QColor
-self.__highlightingPen = QPen(
+"""
-self.viewport().palette().color(QPalette.WindowText))
+self.__highlightingPen = QPen(foreground)
+self.__highlightingBrush = QBrush(background)
 self.viewport().update()
 def overwriteMode(self):
 """
 Public method to get the overwrite mode.
 @type bool
 """
 self.__overwriteMode = on
 self.overwriteModeChanged.emit(self.__overwriteMode)
-def selectionColor(self):
+def selectionColors(self):
 """
-Public method to get the selection color.
+Public method to get the selection colors.
-@return selection color
+@return selection foreground and background colors
-@rtype QColor
+@rtype tuple of 2 QColor
 """
-return self.__selectionBrush.color()
+return self.__selectionPen.color(), self.__selectionBrush.color()
-def setSelectionColor(self, color):
+def setSelectionColors(self, foreground, background):
 """
-Public method to set the selection color.
+Public method to set the selection colors.
-@param color new selection color
+@param foreground selection foreground color
 @type QColor
-"""
+@param background selection background color
-self.__selectionBrush = QBrush(color)
+@type QColor
-self.__selectionPen = QPen(Qt.white)
+"""
+self.__selectionPen = QPen(foreground)
+self.__selectionBrush = QBrush(background)
 self.viewport().update()
 def isReadOnly(self):
 """
 Public method to test the read only state.
 self.__pxGapAdr = self.__pxCharWidth // 2
 self.__pxGapAdrHex = self.__pxCharWidth
 self.__pxGapHexAscii = 2 * self.__pxCharWidth
 self.__pxCursorWidth = self.__pxCharHeight // 7
 self.__pxSelectionSub = self.fontMetrics().descent()
+self.__adjust()
 self.viewport().update()
 def dataAt(self, pos, count=-1):
 """
 Public method to get data from a given position.
 if self.__addressArea:
 painter.fillRect(
 QRect(-pxOfsX, evt.rect().top(),
 self.__pxPosHexX - self.__pxGapAdrHex // 2 - pxOfsX,
 self.height()),
-self.__addressAreaColor)
+self.__addressAreaBrush)
 if self.__asciiArea:
 linePos = self.__pxPosAsciiX - (self.__pxGapHexAscii // 2)
 painter.setPen(Qt.gray)
 painter.drawLine(linePos - pxOfsX, evt.rect().top(),
 linePos - pxOfsX, self.height())
 painter.setPen(
 self.viewport().palette().color(QPalette.WindowText))
 # paint the address area
 if self.__addressArea:
+painter.setPen(self.__addressAreaPen)
 address = ""
 row = 0
 pxPosY = self.__pxCharHeight
 while row <= len(self.__dataShown) // self.BYTES_PER_LINE:
 address = "{0:0{1}x}".format(
 colIdx += 1
 # increment loop variables
 row += 1
 pxPosY += self.__pxCharHeight
 painter.setBackgroundMode(Qt.TransparentMode)
 painter.setPen(
 self.viewport().palette().color(QPalette.WindowText))
 # paint cursor
 if self.__blink and not self.__readOnly and self.hasFocus():
 painter.fillRect(
 self.__cursorRect, self.palette().color(QPalette.WindowText))

Mercurial Repositories > eric / file comparison

comparison: HexEdit/HexEditWidget.py

HexEdit/HexEditWidget.py