working omni bar

Author: ranfdev

src/config.rs

@@ -4,7 +4,7 @@ pub const LOCALEDIR: &str = "/app/share/locale";
 pub const PKGDATADIR: &str = "/app/share/geopard";
 pub const PROFILE: &str = "Devel";
 pub const RESOURCES_FILE: &str = concat!("/app/share/geopard", "/resources.gresource");
-pub const VERSION: &str = "1.0.0-alpha-50a81e9";
+pub const VERSION: &str = "1.0.0-alpha-904f4a7";
 
 use once_cell::sync::Lazy;
 use serde::{Deserialize, Serialize};

src/tab.rs

@@ -629,7 +629,7 @@ impl Tab {
             let mut url = url.clone();
             url.set_query(Some(&query));
             text_input
-                .activate_action("win.open-omni", Some(&url.to_string().to_variant()))
+                .activate_action("win.open-url", Some(&url.to_string().to_variant()))
                 .unwrap();
         });
         ctx.insert_widget(&mut iter, &text_input);

src/window.rs

@@ -143,24 +143,11 @@ impl Window {
             &*imp.style_provider.borrow(),
             gtk::STYLE_PROVIDER_PRIORITY_APPLICATION,
         );
-        this.bind_signals();
         this.squeezer_changed();
         this.setup_actions_signals();
         this.open_in_new_tab(bookmarks_url().as_str());
         this
     }
-    fn bind_signals(&self) {
-        self.imp().tab_view.connect_selected_page_notify(
-            clone!(@weak self as this => @default-panic, move |tab_view| {
-              this.page_switched(tab_view);
-            }),
-        );
-        self.imp().squeezer.connect_visible_child_notify(
-            clone!(@weak self as this => @default-panic, move |_sq| {
-                this.squeezer_changed();
-            }),
-        );
-    }
     fn setup_actions_signals(&self) {
         let imp = self.imp();
 
@@ -224,6 +211,28 @@ impl Window {
                 None
             }),
         );
+
+        imp.tab_view.connect_selected_page_notify(
+            clone!(@weak self as this => @default-panic, move |tab_view| {
+              this.page_switched(tab_view);
+            }),
+        );
+        imp.squeezer.connect_visible_child_notify(
+            clone!(@weak self as this => @default-panic, move |_sq| {
+                this.squeezer_changed();
+            }),
+        );
+        imp.url_bar.connect_activate(
+            clone!(@weak self as this => @default-panic, move |_sq| {
+                this.open_omni(this.imp().url_bar.text().as_str());
+            })
+        );
+        imp.small_url_bar.connect_activate(
+            clone!(@weak self as this => @default-panic, move |_sq| {
+                this.open_omni(this.imp().small_url_bar.text().as_str());
+            })
+        );
+
         adw::StyleManager::default().connect_dark_notify(clone!(@weak self as this => @default-panic, move |_| {
             this.set_special_color_from_hash();
         }));
@@ -346,15 +355,11 @@ impl Window {
             }
         });
     }
-    // this should also handle search requests
     fn open_omni(&self, v: &str) {
-        let url = Url::parse(v);
+        let url = Url::parse(v).or_else(|_| Url::parse(&format!("gemini://geminispace.info/search?{}", v)));
         match url {
             Ok(url) => self.current_tab().spawn_open_url(url),
-            Err(e) => error!(
-                "Failed to parse url (will trigger a search in the future): {:?}",
-                e
-            ),
+            Err(e) => error!("Failed to open from omni bar"),
         }
     }
     fn open_url_str(&self, v: &str) {