edof 4.2.1__tar.gz → 4.2.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edof
-Version: 4.2.1
+Version: 4.2.3
 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.3}/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.3}/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.3/edof/_apps/_assoc_dialog.py

@@ -0,0 +1,92 @@
+"""Shared .edof file-association dialog.
+
+The user chooses *here* (inside the EDOF app) which app opens .edof files on
+double-click; the choice is then registered with the OS. Used by both the
+editor and the viewer so the experience is identical.
+"""
+from __future__ import annotations
+
+
+def manage_association(parent=None):
+    from PyQt6.QtWidgets import (
+        QDialog, QVBoxLayout, QHBoxLayout, QLabel, QRadioButton, QButtonGroup,
+        QPushButton, QMessageBox, QFrame,
+    )
+    from edof._apps.file_assoc import (
+        associate_edof_files, unassociate_edof_files, current_association_status,
+    )
+
+    status = current_association_status()
+    is_assoc = "associated" in status.lower() and "not " not in status.lower()
+    editor_default = "editor" in status.lower()
+
+    dlg = QDialog(parent)
+    dlg.setWindowTitle("File association (.edof)")
+    dlg.setMinimumWidth(420)
+    v = QVBoxLayout(dlg)
+
+    v.addWidget(QLabel(f"<b>Current status:</b> {status}"))
+    info = QLabel(
+        "Choose which app opens a <code>.edof</code> file when you double-click "
+        "it. You decide here, inside EDOF; the other app stays available via "
+        "right-click \u2192 Open With. Files show the EDOF icon either way."
+    )
+    info.setWordWrap(True)
+    v.addWidget(info)
+
+    rb_view = QRadioButton("Open with EDOF Viewer (read-only)")
+    rb_edit = QRadioButton("Open with EDOF Editor")
+    grp = QButtonGroup(dlg)
+    grp.addButton(rb_view)
+    grp.addButton(rb_edit)
+    (rb_edit if editor_default else rb_view).setChecked(True)
+    v.addWidget(rb_view)
+    v.addWidget(rb_edit)
+
+    line = QFrame()
+    line.setFrameShape(QFrame.Shape.HLine)
+    v.addWidget(line)
+
+    row = QHBoxLayout()
+    btn_reg = QPushButton("Register / Update")
+    btn_rm = QPushButton("Remove association")
+    btn_rm.setEnabled(is_assoc)
+    btn_close = QPushButton("Close")
+    row.addWidget(btn_reg)
+    row.addWidget(btn_rm)
+    row.addStretch(1)
+    row.addWidget(btn_close)
+    v.addLayout(row)
+
+    note = QLabel(
+        "<small>On Windows this is per-user (no admin needed); you may need to "
+        "log out and back in for the Explorer icon to refresh.</small>"
+    )
+    note.setWordWrap(True)
+    v.addWidget(note)
+
+    def _do_register():
+        app = "editor" if rb_edit.isChecked() else "viewer"
+        try:
+            ok, msg = associate_edof_files(default_app=app)
+            (QMessageBox.information if ok else QMessageBox.warning)(
+                dlg, "File association", msg)
+            if ok:
+                dlg.accept()
+        except Exception as e:  # noqa: BLE001
+            QMessageBox.critical(dlg, "File association", str(e))
+
+    def _do_remove():
+        try:
+            ok, msg = unassociate_edof_files()
+            (QMessageBox.information if ok else QMessageBox.warning)(
+                dlg, "File association", msg)
+            if ok:
+                dlg.accept()
+        except Exception as e:  # noqa: BLE001
+            QMessageBox.critical(dlg, "File association", str(e))
+
+    btn_reg.clicked.connect(_do_register)
+    btn_rm.clicked.connect(_do_remove)
+    btn_close.clicked.connect(dlg.reject)
+    dlg.exec()

edof-4.2.3/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.3/edof/_apps/assets/icons/__init__.py

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

{edof-4.2.1 → edof-4.2.3}/edof/_apps/cli.py

@@ -796,6 +796,8 @@ Examples:
                      help="Remove the .edof file association instead of adding it")
     pa.add_argument("--status", action="store_true",
                      help="Show current association status and exit")
+    pa.add_argument("--app", choices=["viewer", "editor"], default="viewer",
+                     help="Which app opens .edof on double-click (default: viewer)")
 
     return p
 
@@ -817,9 +819,8 @@ def cmd_associate_files(args):
             sys.exit(1)
     else:
         try:
-            associate_edof_files()
-            print("OK: .edof files now associated with edof-viewer.")
-            print("  Double-clicking a .edof file will now open it in edof-viewer.")
+            ok, info = associate_edof_files(default_app=getattr(args, "app", "viewer"))
+            print(("OK: " if ok else "WARN: ") + info)
             print("  On Windows, you may need to log out and back in for icons to refresh.")
         except Exception as e:
             print(f"ERROR: {e}")

{edof-4.2.1 → edof-4.2.3}/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,42 +10305,14 @@ 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 (choose app in-app, register/remove)."""
         try:
-            from edof._apps.file_assoc import (
-                associate_edof_files, unassociate_edof_files,
-                current_association_status,
-            )
+            from edof._apps._assoc_dialog import manage_association
         except Exception as e:
             QMessageBox.warning(self, "File association",
                                   f"Could not load file association module: {e}")
             return
-        status = current_association_status()
-        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>")
-        bb_text = "Unassociate" if is_assoc else "Associate"
-        ret = QMessageBox.question(self, "File association", msg,
-                                     QMessageBox.StandardButton.Ok | QMessageBox.StandardButton.Cancel)
-        if ret != QMessageBox.StandardButton.Ok: return
-        try:
-            if is_assoc:
-                ok, info = unassociate_edof_files()
-            else:
-                ok, info = associate_edof_files()
-            if ok:
-                QMessageBox.information(self, "File association",
-                                          f"<p><b>Success.</b></p><p>{info}</p>")
-            else:
-                QMessageBox.warning(self, "File association",
-                                       f"<p><b>Failed.</b></p><p>{info}</p>")
-        except Exception as e:
-            QMessageBox.critical(self, "File association",
-                                   f"Error: {e}")
+        manage_association(self)
 
     # ─────────────────────────────────────────────────────────────────────
     # v4.1.2: Multi-window support for embedded sub-documents

{edof-4.2.1 → edof-4.2.3}/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.