Multi-Device-Sync + Teilen/Import + Google-Kalender-Reservierungen - #27

Merged

Sven-MH merged 129 commits into

margenheld:masterfrom

Xveyn:feat/multi-device-sync

May 26, 2026

Commits on May 14, 2026

feat(settings): add show_weekend toggle (default True)
Xveyn
committed
6658b25
feat(ui): render grid with dynamic column count based on show_weekend
Xveyn
committed
f7f2f52
fix(ui): resize window on show_weekend column-count change
Xveyn
committed
a383e67
feat(settings-dialog): add show_weekend checkbox
Xveyn
committed
1bc7f6f
fix(settings-dialog): annotate label helper kw as dict[str, Any]
Xveyn
committed
a0a29d7
chore: bump v1.11.1 + Changelog
Xveyn
committed
8bb860e
fix(ui): zero column weight for hidden weekend columns
Xveyn
committed
90ed783
refactor: remove unused Absender setting
Xveyn
committed
059e503
fix(types): resolve Pylance warnings in mail/theme/logging_setup

Xveyn
and
claude
committed
6e7b551
docs: add multi-device sync design + known-limitations

Xveyn
and
claude
committed
30c1a4a
fix(ui): keep holiday name on single line in fixed-size cells

Xveyn
and
claude
committed
206525a
docs: add multi-device sync implementation plan

Xveyn
and
claude
committed
ff64a3c
feat(storage): add per-entry metadata and tombstone support
Xveyn
committed
50628fe
fix(storage): no-op delete for unknown date; validate apply_merge input

Xveyn
and
claude
committed
484d7d4
feat(storage): migrate legacy entries to add sync metadata
Xveyn
committed
9ebee8d
feat(settings): add sync metadata keys
Xveyn
committed
becec81
feat(settings): add set_synced/apply_synced for sync-tracked fields
Xveyn
committed
22bfe55
feat: add ConflictsStore for local conflict persistence
Xveyn
committed
61580a3
feat(sync): add _merge_one core LWW helper

Xveyn
and
claude
committed
f6b2d4c
test(sync): document tombstone merge behavior

Xveyn
and
claude
committed
fff6b52
feat(sync): merge entries with LWW and conflict detection
Xveyn
committed
81f7e19
feat(sync): merge whitelisted settings with conflict detection
Xveyn
committed
a5a1323
feat(sync): merge conflict list with union-by-id and dedup
Xveyn
committed
7cd7177
feat(sync): propagate resolved conflicts into entries/settings
Xveyn
committed
3e8c86b
feat(sync): add build_local_doc and apply_merged_doc adapters
Xveyn
committed
a434edb
feat(sync): add resolve_conflict to mark and apply user choice
Xveyn
committed
ea18e4f
feat(drive): scaffold module and exception hierarchy
Xveyn
committed
916f80d
feat(drive): add get_drive_service with combined OAuth scopes
Xveyn
committed
f28019a
feat(drive): add find_sync_file for appDataFolder lookup
Xveyn
committed
de12b29
feat(drive): add download and upload with etag-based optimistic locking
Xveyn
committed
bc68252
ci: add google-api-python-client to test deps for drive tests
Xveyn
committed
953ac56
feat(mail): make scopes dynamic via sync_enabled flag
Xveyn
committed
aa69229
feat(main): generate stable device_id and wire to storage/settings
Xveyn
committed
e951c98
feat(main): pull from Drive on startup in background thread

Xveyn
and
claude
committed
d236a70
feat(ui): add sync button and status label in header

Xveyn
and
claude
committed
cc4c383
feat(settings-dialog): add sync section with toggle and conflicts link

Xveyn
and
claude
committed
abc705d
feat(conflicts-dialog): add modal for user-driven conflict resolution

Xveyn
and
claude
committed
105d474
feat(ui): highlight calendar cells with unresolved conflicts

Xveyn
and
claude
committed
096f6c3
feat(sync): quarantine corrupt remote sync file on pull
Xveyn
committed
c484e84
chore: bump v1.12.0 + Changelog for multi-device sync
Xveyn
committed
63f17cd
fix(sync): close gaps from final review: settings meta, OAuth threading, scope, traceback

Xveyn
and
claude
committed
3180218
fix(ui): hide sync widgets when sync is disabled

Xveyn
and
claude
committed
8f5d3cf
feat(ui): brand window title bar in app theme color on Windows 11

Xveyn
and
claude
committed
bfc6127
feat(ui): replace messagebox.askyesno with themed confirm dialog

Xveyn
and
claude
committed
0a7bc3b
fix(drive): drop etag field (removed in v3), use version token

Xveyn
and
claude
committed
0814c77
fix(ui): surface push-on-close errors via messagebox

