Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
563a9de
macOS prototype: SwiftUI app and its .dmg (step 3, phase 3)
claude Oct 29, 2026
8b9d492
macOS app: split the views so Swift type-checks them
claude Oct 29, 2026
857a0c2
Merge the merged phase 3 branch, keeping main's content
claude Oct 29, 2026
f985c5d
macOS app: a sword for the weapons, and xattr in Read Me First
claude Oct 29, 2026
052de0f
macOS: the library and the sheet (step 3, phase 4, stage 1)
claude Oct 29, 2026
07900af
Merge the merged branch, keeping main's content
claude Oct 29, 2026
6f733ba
cr-mac-ffi: help, about and entry help for the Mac
claude Oct 29, 2026
8445734
macOS: Help and About
claude Oct 29, 2026
bd36fcc
Merge the merged branch, keeping main's content
claude Oct 29, 2026
c068fde
cr-mac-ffi: rustfmt
claude Oct 29, 2026
d74f022
macOS: the books
claude Oct 29, 2026
01a69df
cr-mac-ffi: rustfmt
claude Oct 29, 2026
9227d73
Merge the merged branch, keeping main's content
claude Oct 29, 2026
364072a
Roadmap: Help and About done on the Mac
claude Oct 29, 2026
1529c24
Merge the merged branch, keeping main's content
claude Oct 29, 2026
6585c2d
macOS: New Character and Enter Character
claude Oct 29, 2026
8d7f329
Merge the merged branch, keeping main's content
claude Oct 29, 2026
84ead8c
macOS: Edit Character with every page of the editor
claude Oct 29, 2026
bcdbaf0
Merge the merged branch, keeping main's content
claude Oct 29, 2026
6cdb709
macOS: New NPC, New NPC Group and Roll on a Table
claude Oct 29, 2026
18ba9b6
macOS: Roll Treasure and the saved treasure
claude Oct 29, 2026
4ed75b6
Merge the merged branch, keeping main's content
claude Oct 29, 2026
a760f8d
Merge the merged branch, keeping main's content
claude Oct 29, 2026
aa329ec
macOS: New Encounter, the encounters and the encounter tables
claude Oct 29, 2026
37ae17e
Merge the merged branch, keeping main's content
claude Oct 29, 2026
5d9b734
macOS: Manage Parties and Group Encounter
claude Oct 29, 2026
20a171a
Merge the merged branch, keeping main's content
claude Oct 29, 2026
a82bcb4
macOS: the record editor of the user databases
claude Oct 29, 2026
57cded9
Merge the merged branch, keeping main's content
claude Oct 29, 2026
98f38ce
macOS: Allowed Classes, Restore and the treasure table editor
claude Oct 29, 2026
1cf1e51
Merge the merged branch, keeping main's content
claude Oct 29, 2026
7408c86
macOS: the encounter template editor
claude Oct 29, 2026
cd635dc
Merge the merged branch, keeping main's content
claude Oct 29, 2026
c2df72a
macOS: Export, Import Core Rules 2.0, New Package and Edit Package
claude Oct 29, 2026
f16c070
Merge the merged branch, keeping main's content
claude Oct 29, 2026
2a46ffa
macOS: Extract Data from CD, from an ISO image or a copied folder
claude Oct 29, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/cr-app/src/action.rs
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ pub const NOT_YET_ON_WINDOWS: &[Action] = &[];
/// The actions the Mac app does not have yet. An action comes off as the
/// Mac app gets it, and the release with macOS waits until the list is
/// empty.
pub const NOT_YET_ON_MACOS: &[Action] = &[EXTRACT_DATA];
pub const NOT_YET_ON_MACOS: &[Action] = &[];

