Mercurial Repositories > eric / file diff

--- a/src/eric7/PdfViewer/PdfView.py	Fri Jan 20 15:50:55 2023 +0100
+++ b/src/eric7/PdfViewer/PdfView.py	Fri Jan 20 16:11:50 2023 +0100
@@ -29,8 +29,8 @@
     Class defining the various marker types.
     """
 
-    SearchResult = 0
-    Selection = 1
+    SEARCHRESULT = 0
+    SELECTION = 1
 
 
 @dataclass
@@ -60,8 +60,8 @@
 
     MarkerColors = {
         # merker type: (pen color, brush color)
-        PdfMarkerType.SearchResult: (QColor(255, 200, 0, 255), QColor(255, 200, 0, 64)),
-        PdfMarkerType.Selection: (QColor(0, 0, 255, 255), QColor(0, 0, 255, 64)),
+        PdfMarkerType.SEARCHRESULT: (QColor(255, 200, 0, 255), QColor(255, 200, 0, 64)),
+        PdfMarkerType.SELECTION: (QColor(0, 0, 255, 255), QColor(0, 0, 255, 64)),
     }
 
     selectionAvailable = pyqtSignal(bool)
@@ -251,7 +251,7 @@
         @type QMouseEvent
         """
         if evt.button() == Qt.MouseButton.LeftButton:
-            self.clearMarkers(PdfMarkerType.Selection)
+            self.clearMarkers(PdfMarkerType.SELECTION)
             self.selectionAvailable.emit(False)
 
             self.__rubberBandOrigin = evt.pos()
@@ -311,7 +311,7 @@
                     if selection.isValid():
                         for bound in selection.bounds():
                             self.addMarker(
-                                page, bound.boundingRect(), PdfMarkerType.Selection
+                                page, bound.boundingRect(), PdfMarkerType.SELECTION
                             )
                             self.selectionAvailable.emit(True)
 
@@ -438,12 +438,12 @@
         
         startPage = (
             self.pageNavigator().currentPage()
-            if self.pageMode == QPdfView.PageMode.SinglePage
+            if self.pageMode() == QPdfView.PageMode.SinglePage
             else 0
         )
         endPage = (
             self.pageNavigator().currentPage() + 1
-            if self.pageMode == QPdfView.PageMode.SinglePage
+            if self.pageMode() == QPdfView.PageMode.SinglePage
             else pageCount
         )
 
@@ -612,14 +612,14 @@
         @type QPdfLink
         """
         for rect in link.rectangles():
-            self.addMarker(link.page(), rect, PdfMarkerType.SearchResult)
+            self.addMarker(link.page(), rect, PdfMarkerType.SEARCHRESULT)
 
     @pyqtSlot()
     def clearSearchMarkers(self):
         """
         Public slot to clear the search markers.
         """
-        self.clearMarkers(PdfMarkerType.SearchResult)
+        self.clearMarkers(PdfMarkerType.SEARCHRESULT)
 
     def hasSelection(self):
         """
@@ -629,7 +629,7 @@
         @rtype bool
         """
         return any(
-            m.markerType == PdfMarkerType.Selection
+            m.markerType == PdfMarkerType.SELECTION
             for p in self.__markers
             for m in self.__markers[p]
         )
@@ -644,7 +644,7 @@
         for page in self.__markers:
             markersList = [
                 m for m in self.__markers[page]
-                if m.markerType == PdfMarkerType.Selection
+                if m.markerType == PdfMarkerType.SELECTION
             ]
             if markersList:
                 selection = self.document().getSelection(
@@ -662,4 +662,4 @@
         """
         Public slot to clear the current selection.
         """
-        self.clearMarkers(PdfMarkerType.Selection)
+        self.clearMarkers(PdfMarkerType.SELECTION)