GUI: Add window icon. (#74)

* GUI: Add window icon. Signed-off-by: Slendi <[email protected]> * Fix Use resource file, make Pyinstaller work, make Windows taskbar work * Use icon for all windows * Fix on Wayland --------- Signed-off-by: Slendi <[email protected]> Co-authored-by: Raymond Li <[email protected]>
CharaChorder · Oct 29, 2023 · 88a5982 · 88a5982
1 parent 447720a
commit 88a5982
Show file tree

Hide file tree

Showing 13 changed files with 121 additions and 75 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ nexus.egg-info/
 **/__pycache__/
 src/nexus/ui/*.py
 src/nexus/translations/
+/resources_rc.py
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -7,6 +7,7 @@ repos:
       - id: check-case-conflict
       - id: check-docstring-first
       - id: check-executables-have-shebangs
+        exclude: '^.+\.desktop$'
       - id: check-shebang-scripts-are-executable
       - id: check-merge-conflict
       - id: check-symlinks
@@ -46,7 +47,7 @@ repos:
           - --statistics
           - --max-line-length=120
           - --per-file-ignores=src/nexus/Freqlog/backends/__init__.py:F401
-          - --exclude=venv,src/nexus/ui
+          - --exclude=venv,src/nexus/ui,resources_rc.py
         additional_dependencies: [flake8]
       - id: pytest
         name: pytest

diff --git a/com.charachorder.nexus.desktop b/com.charachorder.nexus.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Comment=CharaChorder's all-in-one desktop app, supporting Linux, Windows, and macOS.
+Exec=nexus
+Icon=ui/images/icon.ico
+Name=nexus
+StartupNotify=true
+StartupWMClass=nexus
+Terminal=false
+Type=Application
diff --git a/dist.py b/dist.py
@@ -61,6 +61,10 @@ def run_command(command: str):
 for f in glob.glob('ui/*.ui'):
     run_command(f"{venv_path}pyside6-uic {f} -o src/nexus/ui/{Path(f).stem}.py")
 
+# Generate resources
+print("Generating resources...")
+run_command(f"{venv_path}pyside6-rcc ui/resources.qrc -o resources_rc.py")
+
 # Generate translations
 print("Generating TS templates...")
 run_command(f"{venv_path}pyside6-lupdate " +
@@ -73,7 +77,7 @@ def run_command(command: str):
 
 if not (args.no_build or args.ui_only):
     # Pyinstaller command
-    build_cmd = "pyinstaller --onefile --name nexus src/nexus/__main__.py"
+    build_cmd = "pyinstaller --onefile --name nexus src/nexus/__main__.py --icon ui/images/icon.ico"
     if os_name == "notwin":  # Add hidden imports for Linux
         build_cmd += " --hidden-import pynput.keyboard._xorg --hidden-import pynput.mouse._xorg"
 

diff --git a/src/nexus/GUI.py b/src/nexus/GUI.py
@@ -9,15 +9,19 @@
     QDialog, QFileDialog, QDialogButtonBox, QVBoxLayout, QLabel, QMenu, QSystemTrayIcon
 from PySide6.QtGui import QIcon, QAction
 
+from nexus import __id__, __version__
 from nexus.Freqlog import Freqlog
 from nexus.ui.BanlistDialog import Ui_BanlistDialog
 from nexus.ui.BanwordDialog import Ui_BanwordDialog
 from nexus.ui.MainWindow import Ui_MainWindow
-
 from nexus.style import Stylesheet, Colors
-
 from nexus.Freqlog.Definitions import CaseSensitivity, WordMetadataAttr, WordMetadataAttrLabel, WordMetadata, Defaults
 
+if os.name == 'nt':  # Needed for taskbar icon on Windows
+    import ctypes
+
+    ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(f"{__id__}.{__version__}")
+
 
 class MainWindow(QMainWindow, Ui_MainWindow):
     """Set up the main window. Required because Qt is a PITA."""
@@ -85,10 +89,10 @@ def __init__(self, args: argparse.Namespace):
         self.tr = self.translator.translate
 
         # System tray
-        self.tray_icon = QIcon(os.path.join(script_parent_path, 'assets', 'images', 'icon.ico'))
+        self.nexus_icon = QIcon(":images/icon.ico")
         self.tray = QSystemTrayIcon()
         self.tray.activated.connect(self.show_hide)
-        self.tray.setIcon(self.tray_icon)
+        self.tray.setIcon(self.nexus_icon)
         self.tray.setVisible(True)
 
         # System tray menu
@@ -101,6 +105,9 @@ def __init__(self, args: argparse.Namespace):
         self.tray_menu.addAction(self.quit_tray_menu_action)
         self.tray.setContextMenu(self.tray_menu)
 
+        # Set window icon - required for Wayland
+        self.app.setDesktopFileName(f"{__id__}")
+
         # Components
         self.start_stop_button: QPushButton = self.window.startStopButton
         self.chentry_table: QTableWidget = self.window.chentryTable

diff --git a/src/nexus/__init__.py b/src/nexus/__init__.py
@@ -1,4 +1,5 @@
 """All-in-one cross-platform CharaChorder desktop app."""
 
 __author__ = "CharaChorder"
-__version__ = "0.3.0"
+__id__ = "com.charachorder.nexus"
+__version__ = "0.4.0"