#[cfg(test)]
mod tests {
Expand Down
20 changes: 12 additions & 8 deletions crates/cr-i18n/po/corerules.pot
Original file line number Diff line number Diff line change
Expand Up @@ -5269,8 +5269,8 @@ msgid "Help"
msgstr ""

#: crates/cr-gtk/src/help.rs:284
#: crates/cr-mac-ffi/src/lib.rs:855
#: crates/cr-mac-ffi/src/lib.rs:901
#: crates/cr-mac-ffi/src/lib.rs:892
#: crates/cr-mac-ffi/src/lib.rs:938
#: crates/cr-win/src/app.rs:1834
#: crates/cr-win/src/app.rs:1843
#: crates/cr-win/src/app.rs:3522
Expand Down Expand Up @@ -5441,7 +5441,7 @@ msgid "Character created"
msgstr ""

#: crates/cr-gtk/src/main.rs:906
#: crates/cr-mac-ffi/src/lib.rs:934
#: crates/cr-mac-ffi/src/lib.rs:971
#: crates/cr-win/src/app.rs:2763
msgid "Converted to a character"
msgstr ""
Expand Down Expand Up @@ -5665,7 +5665,7 @@ msgid "Show a Party"
msgstr ""

#: crates/cr-gtk/src/main.rs:1589
#: crates/cr-mac-ffi/src/lib.rs:629
#: crates/cr-mac-ffi/src/lib.rs:666
#: crates/cr-win/src/app/library.rs:337
msgid "All Types"
msgstr ""
Expand Down Expand Up @@ -5714,7 +5714,7 @@ msgstr ""
#: crates/cr-mac-ffi/src/encounter.rs:225
#: crates/cr-mac-ffi/src/encounter.rs:526
#: crates/cr-mac-ffi/src/encounter.rs:962
#: crates/cr-mac-ffi/src/lib.rs:1109
#: crates/cr-mac-ffi/src/lib.rs:1146
#: crates/cr-mac-ffi/src/sheet.rs:85
#: crates/cr-win/src/app/library.rs:261
#: crates/cr-win/src/app.rs:402
Expand Down Expand Up @@ -6380,19 +6380,19 @@ msgid "Choose Picture"
msgstr ""

#: crates/cr-gtk/src/picture.rs:282
#: crates/cr-mac-ffi/src/lib.rs:984
#: crates/cr-mac-ffi/src/lib.rs:1021
#: crates/cr-win/src/app/portrait.rs:120
msgid "Portraits"
msgstr ""

#: crates/cr-gtk/src/picture.rs:285
#: crates/cr-mac-ffi/src/lib.rs:987
#: crates/cr-mac-ffi/src/lib.rs:1024
#: crates/cr-win/src/app/portrait.rs:122
msgid "Portraits for {race}"
msgstr ""

#: crates/cr-gtk/src/picture.rs:286
#: crates/cr-mac-ffi/src/lib.rs:988
#: crates/cr-mac-ffi/src/lib.rs:1025
#: crates/cr-win/src/app/portrait.rs:123
msgid "Other Portraits"
msgstr ""
Expand Down Expand Up @@ -7950,6 +7950,10 @@ msgstr ""
msgid "Rank"
msgstr ""

#: crates/cr-mac-ffi/src/lib.rs:523
msgid "Copies the rules databases, books and tables the app uses from a Core Rules 2.0 or Expansion CD into the app's data folder. Choose the CD's ISO image, or a folder the CD's files were copied into."
msgstr ""

#: crates/cr-mac-ffi/src/parties.rs:269
#: crates/cr-win/src/app/parties.rs:177
msgid "Empty parties are removed when you leave this page."
Expand Down
20 changes: 12 additions & 8 deletions crates/cr-i18n/po/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -5269,8 +5269,8 @@ msgid "Help"
msgstr "Hilfe"

#: crates/cr-gtk/src/help.rs:284
#: crates/cr-mac-ffi/src/lib.rs:855
#: crates/cr-mac-ffi/src/lib.rs:901
#: crates/cr-mac-ffi/src/lib.rs:892
#: crates/cr-mac-ffi/src/lib.rs:938
#: crates/cr-win/src/app.rs:1834
#: crates/cr-win/src/app.rs:1843
#: crates/cr-win/src/app.rs:3522
Expand Down Expand Up @@ -5441,7 +5441,7 @@ msgid "Character created"
msgstr "Charakter erstellt"

#: crates/cr-gtk/src/main.rs:906
#: crates/cr-mac-ffi/src/lib.rs:934
#: crates/cr-mac-ffi/src/lib.rs:971
#: crates/cr-win/src/app.rs:2763
msgid "Converted to a character"
msgstr "In einen Charakter umgewandelt"
Expand Down Expand Up @@ -5665,7 +5665,7 @@ msgid "Show a Party"
msgstr "Eine Gruppe anzeigen"

#: crates/cr-gtk/src/main.rs:1589
#: crates/cr-mac-ffi/src/lib.rs:629
#: crates/cr-mac-ffi/src/lib.rs:666
#: crates/cr-win/src/app/library.rs:337
msgid "All Types"
msgstr "Alle Typen"
Expand Down Expand Up @@ -5714,7 +5714,7 @@ msgstr "Einträge"
#: crates/cr-mac-ffi/src/encounter.rs:225
#: crates/cr-mac-ffi/src/encounter.rs:526
#: crates/cr-mac-ffi/src/encounter.rs:962
#: crates/cr-mac-ffi/src/lib.rs:1109
#: crates/cr-mac-ffi/src/lib.rs:1146
#: crates/cr-mac-ffi/src/sheet.rs:85
#: crates/cr-win/src/app/library.rs:261
#: crates/cr-win/src/app.rs:402
Expand Down Expand Up @@ -6380,19 +6380,19 @@ msgid "Choose Picture"
msgstr "Bild wählen"

#: crates/cr-gtk/src/picture.rs:282
#: crates/cr-mac-ffi/src/lib.rs:984
#: crates/cr-mac-ffi/src/lib.rs:1021
#: crates/cr-win/src/app/portrait.rs:120
msgid "Portraits"
msgstr "Porträts"

#: crates/cr-gtk/src/picture.rs:285
#: crates/cr-mac-ffi/src/lib.rs:987
#: crates/cr-mac-ffi/src/lib.rs:1024
#: crates/cr-win/src/app/portrait.rs:122
msgid "Portraits for {race}"
msgstr "Porträts für {race}"

#: crates/cr-gtk/src/picture.rs:286
#: crates/cr-mac-ffi/src/lib.rs:988
#: crates/cr-mac-ffi/src/lib.rs:1025
#: crates/cr-win/src/app/portrait.rs:123
msgid "Other Portraits"
msgstr "Weitere Porträts"
Expand Down Expand Up @@ -7950,6 +7950,10 @@ msgstr "{shown} von {count} angezeigt; suche, um die Liste einzugrenzen"
msgid "Rank"
msgstr "Rang"

#: crates/cr-mac-ffi/src/lib.rs:523
msgid "Copies the rules databases, books and tables the app uses from a Core Rules 2.0 or Expansion CD into the app's data folder. Choose the CD's ISO image, or a folder the CD's files were copied into."
msgstr "Kopiert die Regeldatenbanken, Bücher und Tabellen, die die App verwendet, von einer CD von Core Rules 2.0 oder der Expansion in den Datenordner der App. Wählen Sie das ISO-Abbild der CD oder einen Ordner, in den die Dateien der CD kopiert wurden."

#: crates/cr-mac-ffi/src/parties.rs:269
#: crates/cr-win/src/app/parties.rs:177
msgid "Empty parties are removed when you leave this page."
Expand Down
20 changes: 12 additions & 8 deletions crates/cr-i18n/po/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -5269,8 +5269,8 @@ msgid "Help"
msgstr "Ayuda"

#: crates/cr-gtk/src/help.rs:284
#: crates/cr-mac-ffi/src/lib.rs:855
#: crates/cr-mac-ffi/src/lib.rs:901
#: crates/cr-mac-ffi/src/lib.rs:892
#: crates/cr-mac-ffi/src/lib.rs:938
#: crates/cr-win/src/app.rs:1834
#: crates/cr-win/src/app.rs:1843
#: crates/cr-win/src/app.rs:3522
Expand Down Expand Up @@ -5441,7 +5441,7 @@ msgid "Character created"
msgstr "Personaje creado"

#: crates/cr-gtk/src/main.rs:906
#: crates/cr-mac-ffi/src/lib.rs:934
#: crates/cr-mac-ffi/src/lib.rs:971
#: crates/cr-win/src/app.rs:2763
msgid "Converted to a character"
msgstr "Convertido en personaje"
Expand Down Expand Up @@ -5665,7 +5665,7 @@ msgid "Show a Party"
msgstr "Mostrar una compañía"

#: crates/cr-gtk/src/main.rs:1589
#: crates/cr-mac-ffi/src/lib.rs:629
#: crates/cr-mac-ffi/src/lib.rs:666
#: crates/cr-win/src/app/library.rs:337
msgid "All Types"
msgstr "Todos los tipos"
Expand Down Expand Up @@ -5714,7 +5714,7 @@ msgstr "Entradas"
#: crates/cr-mac-ffi/src/encounter.rs:225
#: crates/cr-mac-ffi/src/encounter.rs:526
#: crates/cr-mac-ffi/src/encounter.rs:962
#: crates/cr-mac-ffi/src/lib.rs:1109
#: crates/cr-mac-ffi/src/lib.rs:1146
#: crates/cr-mac-ffi/src/sheet.rs:85
#: crates/cr-win/src/app/library.rs:261
#: crates/cr-win/src/app.rs:402
Expand Down Expand Up @@ -6380,19 +6380,19 @@ msgid "Choose Picture"
msgstr "Elegir imagen"

#: crates/cr-gtk/src/picture.rs:282
#: crates/cr-mac-ffi/src/lib.rs:984
#: crates/cr-mac-ffi/src/lib.rs:1021
#: crates/cr-win/src/app/portrait.rs:120
msgid "Portraits"
msgstr "Retratos"

#: crates/cr-gtk/src/picture.rs:285
#: crates/cr-mac-ffi/src/lib.rs:987
#: crates/cr-mac-ffi/src/lib.rs:1024
#: crates/cr-win/src/app/portrait.rs:122
msgid "Portraits for {race}"
msgstr "Retratos de {race}"

#: crates/cr-gtk/src/picture.rs:286
#: crates/cr-mac-ffi/src/lib.rs:988
#: crates/cr-mac-ffi/src/lib.rs:1025
#: crates/cr-win/src/app/portrait.rs:123
msgid "Other Portraits"
msgstr "Otros retratos"
Expand Down Expand Up @@ -7950,6 +7950,10 @@ msgstr "Se muestran {shown} de {count}; busca para acotar la lista"
msgid "Rank"
msgstr "Rango"

#: crates/cr-mac-ffi/src/lib.rs:523
msgid "Copies the rules databases, books and tables the app uses from a Core Rules 2.0 or Expansion CD into the app's data folder. Choose the CD's ISO image, or a folder the CD's files were copied into."
msgstr "Copia las bases de datos de reglas, los libros y las tablas que usa la aplicación desde un CD de Core Rules 2.0 o de la Expansion a la carpeta de datos de la aplicación. Elija la imagen ISO del CD, o una carpeta a la que se copiaron los archivos del CD."

#: crates/cr-mac-ffi/src/parties.rs:269
#: crates/cr-win/src/app/parties.rs:177
msgid "Empty parties are removed when you leave this page."
Expand Down
20 changes: 12 additions & 8 deletions crates/cr-i18n/po/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -5269,8 +5269,8 @@ msgid "Help"
msgstr "Aide"

#: crates/cr-gtk/src/help.rs:284
#: crates/cr-mac-ffi/src/lib.rs:855
#: crates/cr-mac-ffi/src/lib.rs:901
#: crates/cr-mac-ffi/src/lib.rs:892
#: crates/cr-mac-ffi/src/lib.rs:938
#: crates/cr-win/src/app.rs:1834
#: crates/cr-win/src/app.rs:1843
#: crates/cr-win/src/app.rs:3522
Expand Down Expand Up @@ -5441,7 +5441,7 @@ msgid "Character created"
msgstr "Personnage créé"

#: crates/cr-gtk/src/main.rs:906
#: crates/cr-mac-ffi/src/lib.rs:934
#: crates/cr-mac-ffi/src/lib.rs:971
#: crates/cr-win/src/app.rs:2763
msgid "Converted to a character"
msgstr "Converti en personnage"
Expand Down Expand Up @@ -5665,7 +5665,7 @@ msgid "Show a Party"
msgstr "Afficher une équipe"

#: crates/cr-gtk/src/main.rs:1589
#: crates/cr-mac-ffi/src/lib.rs:629
#: crates/cr-mac-ffi/src/lib.rs:666
#: crates/cr-win/src/app/library.rs:337
msgid "All Types"
msgstr "Tous les types"
Expand Down Expand Up @@ -5714,7 +5714,7 @@ msgstr "Entrées"
#: crates/cr-mac-ffi/src/encounter.rs:225
#: crates/cr-mac-ffi/src/encounter.rs:526
#: crates/cr-mac-ffi/src/encounter.rs:962
#: crates/cr-mac-ffi/src/lib.rs:1109
#: crates/cr-mac-ffi/src/lib.rs:1146
#: crates/cr-mac-ffi/src/sheet.rs:85
#: crates/cr-win/src/app/library.rs:261
#: crates/cr-win/src/app.rs:402
Expand Down Expand Up @@ -6380,19 +6380,19 @@ msgid "Choose Picture"
msgstr "Choisir une image"

#: crates/cr-gtk/src/picture.rs:282
#: crates/cr-mac-ffi/src/lib.rs:984
#: crates/cr-mac-ffi/src/lib.rs:1021
#: crates/cr-win/src/app/portrait.rs:120
msgid "Portraits"
msgstr "Portraits"

#: crates/cr-gtk/src/picture.rs:285
#: crates/cr-mac-ffi/src/lib.rs:987
#: crates/cr-mac-ffi/src/lib.rs:1024
#: crates/cr-win/src/app/portrait.rs:122
msgid "Portraits for {race}"
msgstr "Portraits de {race}"

#: crates/cr-gtk/src/picture.rs:286
#: crates/cr-mac-ffi/src/lib.rs:988
#: crates/cr-mac-ffi/src/lib.rs:1025
#: crates/cr-win/src/app/portrait.rs:123
msgid "Other Portraits"
msgstr "Autres portraits"
Expand Down Expand Up @@ -7950,6 +7950,10 @@ msgstr "{shown} sur {count} affichés ; recherchez pour réduire la liste"
msgid "Rank"
msgstr "Rang"

#: crates/cr-mac-ffi/src/lib.rs:523
msgid "Copies the rules databases, books and tables the app uses from a Core Rules 2.0 or Expansion CD into the app's data folder. Choose the CD's ISO image, or a folder the CD's files were copied into."
msgstr "Copie les bases de règles, les livres et les tables que l’application utilise depuis un CD de Core Rules 2.0 ou de l’Expansion dans le dossier de données de l’application. Choisissez l’image ISO du CD, ou un dossier dans lequel les fichiers du CD ont été copiés."

#: crates/cr-mac-ffi/src/parties.rs:269
#: crates/cr-win/src/app/parties.rs:177
msgid "Empty parties are removed when you leave this page."
Expand Down
20 changes: 12 additions & 8 deletions crates/cr-i18n/po/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -5269,8 +5269,8 @@ msgid "Help"
msgstr "Aiuto"

#: crates/cr-gtk/src/help.rs:284
#: crates/cr-mac-ffi/src/lib.rs:855
#: crates/cr-mac-ffi/src/lib.rs:901
#: crates/cr-mac-ffi/src/lib.rs:892
#: crates/cr-mac-ffi/src/lib.rs:938
#: crates/cr-win/src/app.rs:1834
#: crates/cr-win/src/app.rs:1843
#: crates/cr-win/src/app.rs:3522
Expand Down Expand Up @@ -5441,7 +5441,7 @@ msgid "Character created"
msgstr "Personaggio creato"

#: crates/cr-gtk/src/main.rs:906
#: crates/cr-mac-ffi/src/lib.rs:934
#: crates/cr-mac-ffi/src/lib.rs:971
#: crates/cr-win/src/app.rs:2763
msgid "Converted to a character"
msgstr "Convertito in personaggio"
Expand Down Expand Up @@ -5665,7 +5665,7 @@ msgid "Show a Party"
msgstr "Mostra una compagnia"

#: crates/cr-gtk/src/main.rs:1589
#: crates/cr-mac-ffi/src/lib.rs:629
#: crates/cr-mac-ffi/src/lib.rs:666
#: crates/cr-win/src/app/library.rs:337
msgid "All Types"
msgstr "Tutti i tipi"
Expand Down Expand Up @@ -5714,7 +5714,7 @@ msgstr "Voci"
#: crates/cr-mac-ffi/src/encounter.rs:225
#: crates/cr-mac-ffi/src/encounter.rs:526
#: crates/cr-mac-ffi/src/encounter.rs:962
#: crates/cr-mac-ffi/src/lib.rs:1109
#: crates/cr-mac-ffi/src/lib.rs:1146
#: crates/cr-mac-ffi/src/sheet.rs:85
#: crates/cr-win/src/app/library.rs:261
#: crates/cr-win/src/app.rs:402
Expand Down Expand Up @@ -6380,19 +6380,19 @@ msgid "Choose Picture"
msgstr "Scegli immagine"

#: crates/cr-gtk/src/picture.rs:282
#: crates/cr-mac-ffi/src/lib.rs:984
#: crates/cr-mac-ffi/src/lib.rs:1021
#: crates/cr-win/src/app/portrait.rs:120
msgid "Portraits"
msgstr "Ritratti"

#: crates/cr-gtk/src/picture.rs:285
#: crates/cr-mac-ffi/src/lib.rs:987
#: crates/cr-mac-ffi/src/lib.rs:1024
#: crates/cr-win/src/app/portrait.rs:122
msgid "Portraits for {race}"
msgstr "Ritratti per {race}"

#: crates/cr-gtk/src/picture.rs:286
#: crates/cr-mac-ffi/src/lib.rs:988
#: crates/cr-mac-ffi/src/lib.rs:1025
#: crates/cr-win/src/app/portrait.rs:123
msgid "Other Portraits"
msgstr "Altri ritratti"
Expand Down Expand Up @@ -7950,6 +7950,10 @@ msgstr "Mostrati {shown} di {count}; cerca per restringere l’elenco"
msgid "Rank"
msgstr "Grado"

#: crates/cr-mac-ffi/src/lib.rs:523
msgid "Copies the rules databases, books and tables the app uses from a Core Rules 2.0 or Expansion CD into the app's data folder. Choose the CD's ISO image, or a folder the CD's files were copied into."
msgstr "Copia i database delle regole, i libri e le tabelle che l'app usa da un CD di Core Rules 2.0 o dell'Expansion nella cartella dei dati dell'app. Scegli l'immagine ISO del CD, oppure una cartella in cui sono stati copiati i file del CD."

#: crates/cr-mac-ffi/src/parties.rs:269
#: crates/cr-win/src/app/parties.rs:177
msgid "Empty parties are removed when you leave this page."
Expand Down
Loading
Loading