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 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
|
8f0640a7b2
|
Merge PR #603 from NikitkaRa: Render: draw chart trendlines
# Conflicts:
# crates/render/src/chart.rs
|
2026-10-14 13:47:08 -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 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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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 |
|
Brandon Thomas
|
0bab72aff2
|
Merge PR #590 from NikitkaRa: PPTX: round-trip chart trendlines
|
2026-10-14 13:08:57 -04:00 |
|
Brandon Thomas
|
15b9ae0267
|
Merge PR #578 from NikitkaRa: PPTX: round-trip 3-D models and animation bounce end
|
2026-10-14 13:08:56 -04:00 |
|
Brandon Thomas
|
f4c182795f
|
Merge PR #562 from NikitkaRa: Pptx: round-trip text effects, layout, fills, bevels and connectors
|
2026-10-14 13:08:54 -04:00 |
|
Brandon Thomas
|
4dea355f02
|
Merge PR #554 from NikitkaRa: Pptx: round-trip comments, links, shows, groups and inherited placeholders
|
2026-10-14 13:08:53 -04:00 |
|
Brandon Thomas
|
c9e071c355
|
Merge PR #517 from NikitkaRa: PPTX: owned corpus round-trip, keep notes-master header and footer
|
2026-10-14 13:08:48 -04:00 |
|
Brandon Thomas
|
e12f40a05a
|
Merge PR #511 from NikitkaRa: UI: WordArt Transform gallery applies a text warp
|
2026-10-14 13:08:48 -04:00 |
|
Brandon Thomas
|
994d9a4b66
|
Merge PR #467 from NikitkaRa: Parsers: check hostile numeric fields before arithmetic (#426)
|
2026-10-14 13:08:43 -04:00 |
|
Brandon Thomas
|
78b6c2982f
|
Merge PR #439 from NikitkaRa: Pptx: read and write embedded fonts
# Conflicts:
# crates/pptx/tests/roundtrip.rs
|
2026-10-14 13:08:43 -04:00 |
|
Brandon Thomas
|
271822164f
|
Merge PR #437 from NikitkaRa: Metafile: clip EMF and WMF drawing to rectangle regions
# Conflicts:
# crates/render/src/tests.rs
|
2026-10-14 13:08:42 -04:00 |
|
Brandon Thomas
|
44f4b037e2
|
Merge PR #244 from pierrevbc: Canvas: right click selects the shape under the pointer
# Conflicts:
# crates/engine/src/tests.rs
|
2026-10-14 12:58:01 -04:00 |
|
Brandon Thomas
|
af1c6696ca
|
Merge PR #280 from albayazid: Comments: threads and resolved state survive a .pptx round trip (#70)
|
2026-10-14 12:57:23 -04:00 |
|
Brandon Thomas
|
b6721fe32f
|
Merge PR #246 from pierrevbc: Title bar: Export button next to Save
|
2026-10-14 12:57:22 -04:00 |
|
Brandon Thomas
|
b7cb5331d7
|
Merge PR #242 from pierrevbc: SmartArt: text is laid out on its text rectangle (dsp:txXfrm), not in columns
|
2026-10-14 12:57:22 -04:00 |
|
Brandon Thomas
|
1171e92308
|
Merge PR #707 from lambertoo: Fix keyboard navigation when Presenter View has focus
# Conflicts:
# crates/ui-egui/src/show.rs
|
2026-10-14 12:54:05 -04:00 |
|
Brandon Thomas
|
b9b0fdbab0
|
Merge PR #587 from MMexicann: Media: preserve video frames and EOF across seeks
|
2026-10-14 12:53:42 -04:00 |
|
Brandon Thomas
|
903cf0930b
|
Merge PR #463 from Zetenypapp: Copy and Cut buttons and menus put the text on the system clipboard (#431)
|
2026-10-14 12:53:42 -04:00 |
|
Brandon Thomas
|
5d406be3b0
|
Merge PR #460 from albayazid: Slide show: Honeycomb's hexagons cover the whole slide again (#420)
|
2026-10-14 12:53:42 -04:00 |
|