diff options
| -rw-r--r-- | Cargo.lock | 66 | ||||
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | default.nix | 3 | ||||
| -rw-r--r-- | src/components/post_editor.rs | 40 | ||||
| -rw-r--r-- | src/main.rs | 3 |
5 files changed, 98 insertions, 16 deletions
diff --git a/Cargo.lock b/Cargo.lock index 58cb500..4074e7a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -123,6 +123,7 @@ dependencies = [ "kittybox-util", "libadwaita", "libsecret", + "libspelling", "log", "microformats", "relm4", @@ -132,6 +133,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "soup3", + "sourceview5", "thiserror", "tokio", "tracing", @@ -1050,6 +1052,35 @@ dependencies = [ ] [[package]] +name = "libspelling" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cbd36b794de5725e0b2be4cc90c57c5e3c7a5a3e5c317436e9e667305274c34" +dependencies = [ + "gio", + "glib", + "gtk4", + "libc", + "libspelling-sys", + "sourceview5", +] + +[[package]] +name = "libspelling-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d2ec120461981daf9d0c5a8b0bc55ebf350292280e93fd6d063895593754484" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk4-sys", + "libc", + "sourceview5-sys", + "system-deps", +] + +[[package]] name = "litemap" version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1714,6 +1745,41 @@ dependencies = [ ] [[package]] +name = "sourceview5" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0e07d99b15f12767aa1c84870c45667f42bf24fd6a989dc70088e32854ef56e" +dependencies = [ + "futures-channel", + "futures-core", + "gdk-pixbuf", + "gdk4", + "gio", + "glib", + "gtk4", + "libc", + "pango", + "sourceview5-sys", +] + +[[package]] +name = "sourceview5-sys" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a3759467713554a8063faa380237ee2c753e89026bbe1b8e9611d991cb106ff" +dependencies = [ + "gdk-pixbuf-sys", + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk4-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/Cargo.toml b/Cargo.toml index 7b76f8c..2b6d3eb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,6 +19,7 @@ gettext-rs = { version = "=0.7.0", features = ["gettext-system"] } gio = { version = "0.20.1", features = ["v2_80"] } glib = { version = "0.20.1", features = ["log"] } gtk = { version = "0.9.0", package = "gtk4", features = ["gnome_46", "v4_14"] } +sourceview5 = { version = "0.9.1" } kittybox-indieauth = { git = "https://git.vikanezrimaya.xyz/kittybox", version = "0.2.0" } kittybox-util = { git = "https://git.vikanezrimaya.xyz/kittybox", version = "0.3.0" } libsecret = { version = "0.7.0", features = ["v0_21_2"] } @@ -30,6 +31,7 @@ serde = { version = "1.0.208", features = ["derive"] } serde_json = "1.0.125" serde_urlencoded = "0.7.1" soup3 = "0.7.0" +spelling = { version = "0.3.0", package = "libspelling" } thiserror = "1.0.63" tokio = { version = "1.39.3", features = ["full", "tracing"] } tracing = { version = "0.1.40", features = ["log"] } diff --git a/default.nix b/default.nix index de622f9..ebd0f28 100644 --- a/default.nix +++ b/default.nix @@ -2,6 +2,7 @@ , pkg-config, wrapGAppsHook4, meson, ninja, gettext , desktop-file-utils , gtk4, libadwaita, libpanel, libsoup_3, libsecret +, libspelling, gtksourceview5 , librsvg, glib-networking , withLLMEnhancements ? true @@ -26,7 +27,7 @@ let strictDeps = true; buildInputs = [ - gtk4 libadwaita libsoup_3 libsecret + gtk4 libadwaita libsoup_3 libsecret libspelling gtksourceview5 librsvg glib-networking gettext ]; diff --git a/src/components/post_editor.rs b/src/components/post_editor.rs index 25069be..c26b095 100644 --- a/src/components/post_editor.rs +++ b/src/components/post_editor.rs @@ -79,7 +79,7 @@ pub(crate) struct PostEditor<E> { #[do_not_track] name_buffer: gtk::EntryBuffer, #[do_not_track] summary_buffer: gtk::EntryBuffer, - #[do_not_track] content_buffer: gtk::TextBuffer, + #[do_not_track] content_buffer: spelling::TextBufferAdapter, #[do_not_track] pending_tag_buffer: gtk::EntryBuffer, #[do_not_track] tags: relm4::factory::FactoryVecDeque<TagPill>, @@ -228,7 +228,10 @@ impl<E: std::error::Error + std::fmt::Debug + Send + 'static> Component for Post set_height_request: 200, #[name = "content_textarea"] gtk::TextView { - set_buffer: Some(&model.content_buffer), + set_buffer: model.content_buffer.buffer().as_ref(), + set_extra_menu: Some(&model.content_buffer.menu_model()), + insert_action_group: ("spelling", Some(&model.content_buffer)), + set_hexpand: true, #[iterate] add_css_class: &["frame", "view"], @@ -334,9 +337,12 @@ impl<E: std::error::Error + std::fmt::Debug + Send + 'static> Component for Post name_buffer: gtk::EntryBuffer::default(), summary_buffer: gtk::EntryBuffer::default(), - content_buffer: gtk::TextBuffer::default(), - pending_tag_buffer: gtk::EntryBuffer::default(), + content_buffer: spelling::TextBufferAdapter::new( + &sourceview5::Buffer::new(Some(&Default::default())), + &spelling::Checker::default() + ), + pending_tag_buffer: gtk::EntryBuffer::default(), tags: FactoryVecDeque::builder() .launch({ let listbox = gtk::Box::default(); @@ -370,11 +376,14 @@ impl<E: std::error::Error + std::fmt::Debug + Send + 'static> Component for Post let visibility_model = adw::EnumListModel::new(Visibility::static_type()); - let widgets = view_output!(); + model.content_buffer.checker().unwrap().set_language("en_US"); + let widgets = view_output!(); #[cfg(feature = "smart-summary")] widgets.summary_field.append(model.smart_summary.widget()); + model.content_buffer.set_enabled(true); + widgets.visibility_selector.set_expression(Some( gtk::ClosureExpression::new::<String>( [] as [gtk::Expression; 0], @@ -396,7 +405,7 @@ impl<E: std::error::Error + std::fmt::Debug + Send + 'static> Component for Post let mut tags = model.tags.guard(); post.tags.into_iter().for_each(|t| { tags.push_back(t.into_boxed_str()); }); - model.content_buffer.set_text(&post.content); + model.content_buffer.buffer().unwrap().set_text(&post.content); widgets.visibility_selector.set_selected( visibility_model.find_position(post.visibility.into_glib()) @@ -409,18 +418,19 @@ impl<E: std::error::Error + std::fmt::Debug + Send + 'static> Component for Post fn update_with_view(&mut self, widgets: &mut Self::Widgets, msg: Self::Input, sender: ComponentSender<Self>, root: &Self::Root) { self.reset(); + let content_buffer = self.content_buffer.buffer().unwrap(); match msg { #[cfg(feature = "smart-summary")] Input::SmartSummary(crate::components::SmartSummaryOutput::Start) => { widgets.content_textarea.set_sensitive(false); - if self.content_buffer.char_count() == 0 { + if content_buffer.char_count() == 0 { let _ = self.smart_summary.sender().send( crate::components::SmartSummaryInput::Cancel ); } else { - let text = self.content_buffer.text( - &self.content_buffer.start_iter(), - &self.content_buffer.end_iter(), + let text = content_buffer.text( + &content_buffer.start_iter(), + &content_buffer.end_iter(), false ); @@ -470,7 +480,7 @@ impl<E: std::error::Error + std::fmt::Debug + Send + 'static> Component for Post }, Input::Submit => { self.sending = true; - let post = if self.content_buffer.char_count() > 0 { + let post = if content_buffer.char_count() > 0 { Some(Post { name: if self.name_buffer.length() > 0 { Some(self.name_buffer.text().into()) @@ -479,9 +489,9 @@ impl<E: std::error::Error + std::fmt::Debug + Send + 'static> Component for Post Some(self.summary_buffer.text().into()) } else { None }, tags: self.tags.iter().map(|t| t.0.clone().into()).collect(), - content: self.content_buffer.text( - &self.content_buffer.start_iter(), - &self.content_buffer.end_iter(), + content: content_buffer.text( + &content_buffer.start_iter(), + &content_buffer.end_iter(), false ).into(), visibility: self.visibility, @@ -493,7 +503,7 @@ impl<E: std::error::Error + std::fmt::Debug + Send + 'static> Component for Post self.name_buffer.set_text(""); self.summary_buffer.set_text(""); self.tags.guard().clear(); - self.content_buffer.set_text(""); + content_buffer.set_text(""); let toast = adw::Toast::new(&gettext("Post submitted")); toast.set_button_label(Some(&gettext("Open"))); toast.connect_button_clicked(move |toast| { diff --git a/src/main.rs b/src/main.rs index 9f531ea..fd35871 100644 --- a/src/main.rs +++ b/src/main.rs @@ -16,6 +16,9 @@ fn main() { relm4_icons::initialize_icons(bowl::icons::GRESOURCE_BYTES, bowl::icons::RESOURCE_PREFIX); + spelling::init(); + sourceview5::init(); + let app = relm4::RelmApp::new(bowl::APPLICATION_ID); relm4::set_global_css("/* CSS for Bowl */ .tag-pill button { |