YGGverse/Yoda
1
0
Fork 0
mirror of https://github.com/YGGverse/Yoda.git synced 2025-03-10 12:41:34 +00:00
Code Issues Projects Releases Wiki Activity

implement base button, rename navigation actions

Browse Source
This commit is contained in:
yggverse 2024-09-30 16:34:58 +03:00
parent 2a47c2db35
commit 68898d8da0
6 changed files with 100 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/browser.rs
View File

@ -60,6 +60,7 @@ impl Browser {
));
let main = Arc::new(Main::new(
action_tab_page_navigation_base.clone(),
action_tab_page_navigation_reload.clone(),
action_update.clone(),
));
@ -134,19 +135,19 @@ impl Browser {
action_tab_page_navigation_base.connect_activate({
let main = main.clone();
move |_, _| {
// @TODO
main.tab_page_navigation_base();
}
});
action_tab_page_navigation_history_back.connect_activate({
let main = main.clone();
// let main = main.clone();
move |_, _| {
// @TODO
}
});
action_tab_page_navigation_history_forward.connect_activate({
let main = main.clone();
// let main = main.clone();
move |_, _| {
// @TODO
}
@ -155,7 +156,7 @@ impl Browser {
action_tab_page_navigation_reload.connect_activate({
let main = main.clone();
move |_, _| {
main.tab_page_reload();
main.tab_page_navigation_reload();
}
});

15
src/browser/main.rs
View File

@ -14,11 +14,16 @@ pub struct Main {
impl Main {
// Construct
pub fn new(
action_tab_page_navigation_base: Arc<SimpleAction>,
action_tab_page_navigation_reload: Arc<SimpleAction>,
action_update: Arc<SimpleAction>,
) -> Self {
// Init components
let tab = Arc::new(Tab::new(action_tab_page_navigation_reload, action_update));
let tab = Arc::new(Tab::new(
action_tab_page_navigation_base,
action_tab_page_navigation_reload,
action_update,
));
tab.activate(tab.clone());
tab.append(Some(GString::from("gemini://geminiprotocol.net/")), true); // demo tab @TODO replace with session restore feature
@ -36,8 +41,12 @@ impl Main {
self.tab.append(tab_page_navigation_request_text, true);
}
pub fn tab_page_reload(&self) {
self.tab.page_reload();
pub fn tab_page_navigation_base(&self) {
self.tab.page_navigation_base();
}
pub fn tab_page_navigation_reload(&self) {
self.tab.page_navigation_reload();
}
pub fn tab_close(&self) {

21
src/browser/main/tab.rs
View File

@ -17,6 +17,7 @@ pub struct Tab {
// GTK
widget: Notebook,
// Keep action links in memory to not require them on every tab append
action_tab_page_navigation_base: Arc<SimpleAction>,
action_tab_page_navigation_reload: Arc<SimpleAction>,
action_update: Arc<SimpleAction>,
// Dynamically allocated reference index
@ -27,6 +28,7 @@ pub struct Tab {
impl Tab {
// Construct
pub fn new(
action_tab_page_navigation_base: Arc<SimpleAction>,
action_tab_page_navigation_reload: Arc<SimpleAction>,
action_update: Arc<SimpleAction>,
) -> Self {
@ -38,6 +40,7 @@ impl Tab {
// GTK
widget,
// Define action links
action_tab_page_navigation_base,
action_tab_page_navigation_reload,
action_update,
// Init empty HashMap index as no tabs appended yet
@ -76,6 +79,7 @@ impl Tab {
let page = Arc::new(Page::new(
id.clone(),
page_navigation_request_text.clone(),
self.action_tab_page_navigation_base.clone(),
self.action_tab_page_navigation_reload.clone(),
self.action_update.clone(),
));
@ -144,14 +148,27 @@ impl Tab {
}
}
pub fn page_reload(&self) {
pub fn page_navigation_base(&self) {
// Get current page
if let Some(page_number) = self.widget.current_page() {
// Get default widget to extract it name as the ID for childs
if let Some(widget) = self.widget.nth_page(Some(page_number)) {
// Get page by widget ID
if let Some(page) = self.pages.borrow().get(&widget.widget_name()) {
page.reload();
page.navigation_base();
}
}
}
}
pub fn page_navigation_reload(&self) {
// Get current page
if let Some(page_number) = self.widget.current_page() {
// Get default widget to extract it name as the ID for childs
if let Some(widget) = self.widget.nth_page(Some(page_number)) {
// Get page by widget ID
if let Some(page) = self.pages.borrow().get(&widget.widget_name()) {
page.navigation_reload();
}
}
}

14
src/browser/main/tab/page.rs
View File

@ -14,7 +14,7 @@ use gtk::{
glib::{gformat, GString, Priority, Regex, RegexCompileFlags, RegexMatchFlags, Uri, UriFlags},
prelude::{
ActionExt, ActionMapExt, BoxExt, IOStreamExt, InputStreamExtManual, OutputStreamExtManual,
SocketClientExt, StaticVariantType, WidgetExt,
SocketClientExt, StaticVariantType, ToVariant, WidgetExt,
},
Box, Orientation,
};
@ -24,6 +24,7 @@ pub struct Page {
// GTK
widget: Box,
// Actions
action_page_open: Arc<SimpleAction>,
// action_tab_page_navigation_reload: Arc<SimpleAction>,
action_update: Arc<SimpleAction>,
// Components
@ -38,6 +39,7 @@ impl Page {
pub fn new(
name: GString,
navigation_request_text: Option<GString>,
action_tab_page_navigation_base: Arc<SimpleAction>,
action_tab_page_navigation_reload: Arc<SimpleAction>,
action_update: Arc<SimpleAction>,
) -> Page {
@ -55,6 +57,7 @@ impl Page {
let content = Arc::new(Content::new(action_page_open.clone()));
let navigation = Arc::new(Navigation::new(
navigation_request_text,
action_tab_page_navigation_base.clone(),
action_tab_page_navigation_reload.clone(),
action_update.clone(),
));
@ -94,6 +97,7 @@ impl Page {
// GTK
widget,
// Actions
action_page_open,
// action_tab_page_navigation_reload,
action_update,
// Components
@ -109,7 +113,13 @@ impl Page {
self.navigation.grab_request_focus();
}
pub fn reload(&self) {
pub fn navigation_base(&self) {
if let Some(address) = self.navigation.base_address() {
self.action_page_open.activate(Some(&address.to_variant()));
}
}
pub fn navigation_reload(&self) {
// Init globals
let request_text = self.navigation.request_text();

7
src/browser/main/tab/page/navigation.rs
View File

@ -33,11 +33,12 @@ pub struct Navigation {
impl Navigation {
pub fn new(
request_text: Option<GString>,
action_tab_page_navigation_base: Arc<SimpleAction>,
action_tab_page_navigation_reload: Arc<SimpleAction>,
action_update: Arc<SimpleAction>,
) -> Self {
// Init components
let base = Base::new();
let base = Base::new(action_tab_page_navigation_base);
let history = History::new();
let reload = Reload::new(action_tab_page_navigation_reload.clone());
let request = Request::new(
@ -102,6 +103,10 @@ impl Navigation {
&self.widget
}
pub fn base_address(&self) -> Option<GString> {
self.base.address()
}
pub fn request_text(&self) -> GString {
self.request.text()
}

52
src/browser/main/tab/page/navigation/base.rs
View File

@ -1,35 +1,75 @@
use gtk::{glib::Uri, prelude::WidgetExt, Button};
use gtk::{
gio::SimpleAction,
glib::{gformat, GString, Uri},
prelude::{ActionExt, ButtonExt, WidgetExt},
Button,
};
use std::{cell::RefCell, sync::Arc};
pub struct Base {
action_tab_page_navigation_base: Arc<SimpleAction>,
uri: RefCell<Option<Uri>>,
widget: Button,
}
impl Base {
// Construct
pub fn new() -> Self {
pub fn new(action_tab_page_navigation_base: Arc<SimpleAction>) -> Self {
// Init widget
let widget = Button::builder()
.action_name("win.tab_page_base")
.icon_name("go-home-symbolic")
.tooltip_text("Base")
.sensitive(false)
.build();
Self { widget }
// Init events
widget.connect_clicked({
let action_tab_page_navigation_base = action_tab_page_navigation_base.clone();
move |_| {
action_tab_page_navigation_base.activate(None);
}
});
// Return activated struct
Self {
action_tab_page_navigation_base,
uri: RefCell::new(None),
widget,
}
}
// Actions
pub fn update(&self, uri: Option<Uri>) {
let status = match uri {
// Update sensitivity
let status = match &uri {
Some(uri) => "/" != uri.path(),
None => false,
};
self.widget.action_set_enabled("win.tab_page_base", status);
self.action_tab_page_navigation_base.set_enabled(status);
self.widget.set_sensitive(status);
// Update parsed cache
self.uri.replace(uri);
}
// Getters
pub fn widget(&self) -> &Button {
&self.widget
}
pub fn address(&self) -> Option<GString> {
if let Some(uri) = self.uri.take() {
let scheme = uri.scheme();
let port = uri.port();
if let Some(host) = uri.host() {
if port.is_positive() {
return Some(gformat!("{scheme}://{host}:{port}/"));
} else {
return Some(gformat!("{scheme}://{host}/"));
}
}
}
None
}
}