Icon updated

Author: jackmacqueen

icon.svg

@@ -26,7 +26,10 @@ if ! command -v pyinstaller &> /dev/null; then
 fi
 
 echo "Building standalone binary with PyInstaller..."
-pyinstaller --noconfirm --onefile --windowed --clean --name "$PACKAGE_NAME" "$SOURCE_SCRIPT"
+# UPDATED: Added --add-data to bundle the SVG icon inside the binary
+pyinstaller --noconfirm --onefile --windowed --clean \
+            --add-data "icon.svg:." \
+            --name "$PACKAGE_NAME" "$SOURCE_SCRIPT"
 
 # Verify build succeeded
 if [ ! -f "dist/$PACKAGE_NAME" ]; then
@@ -40,14 +43,20 @@ BUILD_DIR="build/${PACKAGE_NAME}_${VERSION}_${ARCH}"
 mkdir -p "$BUILD_DIR/DEBIAN"
 mkdir -p "$BUILD_DIR/usr/local/bin"
 mkdir -p "$BUILD_DIR/usr/share/applications"
+# UPDATED: Create pixmaps directory for the system icon
+mkdir -p "$BUILD_DIR/usr/share/pixmaps"
 
 echo "Creating directory structure for $MENU_NAME (v$VERSION) [$ARCH]..."
 
 # 1. Copy the Compiled Binary
 cp "dist/$PACKAGE_NAME" "$BUILD_DIR/usr/local/bin/$PACKAGE_NAME"
 chmod 755 "$BUILD_DIR/usr/local/bin/$PACKAGE_NAME"
 
-# 2. Create the Control file (Metadata)
+# 2. UPDATED: Copy the Icon for the System Menu
+# We rename it to match the PACKAGE_NAME so the .desktop file finds it easily
+cp "icon.svg" "$BUILD_DIR/usr/share/pixmaps/$PACKAGE_NAME.svg"
+
+# 3. Create the Control file (Metadata)
 cat <<EOF > "$BUILD_DIR/DEBIAN/control"
 Package: $PACKAGE_NAME
 Version: $VERSION
@@ -60,7 +69,7 @@ Description: $DESCRIPTION
  A system tray application to toggle WireGuard interfaces.
 EOF
 
-# 3. Create the Post-Installation Script
+# 4. Create the Post-Installation Script
 cat <<EOF > "$BUILD_DIR/DEBIAN/postinst"
 #!/bin/bash
 set -e
@@ -84,7 +93,7 @@ EOF
 
 chmod 755 "$BUILD_DIR/DEBIAN/postinst"
 
-# 4. Create the Post-Removal Script
+# 5. Create the Post-Removal Script
 cat <<EOF > "$BUILD_DIR/DEBIAN/postrm"
 #!/bin/bash
 set -e
@@ -99,19 +108,20 @@ EOF
 
 chmod 755 "$BUILD_DIR/DEBIAN/postrm"
 
-# 5. Create the .desktop file
+# 6. Create the .desktop file
 cat <<EOF > "$BUILD_DIR/usr/share/applications/$PACKAGE_NAME.desktop"
 [Desktop Entry]
 Name=$MENU_NAME
 Comment=$DESCRIPTION
 Exec=/usr/local/bin/$PACKAGE_NAME
-Icon=network-vpn
+# UPDATED: Use the package name (which maps to the file in /usr/share/pixmaps)
+Icon=$PACKAGE_NAME
 Terminal=false
 Type=Application
 Categories=Network;Utility;
 EOF
 
-# 6. Build the .deb package
+# 7. Build the .deb package
 DEB_FILE="${PACKAGE_NAME}_${VERSION}_${ARCH}.deb"
 dpkg-deb --build "$BUILD_DIR" "$DEB_FILE"
 rm -rf build dist "$PACKAGE_NAME.spec"

package_app.sh

