savanni
/
monorepo
1
0
Fork 0
Code Issues 68 Pull Requests 1 Projects 6 Releases Wiki Activity

Rename Kifu to On The Grid

This commit is contained in:
Savanni D'Gerinel 2024-03-21 23:48:48 -04:00
parent 49571b0f82
commit 48271389ad
60 changed files with 169 additions and 2693 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
Cargo.lock generated
View File

@ -2218,41 +2218,6 @@ dependencies = [
"wasm-bindgen", "wasm-bindgen",
] ]
[[package]]
name = "kifu-core"
version = "0.1.0"
dependencies = [
"async-std",
"chrono",
"config",
"config-derive",
"cool_asserts",
"grid",
"serde 1.0.193",
"serde_json",
"sgf",
"thiserror",
]
[[package]]
name = "kifu-gtk"
version = "0.1.0"
dependencies = [
"async-channel 2.1.1",
"async-std",
"cairo-rs",
"gio",
"glib",
"glib-build-tools 0.17.10",
"gtk4",
"image 0.24.7",
"kifu-core",
"libadwaita",
"pango",
"sgf",
"tokio",
]
[[package]] [[package]]
name = "kv-log-macro" name = "kv-log-macro"
version = "1.0.7" version = "1.0.7"
@ -2730,6 +2695,41 @@ dependencies = [
"vcpkg", "vcpkg",
] ]
[[package]]
name = "otg-core"
version = "0.1.0"
dependencies = [
"async-std",
"chrono",
"config",
"config-derive",
"cool_asserts",
"grid",
"serde 1.0.193",
"serde_json",
"sgf",
"thiserror",
]
[[package]]
name = "otg-gtk"
version = "0.1.0"
dependencies = [
"async-channel 2.1.1",
"async-std",
"cairo-rs",
"gio",
"glib",
"glib-build-tools 0.17.10",
"gtk4",
"image 0.24.7",
"libadwaita",
"otg-core",
"pango",
"sgf",
"tokio",
]
[[package]] [[package]]
name = "pango" name = "pango"
version = "0.18.3" version = "0.18.3"

4
Cargo.toml
View File

@ -18,10 +18,10 @@ members = [
"hex-grid", "hex-grid",
"icon-test", "icon-test",
"ifc", "ifc",
"kifu/core",
"kifu/gtk",
"memorycache", "memorycache",
"nom-training", "nom-training",
"otg/core",
"otg/gtk",
"result-extended", "result-extended",
"screenplay", "screenplay",
"sgf", "sgf",

6
flake.nix
View File

@ -70,7 +70,7 @@
dashboard = attrs: { nativeBuildInputs = gtkNativeInputs; }; dashboard = attrs: { nativeBuildInputs = gtkNativeInputs; };
fitnesstrax = import ./fitnesstrax/app/override.nix { gtkNativeInputs = gtkNativeInputs; }; fitnesstrax = import ./fitnesstrax/app/override.nix { gtkNativeInputs = gtkNativeInputs; };
kifu-gtk = import ./kifu/gtk/override.nix { gtkNativeInputs = gtkNativeInputs; }; otg-gtk = import ./otg/gtk/override.nix { gtkNativeInputs = gtkNativeInputs; };
}; };
}; };
@ -84,7 +84,7 @@
dashboard = cargo_nix.workspaceMembers.dashboard.build; dashboard = cargo_nix.workspaceMembers.dashboard.build;
file-service = cargo_nix.workspaceMembers.file-service.build; file-service = cargo_nix.workspaceMembers.file-service.build;
fitnesstrax = cargo_nix.workspaceMembers.fitnesstrax.build; fitnesstrax = cargo_nix.workspaceMembers.fitnesstrax.build;
kifu-gtk = cargo_nix.workspaceMembers.kifu-gtk.build; otg-gtk = cargo_nix.workspaceMembers.otg-gtk.build;
all = pkgs.symlinkJoin { all = pkgs.symlinkJoin {
name = "all"; name = "all";
@ -93,7 +93,7 @@
dashboard dashboard
file-service file-service
fitnesstrax fitnesstrax
kifu-gtk otg-gtk
]; ];
}; };

591
kifu/core/Cargo.lock generated
View File

