From e7c873108aa908720a186ed3dcb62c3d7689774f Mon Sep 17 00:00:00 2001
From: profitroll <vozhd.kk@gmail.com>
Date: Mon, 23 Jan 2023 12:22:54 +0100
Subject: [PATCH] Updated icons

---
 assets/favicon.png          | Bin 0 -> 2262 bytes
 classes/app.py              |   6 +++---
 classes/toplevel/welcome.py |   5 +++--
 modules/utils.py            |  11 ++++++++++-
 4 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 assets/favicon.png

diff --git a/assets/favicon.png b/assets/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae37da10355c5797d7b7e6d68622ac3375371041
GIT binary patch
literal 2262
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
O1320v5p{N0%6|dmoF<U~

literal 0
HcmV?d00001

diff --git a/classes/app.py b/classes/app.py
index 16c34a5..d11f342 100644
--- a/classes/app.py
+++ b/classes/app.py
@@ -1,5 +1,5 @@
 from os import path
-from tkinter import NSEW, NW, E, N, S, W, messagebox, ttk
+from tkinter import NSEW, NW, E, N, S, W, PhotoImage, messagebox, ttk
 
 import requests
 import sv_ttk
@@ -13,7 +13,7 @@ from classes.frames.saves import FrameSaves
 from classes.frames.settings import FrameSettings
 from classes.toplevel.welcome import ToplevelWelcome
 from modules.theme_titlebar import theme_title_bar
-from modules.utils import configGet, get_string_mode, use_dark_mode
+from modules.utils import configGet, get_string_mode, set_icon, use_dark_mode
 
 
 class App(ThemedTk):
@@ -44,8 +44,8 @@ class App(ThemedTk):
             theme_title_bar(self, mode="dark")
             self.update()
 
+        set_icon(self)
 
-        self.iconbitmap(path.join("assets", "favicon.ico"))
         self.focus_set()
 
         self.draw_main()
diff --git a/classes/toplevel/welcome.py b/classes/toplevel/welcome.py
index 61cf162..8b9f612 100644
--- a/classes/toplevel/welcome.py
+++ b/classes/toplevel/welcome.py
@@ -8,7 +8,7 @@ from classes.custom.image_label import ImageLabel
 from classes.custom.themed_toplevel import ThemedToplevel
 from modules.logger import logger
 from modules.theme_titlebar import theme_title_bar
-from modules.utils import configGet, configSet, use_dark_mode
+from modules.utils import configGet, configSet, set_icon, use_dark_mode
 
 
 class ToplevelWelcome(ThemedToplevel):		
@@ -37,7 +37,8 @@ class ToplevelWelcome(ThemedToplevel):
             theme_title_bar(self, mode="dark")
             self.update()
             
-        self.iconbitmap(path.join("assets", "favicon.ico"))
+        set_icon(self)
+        
         self.focus_set()
 
         self.grid_columnconfigure(0, weight=1)
diff --git a/modules/utils.py b/modules/utils.py
index 9576082..05c98ce 100644
--- a/modules/utils.py
+++ b/modules/utils.py
@@ -1,4 +1,7 @@
 from json import JSONDecodeError, dumps, loads
+from os import path
+from os import name as osname
+from tkinter import Misc, PhotoImage
 from typing import Any, Literal
 
 import darkdetect
@@ -91,4 +94,10 @@ def get_string_mode() -> Literal["dark", "light"]:
         * `Literal["dark", "light"]`
     """    
 
-    return "dark" if use_dark_mode() is True else "light"
\ No newline at end of file
+    return "dark" if use_dark_mode() is True else "light"
+
+def set_icon(me: Misc) -> None:
+    if osname == "nt":
+        me.iconbitmap(path.join("assets", "favicon.ico"))
+    else:
+        me.iconphoto(True, PhotoImage(file=path.join("assets", "favicon.png")))
\ No newline at end of file