MNT: Switch to importing IconFont directly, for use with new icon pro…

…perty
slaclab · Oct 31, 2023 · 951bd24 · 951bd24
1 parent 042f198
commit 951bd24
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/pydm/widgets/pushbutton.py b/pydm/widgets/pushbutton.py
@@ -4,7 +4,7 @@
 from qtpy.QtWidgets import QPushButton, QMessageBox, QInputDialog, QLineEdit, QStyle
 from qtpy.QtCore import Slot, Property
 from .base import PyDMWritableWidget
-from pydm.utilities import iconfont
+from ..utilities import IconFont
 import logging
 
 logger = logging.getLogger(__name__)
@@ -112,7 +112,7 @@ def PyDMIcon(self, value: str) -> None:
         # We don't know if user is trying to use a standard icon or an icon from "Font Awesome",
         # so 1st try to create a Font Awesome one, which hits exception if icon name is not valid.
         try:
-            icon_f = iconfont.IconFont()
+            icon_f = IconFont()
             i = icon_f.icon(value, color=self._pydm_icon_color)
             self.setIcon(i)
         except Exception:
@@ -144,7 +144,7 @@ def PyDMIconColor(self, state_color: QColor) -> None:
             self._pydm_icon_color = state_color
             # apply the new color
             try:
-                icon_f = iconfont.IconFont()
+                icon_f = IconFont()
                 i = icon_f.icon(self._pydm_icon_name, color=self._pydm_icon_color)
                 self.setIcon(i)
             except Exception:

diff --git a/pydm/widgets/related_display_button.py b/pydm/widgets/related_display_button.py
@@ -13,7 +13,6 @@
 from ..utilities.stylesheet import merge_widget_stylesheet
 from ..display import load_file, ScreenTarget
 from typing import Optional, List
-from pydm.utilities import iconfont
 
 logger = logging.getLogger(__name__)
 
@@ -131,7 +130,7 @@ def PyDMIcon(self, value: str) -> None:
         # We don't know if user is trying to use a standard icon or an icon from "Font Awesome",
         # so 1st try to create a Font Awesome one, which hits exception if icon name is not valid.
         try:
-            icon_f = iconfont.IconFont()
+            icon_f = IconFont()
             i = icon_f.icon(value, color=self._pydm_icon_color)
             self.setIcon(i)
         except Exception:
@@ -163,7 +162,7 @@ def PyDMIconColor(self, state_color: QColor) -> None:
             self._pydm_icon_color = state_color
             # apply the new color
             try:
-                icon_f = iconfont.IconFont()
+                icon_f = IconFont()
                 i = icon_f.icon(self._pydm_icon_name, color=self._pydm_icon_color)
                 self.setIcon(i)
             except Exception:

diff --git a/pydm/widgets/shell_command.py b/pydm/widgets/shell_command.py
@@ -13,7 +13,6 @@
 from .base import PyDMWidget, only_if_channel_set
 from ..utilities import IconFont
 from typing import Optional, Union, List
-from pydm.utilities import iconfont
 
 logger = logging.getLogger(__name__)
 
@@ -142,7 +141,7 @@ def PyDMIcon(self, value: str) -> None:
         # We don't know if user is trying to use a standard icon or an icon from "Font Awesome",
         # so 1st try to create a Font Awesome one, which hits exception if icon name is not valid.
         try:
-            icon_f = iconfont.IconFont()
+            icon_f = IconFont()
             i = icon_f.icon(value, color=self._pydm_icon_color)
             self.setIcon(i)
         except Exception:
@@ -174,7 +173,7 @@ def PyDMIconColor(self, state_color: QColor) -> None:
             self._pydm_icon_color = state_color
             # apply the new color
             try:
-                icon_f = iconfont.IconFont()
+                icon_f = IconFont()
                 i = icon_f.icon(self._pydm_icon_name, color=self._pydm_icon_color)
                 self.setIcon(i)
             except Exception: