aiongg
b0b6409112
Integration: track t03
...
# Conflicts:
# ROADMAP.md
# crates/ui-egui/tests/keyboard_shortcuts.rs
# docs/file-format-parity.md
# docs/localization-parity.md
# docs/ui-parity.md
2026-10-22 03:00:13 +00:00
aiongg
54d0f7cfc0
Integration: track t02
...
# Conflicts:
# ROADMAP.md
# crates/core/src/lib.rs
# crates/ui-egui/src/editor.rs
# crates/ui-egui/src/grid.rs
# crates/ui-egui/src/tabs.rs
# docs/chart-parity.md
# docs/localization-parity.md
# docs/ui-parity.md
2026-10-22 02:59:55 +00:00
aiongg
f193f0d834
Integration: track t01
2026-10-22 02:58:49 +00:00
aiongg
55aeed6f1a
Integration: cargo fmt
2026-10-22 02:48:11 +00:00
aiongg
b35b5a8b9d
Integration: cargo fmt
2026-10-22 02:46:29 +00:00
aiongg
7b47c5a846
Integration: #995 test builds Image.data as Arc<Vec<u8>> (after #1629 )
...
shared_media.rs predates the Arc change; literals and comparisons use .into() and to_vec().
2026-10-22 02:46:21 +00:00
aiongg
55877df80f
Integration: cargo fmt
2026-10-22 02:46:00 +00:00
aiongg
f02f446905
Integration: #1194 drop the duplicate Cut and Copy German arms ( #1830 already translates them)
2026-10-22 02:45:54 +00:00
aiongg
c37298b468
Integration: #1151 test literal gains the category_levels field from #1088
2026-10-22 02:40:38 +00:00
aiongg
e4c406dbcf
Merge PR #1194 : fix(ui): ribbon tooltips show each platform's shortcuts (Ctrl+B on Windows, ⌘B on macOS) ( #1191 )
...
crates/ui-egui/src/widgets.rs: both test modules kept.
2026-10-22 02:37:51 +00:00
aiongg
a9a8fe7d20
Integration: #1754 translate the sheet-tab Delete button; Spanish Hide and Autoguardado; test that the sheet-tab and AutoSave labels translate in es, de, fr, ko, ru, zh, sr
2026-10-22 02:37:48 +00:00
aiongg
3a01ce689e
Integration: i18n drop duplicate Unprotect Sheet… entries (added by #1373 and #1754 )
2026-10-22 02:37:43 +00:00
aiongg
9d3252189d
Merge PR #1180 : fix(ui): menu items highlight under the pointer ( #1174 )
...
crates/ui-egui/src/grid.rs: list picker button combines frame_when_inactive(false) with main's LIST_PICKER_ROW_H min size.
2026-10-22 02:37:42 +00:00
aiongg
1316d39865
Merge PR #1151 : Charts: a huge trendline forecast no longer collapses the chart ( #1148 )
...
ROADMAP.md: all rows kept.
crates/chart/src/tests.rs: both tests kept.
2026-10-22 02:37:37 +00:00
aiongg
56c31b0b31
Merge PR #1993 : Grid: the selection outline follows a mouse drag at once
...
Conflicts:
- docs/ui-parity.md: header keeps main's change list plus the outline entry; both log rows kept
2026-10-22 02:37:23 +00:00
aiongg
169c78dda8
Merge PR #1111 : Respect workbook structure protection in sheet rename, move, copy, hide and unhide ( #1049 )
2026-10-22 02:37:22 +00:00
aiongg
d8b73ecb4e
Merge PR #1110 : Size the list validation dropdown to up to 8 rows ( #1089 )
2026-10-22 02:37:19 +00:00
aiongg
f5b35fb3ac
Merge PR #1109 : fix(ui): commit a pointed formula on the sheet it was started on ( #996 )
...
crates/ui-egui/src/lib.rs: sheet re-activation first, then main's unchanged-empty-commit check and the commit chain.
crates/ui-egui/src/tabs.rs: union of test imports.
2026-10-22 02:37:19 +00:00
aiongg
470a2ae2c1
Merge PR #1765 : Sheet protection: obey the Sort and Use AutoFilter boxes
...
Conflicts:
- crates/engine/src/cmd/data.rs: do_sort keeps #1284 's sheet parameter and checks Sorting on it; toggle_filter checks Filtering after #1285 's data_target
- crates/engine/src/tests.rs: adjacent tests, both kept
2026-10-22 02:37:16 +00:00
aiongg
01485e2b66
Merge PR #1838 : Added multi-column/row selection in formulas & column/row selection highlighting.
...
crates/ui-egui/src/editor.rs: kept both appended tests
crates/ui-egui/src/grid.rs: kept the Table heading filter-button check, then point_header(.., mods.shift, mods.command); kept format_painter_apply and the extend/add point_header
2026-10-22 02:37:08 +00:00
aiongg
37bf37d181
Merge PR #1103 : Keep chart cache point positions when a reference has blank edges ( #1015 )
...
crates/xlsx/src/chart.rs: 1103's used-range clipping applied in ref_values after 1088's ref_target call.
2026-10-22 02:37:08 +00:00
aiongg
f4f18bb368
Merge PR #1701 : XLSX: new workbooks get <fileVersion appName="gridcraft"/>
...
Conflicts:
- crates/xlsx/src/write.rs: keeps #1701 's fileVersion block followed by #1626 's workbookPr attributes (showObjects, date1904)
2026-10-22 02:37:05 +00:00
aiongg
ad7fe4ed70
Merge PR #1095 : fix(grid): keep cursor stable during cell dragging ( #936 )
...
crates/ui-egui/src/grid.rs: keep main's touch-pan guard around interact, add 1095's update_cursor call after it.
docs/ui-parity.md: one Last updated line, change notes combined; both history rows kept.
2026-10-22 02:36:58 +00:00
aiongg
857bdae023
Merge PR #1692 : XLSX: keep Japanese phonetic runs on open and save
...
Conflicts:
- crates/model/src/lib.rs, crates/xlsx/src/read.rs, crates/xlsx/src/write.rs: use lists unioned (ShowObjects and the phonetic types)
- docs/file-format-parity.md: main's header and rows kept (#1692 collapsed the three duplicate .xlsx rows; they stay), phonetic-runs text added to each; Last updated 2026-10-20
2026-10-22 02:36:58 +00:00
aiongg
48285a8fc4
Merge PR #1754 : i18n: translate sheet tab context menu and AutoSave toggle ( fixes #1537 )
...
crates/ui-egui/src/i18n/de.rs: kept both sets of entries; dropped the duplicate Unprotect Sheet… line
crates/ui-egui/src/tabs.rs: kept active_sheet_protected() and the protectSheet dialog id, tr() on both button labels
2026-10-22 02:36:53 +00:00
aiongg
e738049157
Merge PR #1088 : Charts: multi-level category axes (year beside month) read, drawn and written back
...
ROADMAP.md: all rows kept.
2026-10-22 02:36:49 +00:00
aiongg
6432253de9
Integration: #973 move the sheet-tab copy row from the element table to the change history
2026-10-22 02:36:40 +00:00
aiongg
cd3fcfd2a0
Merge PR #1083 : Colour menus: More Colors… and Recent Colors ( #928 )
...
ROADMAP.md: all progress-log rows kept.
docs/ui-parity.md: one Last updated line, change notes combined; both history rows kept; ribbon row wording tidied.
2026-10-22 02:36:40 +00:00
aiongg
6370fd2254
Merge PR #1693 : Charts: series that refer to defined names ([0]!Name) plot their data, and are saved qualified
...
crates/xlsx/src/tests/mod.rs: kept both mod lines (cellmetadata, chart_book_names)
docs/file-format-parity.md: kept HEAD header line, both change rows
2026-10-22 02:36:34 +00:00
aiongg
fccca928b3
Merge PR #1631 : Memory: floating pictures' textures are bounded, sized to what is drawn, and dropped with their workbook
...
Conflicts:
- ROADMAP.md: header change line names both memory changes; both progress-log and revision rows kept
2026-10-22 02:36:33 +00:00
aiongg
70426fc913
Merge PR #1657 : Cell editor: the caret contrasts with the cell's fill
2026-10-22 02:36:24 +00:00
aiongg
8ec29a8b3b
Merge PR #1652 : Fill handle: right-drag opens the fill menu (Copy Cells, Fill Series, Fill Formatting Only, Fill Without Formatting, Series…)
...
crates/ui-egui/src/grid.rs: kept both GridState fields (context_menu_frame, fill_menu); previous_popups tuple has four elements inside the touch_pan branch; release match has Drag::Rows|Cols, then the two Drag::Fill arms
docs/ui-parity.md: kept HEAD header line, both change rows
2026-10-22 02:36:24 +00:00
aiongg
8e2974cc65
Merge PR #1629 : Memory: undo steps share picture and macro bytes instead of copying them
...
Conflicts:
- ROADMAP.md: both progress-log and revision rows kept
- crates/xlsx/src/sheet_write.rs: keeps #995 's image_part call; drops #1629 's to_vec line (image_part copies from &[u8])
2026-10-22 02:36:22 +00:00
aiongg
cba89cfda8
Merge PR #1066 : Engine: formulas.evaluate refuses what cell entry refuses, saying why
...
ROADMAP.md: both progress-log rows kept.
2026-10-22 02:36:20 +00:00
aiongg
7fd1553a8b
Merge PR #1626 : Keyboard: Ctrl+6 hides and shows objects, saved as workbookPr showObjects
...
Conflicts:
- docs/file-format-parity.md: header and the three .xlsx rows keep main's text plus the show-objects entry; both log rows kept
- docs/ui-parity.md: header keeps main's text plus Ctrl+6; both log rows kept
2026-10-22 02:36:15 +00:00
aiongg
a8f74730c1
Merge PR #1056 : Fix Command-click and Shift-click references during formula entry
...
contributors/people.toml: union of both new entries.
docs/ui-parity.md: one Last updated line, change notes combined; both history rows kept.
2026-10-22 02:36:14 +00:00
aiongg
75e84a26d5
Merge PR #1612 : Grid: a scrolled Table's header names and filter buttons in the column headings ( #1423 )
...
docs/ui-parity.md: kept HEAD header line, both change rows, newest first
2026-10-22 02:36:10 +00:00
aiongg
c03d4a881b
Merge PR #1570 : XLSX: keep dynamic-array cell metadata (cm) on save
...
ROADMAP.md: kept both progress-log rows
2026-10-22 02:36:04 +00:00
aiongg
5d0d1c2b95
Merge PR #973 : Sheet tabs: Ctrl-drag (Cmd or Option on macOS) drops a copy of the sheet
...
docs/ui-parity.md: one Last updated line, change notes combined.
2026-10-22 02:36:00 +00:00
aiongg
8de6c8376a
Merge PR #1560 : ui: truncate long workbook titles in the title bar
2026-10-22 02:35:58 +00:00
aiongg
7768f56603
Merge PR #1580 : Calc: CELL("filename") names the workbook's file
2026-10-22 02:35:56 +00:00
aiongg
6b0411091a
Merge PR #1559 : Sort and de-duplicate data.textToColumns fixed-width breaks
...
Conflicts:
- crates/engine/src/cmd/data.rs: adjacent test insertions, both kept
2026-10-22 02:35:56 +00:00
aiongg
524ab89a1a
Merge PR #1379 : engine: subtotal honours header:false instead of dropping the first data row
...
Conflicts:
- crates/engine/src/cmd/data.rs: subtotal keeps #1285 's data_target and sheet-qualified calls with #1379 's header/first logic; grand-total range starts at first; both tests kept (#1299 filter blanks, #1379 subtotal)
2026-10-22 02:35:51 +00:00
aiongg
3ed16929d9
Merge PR #1320 : AutoFit Column Width measures text in the font the grid draws it with
...
Conflicts:
- crates/engine/src/cmd/format.rs: autofit_cols keeps #885 's (si, lines) and adds #1320 's measure
2026-10-22 02:35:39 +00:00
aiongg
4fd4d39aa0
Merge PR #1308 : engine: refuse removeDuplicates with no valid column instead of deleting all rows
...
Conflicts:
- crates/engine/src/cmd/data.rs: keeps #1308 's column guard after cols is built; drops its later 'let sheet' (#1285 supplies sheet)
2026-10-22 02:35:34 +00:00
aiongg
77b861392a
Merge PR #1299 : Filter: count empty text and ="" results as (Blanks)
2026-10-22 02:35:26 +00:00
aiongg
41bf1f0e52
Merge PR #1547 : UI: Delete dismisses the AutoComplete proposal, and deleting text never brings it back ( #1521 )
...
crates/ui-egui/src/formula_bar.rs: kept both test modules (spill_tests, tests)
2026-10-22 02:35:25 +00:00
aiongg
d691e95f6d
Merge PR #1285 : Remove Duplicates, Filter and Subtotal: a Sheet! prefix on the range works on that sheet
2026-10-22 02:35:24 +00:00
aiongg
4a8765aa27
Merge PR #970 : Control: Go To and Select over the control channel scroll the active cell into view
2026-10-22 02:35:22 +00:00
aiongg
f8c9f87f6e
Merge PR #913 : Keyboard: Enter after a run of Tabs goes to the next row in the column the run started from
2026-10-22 02:35:22 +00:00