 Brandon Thomas
|
3a8927e3f3
|
Merge PR #691 from NikitkaRa: UI: Trim Media dialog follows the selection
# Conflicts:
# crates/ui-egui/src/dialogs.rs
|
2026-10-14 14:11:53 -04:00 |
|
|
Brandon Thomas
|
a4fa978903
|
Merge PR #703 from NikitkaRa: UI: Slide Master Preserve and Title or Footers placeholders
# Conflicts:
# crates/engine/src/cmd/design.rs
# crates/ui-egui/src/ribbon.rs
|
2026-10-14 14:06:42 -04:00 |
|
|
Brandon Thomas
|
7266b30018
|
Merge PR #698 from NikitkaRa: UI: Design Effects applies a theme effect scheme
# Conflicts:
# crates/engine/src/cmd/design.rs
# crates/ui-egui/src/ribbon.rs
|
2026-10-14 14:04:24 -04:00 |
|
|
Brandon Thomas
|
2009242055
|
Merge PR #684 from NikitkaRa: Export: a PNG or JPEG slide records 144 dpi at the default 2× size
# Conflicts:
# crates/engine/src/cmd/file.rs
# crates/engine/src/tests.rs
|
2026-10-14 14:02:59 -04:00 |
|
|
Brandon Thomas
|
1e80cd5547
|
Merge PR #440 from NikitkaRa: Palette: skip commands that need a value
# Conflicts:
# crates/ui-egui/src/menus.rs
|
2026-10-14 14:01:08 -04:00 |
|
|
Brandon Thomas
|
b3c9cc099c
|
Merge the PPTX writer, notes/handout master, PDF and slide-show PRs integrated on land-r3 (#518 #531 #535 #533 #572 #573 #577 #580 #583 #592 #685 #528 #483 #490 #441 #671 #679 #649 #656 #660 #664 #224)
# Conflicts:
# crates/engine/src/tests.rs
# crates/model/src/lib.rs
# crates/pptx/src/write/mod.rs
# crates/render/src/lib.rs
# crates/ui-egui/src/canvas.rs
# crates/ui-egui/src/lib.rs
# crates/ui-egui/src/thumbs.rs
|
2026-10-14 13:56:41 -04:00 |
|
|
Brandon Thomas
|
912598fa46
|
Merge PR #675 from NikitkaRa: View: Zoom dialog applies a percent or Fit
# Conflicts:
# crates/ui-egui/src/dialogs.rs
|
2026-10-14 13:54:33 -04:00 |
|
|
Brandon ThomasandClaude Opus 5.5
|
f9c1000e35
|
Fix up merged PRs: rustfmt; drop doc rows the union merge left twice
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-14 13:51:53 -04:00 |
|
|
Brandon Thomas
|
bc62c58b17
|
Merge PR #664 from NikitkaRa: Show: show the slide number while typing it
# Conflicts:
# crates/ui-egui/src/show.rs
|
2026-10-14 13:49:49 -04:00 |
|
|
Brandon Thomas
|
e74015490b
|
Merge PR #660 from NikitkaRa: Show: play a custom show
# Conflicts:
# crates/anim/src/show.rs
# crates/engine/src/cmd/review.rs
# crates/ui-egui/src/lib.rs
# crates/ui-egui/src/show.rs
|
2026-10-14 13:49:10 -04:00 |
|
|
Brandon Thomas
|
3e89fbbaa6
|
Merge PR #656 from NikitkaRa: Presenter view: pause and reset the timer, and notes size
# Conflicts:
# crates/ui-egui/src/show.rs
|
2026-10-14 13:48:31 -04:00 |
|
|
Brandon Thomas
|
6c605be582
|
Merge PR #649 from NikitkaRa: Show: See All Slides and zoom
# Conflicts:
# crates/ui-egui/src/show.rs
|
2026-10-14 13:47:54 -04:00 |
|
|
Brandon Thomas
|
d6d7e91c47
|
Merge PR #679 from NikitkaRa: Show: Show Media Controls hides the playback bar
# Conflicts:
# crates/engine/src/cmd/review.rs
# crates/ui-egui/src/show.rs
|
2026-10-14 13:46:55 -04:00 |
|
|
Brandon Thomas
|
ee991563c9
|
Merge PR #441 from NikitkaRa: Show: a laser pointer that leaves no ink
# Conflicts:
# crates/ui-egui/src/show.rs
|
2026-10-14 13:45:58 -04:00 |
|
|
Brandon Thomas
|
0ed74b684a
|
Merge the SmartArt and dialog PRs integrated on land-r1 (#596 #601 #606 #610 #613 #617 #621 #623 #627 #634 #557 #689 #668)
# Conflicts:
# crates/engine/src/tests.rs
# crates/ui-egui/src/dialogs.rs
|
2026-10-14 13:44:43 -04:00 |
|
|
Brandon ThomasandClaude Opus 5.5
|
0376c0b0e1
|
Fix up merged PRs: one parity summary, one dialogs gap entry, no duplicated architecture rows
Recomputed docs/parity-checklist.md's summary with cargo xtask parity.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-14 13:41:30 -04:00 |
|
|
Brandon Thomas
|
5b017f4590
|
Merge PR #682 from NikitkaRa: UI: Alt Text's decorative checkbox follows the selection
# Conflicts:
# crates/ui-egui/src/dialogs.rs
|
2026-10-14 13:36:55 -04:00 |
|
|
Brandon Thomas
|
f52bcfa1c8
|
Merge PR #530 from NikitkaRa: Design: Browse for Themes from a .thmx, .pptx or .potx file
# Conflicts:
# crates/ui-egui/src/lib.rs
|
2026-10-14 13:36:45 -04:00 |
|
|
Brandon Thomas
|
d00b01b5a1
|
Merge PR #540 from NikitkaRa: Table: borders, cell margins and cell text alignment
# Conflicts:
# crates/engine/src/cmd/table.rs
# crates/engine/src/tests.rs
|
2026-10-14 13:36:34 -04:00 |
|
|
Brandon Thomas
|
0f3495e55d
|
Merge PR #512 from NikitkaRa: Home: Replace Fonts dialog and font.replace command
# Conflicts:
# crates/ui-egui/src/dialogs.rs
# crates/ui-egui/src/lib.rs
# crates/ui-egui/src/ribbon.rs
|
2026-10-14 13:34:06 -04:00 |
|
|
Brandon Thomas
|
62fe8571f6
|
Merge PR #687 from NikitkaRa: UI: Create New Theme Fonts dialog edits the theme in one step
# Conflicts:
# crates/engine/src/cmd/design.rs
# crates/ui-egui/src/dialogs.rs
|
2026-10-14 13:33:36 -04:00 |
|
|
Brandon Thomas
|
76bfc19dfa
|
Merge PR #592 from NikitkaRa: Notes Page view draws master text wrapped (stacked on #583)
|
2026-10-14 13:30:54 -04:00 |
|
|
Brandon Thomas
|
4cd6412a3c
|
Merge PR #583 from NikitkaRa: PDF master header/footer text wraps and keeps mixed formatting (stacked on #580)
# Conflicts:
# crates/render/src/lib.rs
# crates/render/src/placed.rs
|
2026-10-14 13:30:43 -04:00 |
|
|
Brandon Thomas
|
18be662a2a
|
Merge PR #668 from NikitkaRa: UI: Date and Time dialog inserts a format in one step
# Conflicts:
# crates/ui-egui/src/dialogs.rs
|
2026-10-14 13:30:31 -04:00 |
|
|
Brandon Thomas
|
6f634a9809
|
Merge PR #580 from NikitkaRa: Notes Master slide preview; master header/footer text keeps its formatting (stacked on #577)
|
2026-10-14 13:30:28 -04:00 |
|
|
Brandon Thomas
|
2d8014c706
|
Merge PR #577 from NikitkaRa: Notes pages and PDF handouts follow their masters (stacked on #573)
# Conflicts:
# crates/pdf/src/lib.rs
# crates/pdf/src/tests.rs
|
2026-10-14 13:30:22 -04:00 |
|
|
Brandon Thomas
|
e0ec02d62c
|
Merge PR #689 from NikitkaRa: UI: Hyperlink dialog follows the selection
# Conflicts:
# crates/engine/src/cmd/insert.rs
# crates/ui-egui/src/dialogs.rs
|
2026-10-14 13:30:10 -04:00 |
|
|
Brandon Thomas
|
63c32b89b8
|
Merge PR #573 from NikitkaRa: Add the Notes Master view (stacked on #572 / #533)
# Conflicts:
# crates/pptx/src/write/mod.rs
|
2026-10-14 13:29:52 -04:00 |
|
|
Brandon Thomas
|
875df7674c
|
Merge PR #572 from NikitkaRa: Add the Handout Master view (stacked on #533)
# Conflicts:
# crates/engine/src/tests.rs
|
2026-10-14 13:29:33 -04:00 |
|
|
Brandon Thomas
|
085ba98d47
|
Merge PR #533 from NikitkaRa: Pptx: round-trip tables, charts, animation, media, sections and masters
# Conflicts:
# crates/pptx/src/write/mod.rs
|
2026-10-14 13:29:06 -04:00 |
|
|
Brandon Thomas
|
b4ea3b1df8
|
Merge PR #535 from NikitkaRa: PPTX: keep custom XML, the sensitivity label and custom properties
# Conflicts:
# crates/model/src/defaults.rs
# crates/model/src/lib.rs
# crates/pptx/src/read/mod.rs
# crates/pptx/src/write/mod.rs
|
2026-10-14 13:26:22 -04:00 |
|
|
Brandon Thomas
|
175142f1d3
|
Merge PR #606 from NikitkaRa: SmartArt: 15 layouts, SmartArt Styles and Change Colors
|
2026-10-14 13:26:21 -04:00 |
|
|
Brandon Thomas
|
eabcf47d09
|
Merge PR #601 from NikitkaRa: SmartArt: write the outline to .pptx as a diagram and read it back from the data model
# Conflicts:
# crates/engine/Cargo.toml
# crates/pptx/src/read/shapes.rs
# crates/pptx/src/write/shapes.rs
|
2026-10-14 13:26:21 -04:00 |
|
|
Brandon Thomas
|
d534343d6e
|
Merge PR #683 from NikitkaRa: UI: Create New Theme Colors dialog edits the theme in one step
# Conflicts:
# crates/ui-egui/src/dialogs.rs
|
2026-10-14 13:26:11 -04:00 |
|
|
Brandon Thomas
|
a205d665b0
|
Merge PR #658 from NikitkaRa: UI: Edit Photo Album reflows the album in one step
|
2026-10-14 13:26:02 -04:00 |
|
|
Brandon Thomas
|
2834166904
|
Merge PR #647 from NikitkaRa: UI: Photo Album dialog inserts pictures as slides
# Conflicts:
# crates/ui-egui/src/dialogs.rs
|
2026-10-14 13:26:02 -04:00 |
|
|
Brandon Thomas
|
20392c955b
|
Merge PR #531 from NikitkaRa: PPTX: keep add-in tags on the presentation, slides and shapes
# Conflicts:
# crates/pptx/src/read/mod.rs
# crates/pptx/src/write/mod.rs
|
2026-10-14 13:25:50 -04:00 |
|
|
Brandon Thomas
|
84d60009be
|
Merge PR #596 from NikitkaRa: SmartArt: Text Pane, add and remove shapes, promote and demote
# Conflicts:
# crates/engine/src/tests.rs
# crates/ui-egui/src/panes.rs
|
2026-10-14 13:25:39 -04:00 |
|
|
Brandon Thomas
|
534925bdf1
|
Merge PR #547 from NikitkaRa: Pictures: Recolor gallery and Set Transparent Color
# Conflicts:
# crates/engine/src/cmd/mod.rs
# crates/engine/src/tests.rs
# crates/ui-egui/src/ribbon.rs
|
2026-10-14 13:23:51 -04:00 |
|
|
Brandon Thomas
|
d0fb793954
|
Merge PR #545 from NikitkaRa: Pictures: Picture Styles gallery and Picture Border
# Conflicts:
# crates/engine/src/cmd/mod.rs
# crates/engine/src/tests.rs
|
2026-10-14 13:23:36 -04:00 |
|
|
Brandon Thomas
|
6af2b0ee21
|
Merge PR #618 from NikitkaRa: Text: underline an IME composition in a table cell
# Conflicts:
# crates/render/src/lib.rs
|
2026-10-14 13:23:32 -04:00 |
|
|
Brandon Thomas
|
058890ed87
|
Merge PR #518 from NikitkaRa: Pictures: Artistic Effects — apply, change, remove and keep in PPTX
# Conflicts:
# crates/engine/src/cmd/mod.rs
# crates/engine/src/tests.rs
# crates/pptx/src/write/dml.rs
|
2026-10-14 13:23:07 -04:00 |
|
|
Brandon Thomas
|
1ac61262eb
|
Merge PR #495 from NikitkaRa: Animation Pane: advanced timeline with draggable bars
# Conflicts:
# crates/ui-egui/src/lib.rs
|
2026-10-14 13:22:52 -04:00 |
|
|
Brandon Thomas
|
5c0630cba3
|
Merge PR #586 from NikitkaRa: UI: sections in the Slide Sorter
# Conflicts:
# crates/ui-egui/src/lib.rs
# crates/ui-egui/src/sorter.rs
|
2026-10-14 13:21:53 -04:00 |
|
|
Brandon Thomas
|
0f7dc3d336
|
Merge PR #593 from NikitkaRa: File: six original starter decks
# Conflicts:
# crates/engine/src/lib.rs
|
2026-10-14 13:21:23 -04:00 |
|
|
Brandon Thomas
|
32a2d9e6bd
|
Merge PR #560 from NikitkaRa: UI: View › New Window opens a second window
# Conflicts:
# crates/ui-egui/src/lib.rs
|
2026-10-14 13:21:19 -04:00 |
|
|
Brandon Thomas
|
ab3b1defbf
|
Merge PR #140 from alexanderalber: Slide show: media set to play in the click sequence starts on Next (#116)
# Conflicts:
# crates/anim/src/tests.rs
# crates/ui-egui/src/show.rs
|
2026-10-14 13:20:15 -04:00 |
|
|
Brandon Thomas
|
a5ce62fe28
|
Merge PR #672 from NikitkaRa: Review: previous and next comment
|
2026-10-14 13:09:06 -04:00 |
|
|
Brandon Thomas
|
9eed1b4532
|
Merge PR #641 from NikitkaRa: UI: Size and Position dialog sets geometry in one step
|
2026-10-14 13:09:03 -04:00 |
|
|
Brandon Thomas
|
a87f84526f
|
Merge PR #625 from NikitkaRa: Insert: a gallery of Lucide icons as stroked shapes
|
2026-10-14 13:09:01 -04:00 |
|