Xveyn
and
claude
committed
24b0372
docs(readme): add multi-device sync setup guide

Xveyn
and
claude
committed
399a72a
chore: gitignore runtime state, commit pending docs

Xveyn
and
claude
committed
9f10189
feat(ui): themed success popup for email send

Xveyn
and
claude
committed
572a7ad
feat(ui): larger time font in calendar cells when weekends hidden

Xveyn
and
claude
committed
0136529
feat(ui): bump time font further when weekends hidden

Xveyn
and
claude
committed
4b65fbe
feat(ui): larger holiday name font when weekends hidden

Xveyn
and
claude
committed
94e8688
fix(ui): add padding to holiday cells, shorter truncation in narrow mode

Xveyn
and
claude
committed
8c60f74
feat: add 'always on top' option

Xveyn
and
claude
committed
45de6fc
feat: minimize to system tray (Windows + macOS)

Xveyn
and
claude
committed
15303f3
fix(ui): show tooltip on truncated holiday cell names

Xveyn
and
claude
committed
56b5215
fix(ui): bind holiday tooltip to all child widgets, not just frame

Xveyn
and
claude
committed
f373743
fix(tooltip): force topmost on tooltip popup

Xveyn
and
claude
committed
824caaa
fix(tooltip): share single popup across multiple bound widgets

Xveyn
and
claude
committed
461a76e
fix(ui): show holiday warning on day click, not on save

Xveyn
and
claude
committed
09d98e6
feat: read and display authenticated sender email in settings

Xveyn
and
claude
committed
aca4e92
feat(settings-dialog): add 'Anmelden'/'Aktualisieren' button for sender

Xveyn
and
claude
committed
044bf6b
fix(settings-dialog): sender refresh — set inner label text, no -state

Xveyn
and
claude
committed
37e7d04
fix(mail): use Gmail getProfile + tokeninfo for email lookup

Xveyn
and
claude
committed
0fb090e
debug: log granted scopes + tokeninfo keys for sender lookup

Xveyn
and
claude
committed
1bd2208
fix: unify userinfo.email scope across mail.py and drive.py paths

Xveyn
and
claude
committed
d7ce9bb
fix(auth): set OAUTHLIB_RELAX_TOKEN_SCOPE to handle Google scope drift

Xveyn
and
claude
committed
ecb431b
feat: auto-fetch sender email after settings change and mail send

Xveyn
and
claude
committed
2b9611f
docs(readme): list userinfo.email scope in Gmail setup

Xveyn
and
claude
committed
6bb532e
fix(ui): pixel-fix empty calendar cells to match entry/holiday widths

Xveyn
and
claude
committed
6405c6f
fix(theme): clamp dialog position to screen bounds

Xveyn
and
claude
committed
ff1d04a
feat(settings): drop focus when clicking non-interactive areas

Xveyn
and
claude
committed
1fef508
fix(ui): readable entry times in month view, tighter holiday truncation in week view

Xveyn
and
claude
committed
560e6c1
chore: clear Pylance Optional-access warnings across modules

Xveyn
and
claude
committed
f4e6573
docs(changelog): expand 1.12.0 with post-bump features

Xveyn
and
claude
committed
c534a19

Commits on May 17, 2026

fix(ui): drop empty leading row in month view when weekends are hidden

Xveyn
and
claude
committed
499e33d
feat(ui): toggle month/week view with Tab key

Xveyn
and
claude
committed
92b4838
fix(ui): stabilize header row height across month/week views

Xveyn
and
claude
committed
3e6ddcb
fix(ui): pin window width across view and weekend toggles

Xveyn
and
claude
committed
df4130d
chore: ignore .aider* tool artifacts

Xveyn
and
claude
committed
2f78fe6
docs: capture code-quality hygiene findings

Xveyn
and
claude
committed
fe414a3
docs: add planned-features notebook with share-via-mail spec

Xveyn
and
claude
committed
42c29df

Commits on May 18, 2026

docs(spec): design „Arbeitszeiten teilen + importieren"

Xveyn
and
claude
committed
8b99501
docs(spec): add Zeitraum-Filter to import flow

Xveyn
and
claude
committed
ebfec4c
docs(plan): implementation plan for share + import feature

Xveyn
and
claude
committed
f3a6502
feat(storage): save_many for atomic multi-entry writes

Xveyn
and
claude
committed
a05a2d4
feat(share): parse + validate share-file wire format

Xveyn
and
claude
committed
8bad4b1
fix(share): validate clock times beyond regex shape

Xveyn
and
claude
committed
6d2a219
feat(share): build + serialize share-doc (round-trip)