@ -1,591 +0,0 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
[[package]]
name = "android_system_properties"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
dependencies = [
"libc",
]
[[package]]
name = "autocfg"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "bumpalo"
version = "3.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8"
[[package]]
name = "cc"
version = "1.0.79"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
[[package]]
name = "cfg-if"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "chrono"
version = "0.4.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b"
dependencies = [
"iana-time-zone",
"js-sys",
"num-integer",
"num-traits",
"serde",
"time",
"wasm-bindgen",
"winapi",
]
[[package]]
name = "codespan-reporting"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
dependencies = [
"termcolor",
"unicode-width",
]
[[package]]
name = "cool_asserts"
version = "2.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee9f254e53f61e2688d3677fa2cbe4e9b950afd56f48819c98817417cf6b28ec"
dependencies = [
"indent_write",
]
[[package]]
name = "core-foundation-sys"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
[[package]]
name = "cxx"
version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93"
dependencies = [
"cc",
"cxxbridge-flags",
"cxxbridge-macro",
"link-cplusplus",
]
[[package]]
name = "cxx-build"
version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b"
dependencies = [
"cc",
"codespan-reporting",
"once_cell",
"proc-macro2",
"quote",
"scratch",
"syn 2.0.12",
]
[[package]]
name = "cxxbridge-flags"
version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb"
[[package]]
name = "cxxbridge-macro"
version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.12",
]
[[package]]
name = "grid"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0634107a3a005070dd73e27e74ecb691a94e9e5ba7829f434db7fbf73a6b5c47"
dependencies = [
"no-std-compat",
]
[[package]]
name = "iana-time-zone"
version = "0.1.56"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c"
dependencies = [
"android_system_properties",
"core-foundation-sys",
"iana-time-zone-haiku",
"js-sys",
"wasm-bindgen",
"windows",
]
[[package]]
name = "iana-time-zone-haiku"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
dependencies = [
"cxx",
"cxx-build",
]
[[package]]
name = "indent_write"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0cfe9645a18782869361d9c8732246be7b410ad4e919d3609ebabdac00ba12c3"
[[package]]
name = "itoa"
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
[[package]]
name = "js-sys"
version = "0.3.61"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
dependencies = [
"wasm-bindgen",
]
[[package]]
name = "kifu-core"
version = "0.1.0"
dependencies = [
"chrono",
"cool_asserts",
"grid",
"serde",
"serde_json",
"sgf",
"thiserror",
"typeshare",
]
[[package]]
name = "libc"
version = "0.2.140"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
[[package]]
name = "link-cplusplus"
version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
dependencies = [
"cc",
]
[[package]]
name = "log"
version = "0.4.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
dependencies = [
"cfg-if",
]
[[package]]
name = "memchr"
version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]]
name = "minimal-lexical"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]]
name = "no-std-compat"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c"
[[package]]
name = "nom"
version = "7.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
dependencies = [
"memchr",
"minimal-lexical",
]
[[package]]
name = "num-integer"
version = "0.1.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
dependencies = [
"autocfg",
"num-traits",
]
[[package]]
name = "num-traits"
version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
dependencies = [
"autocfg",
]
[[package]]
name = "once_cell"
version = "1.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
[[package]]
name = "proc-macro2"
version = "1.0.52"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quote"
version = "1.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
dependencies = [
"proc-macro2",
]
[[package]]
name = "ryu"
version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
[[package]]
name = "scratch"
version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
[[package]]
name = "serde"
version = "1.0.162"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71b2f6e1ab5c2b98c05f0f35b236b22e8df7ead6ffbf51d7808da7f8817e7ab6"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.162"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2a0814352fd64b58489904a44ea8d90cb1a91dcb6b4f5ebabc32c8318e93cb6"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.12",
]
[[package]]
name = "serde_json"
version = "1.0.96"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
dependencies = [
"itoa",
"ryu",
"serde",
]
[[package]]
name = "sgf"
version = "0.1.0"
dependencies = [
"chrono",
"nom",
"serde",
"thiserror",
"typeshare",
]
[[package]]
name = "syn"
version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]]
name = "syn"
version = "2.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79d9531f94112cfc3e4c8f5f02cb2b58f72c97b7efd85f70203cc6d8efda5927"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]]
name = "termcolor"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
dependencies = [
"winapi-util",
]
[[package]]
name = "thiserror"
version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.12",
]
[[package]]
name = "time"
version = "0.1.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
dependencies = [
"libc",
"wasi",
"winapi",
]
[[package]]
name = "typeshare"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f44d1a2f454cb35fbe05b218c410792697e76bd868f48d3a418f2cd1a7d527d6"
dependencies = [
"chrono",
"serde",
"serde_json",
"typeshare-annotation",
]
[[package]]
name = "typeshare-annotation"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc670d0e358428857cc3b4bf504c691e572fccaec9542ff09212d3f13d74b7a9"
dependencies = [
"quote",
"syn 1.0.109",
]
[[package]]
name = "unicode-ident"
version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
[[package]]
name = "unicode-width"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
[[package]]
name = "wasi"
version = "0.10.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
[[package]]
name = "wasm-bindgen"
version = "0.2.84"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
dependencies = [
"cfg-if",
"wasm-bindgen-macro",
]
[[package]]
name = "wasm-bindgen-backend"
version = "0.2.84"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2",
"quote",
"syn 1.0.109",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-macro"
version = "0.2.84"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
]
[[package]]
name = "wasm-bindgen-macro-support"
version = "0.2.84"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.109",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
version = "0.2.84"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
[[package]]
name = "winapi"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
dependencies = [
"winapi-i686-pc-windows-gnu",
"winapi-x86_64-pc-windows-gnu",
]
[[package]]
name = "winapi-i686-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-util"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
dependencies = [
"winapi",
]
[[package]]
name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
dependencies = [
"windows-targets",
]
[[package]]
name = "windows-targets"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
dependencies = [
"windows_aarch64_gnullvm",
"windows_aarch64_msvc",
"windows_i686_gnu",
"windows_i686_msvc",
"windows_x86_64_gnu",
"windows_x86_64_gnullvm",
"windows_x86_64_msvc",
]
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
[[package]]
name = "windows_aarch64_msvc"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
[[package]]
name = "windows_i686_gnu"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
[[package]]
name = "windows_i686_msvc"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
[[package]]
name = "windows_x86_64_gnu"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
[[package]]
name = "windows_x86_64_msvc"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"

32
kifu/core/src/lib.rs
View File

@ -1,32 +0,0 @@
/*
Copyright 2024, Savanni D'Gerinel <savanni@luminescent-dreams.com>
This file is part of Kifu.
Kifu is free software: you can redistribute it and/or modify it under the terms of the GNU
General Public License as published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
Kifu is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License along with Kifu. If not, see <https://www.gnu.org/licenses/>.
*/
extern crate config_derive;
mod api;
pub use api::{Core, CoreNotification, CoreRequest, CoreResponse, Observable};
mod board;
pub use board::*;
mod database;
pub mod library;
mod types;
pub use types::{BoardError, Color, Config, ConfigOption, LibraryPath, Player, Rank, Size};
pub mod settings;

1729
kifu/gtk/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

38
kifu/gtk/src/view_models/game_review_view_model.rs
View File

