aiongg
eea99d1ee8
Integration: #1514 Enter stays local
...
Enter in a multi-line field is a new line only in the Printing Instructions dialog; the flag now uses a stable id (Id::unique never matched) and is cleared for every dialog.
2026-10-30 23:28:05 +00:00
aiongg
c77b593f80
Integration: #1514 summary wording
...
The Summary lines use neutral wording of our own (keeping the feature names); i18n keys and the test follow, translations carry over.
2026-10-30 23:27:46 +00:00
aiongg
bbce6f0323
Integration: #1514 theme tokens
...
Status and warning colours come from the theme's warn and error colours instead of hard-coded RGB values.
2026-10-30 23:27:29 +00:00
aiongg
1fb973c3ad
Merge PR #1514 : Package dialog
...
crates/ui-egui/src/dialogs.rs: kept main's Insert Pages dialog and the PR's MULTILINE_FOCUS key
crates/ui-egui/src/i18n/*.rs: kept both sides' rows
2026-10-30 23:27:02 +00:00
aiongg
35697cb807
Merge PR #1255 : TOC separator and style notation
...
crates/idml/src/tests.rs: kept the PR's TOC tests, dropped the duplicate copy from #1249
crates/engine/src/tests/idml.rs: main's createBookmarks plus the PR's right-indent separator
crates/ui-egui/src/dialogs.rs: main's labelled_by fields plus the PR's special-character menu
crates/ui-egui/src/i18n/*.rs: kept both added rows
2026-10-30 23:26:42 +00:00
aiongg
d00e7fce21
Merge PR #1249 : IDML import of TOC separators and entry styles
...
crates/idml/src/import.rs, tests.rs: conflicts were the old pre-split copy; PR's three small changes ported by hand into import/document.rs, names.rs and tests.rs
2026-10-30 23:26:07 +00:00
aiongg
eb9704f710
Merge pull request #2056 from aiongg/integration-1030
...
Integrate 43 reviewed PRs
2026-10-30 19:00:53 -04:00
aiongg
916ec9cb9a
Merge review fixes: minors and docs
2026-10-30 21:34:10 +00:00
aiongg
7bad69c14a
Integration: cargo fmt
2026-10-30 21:33:58 +00:00
aiongg
2ecb85ff97
Integration: #1674 text.move leaves the selected cells, so typing inserts at the caret
2026-10-30 21:29:34 +00:00
aiongg
0ca30e1408
Integration: #1496 Find/Change: a null attribute with an empty Change formats the found text instead of deleting it
2026-10-30 21:29:34 +00:00
aiongg
14eb9f0be6
Integration: #1285/#1286 ui-parity: TOC dialog notes in the body, revision-history row, header
2026-10-30 21:25:23 +00:00
aiongg
336eb0593c
Integration: #1394/#1413 ROADMAP: one Status heading, progress log newest first
2026-10-30 21:25:12 +00:00
aiongg
ff5d4e1f8e
Integration: #1509 spelling suggestions include the common words
2026-10-30 21:24:47 +00:00
aiongg
e05c1c5360
Integration: #1425 the cursor readout has its own dark text colour on the light grey box
2026-10-30 21:24:39 +00:00
aiongg
376cf3325a
Integration: #1505 leaving parent pages for a page fits its spread before centring the page
2026-10-30 21:24:39 +00:00
aiongg
978effab49
Integration: #902 Direct Selection anchor drags send a spread-space delta
2026-10-30 21:24:27 +00:00
aiongg
55fb94242e
Integration: #902 Direct Selection anchor pull selects the frame, not its content
2026-10-30 21:24:27 +00:00
aiongg
09fbe280ff
Integration: #1125 Direct Selection on one of several selected frames selects just that frame
2026-10-30 21:24:27 +00:00
aiongg
bc1be1e646
Integration: #1504 a Color panel edit of a gradient stop drops the stop's swatch
2026-10-30 21:23:46 +00:00
aiongg
2bf89ce370
Integration: #1394 turning Auto-Fit off alone keeps the picture where it is
2026-10-30 21:23:07 +00:00
aiongg
6a1d554d44
Integration: #1554 prefs.set rejects unknown keys inside defaultUnits
2026-10-30 21:22:34 +00:00
aiongg
60e3068bbf
Integration: close the TOC bookmarks test where track a's tests were appended
2026-10-30 20:51:17 +00:00
aiongg
92327dcc4c
Merge track b: swatches, canvas, tools and tables PRs
...
Conflicts: engine/src/tests.rs and i18n/*.rs: adjacent additions from both sides, both kept.
2026-10-30 20:49:48 +00:00
aiongg
e15fc040b5
Merge track a: properties, object and layout PRs
...
Conflicts: dialogs/tests.rs and i18n/{ar,cs,it,ka,pl,pt_br,ru,uk}.rs: adjacent additions from both sides, both kept.
2026-10-30 20:49:28 +00:00
aiongg
6e9ef6248c
Integration: cargo fmt
2026-10-30 19:48:22 +00:00
aiongg
aabf0fa805
Integration: #1431/#1504 spectrum_pick takes the language (merged helper lost its app)
2026-10-30 19:47:45 +00:00
aiongg
086acac2c7
Merge PR #1505 : Status bar: the page box names the parent in view (A-Parent) and lists the parents
2026-10-30 19:46:56 +00:00
aiongg
be3382dc36
Merge PR #1681 : Show Hidden Characters marks table cells, as InDesign (# in every cell, ¶ after the table)
2026-10-30 19:46:52 +00:00
aiongg
e3aa2c260a
Merge PR #1509 : Spelling: "we", "if", "email" and contractions with a typographer's apostrophe aren't misspelled
2026-10-30 19:46:49 +00:00
aiongg
4638b19387
Merge PR #1257 : TOC: generate and refresh PDF bookmarks
...
crates/ui-egui/src/dialogs/tests.rs: kept HEAD, appended #1257 's new test
2026-10-30 19:46:49 +00:00
aiongg
e8e80ce22c
Merge PR #1285 : TOC: keep the title field readable beside its style selector
...
crates/ui-egui/src/dialogs.rs: TOC title row by hand: the reserved-width title field (#1285 ) with its accessible name, and the style selector keeping the label-id name argument
crates/ui-egui/src/dialogs/tests.rs: kept HEAD, applied #1285 's 450->360 viewport edits in 3 tests, appended its new test
2026-10-30 19:46:44 +00:00
aiongg
3af0c95b40
Merge PR #1286 : TOC: toggle More Options without losing hidden settings
...
crates/ui-egui/src/dialogs/tests.rs: kept HEAD, appended #1286 's new test
2026-10-30 19:46:12 +00:00
aiongg
eb2eb299f3
Merge PR #1508 : Insert Pages dialog as InDesign's: before or after a page, at the start or end, with a parent
...
crates/ui-egui/src/i18n/*.rs: kept both sides' rows (unique keys)
2026-10-30 19:46:06 +00:00
aiongg
a562053b7e
Integration: #1406 preview_dropdown 4-argument form
2026-10-30 19:46:02 +00:00
aiongg
ed53f8a744
Merge PR #1513 : Preferences › File Handling: Number of Recent Items shows 20, not 20.0
...
crates/ui-egui/src/dialogs/tests.rs: kept HEAD, appended #1513 's new test
2026-10-30 19:45:58 +00:00
aiongg
2f8c43a079
Merge PR #1554 : Preferences: Units & Increments with no document open set the units of new documents, as in InDesign
...
crates/ui-egui/src/dialogs/tests.rs: kept HEAD, appended #1554 's new test
2026-10-30 19:45:55 +00:00
aiongg
3fa5fbbbc7
Merge PR #1433 : Fitting: Clear Frame Fitting Options, and the submenu grouped as the reference app's
...
Conflicts:
crates/ui-egui/src/menus/tables.rs: kept the Fitting separator from the Object menu order (#1413 ); #1433 's own comment line dropped
crates/ui-egui/src/i18n/*.rs (ar, cs, de, it, ja, ka, pl, pt_br, ru, uk): kept both sides' keys, plus #1433 's Clear Frame Fitting Options
2026-10-30 19:45:49 +00:00
aiongg
0844e87aab
Merge PR #1512 : Preferences › Interface: Color Theme swatches and the Tools panel's columns, as InDesign's
...
crates/ui-egui/src/dialogs/tests.rs: kept HEAD, appended #1512 's new test
crates/ui-egui/src/i18n/*.rs: kept both sides' rows (unique keys)
2026-10-30 19:45:46 +00:00
aiongg
e6001835ed
Merge PR #1408 : Layout: Create Guides puts its guides on both pages of the spread in view, as reference app does
2026-10-30 19:45:41 +00:00
aiongg
84583f4855
Merge PR #893 : Numbering & Section Options opens as New Section on a page without one
...
Conflicts:
crates/ui-egui/src/dialogs/tests.rs: kept both tests (#1406 corner options, #893 new section)
crates/ui-egui/src/i18n/*.rs (ar, cs, de, it, ja, ka, pl, pt_br, ru, uk): kept both sides' keys, plus #893 's New Section
2026-10-30 19:45:41 +00:00
aiongg
bbaf2f10e1
Merge PR #1413 : Object menu: the reference app's order and groups, Join/Open/Close Path under Paths, Convert Point
...
Conflicts:
crates/ui-egui/src/i18n/*.rs (table, ar, cs, de, it, ja, pl, pt_br, ru, uk): kept both sides' keys (#1406 and #1414 corner keys, #1413 Join/Convert Point/Plain/Symmetrical), no duplicates
2026-10-30 19:45:29 +00:00
aiongg
52ea6806df
Merge PR #1496 : Find/Change: Change Format, with a character or paragraph style
...
crates/ui-egui/src/dialogs/tests.rs: kept HEAD, appended #1496 's new test
crates/ui-egui/src/i18n/*.rs: kept both sides' rows (unique keys)
2026-10-30 19:45:28 +00:00
aiongg
4a6be7eef5
Merge PR #1406 : Object: Corner Options opens a dialog laid out as the reference app's, also from the Properties Corner link
...
Conflicts:
crates/ui-egui/src/i18n/*.rs (table, ar, cs, de, it, ja, ka, pl, pt_br, ru, uk): kept both sides' keys (#1414 's Stroke Type/Corner Shape, #1406 's Corner Size and Shape:), no duplicates
2026-10-30 19:45:16 +00:00
aiongg
11283738c0
Merge PR #1437 : Properties: the Align To button shows its target (selection, key object, margins, page, spread)
...
Conflicts:
crates/ui-egui/src/panels/properties.rs: combined the two cfg(test) object imports (preview_row from #1414 , align_to_icon from #1437 )
2026-10-30 19:45:08 +00:00
aiongg
dc14a8c329
Merge PR #1492 : Character styles: a new style from the selected text, applied to it
...
crates/ui-egui/src/dialogs/tests.rs: kept both sides (the new character-style test added next to #1464 's)
crates/ui-egui/src/i18n/*.rs: kept #1464 's rows and added only #1492 's new keys (New Paragraph/Character Style); older copies of #1464 rows dropped
2026-10-30 19:45:05 +00:00
aiongg
2f332774eb
Merge PR #1414 : Properties: corner shape and stroke type lists show their glyphs, as in the reference app
...
Conflicts:
crates/ui-egui/src/panels/properties/tests.rs: kept both sides' tests (earlier merged tests plus #1414 's two tests)
2026-10-30 19:45:01 +00:00
aiongg
86852903af
Merge PR #1485 : Properties: Bullets and Numbering's Options opens the Bullets and Numbering dialog
2026-10-30 19:44:50 +00:00
aiongg
e703cd6f24
Merge PR #1390 : Properties: Text Wrap shows the four wrap offsets, as in the reference app
...
Conflicts:
crates/ui-egui/src/panels/properties/tests.rs: kept both sides' tests (earlier merged tests plus #1390 's text wrap offsets test)
2026-10-30 19:44:50 +00:00
aiongg
0a2a2039a5
Merge PR #1674 : Tables: Shift+Tab goes back a cell, and Esc toggles between the text and the cell
2026-10-30 19:44:37 +00:00
aiongg