Refactor pages in own folder, handle open during in flight req, color links

Author: ranfdev

data/resources/ui/download_page.blp

@@ -1,7 +1,7 @@
 using Gtk 4.0;
 using Adw 1;
 
-template DownloadPage: Gtk.Box {
+template Download: Gtk.Box {
   margin-top: 8;
   margin-bottom: 8;
   margin-start: 8;

data/resources/ui/input_page.blp

@@ -1,7 +1,7 @@
 using Gtk 4.0;
 using Adw 1;
 
-template InputPage: Gtk.Box {
+template Input: Gtk.Box {
   margin-top: 8;
   margin-bottom: 8;
   margin-start: 8;

src/widgets/mod.rs

@@ -1,11 +1,7 @@
-mod download_page;
-mod input_page;
-mod page;
+mod pages;
 #[allow(clippy::await_holding_refcell_ref)]
 mod tab;
 mod window;
 
-pub use download_page::DownloadPage;
-pub use input_page::InputPage;
 pub use tab::Tab;
 pub use window::Window;

src/widgets/download_page.rs src/widgets/pages/download.rssrc/widgets/download_page.rs renamed to src/widgets/pages/download.rs

@@ -8,7 +8,7 @@ mod imp {
     pub use super::*;
     #[derive(CompositeTemplate, Default)]
     #[template(resource = "/com/ranfdev/Geopard/ui/download_page.ui")]
-    pub struct DownloadPage {
+    pub struct Download {
         #[template_child]
         pub label: TemplateChild<gtk::Label>,
         #[template_child]
@@ -20,10 +20,10 @@ mod imp {
     }
 
     #[glib::object_subclass]
-    impl ObjectSubclass for DownloadPage {
+    impl ObjectSubclass for Download {
         // `NAME` needs to match `class` attribute of template
-        const NAME: &'static str = "DownloadPage";
-        type Type = super::DownloadPage;
+        const NAME: &'static str = "Download";
+        type Type = super::Download;
         type ParentType = gtk::Box;
 
         fn class_init(klass: &mut Self::Class) {
@@ -35,22 +35,22 @@ mod imp {
         }
     }
 
-    impl ObjectImpl for DownloadPage {}
-    impl WidgetImpl for DownloadPage {}
-    impl BoxImpl for DownloadPage {}
+    impl ObjectImpl for Download {}
+    impl WidgetImpl for Download {}
+    impl BoxImpl for Download {}
 }
 
 glib::wrapper! {
-    pub struct DownloadPage(ObjectSubclass<imp::DownloadPage>)
+    pub struct Download(ObjectSubclass<imp::Download>)
     @extends gtk::Box, gtk::Widget;
 }
 
-impl DownloadPage {
+impl Download {
     pub fn new() -> Self {
         glib::Object::new(&[]).unwrap()
     }
 }
-impl Default for DownloadPage {
+impl Default for Download {
     fn default() -> Self {
         Self::new()
     }

src/widgets/page.rs src/widgets/pages/hypertext.rssrc/widgets/page.rs renamed to src/widgets/pages/hypertext.rs

@@ -6,7 +6,6 @@ use glib::subclass::{Signal, SignalType};
 use glib::Properties;
 use gtk::glib;
 use gtk::prelude::*;
-use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use gtk::{gdk, gio};
 use once_cell::sync::Lazy;
@@ -112,7 +111,8 @@ impl Surface {
                 .unwrap(),
         );
         tag_a.set_line_height(1.4);
-        tag_a.set_foreground(Some("blue"));
+        let accent_color = &self.text_view.style_context().lookup_color("accent_color");
+        tag_a.set_foreground_rgba(accent_color.as_ref());
 
         let tag_pre = Self::create_tag(
             "pre",
@@ -140,23 +140,15 @@ impl Surface {
             .name(name)
             .build()
     }
-    pub fn set_link_color(&self, color: &gtk::gdk::RGBA) {
-        self.text_view
-            .buffer()
-            .tag_table()
-            .lookup("a")
-            .unwrap()
-            .set_foreground_rgba(Some(color));
-    }
+
     pub fn clear(&mut self) {
         let b = &self.text_view.buffer();
         b.delete(&mut b.start_iter(), &mut b.end_iter());
     }
 }
 
-pub enum PageEvent {
+pub enum HypertextEvent {
     Title(String),
-    Link(gtk::TextTag, String),
 }
 
 pub enum Title {
@@ -168,8 +160,8 @@ pub mod imp {
     use super::*;
 
     #[derive(Default, Properties)]
-    #[properties(wrapper_type = super::Page)]
-    pub struct Page {
+    #[properties(wrapper_type = super::Hypertext)]
+    pub struct Hypertext {
         pub(super) tag_stack: RefCell<Vec<gemini::Tag>>,
         pub(super) links: RefCell<HashMap<gtk::TextTag, String>>,
         pub(super) surface: RefCell<Option<Surface>>,
@@ -181,12 +173,12 @@ pub mod imp {
     }
 
     #[glib::object_subclass]
-    impl ObjectSubclass for Page {
-        const NAME: &'static str = "GeopardPage";
-        type Type = super::Page;
+    impl ObjectSubclass for Hypertext {
+        const NAME: &'static str = "GeopardHypertext";
+        type Type = super::Hypertext;
     }
 
-    impl ObjectImpl for Page {
+    impl ObjectImpl for Hypertext {
         fn signals() -> &'static [glib::subclass::Signal] {
             static SIGNALS: Lazy<Vec<glib::subclass::Signal>> = Lazy::new(|| {
                 vec![
@@ -214,7 +206,7 @@ pub mod imp {
         }
     }
 
-    impl Page {
+    impl Hypertext {
         pub fn title(&self) -> String {
             match &*self.title.borrow() {
                 None => String::new(),
@@ -225,14 +217,14 @@ pub mod imp {
     }
 }
 glib::wrapper! {
-    pub struct Page(ObjectSubclass<imp::Page>);
+    pub struct Hypertext(ObjectSubclass<imp::Hypertext>);
 }
-impl Default for Page {
+impl Default for Hypertext {
     fn default() -> Self {
         glib::Object::new(&[]).unwrap()
     }
 }
-impl Page {
+impl Hypertext {
     pub fn new(url: String, surface: Surface) -> Self {
         let text_view = surface.text_view.clone();
 
@@ -249,22 +241,22 @@ impl Page {
         text_view.add_controller(&motion_ctrl);
 
         left_click_ctrl.connect_released(
-            clone!(@weak this => @default-panic, move |ctrl, _n_press, x, y| {
+            clone!(@strong this => @default-panic, move |ctrl, _n_press, x, y| {
                 if let Err(e) = this.handle_click(ctrl, x, y) {
                     log::info!("{}", e);
                 };
             }),
         );
 
         right_click_ctrl.connect_pressed(
-            clone!(@weak this => @default-panic, move |_ctrl, _n_press, x, y| {
+            clone!(@strong this => @default-panic, move |_ctrl, _n_press, x, y| {
                 if let Err(e) = this.handle_right_click(x, y) {
                     log::info!("{}", e);
                 };
             }),
         );
 
-        motion_ctrl.connect_motion(clone!(@weak this => @default-panic,move |_ctrl, x, y|  {
+        motion_ctrl.connect_motion(clone!(@strong this => @default-panic,move |_ctrl, x, y|  {
             let _ = this.handle_motion(x, y);
         }));
 
@@ -273,9 +265,9 @@ impl Page {
     pub fn render<'e>(
         &self,
         tokens: impl Iterator<Item = gemini::Event<'e>>,
-        page_events: &'e mut Vec<PageEvent>,
+        out_events: &'e mut Vec<HypertextEvent>,
     ) -> anyhow::Result<()> {
-        page_events.clear();
+        out_events.clear();
         let mut tag_stack = self.imp().tag_stack.borrow_mut();
         for ev in tokens {
             let parent_tag = tag_stack.last();
@@ -323,7 +315,6 @@ impl Page {
                                 .links
                                 .borrow_mut()
                                 .insert(tag.clone(), url.clone());
-                            page_events.push(PageEvent::Link(tag, url.clone()));
                         }
                         gemini::Tag::Heading(1) => {
                             let mut title = self.imp().title.borrow_mut();
@@ -358,7 +349,7 @@ impl Page {
                             buffer.insert(&mut buffer.end_iter(), "\n");
                             if matches!(parent_tag, gemini::Tag::Heading(1)) {
                                 if let Some(Title::Incomplete(title)) = self.imp().title.take() {
-                                    page_events.push(PageEvent::Title(title.clone()));
+                                    out_events.push(HypertextEvent::Title(title.clone()));
                                     self.imp().title.replace(Some(Title::Complete(title)));
                                 }
                             }
@@ -415,36 +406,11 @@ impl Page {
         }
         Ok(())
     }
-    pub fn display_error(&self, error: anyhow::Error) {
-        log::error!("{:?}", error);
-
-        let status_page = adw::StatusPage::new();
-        status_page.set_title("Error");
-        status_page.set_description(Some(&error.to_string()));
-        status_page.set_icon_name(Some("dialog-error-symbolic"));
-
-        // TODO:
-        /* self.stack.add_child(&status_page);
-        self.stack.set_visible_child(&status_page); */
-    }
     fn parse_link(&self, link: &str) -> Result<Url, url::ParseError> {
         let current_url = Url::parse(self.imp().url.borrow().as_str())?;
         let link_url = Url::options().base_url(Some(&current_url)).parse(link)?;
         Ok(link_url)
     }
-    pub fn set_link_color(&self, color: &gtk::gdk::RGBA) {
-        self.imp()
-            .surface
-            .borrow()
-            .as_ref()
-            .unwrap()
-            .text_view
-            .buffer()
-            .tag_table()
-            .lookup("a")
-            .unwrap()
-            .set_foreground_rgba(Some(color));
-    }
     fn extract_linkhandler<'a>(
         m: &'a HashMap<gtk::TextTag, String>,
         text_view: &gtk::TextView,

src/widgets/input_page.rs src/widgets/pages/input.rssrc/widgets/input_page.rs renamed to src/widgets/pages/input.rs

@@ -8,18 +8,18 @@ mod imp {
     pub use super::*;
     #[derive(CompositeTemplate, Default)]
     #[template(resource = "/com/ranfdev/Geopard/ui/input_page.ui")]
-    pub struct InputPage {
+    pub struct Input {
         #[template_child]
         pub label: TemplateChild<gtk::Label>,
         #[template_child]
         pub entry: TemplateChild<gtk::Entry>,
     }
 
     #[glib::object_subclass]
-    impl ObjectSubclass for InputPage {
+    impl ObjectSubclass for Input {
         // `NAME` needs to match `class` attribute of template
-        const NAME: &'static str = "InputPage";
-        type Type = super::InputPage;
+        const NAME: &'static str = "Input";
+        type Type = super::Input;
         type ParentType = gtk::Box;
 
         fn class_init(klass: &mut Self::Class) {
@@ -31,22 +31,22 @@ mod imp {
         }
     }
 
-    impl ObjectImpl for InputPage {}
-    impl WidgetImpl for InputPage {}
-    impl BoxImpl for InputPage {}
+    impl ObjectImpl for Input {}
+    impl WidgetImpl for Input {}
+    impl BoxImpl for Input {}
 }
 
 glib::wrapper! {
-    pub struct InputPage(ObjectSubclass<imp::InputPage>)
+    pub struct Input(ObjectSubclass<imp::Input>)
     @extends gtk::Box, gtk::Widget;
 }
 
-impl InputPage {
+impl Input {
     pub fn new() -> Self {
         glib::Object::new(&[]).unwrap()
     }
 }
-impl Default for InputPage {
+impl Default for Input {
     fn default() -> Self {
         Self::new()
     }

src/widgets/pages/mod.rs

@@ -0,0 +1,7 @@
+mod download;
+pub mod hypertext;
+mod input;
+
+pub use download::Download;
+pub use hypertext::Hypertext;
+pub use input::Input;