Fix AttributeError when running on older Qt versions

Fixes #286
koordinates · Sep 6, 2023 · 569b38a · 569b38a
1 parent 49f1287
commit 569b38a
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 19 deletions.
diff --git a/koordinates/gui/custom_combo_box.py b/koordinates/gui/custom_combo_box.py
@@ -98,17 +98,21 @@ def move_to_anchor_placement(self):
                        )
             )
 
-            screen = self.anchor_widget.screen()
-            if screen:
-                screen_width = screen.size().width()
-                pos_on_screen = new_pos.x() - screen.geometry().left()
-                if pos_on_screen + self.width() > screen_width:
-                    # align with right side of anchor widget instead, to
-                    # avoid combo box overflowing outside of screen
-                    right_edge = new_pos.x() + self.anchor_widget.width()
-                    new_pos.setX(
-                        right_edge - self.width()
-                    )
+            try:
+                screen = self.anchor_widget.screen()
+                if screen:
+                    screen_width = screen.size().width()
+                    pos_on_screen = new_pos.x() - screen.geometry().left()
+                    if pos_on_screen + self.width() > screen_width:
+                        # align with right side of anchor widget instead, to
+                        # avoid combo box overflowing outside of screen
+                        right_edge = new_pos.x() + self.anchor_widget.width()
+                        new_pos.setX(
+                            right_edge - self.width()
+                        )
+            except AttributeError:
+                # requires Qt 5.14+
+                pass
 
             self.move(new_pos)
 

diff --git a/koordinates/gui/dataset_browser_items.py b/koordinates/gui/dataset_browser_items.py
@@ -433,7 +433,11 @@ def __init__(self,
 
         self.raw_thumbnail = None
 
-        font_scale = self.screen().logicalDotsPerInch() / 92
+        try:
+            font_scale = self.screen().logicalDotsPerInch() / 92
+        except AttributeError:
+            # requires Qt 5.14+
+            font_scale = 1
 
         self.thumbnail_label = Label()
         self.thumbnail_label.setFixedHeight(150)
@@ -597,7 +601,11 @@ def update_thumbnail(self):
                 thumbnail_svg, size, size)
 
         thumbnail = self.process_thumbnail(self.raw_thumbnail)
-        dpi_ratio = self.window().screen().devicePixelRatio()
+        try:
+            dpi_ratio = self.window().screen().devicePixelRatio()
+        except AttributeError:
+            # requires Qt 5.14
+            dpi_ratio = 1
         width = int(thumbnail.width() / dpi_ratio)
         height = int(thumbnail.height() / dpi_ratio)
         self.thumbnail_label.setFixedSize(QSize(width, height))
@@ -611,7 +619,12 @@ def process_thumbnail(self, img: Optional[QImage]) -> QImage:
             size = QSize(self.width(), self.THUMBNAIL_SIZE)
 
         image_size = size
-        scale_factor = self.window().screen().devicePixelRatio()
+        try:
+            scale_factor = self.window().screen().devicePixelRatio()
+        except AttributeError:
+            # requires Qt 5.14+
+            scale_factor = 1
+
         if scale_factor > 1:
             image_size *= scale_factor
 
@@ -720,7 +733,11 @@ def process_thumbnail(self, img: Optional[QImage]) -> QImage:
             self.dataset
         )
 
-        font_scale = self.screen().logicalDotsPerInch() / 92
+        try:
+            font_scale = self.screen().logicalDotsPerInch() / 92
+        except AttributeError:
+            # requires Qt 5.14 +
+            font_scale = 1
 
         overlay_font_size = 7.5
         if platform.system() == 'Darwin':

diff --git a/koordinates/gui/dataset_dialog.py b/koordinates/gui/dataset_dialog.py
@@ -493,7 +493,12 @@ def get_history_details(self) -> List[Tuple]:
 
     def setThumbnail(self, img):
         image_size = self.thumbnail_label.size()
-        scale_factor = self.window().screen().devicePixelRatio()
+        try:
+            scale_factor = self.window().screen().devicePixelRatio()
+        except AttributeError:
+            # requires Qt 5.14+
+            scale_factor = 1
+
         if scale_factor > 1:
             image_size *= scale_factor
 

diff --git a/koordinates/gui/detail_widgets/header_widget.py b/koordinates/gui/detail_widgets/header_widget.py
@@ -94,7 +94,12 @@ def __init__(self, dataset: Dataset, parent=None):
 
         hl.addWidget(url_frame, 1)
 
-        font_scale = self.screen().logicalDotsPerInch() / 92
+        try:
+            font_scale = self.screen().logicalDotsPerInch() / 92
+        except AttributeError:
+            # requires Qt 5.14+
+            font_scale = 1
+
         org_font_size = 10
         if font_scale > 1:
             org_font_size = int(12 / font_scale)

diff --git a/koordinates/gui/koordinates.py b/koordinates/gui/koordinates.py
@@ -443,7 +443,13 @@ def __init__(self, parent):
         self.results_panel.publisher_cleared.connect(
             self.filter_widget.remove_publisher_filter)
 
-        if os.name == 'nt' or self.window().screen().devicePixelRatio() > 1:
+        try:
+            device_pixel_ratio = self.window().screen().devicePixelRatio()
+        except AttributeError:
+            # requires Qt 5.14+
+            device_pixel_ratio = 1
+
+        if os.name == 'nt' or device_pixel_ratio > 1:
             self.button_sort_order.setStyleSheet(
                 'QToolButton { padding-right: 30px; padding-left: 0px; }'
             )

diff --git a/koordinates/gui/results_panel/explore_panel.py b/koordinates/gui/results_panel/explore_panel.py
@@ -44,7 +44,11 @@ def __init__(self,
         self.title_label.setWordWrap(True)
 
         main_title_size = 14
-        font_scale = self.screen().logicalDotsPerInch() / 92
+        try:
+            font_scale = self.screen().logicalDotsPerInch() / 92
+        except AttributeError:
+            # requires Qt 5.14+
+            font_scale = 1
 
         if platform.system() == 'Darwin':
             # fonts looks smaller on a mac, where things "just work" :P