Fix icon paths

jellydreams · Feb 26, 2025 · 11c324c · 11c324c
1 parent c6a0593
commit 11c324c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 23 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -27,7 +27,7 @@ python app.py
 ### Build executable
 
 ```shell
- pyinstaller ./app.py -n VTS_Fullbody_Tracking-1.0-beta --add-data='models/*:models' --add-data="venv/Lib/site-packages/mediapipe/modules/pose_landmark/*:mediapipe/modules/pose_landmark" --add-data="venv/Lib/site-packages/mediapipe/modules/pose_detection/*:mediapipe/modules/pose_detection" --add-data='plugin/icons/*.png:.' -F -w
+ pyinstaller ./app.py -n VTS_Fullbody_Tracking-v1.0-beta --add-data='models/*:models' --add-data="venv/Lib/site-packages/mediapipe/modules/pose_landmark/*:mediapipe/modules/pose_landmark" --add-data="venv/Lib/site-packages/mediapipe/modules/pose_detection/*:mediapipe/modules/pose_detection" --add-data='plugin/icons/*.png:plugin/icons/.' -F -w
 ```
 
 

diff --git a/plugin/connector.py b/plugin/connector.py
@@ -13,7 +13,7 @@
 VTUBE_STUDIO = 'VTube Studio'
 
 
-icon_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '../icon.png'))
+icon_path = os.path.abspath(os.path.join(os.path.dirname(__file__), 'icons/icon.png'))
 
 plugin_info = {
     "plugin_name": "VTS_Fullbody_Tracking",

diff --git a/plugin/ui.py b/plugin/ui.py
@@ -76,23 +76,23 @@ def get_configuration(self):
 
         return settings
 
+    def load_icon(self, icon_path, resize=(32, 32)):
+        image = os.path.abspath(os.path.join(os.path.dirname(__file__), icon_path))
+        image = Image.open(image)
+        image_resized = image.resize(resize)
+        return ImageTk.PhotoImage(image_resized)
+
     def set_icons(self):
         # Set window icon
-        icon_path = os.path.abspath(os.path.join(os.path.dirname(__file__), ICON_PATH))
-        icon_image = Image.open(icon_path)
-        icon_resized_for_window = icon_image.resize((32, 32))
-        window_icon = ImageTk.PhotoImage(icon_resized_for_window)
-        self.root.iconphoto(False, window_icon)
+        window_icon = self.load_icon(ICON_PATH, (32, 32))
+        self.root.iconphoto(True, window_icon)
 
     def set_header(self):
         header_frame = tk.Frame(self.root, bg='#222222')
         header_frame.pack(fill=tk.X)
 
-        # Load and resize icon image for window and header
-        icon_path = os.path.abspath(os.path.join(os.path.dirname(__file__), ICON_PATH))
-        icon_image = Image.open(icon_path)#.replace("plugin\\", ""))
-        icon_photo = icon_image.resize((50, 50))
-        self.icon_photo = ImageTk.PhotoImage(icon_photo)
+        self.icon_photo = self.load_icon(ICON_PATH, (50, 50))
+
         icon_label = tk.Label(header_frame, image=self.icon_photo, bg='#222222')
         icon_label.pack(side=tk.LEFT, padx=10, pady=10)
 
@@ -173,17 +173,9 @@ def toggle_inputs():
                 vtube_port_label.config(fg="gray")
                 vtube_name_label.config(fg="gray")
 
-        # load vtube studio icon
-        image = os.path.abspath(os.path.join(os.path.dirname(__file__), ICON_VTUBE_STUDIO))
-        image = Image.open(image)
-        image_resized = image.resize((25, 25))
-        self.vtube_studio_icon = ImageTk.PhotoImage(image_resized)
-
-        # load nizima icon
-        image = os.path.abspath(os.path.join(os.path.dirname(__file__), ICON_NIZIMA))
-        image = Image.open(image)
-        image_resized = image.resize((25, 25))
-        self.nizima_icon = ImageTk.PhotoImage(image_resized)
+        # load software icons
+        self.vtube_studio_icon = self.load_icon(ICON_VTUBE_STUDIO, (25, 25))
+        self.nizima_icon = self.load_icon(ICON_NIZIMA, (25, 25))
 
         # Variable to track the selected software
         self.selected_software = tk.StringVar(value=VTUBE_STUDIO)