@@ -4,19 +4,33 @@
 from PyQt6.QtWidgets import (QApplication, QMainWindow, QLabel, QVBoxLayout, 
                              QWidget, QSystemTrayIcon, QMenu, QPushButton, 
                              QMessageBox, QListWidget, QListWidgetItem, QHBoxLayout)
+from PyQt6.QtSvg import QSvgRenderer
 from PyQt6.QtGui import QAction, QIcon, QPainter, QColor
 from PyQt6.QtCore import QSize, QTimer, Qt
 
 # Configuration
 WG_DIR = "/etc/wireguard"
 
+# --- HELPER FUNCTION ---
+def resource_path(relative_path):
+    """ Get absolute path to resource, works for dev and for PyInstaller """
+    try:
+        base_path = sys._MEIPASS
+    except Exception:
+        base_path = os.path.abspath(".")
+
+    return os.path.join(base_path, relative_path)
+
 class MainWindow(QMainWindow):
     def __init__(self):
         super().__init__()
 
+        # Initial Icon Load
+        self.setWindowIcon(QIcon(resource_path("icon.svg")))
+
         self.setWindowTitle("WireTray")
         self.setMinimumSize(QSize(400, 450))
-        self.configs = [] # List of config names (e.g., ['wg0', 'wg1'])
+        self.configs = [] 
 
         # --- GUI Setup ---
         central_widget = QWidget()
@@ -58,14 +72,12 @@ def __init__(self):
 
         # --- System Tray Setup ---
         self.tray_icon = QSystemTrayIcon(self)
-        self.tray_icon.setIcon(self.create_status_icon(False))
 
-        # We build the menu dynamically in update_tray_menu
+        # Initialize menu
         self.tray_menu = QMenu()
         self.tray_icon.setContextMenu(self.tray_menu)
         self.tray_icon.show()
 
-        # Handle clicking the icon itself (Left click)
         self.tray_icon.activated.connect(self.on_tray_icon_click)
 
         # --- Timer for Status Updates ---
@@ -84,8 +96,6 @@ def scan_configs(self):
 
         try:
             if not os.path.exists(WG_DIR):
-                # We can't use MessageBox here easily if it runs on startup loop, 
-                # so we show error in list
                 item = QListWidgetItem("Error: /etc/wireguard not found")
                 self.list_widget.addItem(item)
                 return
@@ -98,10 +108,8 @@ def scan_configs(self):
 
             self.configs.sort()
 
-            # Populate List Widget
             for config in self.configs:
                 item = QListWidgetItem(config)
-                # FIX: Store the "clean" name in hidden data so we don't break it when changing text
                 item.setData(Qt.ItemDataRole.UserRole, config) 
                 self.list_widget.addItem(item)
 
@@ -115,10 +123,8 @@ def update_tray_menu(self):
         """Rebuilds the tray menu with available configs."""
         self.tray_menu.clear()
 
-        # Add Actions for each config
         for config in self.configs:
             action = QAction(config, self)
-            # We use a lambda with default arg to capture the specific config string
             action.triggered.connect(lambda checked, c=config: self.toggle_vpn(c))
             self.tray_menu.addAction(action)
 
@@ -136,17 +142,12 @@ def is_interface_active(self, interface):
         return os.path.exists(f"/sys/class/net/{interface}")
 
     def update_status(self):
-        """Checks status of all configs and updates UI."""
         any_active = False
 
-        # 1. Update List Widget
         for i in range(self.list_widget.count()):
             item = self.list_widget.item(i)
-            
-            # FIX: Retrieve the clean name from hidden data
             name = item.data(Qt.ItemDataRole.UserRole)
 
-            # Skip items that aren't configs (like error messages)
             if not name:
                 continue
 
@@ -155,21 +156,16 @@ def update_status(self):
                 any_active = True
                 item.setIcon(QIcon.fromTheme("network-transmit-receive"))
                 item.setText(f"{name} (Active)")
