diff options
Diffstat (limited to 'src/components/post_editor.rs')
| -rw-r--r-- | src/components/post_editor.rs | 40 |
1 files changed, 25 insertions, 15 deletions
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| { |