Read version and display on config. window

Try to run python code with local interpreter: useful when working with venvs

Author: mathoudebine

.gitignore

@@ -140,4 +140,5 @@ dmypy.json
 screencap.png
 tmp
 
+version.txt
 external/LibreHardwareMonitor/LibreHardwareMonitorLib.sys

configure.py

@@ -163,8 +163,10 @@
 
 MAIN_DIRECTORY = Path(__file__).resolve().parent
 THEMES_DIR = MAIN_DIRECTORY / "res/themes"
+VERSION_FILE = MAIN_DIRECTORY / "version.txt"
 
 circular_mask = Image.open(MAIN_DIRECTORY / "res/backgrounds/circular-mask.png")
+DISABLED_COLOR = "#C0C0C0"
 
 
 def get_theme_data(name: str):
@@ -323,6 +325,17 @@ def __init__(self):
                                    "Fans missing from the list? Install lm-sensors package\n"
                                    "and run 'sudo sensors-detect' command, then reboot.")
 
+        try:
+            version = open(VERSION_FILE).readline()
+        except:
+            try:
+                version = subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD']).decode('utf-8')
+            except:
+                version = "0.0.0"
+
+        version_label = ttk.Label(self.window, text=version, foreground=DISABLED_COLOR)
+        version_label.place(x=5, y=550)
+
         self.weather_ping_btn = ttk.Button(self.window, text="Weather & ping",
                                            command=lambda: self.on_weatherping_click())
         self.weather_ping_btn.place(x=80, y=520, height=50, width=130)
@@ -510,13 +523,6 @@ 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":
-        #    os.startfile(path)
-        # elif platform.system() == "Darwin":
-        #    subprocess.Popen(["open", path])
-        # else:
-        #    subprocess.Popen(["xdg-open", path])
         path = MAIN_DIRECTORY / "res/themes"
 
         if platform.system() == "Windows":
@@ -527,24 +533,35 @@ def on_open_theme_folder_click(self):
             subprocess.Popen(["xdg-open", str(path)])
 
     def on_theme_editor_click(self):
-        theme_editor = next(MAIN_DIRECTORY.glob("theme-editor.*"))
-
-        if platform.system() == "Windows":
-            subprocess.Popen([str(theme_editor), self.theme_cb.get()], shell=True)
-        else:
-            subprocess.Popen([str(theme_editor), self.theme_cb.get()])
+        try:
+            # Load Python file with local python interpreter (useful for venvs)
+            theme_editor = next(MAIN_DIRECTORY.glob("theme-editor.py"))
+            subprocess.Popen([sys.executable, str(theme_editor), self.theme_cb.get()])
+        except:
+            # Load binary (for releases) or Python file with system interpreter
+            theme_editor = next(MAIN_DIRECTORY.glob("theme-editor*"))
+            if platform.system() == "Windows":
+                subprocess.Popen([str(theme_editor), self.theme_cb.get()], shell=True)
+            else:
+                subprocess.Popen([str(theme_editor), self.theme_cb.get()])
 
     def on_save_click(self):
         self.save_config_values()
 
     def on_saverun_click(self):
         self.save_config_values()
-        main_file = next(MAIN_DIRECTORY.glob("main.*"))
 
-        if platform.system() == "Windows":
-            subprocess.Popen([str(main_file)], shell=True)
-        else:
-            subprocess.Popen([str(main_file)])
+        try:
+            # Load Python file with local python interpreter (useful for venvs)
+            main_file = next(MAIN_DIRECTORY.glob("main.py"))
+            subprocess.Popen([sys.executable, str(main_file)])
+        except:
+            # Load binary (for releases) or Python file with system interpreter
+            main_file = next(MAIN_DIRECTORY.glob("main*"))
+            if platform.system() == "Windows":
+                subprocess.Popen([str(main_file)], shell=True)
+            else:
+                subprocess.Popen([str(main_file)])
 
         self.window.destroy()
 
@@ -556,10 +573,10 @@ def on_model_change(self, e=None):
         self.show_hide_brightness_warning()
         model = self.model_cb.get()
         if model == SIMULATED_MODEL:
-            self.com_cb.configure(state="disabled", foreground="#C0C0C0")
-            self.orient_cb.configure(state="disabled", foreground="#C0C0C0")
+            self.com_cb.configure(state="disabled", foreground=DISABLED_COLOR)
+            self.orient_cb.configure(state="disabled", foreground=DISABLED_COLOR)
             self.brightness_slider.configure(state="disabled")
-            self.brightness_val_label.configure(foreground="#C0C0C0")
+            self.brightness_val_label.configure(foreground=DISABLED_COLOR)
         else:
             self.com_cb.configure(state="readonly", foreground="#000")
             self.orient_cb.configure(state="readonly", foreground="#000")
@@ -591,8 +608,8 @@ def on_size_change(self, e=None):
     def on_hwlib_change(self, e=None):
         hwlib = [k for k, v in hw_lib_map.items() if v == self.hwlib_cb.get()][0]
         if hwlib == "STUB" or hwlib == "STATIC":
-            self.eth_cb.configure(state="disabled", foreground="#C0C0C0")
-            self.wl_cb.configure(state="disabled", foreground="#C0C0C0")
+            self.eth_cb.configure(state="disabled", foreground=DISABLED_COLOR)
+            self.wl_cb.configure(state="disabled", foreground=DISABLED_COLOR)
         else:
             self.eth_cb.configure(state="readonly", foreground="#000")
             self.wl_cb.configure(state="readonly", foreground="#000")

library/pythoncheck.py

@@ -24,19 +24,18 @@
 
 # Oldest / newest version supported
 MIN_PYTHON = (3, 9)
-MAX_PYTHON = (3, 14)
 # For Windows: max Python 3.13 until PythonNet support for 3.14
 MAX_PYTHON_WINDOWS = (3, 13)
+MAX_PYTHON_OTHERS = (3, 14)
+MAX_PYTHON = MAX_PYTHON_WINDOWS if sys.platform == "win32" else MAX_PYTHON_OTHERS
 
 
 def check_python_version():
     current_version = sys.version_info[:2]
-    platform = sys.platform
 
-    if current_version < MIN_PYTHON or (platform == "win32" and current_version > MAX_PYTHON_WINDOWS) or (
-            platform != "win32" and current_version > MAX_PYTHON):
+    if current_version < MIN_PYTHON or current_version > MAX_PYTHON:
         print(f"[ERROR] Python {current_version[0]}.{current_version[1]} is not supported by this program. "
-              f"Python {MIN_PYTHON[0]}.{MIN_PYTHON[1]}-{MAX_PYTHON[0]}.{MAX_PYTHON[1]} required on platform {platform}.")
+              f"Python {MIN_PYTHON[0]}.{MIN_PYTHON[1]}-{MAX_PYTHON[0]}.{MAX_PYTHON[1]} required on platform {sys.platform}.")
         try:
             sys.exit(0)
         except:

main.py

@@ -116,12 +116,18 @@ def on_signal_caught(signum, frame=None):
     def on_configure_tray(tray_icon, item):
         logger.info("Configure from tray icon")
 
-        configure_file = next(MAIN_DIRECTORY.glob("configure.*"))
+        try:
+            # Load Python file with local python interpreter (useful for venvs)
+            configure_file = next(MAIN_DIRECTORY.glob("configure.py"))
+            subprocess.Popen([sys.executable, str(configure_file)])
+        except:
+            # Load binary (for releases) or Python file with system interpreter
+            configure_file = next(MAIN_DIRECTORY.glob("configure*"))
+            if platform.system() == "Windows":
+                subprocess.Popen([str(configure_file)], shell=True)
+            else:
+                subprocess.Popen([str(configure_file)])
 
-        if platform.system() == "Windows":
-            subprocess.Popen([str(configure_file)], shell=True)
-        else:
-            subprocess.Popen([str(configure_file)])
         clean_stop(tray_icon)
 
     def on_exit_tray(tray_icon, item):