@ -1,38 +0,0 @@
/*
Copyright 2024, Savanni D'Gerinel <savanni@luminescent-dreams.com>
This file is part of Kifu.
Kifu is free software: you can redistribute it and/or modify it under the terms of the GNU
General Public License as published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
Kifu is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License along with Kifu. If not, see <https://www.gnu.org/licenses/>.
*/
use crate::LocalObserver;
use kifu_core::{Core, CoreNotification};
pub struct GameReviewViewModel {
core: Core,
notification_observer: LocalObserver<CoreNotification>,
widget: gtk::Box,
}
impl GameReviewViewModel {
fn new(core: Core) -> Self {
let notification_observer = LocalObserver::new(&core, |msg| {
println!("GameReviewViewModel called with message: {:?}", msg)
});
Self {
core,
notification_observer,
widget: gtk::Box::new(gtk::Orientation::Horizontal, 0),
}
}
}

70
kifu/gtk/src/view_models/game_view_model.rs
View File

@ -1,70 +0,0 @@
/*
Copyright 2024, Savanni D'Gerinel <savanni@luminescent-dreams.com>
This file is part of Kifu.
Kifu is free software: you can redistribute it and/or modify it under the terms of the GNU
General Public License as published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
Kifu is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License along with Kifu. If not, see <https://www.gnu.org/licenses/>.
*/
use async_std::{channel::Receiver, task::yield_now};
use kifu_core::{Color, Core, CoreNotification, Goban, Observable, Player};
use std::{cell::RefCell, rc::Rc, time::Duration};
use crate::LocalObserver;
pub struct GameState {
goban: Goban,
white_clock: Duration,
black_clock: Duration,
white_score: f32,
black_score: f32,
current: Color,
}
struct GameViewModelPrivate {
white: Player, /* Maybe this should be PlayerState, instead, combining the player info, current clock, and current captures. */
black: Player,
state: GameState,
}
/// The Game View Model manages the current state of the game. It shows the two player cards, the board, the current capture count, the current player, and it maintains the UI for the clock (bearing in mind that the real clock is managed in the core). This view model should only be created once the details of the game, whether a game in progress or a new game (this view model won't know the difference) is known.
pub struct GameViewModel {
core: Core,
notification_observer: LocalObserver<CoreNotification>,
widget: gtk::Box,
data: Rc<RefCell<GameViewModelPrivate>>,
}
impl GameViewModelPrivate {
fn handle(&mut self, _message: CoreNotification) {}
}
impl GameViewModel {
pub fn new(white: Player, black: Player, game: GameState, core: Core) -> Self {
let data = Rc::new(RefCell::new(GameViewModelPrivate {
white,
black,
state: game,
}));
let notification_observer = LocalObserver::new(&core, |msg| {
println!("GameViewModelHandler called with message: {:?}", msg)
});
Self {
core,
notification_observer,
widget: gtk::Box::new(gtk::Orientation::Horizontal, 0),
data,
}
}
}

62
kifu/gtk/src/view_models/home_view_model.rs
View File

@ -1,62 +0,0 @@
/*
Copyright 2024, Savanni D'Gerinel <savanni@luminescent-dreams.com>
This file is part of Kifu.
Kifu is free software: you can redistribute it and/or modify it under the terms of the GNU
General Public License as published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
Kifu is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License along with Kifu. If not, see <https://www.gnu.org/licenses/>.
*/
use crate::LocalObserver;
use kifu_core::{Core, CoreNotification};
use crate::CoreApi;
use std::sync::Arc;
/// Home controls the view that the user sees when starting the application if there are no games in progress. It provides a window into the database, showing a list of recently recorded games. It also provides the UI for starting a new game. This will render an empty database view if the user hasn't configured a database yet.
#[derive(Clone)]
pub struct HomeViewModel {
/*
core: CoreApi,
notification_observer: Arc<LocalObserver<CoreNotification>>,
widget: gtk::Box,
*/
}
impl HomeViewModel {
pub fn new(core: CoreApi) -> Self {
/*
let notification_observer = LocalObserver::new(&core, |msg| {
println!("HomeViewModel handler called with message: {:?}", msg)
});
Self {
core,
notification_observer: Arc::new(notification_observer),
widget: gtk::Box::new(gtk::Orientation::Horizontal, 0),
}
*/
Self {}
}
/// Create a new game with the given parameters.
fn new_game(&self) {
unimplemented!()
}
/// Select a game from the database to show in detail. This will require a transition away from this view model into a different one.
fn select_game(&self) {
unimplemented!()
}
/// Delete a game from the database.
fn delete_game(&self) {
unimplemented!()
}
}

30
kifu/gtk/src/view_models/mod.rs
View File

@ -1,30 +0,0 @@
/*
Copyright 2024, Savanni D'Gerinel <savanni@luminescent-dreams.com>
This file is part of Kifu.
Kifu is free software: you can redistribute it and/or modify it under the terms of the GNU
General Public License as published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
Kifu is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License along with Kifu. If not, see <https://www.gnu.org/licenses/>.
*/
/*
Every view model requires a reference to the app so that it can call functions on the core, and a notification receiver so that it can receive messages from the core.
The view model is primary over the view. It will construct the view, it can make major changes to the view or even swap for another related view. It must listen for all messages from the core, discarding those that aren't relevant to it. It will also convert requests from sync to async.
*/
mod game_view_model;
pub use game_view_model::GameViewModel;
mod game_review_view_model;
pub use game_review_view_model::GameReviewViewModel;
mod home_view_model;
pub use home_view_model::HomeViewModel;

2
kifu/core/Cargo.toml → otg/core/Cargo.toml
View File

