edof 4.2.3__tar.gz → 4.2.4__tar.gz

{edof-4.2.3 → edof-4.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edof
-Version: 4.2.3
+Version: 4.2.4
 Summary: Easy Document Format – programmatic document creation, editing and export with vector PDF, rich text, tables and PDF import
 License: MIT License
         

{edof-4.2.3 → edof-4.2.4}/edof/_apps/assets/__init__.py

@@ -32,3 +32,21 @@ def app_icon_name(kind: str, ext: str = "ico") -> str:
     """Map a logical kind to an icon file name. kind in {editor,viewer,document}."""
     kind = kind if kind in ("editor", "viewer", "document") else "document"
     return f"edof-{kind}.{ext}"
+
+
+def set_windows_app_id(app_id: str) -> None:
+    """Give this process its own Windows taskbar identity.
+
+    Without this, a GUI launched under python/pythonw is grouped under the host
+    interpreter and the taskbar shows the interpreter's icon instead of the
+    app's window icon. Must be called early, before any window is shown. No-op
+    off Windows.
+    """
+    import sys
+    if sys.platform != "win32":
+        return
+    try:
+        import ctypes
+        ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(str(app_id))
+    except Exception:
+        pass

{edof-4.2.3 → edof-4.2.4}/edof/_apps/editor.py

@@ -12280,6 +12280,13 @@ def _tpl_invoice():
 
 
 def main():
+    # v4.2.4: own taskbar identity so Windows shows the EDOF icon, not Python's.
+    try:
+        from edof._apps.assets import set_windows_app_id
+        set_windows_app_id("DavidSchobl.EDOF.Editor")
+    except Exception:
+        pass
+
     # Remove Qt image allocation limit (default 256 MB blocks large print jobs)
     try:
         from PyQt6.QtGui import QImageReader
@@ -12321,6 +12328,13 @@ def main():
 
     app=QApplication(sys.argv); app.setApplicationName("EDOF Editor")
     app.setApplicationVersion(edof.__version__)
+    try:
+        from edof._apps.assets import icon_path
+        _ip = icon_path("edof-editor.ico") or icon_path("edof-editor.png")
+        if _ip:
+            app.setWindowIcon(QIcon(_ip))
+    except Exception:
+        pass
     try:
         win=EdofEditor(sys.argv[1] if len(sys.argv)>1 else None)
         win.show()

{edof-4.2.3 → edof-4.2.4}/edof/_apps/file_assoc.py

@@ -17,31 +17,46 @@ import subprocess
 from pathlib import Path
 
 
-def _find_viewer_executable():
-    """Locate the edof-viewer command in PATH."""
-    exe = shutil.which("edof-viewer")
-    if exe:
-        return exe
-    # Fallback: try Python module invocation
+def _find_app_executable(cmd_name: str, module: str) -> str:
+    """Locate a GUI launcher as an ABSOLUTE path, never a .bat/.cmd.
+
+    Order: (1) the generated exe next to the interpreter (Scripts/ for pip
+    installs), (2) PATH via shutil.which but rejecting .bat/.cmd and forced to
+    absolute, (3) fall back to running the module with the interpreter
+    (pythonw on Windows so no console appears). This avoids picking up a
+    launcher .bat from the current directory, which has no icon and breaks when
+    invoked with a relative path.
+    """
+    exe_dir = os.path.dirname(os.path.abspath(sys.executable)) if sys.executable else ""
+    names = [cmd_name + ".exe", cmd_name] if os.name == "nt" else [cmd_name]
+    for d in ([os.path.join(exe_dir, "Scripts"), exe_dir] if exe_dir else []):
+        for n in names:
+            p = os.path.join(d, n)
+            if os.path.isfile(p) and not p.lower().endswith((".bat", ".cmd")):
+                return os.path.abspath(p)
+    found = shutil.which(cmd_name)
+    if found and not found.lower().endswith((".bat", ".cmd")):
+        return os.path.abspath(found)
     if sys.executable:
-        return f'"{sys.executable}" -m edof._apps.viewer'
+        py = os.path.abspath(sys.executable)
+        if os.name == "nt":
+            pyw = os.path.join(os.path.dirname(py), "pythonw.exe")
+            if os.path.isfile(pyw):
+                py = pyw
+        return f'"{py}" -m {module}'
     raise RuntimeError(
-        "Could not locate edof-viewer executable. "
-        "Make sure edof[viewer] is installed: pip install 'edof[viewer]'"
+        f"Could not locate {cmd_name}. Install with: pip install 'edof[all]'"
     )
 
 
+def _find_viewer_executable():
+    """Locate the edof-viewer launcher (absolute path, never a .bat)."""
+    return _find_app_executable("edof-viewer", "edof._apps.viewer")
+
+
 def _find_editor_executable():
-    """Locate the edof-editor command in PATH (fallback to module invocation)."""
-    exe = shutil.which("edof-editor")
-    if exe:
-        return exe
-    if sys.executable:
-        return f'"{sys.executable}" -m edof._apps.editor'
-    raise RuntimeError(
-        "Could not locate edof-editor executable. "
-        "Make sure edof[editor] is installed: pip install 'edof[all]'"
-    )
+    """Locate the edof-editor launcher (absolute path, never a .bat)."""
+    return _find_app_executable("edof-editor", "edof._apps.editor")
 
 
 def _cmd_with_arg(exe: str) -> str:

{edof-4.2.3 → edof-4.2.4}/edof/_apps/viewer.py

@@ -581,9 +581,23 @@ def main():
         print("Install with: pip install edof[viewer]")
         sys.exit(1)
 
+    # v4.2.4: own taskbar identity so Windows shows the EDOF icon, not Python's.
+    try:
+        from edof._apps.assets import set_windows_app_id
+        set_windows_app_id("DavidSchobl.EDOF.Viewer")
+    except Exception:
+        pass
+
     app = QApplication(sys.argv)
     app.setApplicationName("EDOF Viewer")
     app.setApplicationVersion(edof.__version__)
+    try:
+        from edof._apps.assets import icon_path
+        _ip = icon_path("edof-viewer.ico") or icon_path("edof-viewer.png")
+        if _ip:
+            app.setWindowIcon(QIcon(_ip))
+    except Exception:
+        pass
 
     # Optional file argument
     filepath = None

{edof-4.2.3 → edof-4.2.4}/edof/version.py

@@ -9,7 +9,7 @@ typography values in pt and are migrated on load.
 """
 
 from __future__ import annotations
-__version__ = "4.2.3"
+__version__ = "4.2.4"
 FORMAT_MAJOR        = 4
 FORMAT_MINOR        = 2
 FORMAT_PATCH        = 0

{edof-4.2.3 → edof-4.2.4}/edof.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edof
-Version: 4.2.3
+Version: 4.2.4
 Summary: Easy Document Format – programmatic document creation, editing and export with vector PDF, rich text, tables and PDF import
 License: MIT License
         

{edof-4.2.3 → edof-4.2.4}/edof.egg-info/entry_points.txt

@@ -1,4 +1,6 @@
 [console_scripts]
 edof-cli = edof._apps.cli:main
+
+[gui_scripts]
 edof-editor = edof._apps.editor:main
 edof-viewer = edof._apps.viewer:main

{edof-4.2.3 → edof-4.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name            = "edof"
-version         = "4.2.3"
+version         = "4.2.4"
 description     = "Easy Document Format – programmatic document creation, editing and export with vector PDF, rich text, tables and PDF import"
 readme          = "README.md"
 license         = { file = "LICENSE" }
@@ -89,6 +89,8 @@ addopts   = "-v --tb=short"
 source = ["edof"]
 
 [project.scripts]
+edof-cli    = "edof._apps.cli:main"
+
+[project.gui-scripts]
 edof-editor = "edof._apps.editor:main"
 edof-viewer = "edof._apps.viewer:main"
-edof-cli    = "edof._apps.cli:main"