diff -r c3686b43f76b -r 773ad1f1ed22 src/eric7/EricWidgets/EricMapWidget.py
--- a/src/eric7/EricWidgets/EricMapWidget.py Tue Apr 04 17:26:54 2023 +0200
+++ b/src/eric7/EricWidgets/EricMapWidget.py Wed Apr 05 11:58:22 2023 +0200
@@ -32,12 +32,12 @@
self.__backgroundColor = QColor("#e7e7e7")
self.__setSliderColor()
- self._master = None
+ self._controller = None
self.__enabled = False
self.__rightSide = True
if parent is not None and isinstance(parent, QAbstractScrollArea):
- self.setMaster(parent)
+ self.setController(parent)
def __setSliderColor(self):
"""
@@ -51,31 +51,32 @@
# light background, use black slider
self.__sliderColor = Qt.GlobalColor.black
- def __updateMasterViewportWidth(self):
+ def __updateControllerViewportWidth(self):
"""
- Private method to update the master's viewport width.
+ Private method to update the controller's viewport width.
"""
- if self._master:
+ if self._controller:
if self.__enabled:
width = self.__width
else:
width = 0
if self.__rightSide:
- self._master.setViewportMargins(0, 0, width, 0)
+ self._controller.setViewportMargins(0, 0, width, 0)
else:
- self._master.setViewportMargins(width, 0, 0, 0)
+ self._controller.setViewportMargins(width, 0, 0, 0)
- def setMaster(self, master):
+ def setController(self, controller):
"""
- Public method to set the map master widget.
+ Public method to set the map controller widget.
- @param master map master widget (QAbstractScrollArea)
+ @param controller map controller widget
+ @type QAbstractScrollArea
"""
- self._master = master
- self._master.setVerticalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOn)
- self._master.verticalScrollBar().valueChanged.connect(self.update)
- self._master.verticalScrollBar().rangeChanged.connect(self.update)
- self.__updateMasterViewportWidth()
+ self._controller = controller
+ self._controller.setVerticalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOn)
+ self._controller.verticalScrollBar().valueChanged.connect(self.update)
+ self._controller.verticalScrollBar().rangeChanged.connect(self.update)
+ self.__updateControllerViewportWidth()
def setWidth(self, width):
"""
@@ -85,7 +86,7 @@
"""
if width != self.__width:
self.__width = max(6, width) # minimum width 6 pixels
- self.__updateMasterViewportWidth()
+ self.__updateControllerViewportWidth()
self.update()
def width(self):
@@ -99,23 +100,23 @@
def setMapPosition(self, onRight):
"""
Public method to set, whether the map should be shown to the right or
- left of the master widget.
+ left of the controller widget.
@param onRight flag indicating to show the map on the right side of
- the master widget
+ the controller widget
@type bool
"""
if onRight != self.__rightSide:
self.__rightSide = onRight
- self.__updateMasterViewportWidth()
+ self.__updateControllerViewportWidth()
self.update()
def isOnRightSide(self):
"""
Public method to test, if the map is shown on the right side of the
- master widget.
+ controller widget.
- @return flag indicating that the map is to the right of the master
+ @return flag indicating that the map is to the right of the controller
widget
@rtype bool
"""
@@ -150,7 +151,7 @@
if enable != self.__enabled:
self.__enabled = enable
self.setVisible(enable)
- self.__updateMasterViewportWidth()
+ self.__updateControllerViewportWidth()
def isEnabled(self):
"""
@@ -201,13 +202,13 @@
self._paintIt(painter)
# step 3: paint the slider
- if self._master:
+ if self._controller:
penColor = self.__sliderColor
painter.setPen(penColor)
brushColor = Qt.GlobalColor.transparent
painter.setBrush(QBrush(brushColor))
painter.drawRect(
- self.__generateSliderRange(self._master.verticalScrollBar())
+ self.__generateSliderRange(self._controller.verticalScrollBar())
)
def _paintIt(self, painter):
@@ -226,8 +227,8 @@
@param event reference to the mouse event (QMouseEvent)
"""
- if event.button() == Qt.MouseButton.LeftButton and self._master:
- vsb = self._master.verticalScrollBar()
+ if event.button() == Qt.MouseButton.LeftButton and self._controller:
+ vsb = self._controller.verticalScrollBar()
value = self.position2Value(event.position().toPoint().y() - 1)
vsb.setValue(int(value - 0.5 * vsb.pageStep())) # center on page
self.__mousePressPos = None
@@ -238,8 +239,8 @@
@param event reference to the mouse event (QMouseEvent)
"""
- if event.buttons() & Qt.MouseButton.LeftButton and self._master:
- vsb = self._master.verticalScrollBar()
+ if event.buttons() & Qt.MouseButton.LeftButton and self._controller:
+ vsb = self._controller.verticalScrollBar()
value = self.position2Value(event.position().toPoint().y() - 1)
vsb.setValue(int(value - 0.5 * vsb.pageStep())) # center on page
@@ -251,24 +252,24 @@
"""
isVertical = event.angleDelta().x() == 0
if (
- self._master
+ self._controller
and event.modifiers() == Qt.KeyboardModifier.NoModifier
and isVertical
):
- QCoreApplication.sendEvent(self._master.verticalScrollBar(), event)
+ QCoreApplication.sendEvent(self._controller.verticalScrollBar(), event)
def calculateGeometry(self):
"""
Public method to recalculate the map widget's geometry.
"""
- if self._master:
- cr = self._master.contentsRect()
- vsb = self._master.verticalScrollBar()
+ if self._controller:
+ cr = self._controller.contentsRect()
+ vsb = self._controller.verticalScrollBar()
if vsb.isVisible():
vsbw = vsb.contentsRect().width()
else:
vsbw = 0
- margins = self._master.contentsMargins()
+ margins = self._controller.contentsMargins()
if margins.right() > vsbw:
vsbw = 0
if self.__rightSide:
@@ -292,9 +293,9 @@
(boolean)
@return scale factor (float)
"""
- if self._master:
+ if self._controller:
delta = 0 if slider else 2
- vsb = self._master.verticalScrollBar()
+ vsb = self._controller.verticalScrollBar()
posHeight = vsb.height() - delta - 1
valHeight = vsb.maximum() - vsb.minimum() + vsb.pageStep()
return float(posHeight) / valHeight
@@ -310,9 +311,9 @@
(boolean)
@return position (integer)
"""
- if self._master:
+ if self._controller:
offset = 0 if slider else 1
- vsb = self._master.verticalScrollBar()
+ vsb = self._controller.verticalScrollBar()
return int((value - vsb.minimum()) * self.scaleFactor(slider) + offset)
else:
return value
@@ -326,9 +327,9 @@
(boolean)
@return scrollbar value (integer)
"""
- if self._master:
+ if self._controller:
offset = 0 if slider else 1
- vsb = self._master.verticalScrollBar()
+ vsb = self._controller.verticalScrollBar()
return vsb.minimum() + max(
0, (position - offset) / self.scaleFactor(slider)
)
