Skip to content

Commit 1a06038

Browse files
committed
Restore icon on Windows
1 parent 95f82ff commit 1a06038

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

backend.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919
sys.exit(1)
2020
logDir = os.path.join(configDir, 'logs', f'{dt.now().strftime('%Y-%m-%d %H%M%S')}.log')
2121
resourceDir = os.path.join(rootDir, "resources")
22-
iconDir = os.path.join(resourceDir, "icon.png")
22+
if osType == 'nt':
23+
iconDir = os.path.join(resourceDir, "icon.ico")
24+
else:
25+
iconDir = os.path.join(resourceDir, "icon.png")
2326

2427
print(f"Root Directory: {rootDir}")
2528
print(f"Initial Directory: {initDir}")

interface.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@ def closeSettings():
2626

2727
# Main Window
2828
ui = tk.Tk()
29-
img = Image.open(bck.iconDir)
30-
ico = ImageTk.PhotoImage(img)
3129
ui.title("MO2 Separator Generator")
32-
ui.wm_iconphoto(True, ico)
3330
ui.geometry("550x525+100+100")
3431
ui.minsize(750,500)
3532
ui.resizable(True, True)
@@ -39,10 +36,19 @@ def closeSettings():
3936
settings = tk.Toplevel(ui)
4037
settings.withdraw()
4138
settings.title("Settings")
42-
settings.wm_iconphoto(True, ico)
4339
settings.geometry('250x200')
4440
settings.resizable(False, False)
4541

42+
# Set icon
43+
if bck.osType == "nt":
44+
ui.iconbitmap(bck.iconDir)
45+
settings.iconbitmap(bck.iconDir)
46+
else:
47+
img = Image.open(bck.iconDir)
48+
ico = ImageTk.PhotoImage(img)
49+
ui.wm_iconphoto(True, ico)
50+
settings.wm_iconphoto(True, ico)
51+
4652
themeFrame = ttk.Frame(settings, padding=(0,0,10,5))
4753
themeChoiceFrame = ttk.Frame(themeFrame)
4854
ttk.Label(themeChoiceFrame, text="Theme: ").pack(side='left', anchor='center')

resources/icon.ico

3.91 KB
Binary file not shown.

0 commit comments

Comments
 (0)