@ -1,5 +1,5 @@
[package] [package]
name = "kifu-core" name = "otg-core"
version = "0.1.0" version = "0.1.0"
edition = "2021" edition = "2021"

0
kifu/core/Makefile → otg/core/Makefile
View File

0
kifu/core/fixtures/empty_database/no-games → otg/core/fixtures/empty_database/no-games
View File

0
kifu/core/fixtures/five_games/2019 Masters R7 B1 -- Zhongfan Jian vs. Mark Lee.sgf → otg/core/fixtures/five_games/2019 Masters R7 B1 -- Zhongfan Jian vs. Mark Lee.sgf
View File

0
kifu/core/fixtures/five_games/2019 Masters R7 B2 -- Eric Lui vs. Nyu Eiko.sgf → otg/core/fixtures/five_games/2019 Masters R7 B2 -- Eric Lui vs. Nyu Eiko.sgf
View File

0
kifu/core/fixtures/five_games/2019 Masters R7 B3 -- Alan Huang vs. Yongfei Ge.sgf → otg/core/fixtures/five_games/2019 Masters R7 B3 -- Alan Huang vs. Yongfei Ge.sgf
View File

0
kifu/core/fixtures/five_games/2022.10.05.sgf → otg/core/fixtures/five_games/2022.10.05.sgf
View File

0
kifu/core/fixtures/five_games/Steve vs savanni 2023.04.20.sgf → otg/core/fixtures/five_games/Steve vs savanni 2023.04.20.sgf
View File

17
kifu/core/src/api.rs → otg/core/src/api.rs
View File

