icon changes based on version

CorwinAnsley · Aug 2, 2022 · 0fb4ec4 · 0fb4ec4
1 parent 39cc8ed
commit 0fb4ec4
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 12 deletions.
diff --git a/artifice/artifice_core/options_window.py b/artifice/artifice_core/options_window.py
@@ -44,8 +44,13 @@ def setup_options_layout(theme = 'Dark', font = None, version='ARTIFICE'):
 def create_options_window(theme = 'Artifice', font = None, window = None, scale = 1, version='ARTIFICE'):
     update_log(f'opening options window')
     layout = setup_options_layout(theme=theme, font=font, version=version)
-    piranha_scaled = scale_image('piranha.png',scale,(64,64))
-    new_window = sg.Window(version, layout, font=font, resizable=False, finalize=True,icon=piranha_scaled)
+
+    if version == 'piranhaGUI':
+        icon_scaled = scale_image('piranha.png',scale,(64,64))
+    else:
+        icon_scaled = scale_image('placeholder_artifice2.ico',scale,(64,64))
+
+    new_window = sg.Window(version, layout, font=font, resizable=False, finalize=True,icon=icon_scaled)
 
     if window != None:
         window.close()

diff --git a/artifice/artifice_core/parse_columns_window.py b/artifice/artifice_core/parse_columns_window.py
@@ -98,8 +98,12 @@ def check_spaces(samples, column):
 def create_parse_window(samples, theme = None, font = None, window = None, samples_column = 0, barcodes_column = 1, has_headers = True, scale = 1, version='ARTIFICE'):
 
     layout, column_headers = setup_parse_layout(samples, font=font, theme=theme, samples_column=samples_column, barcodes_column=barcodes_column, has_headers=has_headers)
-    piranha_scaled = scale_image('piranha.png',scale,(64,64))
-    new_window = sg.Window(version, layout, font=font, resizable=True, finalize=True,icon=piranha_scaled)
+    if version == 'piranhaGUI':
+        icon_scaled = scale_image('piranha.png',scale,(64,64))
+    else:
+        icon_scaled = scale_image('placeholder_artifice2.ico',scale,(64,64))
+
+    new_window = sg.Window(version, layout, font=font, resizable=True, finalize=True,icon=icon_scaled)
 
     if window != None:
         window.close()

diff --git a/artifice/artifice_core/select_protocol_window.py b/artifice/artifice_core/select_protocol_window.py
@@ -126,8 +126,13 @@ def create_protocol_window(theme = 'Artifice', version = 'ARTIFICE', font = None
     update_log('creating protocol window')
     make_theme()
     layout = setup_layout(theme=theme, font=font)
-    piranha_scaled = scale_image('piranha.png',scale,(64,64))
-    new_window = sg.Window(version, layout, font=font, resizable=False, enable_close_attempted_event=True, finalize=True,icon=piranha_scaled)
+
+    if version == 'piranhaGUI':
+        icon_scaled = scale_image('piranha.png',scale,(64,64))
+    else:
+        icon_scaled = scale_image('placeholder_artifice2.ico',scale,(64,64))
+
+    new_window = sg.Window(version, layout, font=font, resizable=False, enable_close_attempted_event=True, finalize=True,icon=icon_scaled)
 
     if window != None:
         window.close()

diff --git a/artifice/artifice_core/startup_window.py b/artifice/artifice_core/startup_window.py
@@ -107,8 +107,12 @@ def setup_layout(theme='Dark', version='ARTIFICE', font = None, scale = 1):
 def create_startup_window(theme = 'Artifice', version = 'ARTIFICE', font = None, window = None, scale = 1):
     update_log('creating startup window')
     layout = setup_layout(theme=theme, font=font, scale=scale)
-    piranha_scaled = scale_image('piranha.png',scale,(64,64))
-    new_window = sg.Window(version, layout, font=font, resizable=False, enable_close_attempted_event=True, finalize=True,use_custom_titlebar=False,icon=piranha_scaled)
+    if version == 'piranhaGUI':
+        icon_scaled = scale_image('piranha.png',scale,(64,64))
+    else:
+        icon_scaled = scale_image('placeholder_artifice2.ico',scale,(64,64))
+
+    new_window = sg.Window(version, layout, font=font, resizable=False, enable_close_attempted_event=True, finalize=True,use_custom_titlebar=False,icon=icon_scaled)
 
     if window != None:
         window.close()

diff --git a/artifice/basic_window/edit_run_window.py b/artifice/basic_window/edit_run_window.py
@@ -64,8 +64,13 @@ def create_edit_window(theme = 'Artifice', version = 'ARTIFICE', font = None, wi
     update_log('creating main window')
     make_theme()
     layout = setup_layout(theme=theme, font=font, version=version)
-    piranha_scaled = scale_image('piranha.png',scale,(64,64))
-    new_window = sg.Window(version, layout, font=font, resizable=False, enable_close_attempted_event=True, finalize=True,icon=piranha_scaled)
+
+    if version == 'piranhaGUI':
+        icon_scaled = scale_image('piranha.png',scale,(64,64))
+    else:
+        icon_scaled = scale_image('placeholder_artifice2.ico',scale,(64,64))
+
+    new_window = sg.Window(version, layout, font=font, resizable=False, enable_close_attempted_event=True, finalize=True,icon=icon_scaled)
 
     if window != None:
         window.close()

diff --git a/artifice/basic_window/execute_run_window.py b/artifice/basic_window/execute_run_window.py
@@ -84,8 +84,12 @@ def create_main_window(theme = 'Artifice', version = 'ARTIFICE', font = None, wi
     update_log('creating main window')
     make_theme()
     layout, rampart_running, piranha_running = setup_layout(theme=theme, font=font)
-    piranha_scaled = scale_image('piranha.png',scale,(64,64))
-    new_window = sg.Window(version, layout, font=font, resizable=False, enable_close_attempted_event=True, finalize=True,icon=piranha_scaled)
+    if version == 'piranhaGUI':
+        icon_scaled = scale_image('piranha.png',scale,(64,64))
+    else:
+        icon_scaled = scale_image('placeholder_artifice2.ico',scale,(64,64))
+
+    new_window = sg.Window(version, layout, font=font, resizable=False, enable_close_attempted_event=True, finalize=True,icon=icon_scaled)
 
     if window != None:
         window.close()