edof 4.2.1__tar.gz → 4.2.2__tar.gz

{edof-4.2.1 → edof-4.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edof
-Version: 4.2.1
+Version: 4.2.2
 Summary: Easy Document Format – programmatic document creation, editing and export with vector PDF, rich text, tables and PDF import
 License: MIT License
         
@@ -185,7 +185,7 @@ A `Document` contains pages; each `Page` contains objects. All measurements are
 | `Table` | Formatted table with per-cell styling | `cells`, `col_widths`, `row_heights`, `table_border` |
 | `Group` | Container with optional clip | `children` |
 
-Common fields on every object: `transform` (position/size/rotation/flip), `opacity`, `layer`, `visible`, `visible_if`, `blend_mode`, `lock_level`, `lock_text`, `lock_position`, `tags`, `shadow`, `effects` (v4.1.0+).
+Common fields on every object: `transform` (position/size/rotation/flip), `opacity`, `layer`, `visible`, `visible_if`, `blend_mode`, `lock_level`, `lock_text`, `lock_position`, `tags`, `shadow`, `effects` (v4.2.0+).
 
 #### Transform fields
 
@@ -207,7 +207,7 @@ All color fields accept tuples in 0–255 range. Both RGB (3-tuple) and RGBA (4-
 obj.style.color    = (74, 144, 226)        # RGB → alpha 255 implied
 obj.fill.color     = (245, 245, 248, 255)  # RGBA — explicit
 obj.stroke.color   = (0, 0, 0, 200)        # RGBA — translucent black
-shape.fill.color   = "#4a90e2"             # v4.1.0+: hex string accepted
+shape.fill.color   = "#4a90e2"             # v4.2.0+: hex string accepted
 ```
 
 When read back, colors come as tuples (`obj.style.color` returns `(74, 144, 226)`, `obj.fill.color` returns `(245, 245, 248, 255)`).
@@ -469,7 +469,7 @@ heading.lock_text  = True       # text never editable until lock_text is cleared
 ### Headings with auto-computed height (no more silent text loss)
 
 ```python
-# v4.1.0+: add_textbox_auto computes height from content and accepts style kwargs
+# v4.2.0+: add_textbox_auto computes height from content and accepts style kwargs
 heading = page.add_textbox_auto(
     20, 20, 170, "MY HEADING",
     font_size=24, bold=True, alignment="center",
@@ -481,7 +481,7 @@ next_y = heading.transform.y + heading.transform.height + 5  # 5 mm gap
 ### Tables with explicit sizing
 
 ```python
-# v4.1.0+: make_table accepts position + size and computes total height
+# v4.2.0+: make_table accepts position + size and computes total height
 tbl = edof.make_table(
     rows=[
         ["Product",    "Qty", "Price"],
@@ -509,7 +509,7 @@ tb.style.color   = edof.as_color("#4a90e2")    # hex via helper
 tb.style.color   = edof.as_color("#4a90e2cc")  # 8-digit hex with alpha
 ```
 
-### Per-side padding (v4.1.0+)
+### Per-side padding (v4.2.0+)
 
 ```python
 tb.style.padding = 2.0           # uniform 2 mm on all sides
@@ -556,7 +556,7 @@ A PyQt6 desktop editor (`edof-editor`) ships with the library. It is a working e
 
 ## Viewer
 
-A lightweight read-only viewer (`edof-viewer`) ships alongside the editor (v4.1.1+). It is designed for the case where someone receives a `.edof` file and just wants to view, print, or convert it — without launching the full editor.
+A lightweight read-only viewer (`edof-viewer`) ships alongside the editor (v4.2.0+). It is designed for the case where someone receives a `.edof` file and just wants to view, print, or convert it — without launching the full editor.
 
 ```bash
 pip install 'edof[viewer]'
@@ -698,7 +698,7 @@ A small `.bat` makes switching painless:
 @echo off
 call D:\apps\Edof_V401\edof-python\.venv\Scripts\activate.bat
 cd /d D:\apps\Edof_V401\edof-python
-cmd /k prompt [edof v4.0.1] $P$G
+cmd /k prompt [edof v4.2.2] $P$G
 ```
 
 Each version's venv is independent. Removing a version is `rmdir /s /q <folder>`; nothing else needs cleanup.

{edof-4.2.1 → edof-4.2.2}/README.md

@@ -103,7 +103,7 @@ A `Document` contains pages; each `Page` contains objects. All measurements are
 | `Table` | Formatted table with per-cell styling | `cells`, `col_widths`, `row_heights`, `table_border` |
 | `Group` | Container with optional clip | `children` |
 
-Common fields on every object: `transform` (position/size/rotation/flip), `opacity`, `layer`, `visible`, `visible_if`, `blend_mode`, `lock_level`, `lock_text`, `lock_position`, `tags`, `shadow`, `effects` (v4.1.0+).
+Common fields on every object: `transform` (position/size/rotation/flip), `opacity`, `layer`, `visible`, `visible_if`, `blend_mode`, `lock_level`, `lock_text`, `lock_position`, `tags`, `shadow`, `effects` (v4.2.0+).
 
 #### Transform fields
 
@@ -125,7 +125,7 @@ All color fields accept tuples in 0–255 range. Both RGB (3-tuple) and RGBA (4-
 obj.style.color    = (74, 144, 226)        # RGB → alpha 255 implied
 obj.fill.color     = (245, 245, 248, 255)  # RGBA — explicit
 obj.stroke.color   = (0, 0, 0, 200)        # RGBA — translucent black
-shape.fill.color   = "#4a90e2"             # v4.1.0+: hex string accepted
+shape.fill.color   = "#4a90e2"             # v4.2.0+: hex string accepted
 ```
 
 When read back, colors come as tuples (`obj.style.color` returns `(74, 144, 226)`, `obj.fill.color` returns `(245, 245, 248, 255)`).
@@ -387,7 +387,7 @@ heading.lock_text  = True       # text never editable until lock_text is cleared
 ### Headings with auto-computed height (no more silent text loss)
 
 ```python
-# v4.1.0+: add_textbox_auto computes height from content and accepts style kwargs
+# v4.2.0+: add_textbox_auto computes height from content and accepts style kwargs
 heading = page.add_textbox_auto(
     20, 20, 170, "MY HEADING",
     font_size=24, bold=True, alignment="center",
@@ -399,7 +399,7 @@ next_y = heading.transform.y + heading.transform.height + 5  # 5 mm gap
 ### Tables with explicit sizing
 
 ```python
-# v4.1.0+: make_table accepts position + size and computes total height
+# v4.2.0+: make_table accepts position + size and computes total height
 tbl = edof.make_table(
     rows=[
         ["Product",    "Qty", "Price"],
@@ -427,7 +427,7 @@ tb.style.color   = edof.as_color("#4a90e2")    # hex via helper
 tb.style.color   = edof.as_color("#4a90e2cc")  # 8-digit hex with alpha
 ```
 
-### Per-side padding (v4.1.0+)
+### Per-side padding (v4.2.0+)
 
 ```python
 tb.style.padding = 2.0           # uniform 2 mm on all sides
@@ -474,7 +474,7 @@ A PyQt6 desktop editor (`edof-editor`) ships with the library. It is a working e
 
 ## Viewer
 
-A lightweight read-only viewer (`edof-viewer`) ships alongside the editor (v4.1.1+). It is designed for the case where someone receives a `.edof` file and just wants to view, print, or convert it — without launching the full editor.
+A lightweight read-only viewer (`edof-viewer`) ships alongside the editor (v4.2.0+). It is designed for the case where someone receives a `.edof` file and just wants to view, print, or convert it — without launching the full editor.
 
 ```bash
 pip install 'edof[viewer]'
@@ -616,7 +616,7 @@ A small `.bat` makes switching painless:
 @echo off
 call D:\apps\Edof_V401\edof-python\.venv\Scripts\activate.bat
 cd /d D:\apps\Edof_V401\edof-python
-cmd /k prompt [edof v4.0.1] $P$G
+cmd /k prompt [edof v4.2.2] $P$G
 ```
 
 Each version's venv is independent. Removing a version is `rmdir /s /q <folder>`; nothing else needs cleanup.

{edof-4.2.1 → edof-4.2.2}/edof/__init__.py

@@ -85,7 +85,8 @@ def new(width: float = 210.0, height: float = 297.0, **kwargs) -> Document:
     Example:
         >>> import edof
         >>> doc = edof.new(210, 297, title="Hello", dpi=300)
-        >>> page = doc.pages[0]
+        >>> page = doc.add_page()
+        >>> page.add_textbox(15, 15, 180, 12, "Hello world!")
         >>> doc.save("hello.edof")
     """
     return Document(width=width, height=height, **kwargs)

edof-4.2.2/edof/_apps/assets/__init__.py

@@ -0,0 +1,34 @@
+"""Bundled application assets (icons).
+
+`icon_path(name)` returns the absolute on-disk path to a packaged icon, working
+both from a source checkout and from an installed wheel. Kept Qt-free so it can
+also be used by the file-association registration code.
+"""
+from __future__ import annotations
+
+import os
+
+
+def icon_path(name: str):
+    """Return the absolute path to a bundled icon file, or None if missing.
+
+    `name` is the file name, e.g. "edof-editor.ico" or "edof-document.png".
+    """
+    # Preferred: importlib.resources (works for installed packages).
+    try:
+        from importlib.resources import files
+        p = files("edof._apps.assets.icons").joinpath(name)
+        sp = str(p)
+        if os.path.isfile(sp):
+            return sp
+    except Exception:
+        pass
+    # Fallback: relative to this file (source checkout).
+    here = os.path.join(os.path.dirname(__file__), "icons", name)
+    return here if os.path.isfile(here) else None
+
+
+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}"

edof-4.2.2/edof/_apps/assets/icons/__init__.py

@@ -0,0 +1 @@
+"""Packaged icon files (.ico/.png/.icns)."""

{edof-4.2.1 → edof-4.2.2}/edof/_apps/editor.py

@@ -23,7 +23,7 @@ try:
     from PyQt6.QtCore import Qt, QPointF, QRectF, QTimer, QSize, pyqtSignal, QObject, QSettings
     from PyQt6.QtGui import (
         QAction, QPainter, QPen, QBrush, QColor, QPixmap, QImage,
-        QPolygonF, QFont, QTransform, QCursor, QKeySequence, QPalette,
+        QPolygonF, QFont, QTransform, QCursor, QKeySequence, QPalette, QIcon,
     )
 except ImportError:
     print("PyQt6 required:  pip install PyQt6"); sys.exit(1)
@@ -233,7 +233,7 @@ QCheckBox::indicator:checked{{background:{ACC};border-color:{ACC}}}
 QRadioButton::indicator{{border-radius:8px}} QRadioButton::indicator:checked{{background:{ACC};border-color:{ACC}}}
 QComboBox::drop-down{{border:none;width:18px}}
 QComboBox QAbstractItemView{{background:{PBG2};color:{FG};selection-background-color:{ACC};font:10pt 'Segoe UI'}}
-QListWidget{{background:#1a1a2e;color:{FG};border:none;outline:none;font:10pt 'Segoe UI'}}
+QListWidget{{background:#1a1a2e;color:{FG};border:none;font:10pt 'Segoe UI'}}
 QListWidget::item{{padding:4px 6px}}
 QListWidget::item:selected{{background:{ACC}}}
 QTableWidget{{background:#1a1a2e;color:{FG};gridline-color:#444;font:10pt 'Segoe UI'}}
@@ -1081,6 +1081,14 @@ class EdofCanvas(QGraphicsView):
                 ed._host_undo = mw._undo
                 ed._host_redo = mw._redo
                 ed._on_body_edit = mw._on_body_touched
+                # v4.2.1: route Ctrl+S / Ctrl+Shift+S to the window's save so
+                # they work while the caret is inside the body text editor
+                # (previously Ctrl+S did nothing and Ctrl+Shift+S toggled
+                # strikethrough instead of Save As).
+                if hasattr(mw, '_save'):
+                    ed._host_save = mw._save
+                if hasattr(mw, '_save_as'):
+                    ed._host_save_as = mw._save_as
         # v4.1.16.4: signals trigger UI cleanup AFTER editor has written
         # data back. Editor.py drives commit/cancel directly; signals are
         # for after-the-fact cleanup only — no recursion possible.
@@ -8200,6 +8208,14 @@ class EdofEditor(QMainWindow):
                 _patch_button_font(btn)
         except Exception: pass
         self.setWindowTitle(f"{t('app_title')} {edof.__version__}")
+        # v4.2.2: window / taskbar icon
+        try:
+            from edof._apps.assets import icon_path
+            _ip = icon_path("edof-editor.ico") or icon_path("edof-editor.png")
+            if _ip:
+                self.setWindowIcon(QIcon(_ip))
+        except Exception:
+            pass
         # v4.0.2/4.1.9.1: restore window geometry, default to maximized on first run
         geom = self._settings.value("geometry")
         if geom is not None:
@@ -8680,7 +8696,7 @@ class EdofEditor(QMainWindow):
         hm.addSeparator()
         # v4.1.0: donate
         # v4.1.1: file association management
-        assoc_act = QAction("Associate .edof files with viewer…", self)
+        assoc_act = QAction("File association (.edof)…", self)
         assoc_act.triggered.connect(self._open_file_assoc_dialog)
         hm.addAction(assoc_act)
         hm.addSeparator()
@@ -10289,7 +10305,7 @@ class EdofEditor(QMainWindow):
         dlg.exec()
 
     def _open_file_assoc_dialog(self):
-        """v4.1.1: Manage .edof file association with edof-viewer."""
+        """Manage the .edof file association (register / remove)."""
         try:
             from edof._apps.file_assoc import (
                 associate_edof_files, unassociate_edof_files,
@@ -10303,10 +10319,12 @@ class EdofEditor(QMainWindow):
         is_assoc = "associated" in status.lower() and "not " not in status.lower()
         msg = (f"<h3>File association</h3>"
                f"<p>Current status: <b>{status}</b></p>"
-               f"<p>When .edof files are associated, double-clicking a "
-               f"<code>.edof</code> file in your file manager opens it in "
-               f"<b>edof-viewer</b> (read-only).</p>"
-               f"<p>{'<b>Currently associated.</b> Click Unassociate to remove.' if is_assoc else 'Click Associate to register .edof files.'}</p>")
+               f"<p>When .edof files are registered, they show the EDOF icon in "
+               f"your file manager and the first time you open one the system "
+               f"lets you choose <b>EDOF Viewer</b> or <b>EDOF Editor</b>. No "
+               f"default is forced, so you stay in control of which app opens "
+               f"them.</p>"
+               f"<p>{'<b>Currently registered.</b> Click OK to remove the association.' if is_assoc else 'Click OK to register .edof files.'}</p>")
         bb_text = "Unassociate" if is_assoc else "Associate"
         ret = QMessageBox.question(self, "File association", msg,
                                      QMessageBox.StandardButton.Ok | QMessageBox.StandardButton.Cancel)

{edof-4.2.1 → edof-4.2.2}/edof/_apps/edof_text_editor.py

@@ -532,6 +532,8 @@ class EdofTextEditor(QWidget):
         # local stacks. Set by the canvas in _start_inline for body editors.
         self._host_undo = None      # callable() -> document-level undo
         self._host_redo = None      # callable() -> document-level redo
+        self._host_save = None      # callable() -> document-level Save (Ctrl+S)
+        self._host_save_as = None   # callable() -> document-level Save As (Ctrl+Shift+S)
         self._on_body_edit = None   # callable() -> checkpoint before an edit burst
         # Idle-overflow auto-commit timer (doc body only)
         self._idle_overflow_timer = QTimer(self)
@@ -1775,6 +1777,16 @@ class EdofTextEditor(QWidget):
                 if k in claim and not ctrl:
                     ev.accept()
                     return True
+                # v4.2.1: in the document body, claim Ctrl+S / Ctrl+Shift+S so
+                # they reach our keyPressEvent (which forwards them to the
+                # window's Save / Save As) instead of being swallowed or, for
+                # Ctrl+Shift+S, triggering the editor's strikethrough action.
+                if (getattr(self, '_is_doc_body', False)
+                        and ctrl and k == Qt.Key.Key_S):
+                    if (self._host_save is not None
+                            or self._host_save_as is not None):
+                        ev.accept()
+                        return True
                 # v4.1.23.38: also claim any Ctrl/Alt combo that maps to a
                 # configured editor action (undo/redo/copy/paste/format/…) so a
                 # window-level QAction (e.g. global Undo on Ctrl+Z) can't eat it
@@ -1861,6 +1873,16 @@ class EdofTextEditor(QWidget):
             self._push_undo("type"); self._insert_text('    '); self._invalidate()
             return
 
+        # v4.2.1: document-level Save / Save As take precedence inside the body
+        # editor, before the configurable dispatch (which maps Ctrl+Shift+S to
+        # strikethrough). Forward to the host window so the standard shortcuts
+        # work while typing.
+        if ctrl and key == Qt.Key.Key_S and getattr(self, '_is_doc_body', False):
+            if shift and self._host_save_as is not None:
+                self._host_save_as(); ev.accept(); return
+            if not shift and self._host_save is not None:
+                self._host_save(); ev.accept(); return
+
         # v4.1.23.37: configurable shortcuts (formatting / clipboard /
         # alignment). Resolved via the user-editable map; unmapped combos
         # (e.g. ctrl+arrow word navigation) fall through to the handlers below.

{edof-4.2.1 → edof-4.2.2}/edof/_apps/file_assoc.py

@@ -31,6 +31,26 @@ def _find_viewer_executable():
     )
 
 
+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]'"
+    )
+
+
+def _cmd_with_arg(exe: str) -> str:
+    """Build a 'command' value: quote the exe (unless already quoted) + "%1"."""
+    if exe.startswith('"') or exe.startswith("'"):
+        return f'{exe} "%1"'
+    return f'"{exe}" "%1"'
+
+
 def current_association_status() -> str:
     """Return human-readable description of current .edof file association."""
     if sys.platform == "win32":
@@ -38,10 +58,19 @@ def current_association_status() -> str:
             import winreg
             with winreg.OpenKey(winreg.HKEY_CLASSES_ROOT, ".edof") as k:
                 cls, _ = winreg.QueryValueEx(k, "")
-            with winreg.OpenKey(winreg.HKEY_CLASSES_ROOT,
-                                 f"{cls}\\shell\\open\\command") as k:
-                cmd, _ = winreg.QueryValueEx(k, "")
-            return f"associated with: {cmd}"
+            if cls and cls.startswith("edof.Document"):
+                # Our document type. With the v4.2.2 model the type has no
+                # default opener, so check whether the open-with choices exist.
+                return ("associated (EDOF icon set; Windows asks which app "
+                        "to open with)")
+            # Some other progid claims .edof
+            try:
+                with winreg.OpenKey(winreg.HKEY_CLASSES_ROOT,
+                                    f"{cls}\\shell\\open\\command") as k:
+                    cmd, _ = winreg.QueryValueEx(k, "")
+                return f"associated with another app: {cmd}"
+            except OSError:
+                return f"associated with: {cls}"
         except OSError:
             return "not associated"
     elif sys.platform.startswith("linux"):
@@ -90,73 +119,145 @@ def unassociate_edof_files():
 # ─────────────────────────────────────────────────────────────────────────────
 
 def _associate_windows():
-    """Register .edof in HKCU\\Software\\Classes (per-user, no admin needed)."""
+    """Register .edof in HKCU\\Software\\Classes (per-user, no admin needed).
+
+    v4.2.2: the association does NOT force a default opener. `.edof` is mapped
+    to a document *type* progid (icon + friendly name, no open command), and the
+    Viewer and Editor are registered as the two "Open with" choices. The first
+    time the user double-clicks a `.edof` file Windows asks which app to use, so
+    the user picks their own default (and can change it any time). Files still
+    show the document icon in Explorer.
+    """
     import winreg
 
-    viewer = _find_viewer_executable()
-    # Build command line. Use double-quotes around the executable path.
-    if viewer.startswith('"') or viewer.startswith("'"):
-        cmd = f'{viewer} "%1"'
-    else:
-        cmd = f'"{viewer}" "%1"'
-
-    progid = "edof.Document.1"
     classes = r"Software\Classes"
+    progid_doc = "edof.Document"          # file type: icon + name, no opener
+    progid_view = "edof.Document.Viewer"  # Open-with choice: Viewer
+    progid_edit = "edof.Document.Editor"  # Open-with choice: Editor
 
-    # 1. .edof → progid
-    with winreg.CreateKeyEx(winreg.HKEY_CURRENT_USER,
-                              f"{classes}\\.edof",
-                              0, winreg.KEY_WRITE) as k:
-        winreg.SetValueEx(k, "", 0, winreg.REG_SZ, progid)
-        winreg.SetValueEx(k, "Content Type", 0, winreg.REG_SZ, "application/x-edof")
+    viewer = _find_viewer_executable()
+    cmd_view = _cmd_with_arg(viewer)
+    try:
+        editor = _find_editor_executable()
+        cmd_edit = _cmd_with_arg(editor)
+    except RuntimeError:
+        editor = None
+        cmd_edit = None
 
-    # 2. progid metadata
+    try:
+        from edof._apps.assets import icon_path
+    except Exception:
+        icon_path = lambda *_a, **_k: None  # noqa: E731
+    doc_icon = icon_path("edof-document.ico")
+    view_icon = icon_path("edof-viewer.ico")
+    edit_icon = icon_path("edof-editor.ico")
+
+    def _set_default(path, value):
+        with winreg.CreateKeyEx(winreg.HKEY_CURRENT_USER, f"{classes}\\{path}",
+                                0, winreg.KEY_WRITE) as k:
+            winreg.SetValueEx(k, "", 0, winreg.REG_SZ, value)
+
+    # 1. .edof → the document TYPE progid (gives icon + name) and the open-with
+    #    list. No "default opener" is set on the type, so Windows prompts the
+    #    user to choose between the Viewer and the Editor.
+    with winreg.CreateKeyEx(winreg.HKEY_CURRENT_USER, f"{classes}\\.edof",
+                            0, winreg.KEY_WRITE) as k:
+        winreg.SetValueEx(k, "", 0, winreg.REG_SZ, progid_doc)
+        winreg.SetValueEx(k, "Content Type", 0, winreg.REG_SZ, "application/x-edof")
     with winreg.CreateKeyEx(winreg.HKEY_CURRENT_USER,
-                              f"{classes}\\{progid}",
-                              0, winreg.KEY_WRITE) as k:
+                            f"{classes}\\.edof\\OpenWithProgids",
+                            0, winreg.KEY_WRITE) as k:
+        winreg.SetValueEx(k, progid_view, 0, winreg.REG_NONE, b"")
+        if editor:
+            winreg.SetValueEx(k, progid_edit, 0, winreg.REG_NONE, b"")
+
+    # 2. Document type: friendly name + icon, deliberately NO shell\open\command.
+    with winreg.CreateKeyEx(winreg.HKEY_CURRENT_USER, f"{classes}\\{progid_doc}",
+                            0, winreg.KEY_WRITE) as k:
         winreg.SetValueEx(k, "", 0, winreg.REG_SZ, "EDOF Document")
         winreg.SetValueEx(k, "FriendlyTypeName", 0, winreg.REG_SZ,
-                           "Easy Document Format File")
-
-    # 3. progid\shell\open\command → "edof-viewer" "%1"
-    with winreg.CreateKeyEx(winreg.HKEY_CURRENT_USER,
-                              f"{classes}\\{progid}\\shell\\open\\command",
-                              0, winreg.KEY_WRITE) as k:
-        winreg.SetValueEx(k, "", 0, winreg.REG_SZ, cmd)
-
-    # 4. DefaultIcon (use viewer exe as icon source if available)
-    if "edof-viewer" in viewer and os.path.isfile(viewer.strip('"').split()[0]):
-        with winreg.CreateKeyEx(winreg.HKEY_CURRENT_USER,
-                                  f"{classes}\\{progid}\\DefaultIcon",
-                                  0, winreg.KEY_WRITE) as k:
-            winreg.SetValueEx(k, "", 0, winreg.REG_SZ, f'"{viewer.strip(chr(34))}",0')
-
-    # 5. Notify shell that associations changed
+                          "Easy Document Format File")
+    if doc_icon and os.path.isfile(doc_icon):
+        _set_default(f"{progid_doc}\\DefaultIcon", f'"{doc_icon}",0')
+
+    # 3. Viewer open-with choice (own name + icon + open command).
+    with winreg.CreateKeyEx(winreg.HKEY_CURRENT_USER, f"{classes}\\{progid_view}",
+                            0, winreg.KEY_WRITE) as k:
+        winreg.SetValueEx(k, "", 0, winreg.REG_SZ, "EDOF Viewer")
+    if view_icon and os.path.isfile(view_icon):
+        _set_default(f"{progid_view}\\DefaultIcon", f'"{view_icon}",0')
+    _set_default(f"{progid_view}\\shell\\open\\command", cmd_view)
+
+    # 4. Editor open-with choice.
+    if cmd_edit:
+        with winreg.CreateKeyEx(winreg.HKEY_CURRENT_USER, f"{classes}\\{progid_edit}",
+                                0, winreg.KEY_WRITE) as k:
+            winreg.SetValueEx(k, "", 0, winreg.REG_SZ, "EDOF Editor")
+        if edit_icon and os.path.isfile(edit_icon):
+            _set_default(f"{progid_edit}\\DefaultIcon", f'"{edit_icon}",0')
+        _set_default(f"{progid_edit}\\shell\\open\\command", cmd_edit)
+
+    # 5. Notify the shell that associations changed
     try:
         import ctypes
         SHCNE_ASSOCCHANGED = 0x08000000
         SHCNF_IDLIST = 0x0000
         ctypes.windll.shell32.SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST,
-                                               None, None)
+                                             None, None)
     except Exception:
         pass
 
+    if editor:
+        return True, (".edof registered. Files now show the EDOF icon, and the "
+                      "first time you open one Windows lets you choose the "
+                      "Viewer or the Editor (no default is forced).")
+    return True, (".edof registered with the Viewer as an open-with choice. "
+                  "(Editor not found, so only the Viewer was registered.)")
+
 
 def _unassociate_windows():
     import winreg
     classes = r"Software\Classes"
     for sub in [
+        r".edof\OpenWithProgids",
         r".edof",
+        # new (v4.2.2) keys
+        r"edof.Document.Viewer\shell\open\command",
+        r"edof.Document.Viewer\shell\open",
+        r"edof.Document.Viewer\shell",
+        r"edof.Document.Viewer\DefaultIcon",
+        r"edof.Document.Viewer",
+        r"edof.Document.Editor\shell\open\command",
+        r"edof.Document.Editor\shell\open",
+        r"edof.Document.Editor\shell",
+        r"edof.Document.Editor\DefaultIcon",
+        r"edof.Document.Editor",
+        r"edof.Document\DefaultIcon",
+        r"edof.Document",
+        # old (<=4.2.1) keys, cleaned up for migration
+        r"edof.Document.1\shell\edit\command",
+        r"edof.Document.1\shell\edit",
         r"edof.Document.1\shell\open\command",
         r"edof.Document.1\shell\open",
         r"edof.Document.1\shell",
         r"edof.Document.1\DefaultIcon",
         r"edof.Document.1",
+        r"edof.Document.Editor.1\shell\open\command",
+        r"edof.Document.Editor.1\shell\open",
+        r"edof.Document.Editor.1\shell",
+        r"edof.Document.Editor.1\DefaultIcon",
+        r"edof.Document.Editor.1",
     ]:
         try:
             winreg.DeleteKey(winreg.HKEY_CURRENT_USER, f"{classes}\\{sub}")
         except OSError:
             pass
+    try:
+        import ctypes
+        ctypes.windll.shell32.SHChangeNotify(0x08000000, 0x0000, None, None)
+    except Exception:
+        pass
+    return True, ".edof association removed."
 
 
 # ─────────────────────────────────────────────────────────────────────────────
@@ -213,6 +314,7 @@ def _associate_linux():
             subprocess.run(cmd, check=False, capture_output=True, timeout=10)
         except (FileNotFoundError, subprocess.TimeoutExpired):
             pass
+    return True, ".edof associated with edof-viewer (Linux desktop entry installed)."
 
 
 def _unassociate_linux():
@@ -230,6 +332,7 @@ def _unassociate_linux():
         )
     except (FileNotFoundError, subprocess.TimeoutExpired):
         pass
+    return True, ".edof association removed."
 
 
 if __name__ == "__main__":

{edof-4.2.1 → edof-4.2.2}/edof/_apps/viewer.py

@@ -90,6 +90,14 @@ class EdofViewer(QMainWindow):
     def __init__(self, filepath: Optional[str] = None):
         super().__init__()
         self.setWindowTitle(f"EDOF Viewer {edof.__version__}")
+        # v4.2.2: window / taskbar icon
+        try:
+            from edof._apps.assets import icon_path
+            _ip = icon_path("edof-viewer.ico") or icon_path("edof-viewer.png")
+            if _ip:
+                self.setWindowIcon(QIcon(_ip))
+        except Exception:
+            pass
         self.resize(1100, 800)
         self.setStyleSheet(VIEWER_QSS)
 
@@ -143,6 +151,12 @@ class EdofViewer(QMainWindow):
         self._act_open.triggered.connect(self._on_open)
         fm.addAction(self._act_open)
 
+        # v4.2.1: open the current document in the editor
+        self._act_edit = QAction("Open in &Editor", self)
+        self._act_edit.setShortcut(QKeySequence("Ctrl+E"))
+        self._act_edit.triggered.connect(self._open_in_editor)
+        fm.addAction(self._act_edit)
+
         self._act_export_pdf = QAction("Export as &PDF…", self)
         self._act_export_pdf.triggered.connect(self._on_export_pdf)
         fm.addAction(self._act_export_pdf)
@@ -214,7 +228,7 @@ class EdofViewer(QMainWindow):
         act_about.triggered.connect(self._on_about)
         hm.addAction(act_about)
 
-        act_associate = QAction("Associate .edof files with this viewer…", self)
+        act_associate = QAction("File association (.edof)…", self)
         act_associate.triggered.connect(self._on_associate)
         hm.addAction(act_associate)
 
@@ -520,28 +534,43 @@ class EdofViewer(QMainWindow):
         )
 
     def _on_associate(self):
-        from edof._apps.file_assoc import associate_edof_files, current_association_status
-        status = current_association_status()
-        msg = (
-            "Associate .edof files with edof Viewer?\n\n"
-            "After this, double-clicking any .edof file in your file manager\n"
-            "will open it directly in this viewer.\n\n"
-            f"Current status: {status}"
+        from edof._apps.file_assoc import (
+            associate_edof_files, unassociate_edof_files,
+            current_association_status,
         )
-        reply = QMessageBox.question(self, "Associate .edof files", msg,
+        status = current_association_status()
+        is_assoc = "associated" in status.lower() and "not " not in status.lower()
+        if is_assoc:
+            msg = ("Remove the .edof file association?\n\n"
+                   "Explorer will stop showing the EDOF icon for .edof files "
+                   "and will no longer offer EDOF apps to open them.\n\n"
+                   f"Current status: {status}")
+            title, verb = "Remove association", "remove"
+        else:
+            msg = ("Register .edof files?\n\n"
+                   "Files will show the EDOF icon, and the first time you open "
+                   "one your system will let you choose the Viewer or the "
+                   "Editor (no default is forced).\n\n"
+                   f"Current status: {status}")
+            title, verb = "Register .edof files", "register"
+        reply = QMessageBox.question(self, title, msg,
             QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No)
         if reply != QMessageBox.StandardButton.Yes:
             return
         try:
-            associate_edof_files()
-            QMessageBox.information(self, "Done",
-                "Successfully associated .edof files with edof Viewer.\n\n"
-                "On Windows, you may need to log out and back in for the\n"
-                "icons in Explorer to refresh.")
+            ok, info = (unassociate_edof_files() if is_assoc
+                        else associate_edof_files())
+            if ok:
+                QMessageBox.information(self, "Done",
+                    f"{info}\n\n"
+                    "On Windows you may need to log out and back in for the "
+                    "icons in Explorer to refresh.")
+            else:
+                QMessageBox.warning(self, "Could not " + verb, info)
         except Exception as e:
-            QMessageBox.warning(self, "Could not associate",
-                f"Failed to associate file types:\n\n{e}\n\n"
-                f"You may need to run the viewer as Administrator on Windows.")
+            QMessageBox.warning(self, "Could not " + verb,
+                f"Failed to {verb} file types:\n\n{e}\n\n"
+                f"On Windows this is per-user and should not need admin rights.")
 
     def _on_donate(self):
         try:
@@ -550,6 +579,26 @@ class EdofViewer(QMainWindow):
         except Exception:
             pass
 
+    def _open_in_editor(self):
+        """v4.2.1: launch edof-editor, opening the currently viewed file."""
+        import shutil, subprocess
+        from PyQt6.QtWidgets import QMessageBox
+        exe = shutil.which("edof-editor")
+        if exe:
+            args = [exe]
+        else:
+            args = [sys.executable, "-m", "edof._apps.editor"]
+        if self._filepath:
+            args.append(self._filepath)
+        try:
+            subprocess.Popen(args, close_fds=True)
+        except Exception as e:
+            QMessageBox.warning(
+                self, "Open in Editor",
+                "Could not launch the editor.\n"
+                "Make sure it is installed: pip install \"edof[all]\"\n\n"
+                f"({e})")
+
 
 # ─────────────────────────────────────────────────────────────────────────────
 # Entry point

{edof-4.2.1 → edof-4.2.2}/edof/engine/document_paginate.py

@@ -230,13 +230,28 @@ def _sync_body_from_textboxes(doc) -> None:
     para_runs = _split_runs_at_newlines(all_runs)
     old_paragraphs = doc.body.paragraphs or []
     new_paragraphs: List[Paragraph] = []
+
+    def _runs_align(runs):
+        # v4.2.1: the editor stamps the chosen alignment onto the runs of a
+        # paragraph (set_alignment). Promote that onto Paragraph.alignment so
+        # it is the durable, canonical home: it survives serialization and is
+        # read by the renderer, the .docx exporter and style resolution. Without
+        # this the alignment lived only on the runs / the page-local map and was
+        # lost on save and on export.
+        for _r in runs:
+            a = getattr(_r, 'alignment', None)
+            if a:
+                return a
+        return None
+
     for i, runs in enumerate(para_runs):
+        run_al = _runs_align(runs)
         if i < len(old_paragraphs):
             old = old_paragraphs[i]
             new_p = Paragraph(
                 runs=runs,
                 style_id=old.style_id,
-                alignment=old.alignment,
+                alignment=(run_al if run_al is not None else old.alignment),
                 line_height=old.line_height,
                 space_before_mm=old.space_before_mm,
                 space_after_mm=old.space_after_mm,
@@ -251,7 +266,7 @@ def _sync_body_from_textboxes(doc) -> None:
                 widow_orphan_control=old.widow_orphan_control,
             )
         else:
-            new_p = Paragraph(runs=runs)
+            new_p = Paragraph(runs=runs, alignment=run_al)
         new_paragraphs.append(new_p)
     # v4.1.23.52: once pagination has run, the page bodies' hard-break flags are
     # the authoritative source of truth for page_break_before. Re-apply it so a

{edof-4.2.1 → edof-4.2.2}/edof/format/styles.py

@@ -330,13 +330,15 @@ class TextRun:
         if self.background    is not None: d["background"]    = _rgba_to_hex(self.background)
         if self.line_height   is not None: d["line_height"]   = self.line_height
         if self.letter_spacing is not None: d["letter_spacing"] = self.letter_spacing
+        if self.alignment     is not None: d["alignment"]     = self.alignment
         return d
 
     @classmethod
     def from_dict(cls, d: dict) -> "TextRun":
         r = cls(text=d.get("text", ""))
         for k in ("font_family", "font_size", "bold", "italic",
-                  "underline", "strikethrough", "line_height", "letter_spacing"):
+                  "underline", "strikethrough", "line_height", "letter_spacing",
+                  "alignment"):
             if k in d: setattr(r, k, d[k])
         for k in ("color", "background"):
             if k in d:

{edof-4.2.1 → edof-4.2.2}/edof/version.py

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

{edof-4.2.1 → edof-4.2.2}/edof.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edof
-Version: 4.2.1
+Version: 4.2.2
 Summary: Easy Document Format – programmatic document creation, editing and export with vector PDF, rich text, tables and PDF import
 License: MIT License
         
@@ -185,7 +185,7 @@ A `Document` contains pages; each `Page` contains objects. All measurements are
 | `Table` | Formatted table with per-cell styling | `cells`, `col_widths`, `row_heights`, `table_border` |
 | `Group` | Container with optional clip | `children` |
 
-Common fields on every object: `transform` (position/size/rotation/flip), `opacity`, `layer`, `visible`, `visible_if`, `blend_mode`, `lock_level`, `lock_text`, `lock_position`, `tags`, `shadow`, `effects` (v4.1.0+).
+Common fields on every object: `transform` (position/size/rotation/flip), `opacity`, `layer`, `visible`, `visible_if`, `blend_mode`, `lock_level`, `lock_text`, `lock_position`, `tags`, `shadow`, `effects` (v4.2.0+).
 
 #### Transform fields
 
@@ -207,7 +207,7 @@ All color fields accept tuples in 0–255 range. Both RGB (3-tuple) and RGBA (4-
 obj.style.color    = (74, 144, 226)        # RGB → alpha 255 implied
 obj.fill.color     = (245, 245, 248, 255)  # RGBA — explicit
 obj.stroke.color   = (0, 0, 0, 200)        # RGBA — translucent black
-shape.fill.color   = "#4a90e2"             # v4.1.0+: hex string accepted
+shape.fill.color   = "#4a90e2"             # v4.2.0+: hex string accepted
 ```
 
 When read back, colors come as tuples (`obj.style.color` returns `(74, 144, 226)`, `obj.fill.color` returns `(245, 245, 248, 255)`).
@@ -469,7 +469,7 @@ heading.lock_text  = True       # text never editable until lock_text is cleared
 ### Headings with auto-computed height (no more silent text loss)
 
 ```python
-# v4.1.0+: add_textbox_auto computes height from content and accepts style kwargs
+# v4.2.0+: add_textbox_auto computes height from content and accepts style kwargs
 heading = page.add_textbox_auto(
     20, 20, 170, "MY HEADING",
     font_size=24, bold=True, alignment="center",
@@ -481,7 +481,7 @@ next_y = heading.transform.y + heading.transform.height + 5  # 5 mm gap
 ### Tables with explicit sizing
 
 ```python
-# v4.1.0+: make_table accepts position + size and computes total height
+# v4.2.0+: make_table accepts position + size and computes total height
 tbl = edof.make_table(
     rows=[
         ["Product",    "Qty", "Price"],
@@ -509,7 +509,7 @@ tb.style.color   = edof.as_color("#4a90e2")    # hex via helper
 tb.style.color   = edof.as_color("#4a90e2cc")  # 8-digit hex with alpha
 ```
 
-### Per-side padding (v4.1.0+)
+### Per-side padding (v4.2.0+)
 
 ```python
 tb.style.padding = 2.0           # uniform 2 mm on all sides
@@ -556,7 +556,7 @@ A PyQt6 desktop editor (`edof-editor`) ships with the library. It is a working e
 
 ## Viewer
 
-A lightweight read-only viewer (`edof-viewer`) ships alongside the editor (v4.1.1+). It is designed for the case where someone receives a `.edof` file and just wants to view, print, or convert it — without launching the full editor.
+A lightweight read-only viewer (`edof-viewer`) ships alongside the editor (v4.2.0+). It is designed for the case where someone receives a `.edof` file and just wants to view, print, or convert it — without launching the full editor.
 
 ```bash
 pip install 'edof[viewer]'
@@ -698,7 +698,7 @@ A small `.bat` makes switching painless:
 @echo off
 call D:\apps\Edof_V401\edof-python\.venv\Scripts\activate.bat
 cd /d D:\apps\Edof_V401\edof-python
-cmd /k prompt [edof v4.0.1] $P$G
+cmd /k prompt [edof v4.2.2] $P$G
 ```
 
 Each version's venv is independent. Removing a version is `rmdir /s /q <folder>`; nothing else needs cleanup.

{edof-4.2.1 → edof-4.2.2}/edof.egg-info/SOURCES.txt

@@ -19,6 +19,20 @@ edof/_apps/edof_text_editor.py
 edof/_apps/file_assoc.py
 edof/_apps/shortcuts.py
 edof/_apps/viewer.py
+edof/_apps/assets/__init__.py
+edof/_apps/assets/icons/__init__.py
+edof/_apps/assets/icons/edof-document-512.png
+edof/_apps/assets/icons/edof-document.icns
+edof/_apps/assets/icons/edof-document.ico
+edof/_apps/assets/icons/edof-document.png
+edof/_apps/assets/icons/edof-editor-512.png
+edof/_apps/assets/icons/edof-editor.icns
+edof/_apps/assets/icons/edof-editor.ico
+edof/_apps/assets/icons/edof-editor.png
+edof/_apps/assets/icons/edof-viewer-512.png
+edof/_apps/assets/icons/edof-viewer.icns
+edof/_apps/assets/icons/edof-viewer.ico
+edof/_apps/assets/icons/edof-viewer.png
 edof/api/__init__.py
 edof/api/commands.py
 edof/crypto/__init__.py

{edof-4.2.1 → edof-4.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name            = "edof"
-version         = "4.2.1"
+version         = "4.2.2"
 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" }
@@ -66,6 +66,7 @@ include = ["edof*"]
 
 [tool.setuptools.package-data]
 edof = ["py.typed", "editor_lang/*.json"]
+"edof._apps.assets.icons" = ["*.ico", "*.png", "*.icns"]
 
 [tool.black]
 line-length    = 100