Xveyn
and
claude
committed
e8084e4
feat(share): diff share-entries against local storage

Xveyn
and
claude
committed
2ee7a63
test(share): cover date_from/date_to range filter in diff

Xveyn
and
claude
committed
0255cb7
feat(share): apply_import via Storage.save_many (atomic)

Xveyn
and
claude
committed
4d51079
feat(settings): add share_recipient default (per-device)

Xveyn
and
claude
committed
3a2ae5b
feat(mail): generalize send_email for arbitrary attachments

Xveyn
and
claude
committed
29aac1b
feat(settings-ui): add „Teilen mit:" recipient field

Xveyn
and
claude
committed
bf5a3b0
feat(share-ui): add share_dialog for exporting entries via Gmail

Xveyn
and
claude
committed
a2fa7a8

Commits on May 19, 2026

feat(import-ui): import_dialog with range filter + conflict modes

Xveyn
and
claude
committed
4a95b05
feat(ui): wire up Teilen-Button + Import-Eintrag im Settings-Dialog

Xveyn
and
claude
committed
37eb14b
docs(changelog): note share + import feature

Xveyn
and
claude
committed
772acec

Commits on May 20, 2026

docs(spec): Design für Google-Kalender-Reservierungen

Xveyn
and
claude
committed
9ee30e6
docs(plan): implementation plan for Google Calendar reservations

Xveyn
and
claude
committed
4f8b4c1
feat(share-ui): Empfänger direkt im Teilen-Dialog eingeben

Xveyn
and
claude
committed
f0d7306
feat(settings): add gcal_enabled/gcal_calendar_id/last_calendar_sync_at keys

Xveyn
and
claude
committed
a134682
feat(reservations): add ReservationStore for local reservation persistence

Xveyn
and
claude
committed
c08c427
feat(reservations): add pure merge_reservations LWW merge

Xveyn
and
claude
committed
e1a1520
feat(gcal): add Calendar event payload/parse helpers

Xveyn
and
claude
committed
1225550
feat(mail): thread gcal_enabled through get_scopes and OAuth getters

Xveyn
and
claude
committed
d8846bc
feat(drive): add gcal_enabled flag to get_drive_service scope set

Xveyn
and
claude
committed
00cf6b8
feat(oauth): pass gcal_enabled to all OAuth service getters

Xveyn
and
claude
committed
43d323a
feat(gcal): add calendar service and event CRUD wrappers

Xveyn
and
claude
committed
46007ee
feat(reservations): add reconcile_reservations orchestrator

Xveyn
and
claude
committed
4874bee
feat(main): add run_calendar_reconcile helper

Xveyn
and
claude
committed
5283c8d
feat(theme): add reservation cell color constants

Xveyn
and
claude
committed
ce79b63
feat(entry-dialog): add reservation section to the day dialog

Xveyn
and
claude
committed
e54eae2
feat(settings-ui): add Google Calendar section with calendar picker

Xveyn
and
claude
committed
e75d9e0
feat(ui): render reservations in calendar grid, wire reconcile triggers

Xveyn
and
claude
committed
fab6341
feat(main): instantiate ReservationStore and pass it to App

Xveyn
and
claude
committed
1487c74
chore: bump version and changelog for Google Calendar reservations

Xveyn
and
claude
committed
5f00718
fix(reservations): preserve concurrent local saves during reconcile

Xveyn
and
claude
committed
5d41ff4

Commits on May 21, 2026

fix(send): verständliche Offline-Meldung statt Traceback

Xveyn
and
claude
committed
28a76f9
fix(ui): Reservierung als reiner Eck-Punkt statt eigener Zelle

Xveyn
and
claude
committed
cfdcd71
fix(ui): Reservierungen nur bei aktivem Kalender-Sync zeigen

Xveyn
and
claude
committed
fe6c3a9
refactor(settings): redundantes Feld "Teilen mit:" entfernen

Xveyn
and
claude
committed
0e5f6f2
fix(settings): NameError im Kalender-Lade-Fehlerpfad beheben

Xveyn
and
claude
committed
3da0010
chore: Version auf 1.12.0 setzen

Xveyn
and
claude
committed
8a47f42
docs: CHANGELOG-Einträge zu einer Release 1.12.0 zusammenführen

Xveyn
and
claude
committed
5a9d861

Commits on May 26, 2026

fix(theme): center dialogs on the parent monitor in multi-monitor setups

Sven-MH
and
claude
committed
71c1ef0
feat(settings-ui): collapsible Gmail and Mail-Vorlage sections

Sven-MH
and
claude
committed
4c18fcd
feat(paths): ZEITERFASSUNG_DATA_DIR env override

Sven-MH
and
claude
committed
be25f96