@ -1,17 +1,17 @@
/* /*
Copyright 2024, Savanni D'Gerinel <savanni@luminescent-dreams.com> Copyright 2024, Savanni D'Gerinel <savanni@luminescent-dreams.com>
This file is part of Kifu. This file is part of On the Grid.
Kifu is free software: you can redistribute it and/or modify it under the terms of the GNU On the Grid is free software: you can redistribute it and/or modify it under the terms of the GNU
General Public License as published by the Free Software Foundation, either version 3 of the General Public License as published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version. License, or (at your option) any later version.
Kifu is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without On the Grid is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details. General Public License for more details.
You should have received a copy of the GNU General Public License along with Kifu. If not, see <https://www.gnu.org/licenses/>. You should have received a copy of the GNU General Public License along with On the Grid. If not, see <https://www.gnu.org/licenses/>.
*/ */
use crate::{ use crate::{
@ -125,10 +125,11 @@ impl Core {
pub fn new(config: Config) -> Self { pub fn new(config: Config) -> Self {
println!("config: {:?}", config); println!("config: {:?}", config);
let library = if let Some(ref path) = config.get::<LibraryPath>() { let library = match config.get::<LibraryPath>() {
Some(Database::open_path(path.to_path_buf()).unwrap()) Some(ref path) if path.to_path_buf().exists() => {
} else { Some(Database::open_path(path.to_path_buf()).unwrap())
None }
_ => None,
}; };
Self { Self {

0
kifu/core/src/board.rs → otg/core/src/board.rs
View File

0
kifu/core/src/database.rs → otg/core/src/database.rs
View File

32
otg/core/src/lib.rs Normal file
View File

@ -0,0 +1,32 @@
/*
Copyright 2024, Savanni D'Gerinel <savanni@luminescent-dreams.com>
This file is part of On the Grid.
On the Grid is free software: you can redistribute it and/or modify it under the terms of
the GNU General Public License as published by the Free Software Foundation, either version 3 of
the License, or (at your option) any later version.
On the Grid is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along with On the Grid. If not, see <https://www.gnu.org/licenses/>.
*/
extern crate config_derive;
mod api;
pub use api::{Core, CoreNotification, CoreRequest, CoreResponse, Observable};
mod board;
pub use board::*;
mod database;
pub mod library;
mod types;
pub use types::{BoardError, Color, Config, ConfigOption, LibraryPath, Player, Rank, Size};
pub mod settings;

8
kifu/core/src/library.rs → otg/core/src/library.rs
View File

@ -1,17 +1,17 @@
/* /*
Copyright 2024, Savanni D'Gerinel <savanni@luminescent-dreams.com> Copyright 2024, Savanni D'Gerinel <savanni@luminescent-dreams.com>
This file is part of Kifu. This file is part of On the Grid.
Kifu is free software: you can redistribute it and/or modify it under the terms of the GNU On the Grid is free software: you can redistribute it and/or modify it under the terms of the GNU
General Public License as published by the Free Software Foundation, either version 3 of the General Public License as published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version. License, or (at your option) any later version.
Kifu is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without On the Grid is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details. General Public License for more details.
You should have received a copy of the GNU General Public License along with Kifu. If not, see <https://www.gnu.org/licenses/>. You should have received a copy of the GNU General Public License along with On the Grid. If not, see <https://www.gnu.org/licenses/>.
*/ */
use crate::{Core, Config}; use crate::{Core, Config};

16
kifu/core/src/settings.rs → otg/core/src/settings.rs
View File

@ -1,17 +1,17 @@
/* /*
Copyright 2024, Savanni D'Gerinel <savanni@luminescent-dreams.com> Copyright 2024, Savanni D'Gerinel <savanni@luminescent-dreams.com>
This file is part of Kifu. This file is part of On the Grid.
Kifu is free software: you can redistribute it and/or modify it under the terms of the GNU On the Grid is free software: you can redistribute it and/or modify it under the terms of
General Public License as published by the Free Software Foundation, either version 3 of the the GNU General Public License as published by the Free Software Foundation, either version 3 of
License, or (at your option) any later version. the License, or (at your option) any later version.
Kifu is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without On the Grid is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License along with Kifu. If not, see <https://www.gnu.org/licenses/>. You should have received a copy of the GNU General Public License along with On the Grid. If not, see <https://www.gnu.org/licenses/>.
*/ */
use crate::{types::LibraryPath, Core, Config}; use crate::{types::LibraryPath, Core, Config};

0
kifu/core/src/types.rs → otg/core/src/types.rs
View File

0
kifu/core/src/ui/elements/game_preview.rs → otg/core/src/ui/elements/game_preview.rs
View File

0
kifu/core/src/ui/elements/menu.rs → otg/core/src/ui/elements/menu.rs
View File

0
kifu/core/src/ui/elements/mod.rs → otg/core/src/ui/elements/mod.rs
View File

0
kifu/core/src/ui/home.rs → otg/core/src/ui/home.rs
View File

0
kifu/core/src/ui/mod.rs → otg/core/src/ui/mod.rs
View File

0
kifu/core/src/ui/playing_field.rs → otg/core/src/ui/playing_field.rs
View File

0
kifu/core/src/ui/types.rs → otg/core/src/ui/types.rs
View File

0
kifu/core/typeshare/core.d.ts → otg/core/typeshare/core.d.ts vendored
View File

13
kifu/gtk/Cargo.toml → otg/gtk/Cargo.toml
View File

@ -1,5 +1,5 @@
[package] [package]
name = "kifu-gtk" name = "otg-gtk"
version = "0.1.0" version = "0.1.0"
edition = "2021" edition = "2021"
@ -17,7 +17,7 @@ gio = { version = "0.18" }
glib = { version = "0.18" } glib = { version = "0.18" }
gtk = { version = "0.7", package = "gtk4", features = [ "v4_10" ] } gtk = { version = "0.7", package = "gtk4", features = [ "v4_10" ] }
image = { version = "0.24" } image = { version = "0.24" }
kifu-core = { path = "../core" } otg-core = { path = "../core" }
pango = { version = "*" } pango = { version = "*" }
sgf = { path = "../../sgf" } sgf = { path = "../../sgf" }
tokio = { version = "1.26", features = [ "full" ] } tokio = { version = "1.26", features = [ "full" ] }
@ -25,12 +25,3 @@ tokio = { version = "1.26", features = [ "full" ] }
[build-dependencies] [build-dependencies]
glib-build-tools = "0.17" glib-build-tools = "0.17"
# [[bin]]
# name = "kifu-gtk"
# path = "src/main.rs"
# [[bin]]
# name = "screenplay"
# path = "src/bin/screenplay.rs"
# required-features = [ "screenplay" ]

2
kifu/gtk/Makefile → otg/gtk/Makefile
View File

@ -3,7 +3,7 @@ release:
dev: dev:
export CONFIG=. export CONFIG=.
cargo watch -x 'run --bin kifu-gtk' cargo watch -x 'run --bin otg-gtk'
screenplay: screenplay:
cargo watch -x 'run --bin screenplay --features="screenplay"' cargo watch -x 'run --bin screenplay --features="screenplay"'

2
kifu/gtk/build.rs → otg/gtk/build.rs
View File

@ -2,6 +2,6 @@ fn main() {
glib_build_tools::compile_resources( glib_build_tools::compile_resources(
&["resources"], &["resources"],
"gresources.xml", "gresources.xml",
"com.luminescent-dreams.kifu-gtk.gresource", "com.luminescent-dreams.otg-gtk.gresource",
); );
} }

0
kifu/gtk/config → otg/gtk/config
View File

2
kifu/gtk/gresources.xml → otg/gtk/gresources.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<gresources> <gresources>
<gresource prefix="/com/luminescent-dreams/kifu-gtk/"> <gresource prefix="/com/luminescent-dreams/otg-gtk/">
<file>wood_texture.jpg</file> <file>wood_texture.jpg</file>
<file>style.css</file> <file>style.css</file>
</gresource> </gresource>

6
kifu/gtk/override.nix → otg/gtk/override.nix
View File

@ -5,8 +5,8 @@ let
in { in {
nativeBuildInputs = gtkNativeInputs; nativeBuildInputs = gtkNativeInputs;
postInstall = '' postInstall = ''
install -Dt $out/share/applications resources/kifu.desktop install -Dt $out/share/applications resources/otg.desktop
install -Dt $out/gsettings-schemas/${gsettingsDir}/glib-2.0/schemas resources/com.luminescent-dreams.kifu.gschema.xml install -Dt $out/gsettings-schemas/${gsettingsDir}/glib-2.0/schemas resources/com.luminescent-dreams.otg.gschema.xml
glib-compile-schemas $out/gsettings-schemas/${gsettingsDir}/glib-2.0/schemas glib-compile-schemas $out/gsettings-schemas/${gsettingsDir}/glib-2.0/schemas
''; '';
# preFixup = '' # preFixup = ''
@ -14,4 +14,4 @@ in {
# --prefix XDG_DATA_DIRS : $out/gsettings-schemas/${gsettingsDir} # --prefix XDG_DATA_DIRS : $out/gsettings-schemas/${gsettingsDir}
# ) # )
# ''; # '';
} }

2
kifu/gtk/resources/com.luminescent-dreams.kifu.dev.gschema.xml → otg/gtk/resources/com.luminescent-dreams.otg.dev.gschema.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<schemalist> <schemalist>
<schema id="com.luminescent-dreams.kifu-gtk.dev" path="/com/luminescent-dreams/kifu-gtk/dev/"> <schema id="com.luminescent-dreams.otg.dev" path="/com/luminescent-dreams/otg-gtk/dev/">
<key name="library-path" type="s"> <key name="library-path" type="s">
<default>""</default> <default>""</default>
<summary>Path to the directory of games</summary> <summary>Path to the directory of games</summary>

2
kifu/gtk/resources/com.luminescent-dreams.kifu.gschema.xml → otg/gtk/resources/com.luminescent-dreams.otg.gschema.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<schemalist> <schemalist>
<schema id="com.luminescent-dreams.kifu-gtk" path="/com/luminescent-dreams/kifu-gtk/"> <schema id="com.luminescent-dreams.otg-gtk" path="/com/luminescent-dreams/otg-gtk/">
<key name="library-path" type="s"> <key name="library-path" type="s">
<default>""</default> <default>""</default>
<summary>Path to the directory of games</summary> <summary>Path to the directory of games</summary>

4
kifu/gtk/resources/kifu.desktop → otg/gtk/resources/otg.desktop
View File

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Version=0.2 Version=0.2
Type=Application Type=Application
Name=Kifu Name=On the Grid
Exec=kifu Exec=otg-gtk

0
kifu/gtk/resources/style.css → otg/gtk/resources/style.css
View File

0
kifu/gtk/resources/wood_texture.jpg → otg/gtk/resources/wood_texture.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 350 KiB

After

Width:  |  Height:  |  Size: 350 KiB

25
kifu/gtk/src/app_window.rs → otg/gtk/src/app_window.rs
View File

@ -1,28 +1,29 @@
/* /*
Copyright 2024, Savanni D'Gerinel <savanni@luminescent-dreams.com> Copyright 2024, Savanni D'Gerinel <savanni@luminescent-dreams.com>
This file is part of Kifu. This file is part of On the Grid.
Kifu is free software: you can redistribute it and/or modify it under the terms of the GNU On the Grid is free software: you can redistribute it and/or modify it under the terms of
General Public License as published by the Free Software Foundation, either version 3 of the the GNU General Public License as published by the Free Software Foundation, either version 3 of
License, or (at your option) any later version. the License, or (at your option) any later version.
Kifu is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without On the Grid is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License along with Kifu. If not, see <https://www.gnu.org/licenses/>. You should have received a copy of the GNU General Public License along with On the Grid. If not, see <https://www.gnu.org/licenses/>.
*/ */
use crate::CoreApi; use crate::CoreApi;
use adw::prelude::*; use adw::prelude::*;
use async_std::task::{block_on, spawn}; use async_std::task::{block_on, spawn};
use kifu_core::settings::SettingsResponse; use otg_core::{
use kifu_core::CoreResponse; settings::{SettingsRequest, SettingsResponse},
use kifu_core::{settings::SettingsRequest, Config, CoreRequest}; Config, CoreRequest, CoreResponse,
};
use std::sync::{Arc, RwLock}; use std::sync::{Arc, RwLock};
use crate::views::{SettingsView, HomeView}; use crate::views::{HomeView, SettingsView};
#[derive(Clone)] #[derive(Clone)]
enum AppView { enum AppView {

4
kifu/gtk/src/components/board.rs → otg/gtk/src/components/board.rs
View File

@ -7,7 +7,7 @@ use gtk::{
subclass::prelude::*, subclass::prelude::*,
}; };
use image::io::Reader as ImageReader; use image::io::Reader as ImageReader;
use kifu_core::{ use otg_core::{
ui::{BoardElement, IntersectionElement}, ui::{BoardElement, IntersectionElement},
Color, Color,
}; };
@ -60,7 +60,7 @@ impl ObjectImpl for BoardPrivate {
let current_player = self.current_player.clone(); let current_player = self.current_player.clone();
let wood_texture = resources_lookup_data( let wood_texture = resources_lookup_data(
"/com/luminescent-dreams/kifu-gtk/wood_texture.jpg", "/com/luminescent-dreams/otg-gtk/wood_texture.jpg",
gio::ResourceLookupFlags::NONE, gio::ResourceLookupFlags::NONE,
) )
.unwrap(); .unwrap();

2
kifu/gtk/src/components/chat.rs → otg/gtk/src/components/chat.rs
View File

@ -1,6 +1,6 @@
use glib::Object; use glib::Object;
use gtk::{prelude::*, subclass::prelude::*}; use gtk::{prelude::*, subclass::prelude::*};
use kifu_core::ui::ChatElement; use otg_core::ui::ChatElement;
#[derive(Default)] #[derive(Default)]
pub struct ChatPrivate { pub struct ChatPrivate {

2
kifu/gtk/src/components/config.rs → otg/gtk/src/components/config.rs
View File

@ -1,7 +1,7 @@
use crate::CoreApi; use crate::CoreApi;
use adw::{prelude::*, subclass::prelude::*}; use adw::{prelude::*, subclass::prelude::*};
use glib::Object; use glib::Object;
use kifu_core::{ui::ConfigurationView, ChangeSettingRequest, CoreRequest}; use otg_core::{ui::ConfigurationView, ChangeSettingRequest, CoreRequest};
#[derive(Default)] #[derive(Default)]
pub struct ConfigurationPagePrivate {} pub struct ConfigurationPagePrivate {}

2
kifu/gtk/src/components/game_preview.rs → otg/gtk/src/components/game_preview.rs
View File

@ -1,6 +1,6 @@
use glib::Object; use glib::Object;
use gtk::{glib, prelude::*, subclass::prelude::*}; use gtk::{glib, prelude::*, subclass::prelude::*};
use kifu_core::ui::GamePreviewElement; use otg_core::ui::GamePreviewElement;
#[derive(Default)] #[derive(Default)]
pub struct GamePreviewPrivate { pub struct GamePreviewPrivate {

2
kifu/gtk/src/components/home.rs → otg/gtk/src/components/home.rs
View File

@ -1,7 +1,7 @@
use crate::{ui::Library, CoreApi}; use crate::{ui::Library, CoreApi};
use glib::Object; use glib::Object;
use gtk::{glib, prelude::*, subclass::prelude::*}; use gtk::{glib, prelude::*, subclass::prelude::*};
use kifu_core::{ use otg_core::{
ui::{HomeView, PlayerElement}, ui::{HomeView, PlayerElement},
CoreRequest, CreateGameRequest, HotseatPlayerRequest, PlayerInfoRequest, CoreRequest, CreateGameRequest, HotseatPlayerRequest, PlayerInfoRequest,
}; };

2
kifu/gtk/src/components/library.rs → otg/gtk/src/components/library.rs
View File

@ -1,7 +1,7 @@
use adw::{prelude::*, subclass::prelude::*}; use adw::{prelude::*, subclass::prelude::*};
use glib::Object; use glib::Object;
use gtk::glib; use gtk::glib;
// use kifu_core::ui::GamePreviewElement; // use otg_core::ui::GamePreviewElement;
use sgf::Game; use sgf::Game;
use std::{cell::RefCell, rc::Rc}; use std::{cell::RefCell, rc::Rc};

0
kifu/gtk/src/components/mod.rs → otg/gtk/src/components/mod.rs
View File

2
kifu/gtk/src/components/player_card.rs → otg/gtk/src/components/player_card.rs
View File

@ -1,6 +1,6 @@
use glib::Object; use glib::Object;
use gtk::{prelude::*, subclass::prelude::*}; use gtk::{prelude::*, subclass::prelude::*};
use kifu_core::ui::PlayerCardElement; use otg_core::ui::PlayerCardElement;
#[derive(Default)] #[derive(Default)]
pub struct PlayerCardPrivate { pub struct PlayerCardPrivate {

2
kifu/gtk/src/components/playing_field.rs → otg/gtk/src/components/playing_field.rs
View File

@ -5,7 +5,7 @@ use crate::{
}; };
use glib::Object; use glib::Object;
use gtk::{prelude::*, subclass::prelude::*}; use gtk::{prelude::*, subclass::prelude::*};
use kifu_core::ui::PlayingFieldView; use otg_core::ui::PlayingFieldView;
use std::{cell::RefCell, rc::Rc}; use std::{cell::RefCell, rc::Rc};
pub struct PlayingFieldPrivate { pub struct PlayingFieldPrivate {

11
kifu/gtk/src/lib.rs → otg/gtk/src/lib.rs
View File

@ -1,17 +1,17 @@
/* /*
Copyright 2024, Savanni D'Gerinel <savanni@luminescent-dreams.com> Copyright 2024, Savanni D'Gerinel <savanni@luminescent-dreams.com>
This file is part of Kifu. This file is part of On the Grid.
Kifu is free software: you can redistribute it and/or modify it under the terms of the GNU On the Grid is free software: you can redistribute it and/or modify it under the terms of the GNU
General Public License as published by the Free Software Foundation, either version 3 of the General Public License as published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version. License, or (at your option) any later version.
Kifu is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without On the Grid is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details. General Public License for more details.
You should have received a copy of the GNU General Public License along with Kifu. If not, see <https://www.gnu.org/licenses/>. You should have received a copy of the GNU General Public License along with On the Grid. If not, see <https://www.gnu.org/licenses/>.
*/ */
pub mod components; pub mod components;
@ -19,11 +19,10 @@ pub mod components;
mod app_window; mod app_window;
pub use app_window::AppWindow; pub use app_window::AppWindow;
mod view_models;
mod views; mod views;
use async_std::task::{spawn, yield_now}; use async_std::task::{spawn, yield_now};
use kifu_core::{Core, Observable, CoreRequest, CoreResponse}; use otg_core::{Core, Observable, CoreRequest, CoreResponse};
use std::{rc::Rc, sync::Arc}; use std::{rc::Rc, sync::Arc};
use tokio::runtime::Runtime; use tokio::runtime::Runtime;

16
kifu/gtk/src/main.rs → otg/gtk/src/main.rs
View File

@ -2,8 +2,8 @@ use adw::prelude::*;
use async_std::channel::Receiver; use async_std::channel::Receiver;
use async_std::task::spawn; use async_std::task::spawn;
use gio::ActionEntry; use gio::ActionEntry;
use kifu_core::{Config, ConfigOption, Core, CoreNotification, LibraryPath, Observable}; use otg_core::{Config, ConfigOption, Core, CoreNotification, LibraryPath, Observable};
use kifu_gtk::{ use otg_gtk::{
perftrace, perftrace,
// ui::{ConfigurationPage, Home, PlayingField}, // ui::{ConfigurationPage, Home, PlayingField},
AppWindow, AppWindow,
@ -11,10 +11,10 @@ use kifu_gtk::{
}; };
use std::sync::{Arc, RwLock}; use std::sync::{Arc, RwLock};
const APP_ID_DEV: &str = "com.luminescent-dreams.kifu-gtk.dev"; const APP_ID_DEV: &str = "com.luminescent-dreams.otg.dev";
const APP_ID_PROD: &str = "com.luminescent-dreams.kifu-gtk"; const APP_ID_PROD: &str = "com.luminescent-dreams.otg";
const RESOURCE_BASE_PATH: &str = "/com/luminescent-dreams/kifu-gtk/"; const RESOURCE_BASE_PATH: &str = "/com/luminescent-dreams/otg/";
async fn handler(notifications: Receiver<CoreNotification>, app_id: String) { async fn handler(notifications: Receiver<CoreNotification>, app_id: String) {
loop { loop {
@ -99,7 +99,7 @@ fn setup_app_configuration_action(app: &adw::Application, app_window: AppWindow)
} }
fn main() { fn main() {
gio::resources_register_include!("com.luminescent-dreams.kifu-gtk.gresource") gio::resources_register_include!("com.luminescent-dreams.otg-gtk.gresource")
.expect("Failed to register resources"); .expect("Failed to register resources");
let app_id = if std::env::var_os("ENV") == Some("dev".into()) { let app_id = if std::env::var_os("ENV") == Some("dev".into()) {
@ -119,8 +119,8 @@ fn main() {
}); });
let app = adw::Application::builder() let app = adw::Application::builder()
.application_id("com.luminescent-dreams.kifu-gtk") .application_id("com.luminescent-dreams.otg-gtk")
.resource_base_path("/com/luminescent-dreams/kifu-gtk") .resource_base_path("/com/luminescent-dreams/otg-gtk")
.build(); .build();
app.connect_activate({ app.connect_activate({

18
kifu/gtk/src/views/home.rs → otg/gtk/src/views/home.rs
View File

@ -1,23 +1,23 @@
/* /*
Copyright 2024, Savanni D'Gerinel <savanni@luminescent-dreams.com> Copyright 2024, Savanni D'Gerinel <savanni@luminescent-dreams.com>
This file is part of Kifu. This file is part of On the Grid.
Kifu is free software: you can redistribute it and/or modify it under the terms of the GNU On the Grid is free software: you can redistribute it and/or modify it under the terms of
General Public License as published by the Free Software Foundation, either version 3 of the the GNU General Public License as published by the Free Software Foundation, either version 3 of
License, or (at your option) any later version. the License, or (at your option) any later version.
Kifu is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without On the Grid is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License along with Kifu. If not, see <https://www.gnu.org/licenses/>. You should have received a copy of the GNU General Public License along with On the Grid. If not, see <https://www.gnu.org/licenses/>.
*/ */
use crate::{components::Library, CoreApi}; use crate::{components::Library, CoreApi};
use glib::Object; use glib::Object;
use gtk::{glib, prelude::*, subclass::prelude::*}; use gtk::{glib, prelude::*, subclass::prelude::*};
use kifu_core::{ use otg_core::{
library::{LibraryRequest, LibraryResponse}, library::{LibraryRequest, LibraryResponse},
CoreRequest, CoreResponse, CoreRequest, CoreResponse,
}; };

0
kifu/gtk/src/views/mod.rs → otg/gtk/src/views/mod.rs
View File

26
kifu/gtk/src/views/settings.rs → otg/gtk/src/views/settings.rs
View File

@ -1,25 +1,25 @@
/* /*
Copyright 2024, Savanni D'Gerinel <savanni@luminescent-dreams.com> Copyright 2024, Savanni D'Gerinel <savanni@luminescent-dreams.com>
This file is part of Kifu. This file is part of On the Grid.
Kifu is free software: you can redistribute it and/or modify it under the terms of the GNU On the Grid is free software: you can redistribute it and/or modify it under the terms of
General Public License as published by the Free Software Foundation, either version 3 of the the GNU General Public License as published by the Free Software Foundation, either version 3 of
License, or (at your option) any later version. the License, or (at your option) any later version.
Kifu is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without On the Grid is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License along with Kifu. If not, see <https://www.gnu.org/licenses/>. You should have received a copy of the GNU General Public License along with On the Grid. If not, see <https://www.gnu.org/licenses/>.
*/ */
use std::{cell::RefCell, path::Path, rc::Rc, borrow::Cow}; use std::{borrow::Cow, cell::RefCell, path::Path, rc::Rc};
use adw::prelude::*; use adw::prelude::*;
use glib::Object; use glib::Object;
use gtk::{prelude::*, subclass::prelude::*}; use gtk::{prelude::*, subclass::prelude::*};
use kifu_core::{Config, ConfigOption, LibraryPath}; use otg_core::{Config, ConfigOption, LibraryPath};
fn library_chooser_row( fn library_chooser_row(
parent: &impl IsA<gtk::Window>, parent: &impl IsA<gtk::Window>,
@ -37,7 +37,11 @@ fn library_chooser_row(
let library_row = adw::ActionRow::builder() let library_row = adw::ActionRow::builder()
.title("Library Path") .title("Library Path")
.subtitle(library_path.map(|LibraryPath(path)| path.to_string_lossy().into_owned()).unwrap_or("No library set".to_owned())) .subtitle(
library_path
.map(|LibraryPath(path)| path.to_string_lossy().into_owned())
.unwrap_or("No library set".to_owned()),
)
.css_classes(["preference-item"]) .css_classes(["preference-item"])
.build(); .build();

8
kifu/kifu-gtk-screenplay/screenplay.rs → otg/kifu-gtk-screenplay/screenplay.rs
View File

@ -1,17 +1,17 @@
use gtk::{prelude::*, subclass::prelude::*}; use gtk::{prelude::*, subclass::prelude::*};
use kifu_core::{ use otg_core::{
ui::{ChatElement, PlayerCardElement, PlayingFieldView}, ui::{ChatElement, PlayerCardElement, PlayingFieldView},
Color, Color,
}; };
use kifu_gtk::ui::{playing_field_view, Chat, PlayerCard, PlayingField}; use otg_gtk::ui::{playing_field_view, Chat, PlayerCard, PlayingField};
use screenplay::{Screen, Screenplay}; use screenplay::{Screen, Screenplay};
fn main() { fn main() {
gio::resources_register_include!("com.luminescent-dreams.kifu-gtk.gresource") gio::resources_register_include!("com.luminescent-dreams.otg-gtk.gresource")
.expect("Failed to register resources"); .expect("Failed to register resources");
let app = gtk::Application::builder() let app = gtk::Application::builder()
.application_id("com.luminescent-dreams.kifu-gtk.screenplay") .application_id("com.luminescent-dreams.otg-gtk.screenplay")
.build(); .build();
app.connect_activate(|app| { app.connect_activate(|app| {