Use more license friendly and theme aware icons

chocolateimage · Jan 27, 2025 · 7bb2ba1 · 7bb2ba1
1 parent 46ae4c8
commit 7bb2ba1
Show file tree

Hide file tree

Showing 20 changed files with 40 additions and 26 deletions.
diff --git a/levelbox.py b/levelbox.py
@@ -12,11 +12,7 @@ def __init__(self, icon, text, onclick=None, tooltip=None):
         super().__init__(" " + text)  # " " is a lazy way to fix icon spacing
         self.setFlat(True)
 
-        icon_darkmode = icon.replace(".svg", "") + "-darkmode.svg"
-        if utils.is_dark_mode() and os.path.exists(icon_darkmode):
-            self.setIcon(QtGui.QIcon(icon_darkmode))
-        else:
-            self.setIcon(QtGui.QIcon(icon))
+        self.setIcon(QtGui.QIcon(utils.get_icon_path(icon)))
 
         self.setSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
         if tooltip != None:
@@ -125,16 +121,16 @@ def __init__(self, data, mw):
         )
         if self.data["min_bpm"] == self.data["max_bpm"]:
             bpmtext = self.get_float_string(self.data["min_bpm"])
-        self.add_metadata("ui/heart-solid.svg", bpmtext + " BPM")
+        self.add_metadata("heart", bpmtext + " BPM")
         if self.data["approval"] == -1:
             self.add_metadata(
-                "ui/x.svg",
+                "x",
                 "Non-Referred",
                 tooltip="Non-Referred: a trusted member of the community has checked for correct\nBPM/offset, metadata, and cues to ensure playability, and has found that this level\ndoes not meet standards.",
             )
         elif self.data["approval"] >= 10:
             self.add_metadata(
-                "ui/checkmark.svg",
+                "checkmark",
                 "Reviewed",
                 onclick=lambda: self.change_facet_approval(True),
                 tooltip="Peer-Reviewed: a trusted member of the community has checked for correct\nBPM/offset, metadata, and cues to ensure playability.",
@@ -216,7 +212,7 @@ def add_tag(self, text):
 
     def add_author(self, author):
         self.add_metadata(
-            "ui/user-solid.svg",
+            "user",
             author,
             onclick=lambda: self.change_facet_author(author),
         )
@@ -256,25 +252,24 @@ def update_download_button_(self):
         if self.is_installed():
             self.lblInstalled.setVisible(True)
             self.btnDownload.setToolTip("Uninstall")
-            if os.name == "nt":
-                self.btnDownload.setIcon(QtGui.QIcon("ui/trash-solid.svg"))
-            else:
+            if QtGui.QIcon.hasThemeIcon("user-trash-full-symbolic"):
                 self.btnDownload.setIcon(
                     QtGui.QIcon.fromTheme("user-trash-full-symbolic")
                 )
+            else:
+                self.btnDownload.setIcon(QtGui.QIcon(utils.get_icon_path("trash")))
             self.bgcolor = "green"
         else:
             self.lblInstalled.setVisible(False)
             self.btnDownload.setToolTip("Install")
-            if os.name == "nt":
-                self.btnDownload.setIcon(QtGui.QIcon("ui/download-solid.svg"))
+            if QtGui.QIcon.hasThemeIcon("download"):
+                self.btnDownload.setIcon(QtGui.QIcon.fromTheme("download"))
+            elif QtGui.QIcon.hasThemeIcon("folder-download-symbolic"):
+                self.btnDownload.setIcon(
+                    QtGui.QIcon.fromTheme("folder-download-symbolic")
+                )
             else:
-                if QtGui.QIcon.hasThemeIcon("download"):
-                    self.btnDownload.setIcon(QtGui.QIcon.fromTheme("download"))
-                else:
-                    self.btnDownload.setIcon(
-                        QtGui.QIcon.fromTheme("folder-download-symbolic")
-                    )
+                self.btnDownload.setIcon(QtGui.QIcon(utils.get_icon_path("download")))
             self.bgcolor = None
         self.repaint()
 

diff --git a/ui/checkmark.svg → ui/checkmark-darkmode.svg b/ui/checkmark.svg → ui/checkmark-darkmode.svg
diff --git a/ui/checkmark-lightmode.svg b/ui/checkmark-lightmode.svg
diff --git a/ui/download-darkmode.svg b/ui/download-darkmode.svg
diff --git a/ui/download-lightmode.svg b/ui/download-lightmode.svg
diff --git a/ui/download-solid.svg b/ui/download-solid.svg
diff --git a/ui/heart-darkmode.svg b/ui/heart-darkmode.svg
diff --git a/ui/heart-lightmode.svg b/ui/heart-lightmode.svg
diff --git a/ui/heart-solid-darkmode.svg b/ui/heart-solid-darkmode.svg
diff --git a/ui/heart-solid.svg b/ui/heart-solid.svg
diff --git a/ui/trash-darkmode.svg b/ui/trash-darkmode.svg
diff --git a/ui/trash-lightmode.svg b/ui/trash-lightmode.svg
diff --git a/ui/trash-solid.svg b/ui/trash-solid.svg
diff --git a/ui/user-darkmode.svg b/ui/user-darkmode.svg
diff --git a/ui/user-lightmode.svg b/ui/user-lightmode.svg
diff --git a/ui/user-solid-darkmode.svg b/ui/user-solid-darkmode.svg
diff --git a/ui/user-solid.svg b/ui/user-solid.svg
diff --git a/ui/x.svg → ui/x-darkmode.svg b/ui/x.svg → ui/x-darkmode.svg
diff --git a/ui/x-lightmode.svg b/ui/x-lightmode.svg
diff --git a/utils.py b/utils.py
@@ -83,3 +83,10 @@ def is_dark_mode():
         background_color.red() + background_color.green() + background_color.blue()
     ) / 3
     return brightness < 128
+
+
+def get_icon_path(icon_name):
+    if is_dark_mode():
+        return "ui/" + icon_name + "-darkmode.svg"
+    else:
+        return "ui/" + icon_name + "-lightmode.svg"