Brandon Thomas
|
aec4043ccd
|
Merge PR #567 from NikitkaRa: View: indent and tab markers on the ruler
# Conflicts:
# crates/engine/src/cmd/format.rs
# crates/ui-egui/src/canvas.rs
|
2026-10-14 14:26:32 -04:00 |
|
Brandon Thomas
|
8fde5f31e7
|
Merge PR #204 from justinjohn0306: Pictures: Change Picture replaces the selected picture (#115)
# Conflicts:
# crates/ui-egui/src/canvas.rs
# crates/ui-egui/src/lib.rs
|
2026-10-14 14:26:16 -04:00 |
|
Brandon Thomas
|
a0d97fa931
|
Merge PR #644 from NikitkaRa: Startup: survive damaged settings, font folders, recovery folders and small texture limits
# Conflicts:
# crates/engine/src/recovery.rs
# crates/fonts/src/fontdb.rs
# crates/fonts/src/lib.rs
# crates/ui-egui/src/lib.rs
|
2026-10-14 14:24:45 -04:00 |
|
Brandon Thomas
|
71c3848eff
|
Merge PR #521 from NikitkaRa: Text: AutoCorrect options, case rules and your own entries
# Conflicts:
# crates/engine/src/tests.rs
|
2026-10-14 14:24:16 -04:00 |
|
Brandon Thomas
|
0c2c433ade
|
Merge the chart and EMF+ metafile PRs integrated on land-r2 (#532 #537 #591 #594 #598 #602 #603 #638 #640 #662 #666 #669 #690 #582 #588 #633 #635)
# Conflicts:
# crates/pptx/src/write/mod.rs
# crates/pptx/tests/roundtrip.rs
|
2026-10-14 14:17:35 -04:00 |
|
 Brandon ThomasandClaude Opus 5.5
|
a85024558d
|
Fix up merged PRs: Quick Access Toolbar defaults keep main's Export button and custom-show start
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-14 14:16:59 -04:00 |
|
Brandon Thomas
|
f6661ed15e
|
Merge PR #563 from NikitkaRa: UI: customizable Quick Access Toolbar
# Conflicts:
# crates/ui-egui/src/lib.rs
# crates/ui-egui/src/ribbon.rs
|
2026-10-14 14:16:22 -04:00 |
|
Brandon Thomas
|
ea12297822
|
Merge PR #223 from marcoarnulfo: Title bar: on macOS the window buttons sit centred in it (#71)
# Conflicts:
# crates/ui-egui/src/ribbon.rs
|
2026-10-14 14:13:29 -04:00 |
|
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 ThomasandClaude Opus 5.5
|
0c3f4eee63
|
Fix up merged PRs: Slide Master Preserve/placeholders know the notes and handout master views
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-14 14:07:31 -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 ThomasandClaude Opus 5.5
|
31e22977f7
|
Fix up merged PRs: the palette test skips UI commands that need a value (#440 hides them)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-14 14:05:00 -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
|
5c7e9fc6c3
|
Format the merged PRs (cargo fmt)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-14 13:53:13 -04:00 |
|
 Brandon ThomasandClaude Opus 5.5
|
0ac222a543
|
Fix up merged PRs: split ribbon buttons carry their label once (#512's label predates main's)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-14 13:51:49 -04:00 |
|
 Brandon ThomasandClaude Opus 5.5
|
6902c4bf92
|
Fix up merged PRs: every presenter-view button uses the light-on-dark style (#221)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-14 13:50:27 -04:00 |
|
Brandon Thomas
|
d2bf428362
|
Merge PR #224 from justinjohn0306: Notes and Presenter View: long notes scroll, presenter controls show (#221)
# Conflicts:
# crates/ui-egui/src/show.rs
|
2026-10-14 13:50:20 -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 ThomasandClaude Opus 5.5
|
b61cf33836
|
Fix up merged PRs: custom-show links carry 'returns'; prefetch follows the show's own order
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-14 13:49:36 -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
|
d3ebe57a02
|
Merge PR #671 from NikitkaRa: Show: a first animation set to With/After Previous plays when the slide appears
# Conflicts:
# crates/ui-egui/src/show.rs
|
2026-10-14 13:46:32 -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 ThomasandClaude Opus 5.5
|
0a470c3b1f
|
Fix up merged PRs: prefetch GIF check passes the document uid
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-14 13:45:41 -04:00 |
|
Brandon Thomas
|
23ac41f191
|
Merge PR #490 from NikitkaRa: Show: render the next slide in the background while the current one rests (#240)
# Conflicts:
# crates/ui-egui/src/show.rs
|
2026-10-14 13:45:21 -04:00 |
|
 Brandon ThomasandClaude Opus 5.5
|
7d87b6e668
|
Fix up merged PRs: transition sounds and media cues pass the document uid
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-14 13:45:01 -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 Thomas
|
8d429a23e9
|
Merge PR #483 from NikitkaRa: Media: keep playback with the document and the clip (#415)
# Conflicts:
# crates/ui-egui/src/show.rs
|
2026-10-14 13:44:40 -04:00 |
|
Brandon Thomas
|
6057715c2a
|
Merge PR #591 from NikitkaRa: Charts: histograms, Pareto and box and whisker; Office 2016 charts save as themselves
# Conflicts:
# crates/render/src/chart.rs
# crates/ui-egui/src/ribbon.rs
|
2026-10-14 13:42:41 -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
|
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 ThomasandClaude Opus 5.5
|
4653cb4e18
|
Fix up merged PRs: Hyperlink dialog tests fill main's new sound fields
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-14 13:30:15 -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 ThomasandClaude Opus 5.5
|
4c1357b2e6
|
Fix up merged PRs: shape.action fills main's new Hyperlink sound fields and CustomShow returns
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-14 13:29:52 -04:00 |
|
Brandon Thomas
|
f685deef57
|
Merge PR #557 from NikitkaRa: Insert: Action Settings dialog and shape.action
# Conflicts:
# crates/engine/src/tests.rs
# crates/ui-egui/src/dialogs.rs
|
2026-10-14 13:29:43 -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 |
|