diff --git a/README.md b/README.md index ce745eb2..c072d7a6 100644 --- a/README.md +++ b/README.md @@ -78,12 +78,12 @@ Select several objects with Shift-click or a lasso. Position and size changes ap ### 4. Print or export -The **ZPL** panel at the bottom shows the generated ZPL, **Copy** puts it on the clipboard. The canvas shows the label as you design it. **Preview** adds an alternative rendering from the connected printer (desktop) or, with consent, from the third-party service [Labelary](https://labelary.com/). +The **ZPL** panel at the bottom shows the generated ZPL, **Copy** puts it on the clipboard. The canvas is ZPLab's rendering of the label. A second rendering comes from the preview renderer under **File → Settings… → App → Preview**: the connected printer (desktop) or, with consent, the third-party service [Labelary](https://labelary.com/). **Preview** shows it for comparison. - **File → Export ZPL:** saves a `.zpl` file, or `.prn` where the save dialog offers file types - **File → Send to Zebra Printer:** opens the send dialog. It sends over the network, through the Zebra Browser Print agent in the browser, or through the system spooler or USB on desktop. -- **File → Export PDF:** saves one PDF page per label page, rendered by the preview renderer. With the renderer off it holds the current page only. A batch PDF holds one page per data row. -- **File → Print as Image (browser):** opens the rendered label, then the browser print dialog +- **File → Export PDF:** saves one PDF page per label page, rendered by the preview renderer. With the renderer off, ZPLab captures the canvas, so the PDF holds the current page only. A batch PDF needs the renderer and holds one page per data row. +- **File → Print as Image (browser):** renders the current page with the same renderer, then opens the browser print dialog ### 5. Save the design @@ -97,7 +97,7 @@ The **ZPL** panel highlights syntax and collapses long blocks of image data. Sel The **command list** left of the code filters as you search. The **ZPL reference** on the right follows the cursor. Click a command to pin its details. The details also show the syntax, a parameter table and an example where the reference has them. A double-click or the right-click menu inserts the command at the cursor. A chevron folds each pane to a rail. Click the rail to bring it back. -While you edit, the canvas shows a live preview. Canvas editing and the **Properties** tab are disabled. Page switching stays enabled. The editor refuses source that is too large or has mismatched `^XA`/`^XZ` commands, and marks the mismatches. Click a mark to insert the missing command. +While you edit, the canvas renders the source. Canvas editing and the **Properties** tab are disabled. Page switching stays enabled. The editor refuses source that is too large or has mismatched `^XA`/`^XZ` commands, and marks the mismatches. Click a mark to insert the missing command. - **Apply** or leaving the panel commits your changes. - `Esc` or **Cancel** discards them. diff --git a/src-tauri/packaging/linux/de.u8array.zplab.metainfo.xml b/src-tauri/packaging/linux/de.u8array.zplab.metainfo.xml index cf080770..c913990b 100644 --- a/src-tauri/packaging/linux/de.u8array.zplab.metainfo.xml +++ b/src-tauri/packaging/linux/de.u8array.zplab.metainfo.xml @@ -34,7 +34,7 @@
  • Typed payloads for QR Code, Data Matrix and Aztec: URLs, Wi-Fi, contacts, email, phone, SMS and coordinates, plus GS1 Digital Links
  • Batch printing: map label variables to CSV, Excel or database columns and print one label per row
  • Printing over raw TCP, the system print queue, or USB
    • -
  • Previews rendered through Labelary, or by the connected printer's own firmware
    • +
  • An optional second rendering of the label, from Labelary or from the connected printer's own firmware, to compare against the canvas
  • An MCP server that lets a local AI assistant read, build and validate labels, and edit the open design directly
  • 32 interface languages, light and dark theme
  • MIT-licensed, with no account and no backend
    • diff --git a/src/components/PrinterSettings/PreviewSettingsTab.test.tsx b/src/components/PrinterSettings/PreviewSettingsTab.test.tsx index 25ce0566..5790c105 100644 --- a/src/components/PrinterSettings/PreviewSettingsTab.test.tsx +++ b/src/components/PrinterSettings/PreviewSettingsTab.test.tsx @@ -24,6 +24,15 @@ describe("PreviewSettingsTab", () => { expect(useLabelStore.getState().previewProvider).toBe("none"); expect(r.getByLabelText(loc.labelaryConsent)).toBeTruthy(); expect(r.queryByText(loc.apiHeading)).toBeNull(); + expect(r.getByText(loc.labelaryIdleHint, { exact: false })).toBeTruthy(); + expect(r.queryByText(en.output.previewNoticeBody, { exact: false })).toBeNull(); + }); + + it("keeps the notice when a stored printer way falls back to Labelary on the web", () => { + act(() => useLabelStore.setState({ previewProvider: "printer" })); + const r = render(); + expect(r.getByText(en.output.previewNoticeBody, { exact: false })).toBeTruthy(); + expect(r.queryByText(loc.labelaryIdleHint, { exact: false })).toBeNull(); }); it("shows the stored choice and says a build without Labelary has no renderer", () => { diff --git a/src/components/PrinterSettings/PreviewSettingsTab.tsx b/src/components/PrinterSettings/PreviewSettingsTab.tsx index ef76a8b0..1c362d5f 100644 --- a/src/components/PrinterSettings/PreviewSettingsTab.tsx +++ b/src/components/PrinterSettings/PreviewSettingsTab.tsx @@ -186,7 +186,8 @@ export function PreviewSettingsTab() {

    {publicHost ? ( <> - {t.output.previewNoticeBody}{" "} + {/* The notice must stand wherever Labelary renders or is about to: a stored printer choice degrades to it on the web. */} + {chosen === "labelary" || provider === "labelary" ? t.output.previewNoticeBody : loc.labelaryIdleHint}{" "} {/* The plans/retention link is about the public service; a custom endpoint is the operator's own, so omit it there. */}