From 6d6b1bc8c8d556cb099f57201738419d7f98434e Mon Sep 17 00:00:00 2001 From: yggverse Date: Wed, 23 Jul 2025 05:44:42 +0300 Subject: [PATCH] temporary disable `libspelling`, use latest gtk api versions --- Cargo.toml | 12 ++++++------ .../window/tab/item/page/input/response/form.rs | 10 +++++----- .../window/tab/item/page/input/titan/text/form.rs | 10 +++++----- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 17161713..8890083a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,12 +12,12 @@ repository = "https://github.com/YGGverse/Yoda" [dependencies.adw] package = "libadwaita" -version = "0.7.2" +version = "0.8.0" features = ["v1_5"] [dependencies.gtk] package = "gtk4" -version = "0.9.7" +version = "0.10.0" features = ["gnome_46"] [dependencies.sqlite] @@ -26,17 +26,17 @@ version = "0.37.0" [dependencies.sourceview] package = "sourceview5" -version = "0.9.1" +version = "0.10.0" [dependencies] ansi-parser = "0.9.1" anyhow = "1.0.97" async-channel = "2.5.0" ggemini = "0.19.0" -ggemtext = "0.6.0" +ggemtext = "0.7.0" indexmap = "2.7.0" itertools = "0.14.0" -libspelling = "0.4.0" +# libspelling = "0.4.0" maxminddb = "0.26.0" openssl = "0.10.72" plurify = "0.2.0" @@ -47,5 +47,5 @@ syntect = "5.2.0" # development [patch.crates-io] ggemini = { git = "https://github.com/YGGverse/ggemini.git" } -# ggemtext = { git = "https://github.com/YGGverse/ggemtext.git" } +ggemtext = { git = "https://github.com/YGGverse/ggemtext.git" } # plurify = { git = "https://github.com/YGGverse/plurify.git" } diff --git a/src/app/browser/window/tab/item/page/input/response/form.rs b/src/app/browser/window/tab/item/page/input/response/form.rs index 378174f9..dda7576b 100644 --- a/src/app/browser/window/tab/item/page/input/response/form.rs +++ b/src/app/browser/window/tab/item/page/input/response/form.rs @@ -3,7 +3,7 @@ use gtk::{ glib::GString, prelude::{TextBufferExt, TextViewExt, WidgetExt}, }; -use libspelling::{Checker, TextBufferAdapter}; +//use libspelling::{Checker, TextBufferAdapter}; use sourceview::Buffer; const MARGIN: i32 = 8; @@ -22,16 +22,16 @@ impl Form for TextView { let buffer = Buffer::builder().build(); // Init [libspelling](https://gitlab.gnome.org/GNOME/libspelling) - let checker = Checker::default(); + /*let checker = Checker::default(); let adapter = TextBufferAdapter::new(&buffer, &checker); - adapter.set_enabled(true); + adapter.set_enabled(true);*/ // Init main widget let text_view = TextView::builder() .bottom_margin(MARGIN) .buffer(&buffer) .css_classes(["frame", "view"]) - .extra_menu(&adapter.menu_model()) + //.extra_menu(&adapter.menu_model()) .left_margin(MARGIN) .margin_bottom(MARGIN / 4) .right_margin(MARGIN) @@ -39,7 +39,7 @@ impl Form for TextView { .wrap_mode(WrapMode::Word) .build(); - text_view.insert_action_group("spelling", Some(&adapter)); + //text_view.insert_action_group("spelling", Some(&adapter)); text_view.set_size_request(-1, 38); // @TODO [#635](https://gitlab.gnome.org/GNOME/pygobject/-/issues/635) // Init events diff --git a/src/app/browser/window/tab/item/page/input/titan/text/form.rs b/src/app/browser/window/tab/item/page/input/titan/text/form.rs index 114c0c99..16c2f6af 100644 --- a/src/app/browser/window/tab/item/page/input/titan/text/form.rs +++ b/src/app/browser/window/tab/item/page/input/titan/text/form.rs @@ -1,5 +1,5 @@ use gtk::{TextView, WrapMode, prelude::WidgetExt}; -use libspelling::{Checker, TextBufferAdapter}; +//use libspelling::{Checker, TextBufferAdapter}; use sourceview::Buffer; pub trait Form { @@ -15,9 +15,9 @@ impl Form for TextView { let buffer = Buffer::builder().build(); // Init [libspelling](https://gitlab.gnome.org/GNOME/libspelling) - let checker = Checker::default(); + /*let checker = Checker::default(); let adapter = TextBufferAdapter::new(&buffer, &checker); - adapter.set_enabled(true); + adapter.set_enabled(true);*/ // Init main widget @@ -27,7 +27,7 @@ impl Form for TextView { .bottom_margin(MARGIN) .buffer(&buffer) .css_classes(["frame", "view"]) - .extra_menu(&adapter.menu_model()) + //.extra_menu(&adapter.menu_model()) .left_margin(MARGIN) .right_margin(MARGIN) .top_margin(MARGIN) @@ -35,7 +35,7 @@ impl Form for TextView { .build() }; - text_view.insert_action_group("spelling", Some(&adapter)); + //text_view.insert_action_group("spelling", Some(&adapter)); text_view.set_size_request(-1, 38); // @TODO [#635](https://gitlab.gnome.org/GNOME/pygobject/-/issues/635) // Init events