prkit 0.3.1__tar.gz → 0.3.2__tar.gz

{prkit-0.3.1 → prkit-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prkit
-Version: 0.3.1
+Version: 0.3.2
 Summary: A cross-platform system-tray presentation toolkit
 Author: meebox
 Author-email: meebox <meebox@gmail.com>
@@ -23,6 +23,8 @@ Description-Content-Type: text/markdown
 
 跨平台的系統匣簡報輔助工具。程式不會開啟主視窗，所有設定都在系統匣圖示的右鍵選單中完成。
 
+同一使用者只能執行一份 PRKit；再次啟動時會提示已有程式在執行，不會建立第二個系統匣圖示。
+
 ## 功能
 
 - 聚光燈游標：可調整顏色、透明度與 48–320 px 圓圈大小；Windows 使用真正的系統游標，macOS/Linux 使用不攔截點擊的透明覆蓋層。
@@ -38,8 +40,8 @@ Description-Content-Type: text/markdown
 
 | 平台 | 下載檔案 | 啟動方式 |
 | --- | --- | --- |
-| Windows x64 | `PRKit-0.3.1-windows-x64.zip` | 解壓完整資料夾後執行 `PRKit/PRKit.exe` |
-| macOS Apple Silicon | `PRKit-0.3.1-macos-arm64.dmg` | 開啟 DMG，將 `PRKit.app` 拖到「Applications」捷徑後啟動 |
+| Windows x64 | `PRKit-0.3.2-windows-x64.zip` | 解壓完整資料夾後執行 `PRKit/PRKit.exe` |
+| macOS Apple Silicon | `PRKit-0.3.2-macos-arm64.dmg` | 開啟 DMG，將 `PRKit.app` 拖到「Applications」捷徑後啟動 |
 
 Windows ZIP 包含完整執行環境與游標復原 watchdog；請保留整個 `PRKit` 資料夾。macOS 目前僅提供 Apple Silicon 版。程式啟動後顯示在系統匣／選單列，不會開啟主視窗。若啟用了開機自動啟動，搬移 Windows 資料夾後請在選單取消勾選再重新勾選，以更新啟動路徑。
 
@@ -72,7 +74,7 @@ uv tool install git+https://github.com/codemee/prkit.git@latest
 prkit
 ```
 
-若要固定特定版本，將 `latest` 改成版本標籤，例如 `v0.3.1`。
+若要固定特定版本，將 `latest` 改成版本標籤，例如 `v0.3.2`。
 
 ## 授權
 

{prkit-0.3.1 → prkit-0.3.2}/README.md

@@ -4,6 +4,8 @@
 
 跨平台的系統匣簡報輔助工具。程式不會開啟主視窗，所有設定都在系統匣圖示的右鍵選單中完成。
 
+同一使用者只能執行一份 PRKit；再次啟動時會提示已有程式在執行，不會建立第二個系統匣圖示。
+
 ## 功能
 
 - 聚光燈游標：可調整顏色、透明度與 48–320 px 圓圈大小；Windows 使用真正的系統游標，macOS/Linux 使用不攔截點擊的透明覆蓋層。
@@ -19,8 +21,8 @@
 
 | 平台 | 下載檔案 | 啟動方式 |
 | --- | --- | --- |
-| Windows x64 | `PRKit-0.3.1-windows-x64.zip` | 解壓完整資料夾後執行 `PRKit/PRKit.exe` |
-| macOS Apple Silicon | `PRKit-0.3.1-macos-arm64.dmg` | 開啟 DMG，將 `PRKit.app` 拖到「Applications」捷徑後啟動 |
+| Windows x64 | `PRKit-0.3.2-windows-x64.zip` | 解壓完整資料夾後執行 `PRKit/PRKit.exe` |
+| macOS Apple Silicon | `PRKit-0.3.2-macos-arm64.dmg` | 開啟 DMG，將 `PRKit.app` 拖到「Applications」捷徑後啟動 |
 
 Windows ZIP 包含完整執行環境與游標復原 watchdog；請保留整個 `PRKit` 資料夾。macOS 目前僅提供 Apple Silicon 版。程式啟動後顯示在系統匣／選單列，不會開啟主視窗。若啟用了開機自動啟動，搬移 Windows 資料夾後請在選單取消勾選再重新勾選，以更新啟動路徑。
 
@@ -53,7 +55,7 @@ uv tool install git+https://github.com/codemee/prkit.git@latest
 prkit
 ```
 
-若要固定特定版本，將 `latest` 改成版本標籤，例如 `v0.3.1`。
+若要固定特定版本，將 `latest` 改成版本標籤，例如 `v0.3.2`。
 
 ## 授權
 

{prkit-0.3.1 → prkit-0.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "prkit"
-version = "0.3.1"
+version = "0.3.2"
 description = "A cross-platform system-tray presentation toolkit"
 readme = "README.md"
 license = "GPL-3.0-or-later"

{prkit-0.3.1 → prkit-0.3.2}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "prkit"
-version = "0.3.1"
+version = "0.3.2"
 description = "A cross-platform system-tray presentation toolkit"
 readme = "README.md"
 license = "GPL-3.0-or-later"

{prkit-0.3.1 → prkit-0.3.2}/src/prkit/__init__.py

@@ -1,3 +1,3 @@
 """Presentation tools for the system tray."""
 
-__version__ = "0.3.1"
+__version__ = "0.3.2"

{prkit-0.3.1 → prkit-0.3.2}/src/prkit/app.py

@@ -10,9 +10,11 @@ from PySide6.QtWidgets import QApplication, QMessageBox
 
 from prkit import autostart
 from prkit.capslock import CapsLockMonitor
+from prkit.icon import tray_icon
 from prkit.input_source import InputSourceMonitor
 from prkit.keyboard import KeyboardMonitor
 from prkit.language import effective_language, tr
+from prkit.message_dialog import MessageDialog
 from prkit.overlays import CapsLockOverlay, KeystrokeOverlay
 from prkit.settings import SettingsStore, SettingsStoreProtocol
 from prkit.spotlight import SpotlightBackend, create_spotlight
@@ -344,18 +346,47 @@ def create_application(arguments: Sequence[str] | None = None) -> QApplication:
     app = QApplication(list(arguments) if arguments is not None else sys.argv)
     app.setOrganizationName("prkit")
     app.setApplicationName("簡報瑞士刀")
+    app.setWindowIcon(tray_icon())
     app.setQuitOnLastWindowClosed(False)
     return app
 
 
+def show_message(app: QApplication, icon: QMessageBox.Icon, language: str, message: str) -> None:
+    dialog = MessageDialog(app, icon, language, message)
+    dialog.exec()
+
+
 def main() -> int:
     app = create_application()
-    if not TrayController.is_available():
+    from prkit.single_instance import acquire
+
+    try:
+        instance_lock = acquire()
+    except OSError as error:
         language = effective_language(SettingsStore().load().language)
-        QMessageBox.critical(
-            None, tr("簡報瑞士刀", language), tr("此桌面環境沒有可用的系統匣。", language)
+        show_message(
+            app,
+            QMessageBox.Icon.Critical,
+            language,
+            tr("無法檢查是否已有執行中的 PRKit：{error}", language).format(error=error),
         )
         return 1
-    controller = AppController(app)
-    controller.start()
-    return app.exec()
+    if instance_lock is None:
+        language = effective_language(SettingsStore().load().language)
+        show_message(app, QMessageBox.Icon.Information, language, tr("PRKit 已在執行。", language))
+        return 0
+    try:
+        if not TrayController.is_available():
+            language = effective_language(SettingsStore().load().language)
+            show_message(
+                app,
+                QMessageBox.Icon.Critical,
+                language,
+                tr("此桌面環境沒有可用的系統匣。", language),
+            )
+            return 1
+        controller = AppController(app)
+        controller.start()
+        return app.exec()
+    finally:
+        instance_lock.unlock()

{prkit-0.3.1 → prkit-0.3.2}/src/prkit/language.py

@@ -32,6 +32,7 @@ ENGLISH = {
     "英文": "English",
     "中文（注音）": "Chinese (Zhuyin)",
     "結束": "Quit",
+    "確定": "OK",
     "無法設定開機自動啟動：{error}": "Could not change start at login: {error}",
     "無法顯示鍵盤狀態：{message}": "Could not display keyboard status: {message}",
     "無法啟用聚光燈游標：{error}": "Could not enable spotlight cursor: {error}",
@@ -40,6 +41,10 @@ ENGLISH = {
     "未知錯誤": "Unknown error",
     "按鍵監聽已停止：{message}": "Keystroke monitoring stopped: {message}",
     "此桌面環境沒有可用的系統匣。": "No system tray is available in this desktop environment.",
+    "PRKit 已在執行。": "PRKit is already running.",
+    "無法檢查是否已有執行中的 PRKit：{error}": (
+        "Could not check for a running PRKit instance: {error}"
+    ),
 }
 
 

prkit-0.3.2/src/prkit/message_dialog.py

@@ -0,0 +1,87 @@
+"""Compact, branded dialogs for startup messages."""
+
+from PySide6.QtCore import Qt
+from PySide6.QtWidgets import (
+    QApplication,
+    QDialog,
+    QHBoxLayout,
+    QLabel,
+    QMessageBox,
+    QPushButton,
+    QVBoxLayout,
+)
+
+from prkit.language import tr
+
+
+class MessageDialog(QDialog):
+    def __init__(
+        self, app: QApplication, icon: QMessageBox.Icon, language: str, message: str
+    ) -> None:
+        super().__init__()
+        self.setObjectName("prkitMessageDialog")
+        self.setWindowTitle(tr("簡報瑞士刀", language))
+        self.setWindowIcon(app.windowIcon())
+        self.setWindowFlag(Qt.WindowType.WindowContextHelpButtonHint, False)
+
+        critical = icon == QMessageBox.Icon.Critical
+        self.badge = QLabel("!" if critical else "i", self)
+        self.badge.setObjectName("statusBadge")
+        self.badge.setFixedSize(20, 20)
+        self.badge.setAlignment(Qt.AlignmentFlag.AlignCenter)
+
+        self.message_label = QLabel(message, self)
+        self.message_label.setObjectName("messageText")
+        self.message_label.setWordWrap(True)
+        self.message_label.setMaximumWidth(360)
+        self.message_label.setAlignment(Qt.AlignmentFlag.AlignLeft | Qt.AlignmentFlag.AlignVCenter)
+        self.message_label.setTextInteractionFlags(Qt.TextInteractionFlag.TextSelectableByMouse)
+
+        content = QHBoxLayout()
+        content.setSpacing(12)
+        content.addWidget(self.badge, alignment=Qt.AlignmentFlag.AlignVCenter)
+        content.addWidget(self.message_label, 1, Qt.AlignmentFlag.AlignVCenter)
+
+        self.confirm_button = QPushButton(tr("確定", language), self)
+        self.confirm_button.setObjectName("confirmButton")
+        self.confirm_button.setFixedSize(76, 32)
+        self.confirm_button.setDefault(True)
+        self.confirm_button.clicked.connect(self.accept)
+
+        actions = QHBoxLayout()
+        actions.addStretch()
+        actions.addWidget(self.confirm_button)
+
+        layout = QVBoxLayout(self)
+        layout.setContentsMargins(20, 20, 20, 18)
+        layout.setSpacing(22)
+        layout.addLayout(content)
+        layout.addLayout(actions)
+
+        badge_color = "#D64545" if critical else "#2563EB"
+        self.setStyleSheet(
+            "QDialog#prkitMessageDialog { background-color: #FFFFFF; }"
+            "QLabel#statusBadge { background-color: "
+            f"{badge_color}; color: #FFFFFF; border-radius: 10px; "
+            "font-size: 12px; font-weight: 600; }"
+            "QLabel#messageText { color: #263445; font-size: 13px; }"
+            "QPushButton#confirmButton { background-color: #2563EB; color: #FFFFFF; "
+            "border: 0; border-radius: 6px; font-size: 13px; }"
+            "QPushButton#confirmButton:hover { background-color: #1D4ED8; }"
+            "QPushButton#confirmButton:pressed { background-color: #1E40AF; }"
+        )
+        self.ensurePolished()
+        self.message_label.ensurePolished()
+        text_width = self.message_label.fontMetrics().horizontalAdvance(message)
+        margins = layout.contentsMargins()
+        non_text_width = margins.left() + self.badge.width() + content.spacing() + margins.right()
+        width = min(420, max(240, text_width + non_text_width))
+        text_height = self.message_label.heightForWidth(width - non_text_width)
+        height = (
+            margins.top()
+            + max(self.badge.height(), text_height)
+            + layout.spacing()
+            + self.confirm_button.height()
+            + margins.bottom()
+        )
+        self.setFixedSize(width, height)

prkit-0.3.2/src/prkit/single_instance.py

@@ -0,0 +1,23 @@
+"""Keep one GUI process per user across installed and frozen copies."""
+
+from pathlib import Path
+
+from PySide6.QtCore import QLockFile, QStandardPaths
+
+
+def acquire(directory: Path | None = None) -> QLockFile | None:
+    if directory is None:
+        location = QStandardPaths.writableLocation(
+            QStandardPaths.StandardLocation.AppLocalDataLocation
+        )
+        if not location:
+            raise OSError("No local application data directory is available")
+        directory = Path(location)
+    directory.mkdir(parents=True, exist_ok=True)
+    lock = QLockFile(str(directory / "prkit.lock"))
+    lock.setStaleLockTime(0)
+    if lock.tryLock(0):
+        return lock
+    if lock.error() == QLockFile.LockError.LockFailedError:
+        return None
+    raise OSError(f"Could not acquire the PRKit instance lock: {lock.error().name}")

{prkit-0.3.1 → prkit-0.3.2}/src/prkit/tray.py

@@ -336,9 +336,7 @@ class TrayController(QObject):
         self.tray.hide()
 
     def notify_warning(self, message: str) -> None:
-        self.tray.showMessage(
-            self.tray.toolTip(), message, QSystemTrayIcon.MessageIcon.Warning, 5000
-        )
+        self.tray.showMessage(self.tray.toolTip(), message, self.tray.icon(), 5000)
 
     def connect_settings(
         self,