-                item.setForeground(QColor("#4CAF50")) # Green text
+                item.setForeground(QColor("#4CAF50"))
             else:
                 item.setIcon(QIcon.fromTheme("network-offline"))
                 item.setText(name)
-                # Reset color based on theme (light/dark mode safe-ish)
-                item.setForeground(QColor(0,0,0) if self.palette().windowText().color().lightness() < 128 else QColor(255,255,255))
+                # Use theme-aware text color for list items
+                item.setForeground(QColor(0,0,0) if self.get_is_light_theme() else QColor(255,255,255))
 
-        # 2. Update Tray Menu Text/Icons
         actions = self.tray_menu.actions()
         for action in actions:
-            # We check if the action text starts with a known config name
-            # This is a bit loose, but works since we rebuild menu on scan
-            # A cleaner way would be to store data in actions too, but this works.
             current_text = action.text()
-            # Strip existing status to find the name
             clean_name = current_text.replace("  [Active]", "")
 
             if clean_name in self.configs:
@@ -179,42 +175,53 @@ def update_status(self):
                 else:
                     action.setText(f"{clean_name}")
 
-        # 3. Update Main Tray Icon
         self.tray_icon.setIcon(self.create_status_icon(any_active))
         self.setWindowIcon(self.create_status_icon(any_active))
 
+    def get_is_light_theme(self):
+        return self.palette().color(self.palette().ColorRole.WindowText).lightness() < 128
+
     def create_status_icon(self, active):
-        base_icon = QIcon.fromTheme("network-vpn")
+        
+        icon_path = resource_path("icon.svg")
+        base_icon = QIcon(icon_path)
         if base_icon.isNull():
-            base_icon = QIcon.fromTheme("network-wired")
+            base_icon = QIcon.fromTheme("network-vpn")
 
         pixmap = base_icon.pixmap(64, 64)
+        
         painter = QPainter(pixmap)
         painter.setRenderHint(QPainter.RenderHint.Antialiasing)
 
-        # Dot color
-        color = QColor("#4CAF50") if active else QColor("#F44336") 
+        is_light_mode = self.get_is_light_theme()
+        
+        icon_color = QColor("black") if is_light_mode else QColor("white")
+        
+        painter.setCompositionMode(QPainter.CompositionMode.CompositionMode_SourceIn)
+        painter.fillRect(pixmap.rect(), icon_color)
+
+        painter.setCompositionMode(QPainter.CompositionMode.CompositionMode_SourceOver)
 
-        painter.setBrush(color)
+        dot_color = QColor("#4CAF50") if active else QColor("#F44336") 
+        painter.setBrush(dot_color)
         painter.setPen(Qt.PenStyle.NoPen)
 
         dot_size = 24
         x = 64 - dot_size
         y = 64 - dot_size
         painter.drawEllipse(x, y, dot_size, dot_size)
+        
         painter.end()
         return QIcon(pixmap)
 
     def on_list_double_click(self, item):
-        # FIX: Use data instead of text splitting
         name = item.data(Qt.ItemDataRole.UserRole)
         if name and name in self.configs:
             self.toggle_vpn(name)
 
     def toggle_selected(self):
         current_item = self.list_widget.currentItem()
         if current_item:
-            # FIX: Use data instead of text splitting
             name = current_item.data(Qt.ItemDataRole.UserRole)
             if name and name in self.configs:
                 self.toggle_vpn(name)
@@ -227,14 +234,12 @@ def toggle_vpn(self, interface):
 
         try:
             QApplication.setOverrideCursor(Qt.CursorShape.WaitCursor)
-            
             result = subprocess.run(cmd_list, capture_output=True, text=True)
 
             if result.returncode != 0:
                 QApplication.restoreOverrideCursor()
                 QMessageBox.critical(self, "Error", f"Failed to toggle {interface}:\n{result.stderr}")
             else:
-                # Force immediate update
                 self.update_status()
 
         except Exception as e: