Harmonize themes and display sizes: common for all 2.x" and 8.8"/9.2"

Author: mathoudebine

configure.py

@@ -22,9 +22,9 @@
 # This file is the system monitor configuration GUI
 
 from library.pythoncheck import check_python_version
+
 check_python_version()
 
-import glob
 import os
 import platform
 import subprocess
@@ -63,8 +63,10 @@
 WEACT_MODEL = "WeAct Studio Display FS V1"
 SIMULATED_MODEL = "Simulated screen"
 
+_SIZE_2_1_INCH = "2.1\""  # Only for retro compatibility
+_SIZE_2_8_INCH = "2.8\""  # Only for retro compatibility
+_SIZE_9_2_INCH = "9.2\""  # Only for retro compatibility
 SIZE_0_96_INCH = "0.96\""
-SIZE_2_1_INCH = "2.1\""  # Only for retro compatibility
 SIZE_2_x_INCH = "2.1\" / 2.8\""
 SIZE_3_5_INCH = "3.5\""
 SIZE_4_6_INCH = "4.6\""
@@ -158,9 +160,9 @@
 MAIN_DIRECTORY = Path(__file__).resolve().parent
 THEMES_DIR = MAIN_DIRECTORY / "res/themes"
 
-
 circular_mask = Image.open(MAIN_DIRECTORY / "res/backgrounds/circular-mask.png")
 
+
 def get_theme_data(name: str):
     dir = THEMES_DIR / name
 
@@ -220,7 +222,8 @@ def __init__(self):
         self.window = Tk()
         self.window.title('Turing System Monitor configuration')
         self.window.geometry("820x580")
-        self.window.iconphoto(True,PhotoImage(file=str(MAIN_DIRECTORY / "res/icons/monitor-icon-17865/64.png")))       # When window gets focus again, reload theme preview in case it has been updated by theme editor
+        self.window.iconphoto(True, PhotoImage(file=str(
+            MAIN_DIRECTORY / "res/icons/monitor-icon-17865/64.png")))  # When window gets focus again, reload theme preview in case it has been updated by theme editor
         self.window.bind("<FocusIn>", self.on_theme_change)
         self.window.after(0, self.on_fan_speed_update)
 
@@ -320,9 +323,8 @@ def __init__(self):
                                            command=lambda: self.on_weatherping_click())
         self.weather_ping_btn.place(x=80, y=520, height=50, width=130)
 
-
         self.open_theme_folder_btn = ttk.Button(self.window, text="Open themes\nfolder",
-                                         command=lambda: self.on_open_theme_folder_click())
+                                                command=lambda: self.on_open_theme_folder_click())
         self.open_theme_folder_btn.place(x=220, y=520, height=50, width=130)
 
         self.edit_theme_btn = ttk.Button(self.window, text="Edit theme", command=lambda: self.on_theme_editor_click())
@@ -346,7 +348,7 @@ def load_theme_preview(self):
         try:
             theme_preview = Image.open(MAIN_DIRECTORY / "res" / "themes" / self.theme_cb.get() / "preview.png")
 
-            if theme_data and theme_data['display'].get("DISPLAY_SIZE", '3.5"') == SIZE_2_1_INCH:
+            if theme_data and theme_data['display'].get("DISPLAY_SIZE", '3.5"') == _SIZE_2_1_INCH:
                 # This is a circular screen: apply a circle mask over the preview
                 theme_preview.paste(circular_mask, mask=circular_mask)
         except:
@@ -414,7 +416,10 @@ def load_config_values(self):
 
         # Guess display size from theme in the configuration
         size = get_theme_size(self.config['config']['THEME'])
-        size = size.replace(SIZE_2_1_INCH, SIZE_2_x_INCH)   # If a theme is for 2.1" then it also is for 2.8"
+        size = size.replace(_SIZE_2_1_INCH, SIZE_2_x_INCH)  # If a theme is for 2.1" then it is for all 2.x"
+        size = size.replace(_SIZE_2_8_INCH, SIZE_2_x_INCH)  # If a theme is for 2.8" then it is for all 2.x"
+        size = size.replace(_SIZE_9_2_INCH,
+                            SIZE_8_8_INCH_NEWREV)  # If a theme is for 9.2" then it is for 8.8"/9.2" (new rev)
         try:
             if size == SIZE_8_8_INCH and self.config['display']['REVISION'] == 'TUR_USB':
                 size = SIZE_8_8_INCH_NEWREV
@@ -501,12 +506,12 @@ def on_weatherping_click(self):
         self.more_config_window.show()
 
     def on_open_theme_folder_click(self):
-        #path = f'"{MAIN_DIRECTORY}res/themes"'
-        #if platform.system() == "Windows":
+        # path = f'"{MAIN_DIRECTORY}res/themes"'
+        # if platform.system() == "Windows":
         #    os.startfile(path)
-        #elif platform.system() == "Darwin":
+        # elif platform.system() == "Darwin":
         #    subprocess.Popen(["open", path])
-        #else:
+        # else:
         #    subprocess.Popen(["xdg-open", path])
         path = MAIN_DIRECTORY / "res/themes"
 
@@ -517,7 +522,6 @@ def on_open_theme_folder_click(self):
         else:
             subprocess.Popen(["xdg-open", str(path)])
 
-
     def on_theme_editor_click(self):
         theme_editor = next(MAIN_DIRECTORY.glob("theme-editor.*"))
 
@@ -526,7 +530,6 @@ def on_theme_editor_click(self):
         else:
             subprocess.Popen([str(theme_editor), self.theme_cb.get()])
 
-
     def on_save_click(self):
         self.save_config_values()
 
@@ -538,7 +541,7 @@ def on_saverun_click(self):
             subprocess.Popen([str(main_file)], shell=True)
         else:
             subprocess.Popen([str(main_file)])
-        
+
         self.window.destroy()
 
     def on_brightness_change(self, e=None):
@@ -561,9 +564,18 @@ def on_model_change(self, e=None):
 
     def on_size_change(self, e=None):
         size = self.size_cb.get()
-        size = size.replace(SIZE_2_x_INCH, SIZE_2_1_INCH)  # For '2.1" / 2.8"' size, keep '2.1"' as size to get themes for
-        size = size.replace(SIZE_8_8_INCH_NEWREV, SIZE_8_8_INCH)
-        themes = get_themes(size)
+
+        # For '2.1" / 2.8"' size, search for themes of both sizes
+        if size == SIZE_2_x_INCH:
+            themes = get_themes(_SIZE_2_1_INCH)
+            themes += get_themes(_SIZE_2_8_INCH)
+        # For 8.8" & 9.2" sizes, search for themes of both sizes
+        elif size == SIZE_8_8_INCH_NEWREV or size == SIZE_8_8_INCH:
+            themes = get_themes(SIZE_8_8_INCH)
+            themes += get_themes(_SIZE_9_2_INCH)
+        else:
+            themes = get_themes(size)
+
         self.theme_cb.config(values=themes)
 
         if not self.theme_cb.get() in themes:
@@ -682,9 +694,10 @@ def __init__(self, main_window: TuringConfigWindow):
         self.citysearch1_label = ttk.Label(self.window, text='Location search', font='bold')
         self.citysearch1_label.place(x=80, y=370)
 
-        self.citysearch2_label = ttk.Label(self.window, text="Enter location to automatically get coordinates (latitude/longitude).\n"
-                                                             "For example \"Berlin\" \"London, GB\", \"London, Quebec\".\n"
-                                                             "Remember to set valid API key and pick language first!")
+        self.citysearch2_label = ttk.Label(self.window,
+                                           text="Enter location to automatically get coordinates (latitude/longitude).\n"
+                                                "For example \"Berlin\" \"London, GB\", \"London, Quebec\".\n"
+                                                "Remember to set valid API key and pick language first!")
         self.citysearch2_label.place(x=10, y=396)
 
         self.citysearch3_label = ttk.Label(self.window, text="Enter location")
@@ -698,7 +711,8 @@ def __init__(self, main_window: TuringConfigWindow):
         self.citysearch4_label.place(x=10, y=540)
         self.citysearch_cb = ttk.Combobox(self.window, values=[], state='readonly')
         self.citysearch_cb.place(x=140, y=544, width=360)
-        self.citysearch_btn2 = ttk.Button(self.window, text="Fill in lat/long", command=lambda: self.on_filllatlong_click())
+        self.citysearch_btn2 = ttk.Button(self.window, text="Fill in lat/long",
+                                          command=lambda: self.on_filllatlong_click())
         self.citysearch_btn2.place(x=520, y=540, height=40, width=130)
 
         self.citysearch_warn_label = ttk.Label(self.window, text="")
@@ -759,10 +773,10 @@ def load_config_values(self, config):
             self.lang_cb.set(weather_lang_map[self.config['config']['WEATHER_LANGUAGE']])
         except:
             self.lang_cb.set(weather_lang_map["en"])
-    
+
     def citysearch_show_warning(self, warning):
         self.citysearch_warn_label.config(text=warning)
-		
+
     def on_search_click(self):
         OPENWEATHER_GEOAPI_URL = "http://api.openweathermap.org/geo/1.0/direct"
         api_key = self.api_entry.get()
@@ -774,8 +788,8 @@ def on_search_click(self):
             return
 
         try:
-            request = requests.get(OPENWEATHER_GEOAPI_URL, timeout=5, params={"appid": api_key, "lang": lang, 
-                                   "q": city, "limit": 10})
+            request = requests.get(OPENWEATHER_GEOAPI_URL, timeout=5, params={"appid": api_key, "lang": lang,
+                                                                              "q": city, "limit": 10})
         except:
             self.citysearch_show_warning("Error fetching OpenWeatherMap Geo API")
             return
@@ -786,7 +800,7 @@ def on_search_click(self):
         elif request.status_code != 200:
             self.citysearch_show_warning(f"Error #{request.status_code} fetching OpenWeatherMap Geo API.")
             return
-        
+
         self._city_entries = []
         cb_entries = []
         for entry in request.json():
@@ -803,7 +817,7 @@ def on_search_click(self):
             self._city_entries.append({"full_name": full_name, "lat": str(lat), "long": str(long)})
             cb_entries.append(full_name)
 
-        self.citysearch_cb.config(values = cb_entries)
+        self.citysearch_cb.config(values=cb_entries)
         if len(cb_entries) == 0:
             self.citysearch_show_warning("No given city found.")
         else: