YGGverse/Yoda
1
0
Fork 0
mirror of https://github.com/YGGverse/Yoda.git synced 2025-08-31 17:02:08 +00:00
Code Issues Projects Releases Wiki Activity

improve history/bookmarks ui responsibility: make text selectable, add suffix widgets to open the links, add visit counter to the history dialog

Browse Source
This commit is contained in:
yggverse 2025-07-26 10:56:04 +03:00
parent 12ace95042
commit d60b46a333
2 changed files with 69 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/app/browser/bookmarks.rs
View File

@ -9,7 +9,10 @@ use adw::{
PreferencesPageExt,
},
};
use gtk::glib::{DateTime, GString, Uri, UriFlags};
use gtk::{
glib::{DateTime, GString, Uri, UriFlags},
prelude::ButtonExt,
};
use indexmap::IndexMap;
use std::rc::Rc;
@ -51,7 +54,7 @@ impl Bookmarks for adw::PreferencesDialog {
d.add(&{
let p = PreferencesPage::builder()
.icon_name("document-open-recent-symbolic")
.title("All")
//.title("All")
.build();
for (group, records) in index {
@ -70,16 +73,14 @@ impl Bookmarks for adw::PreferencesDialog {
.format_iso8601()
.unwrap(),
)
.title_selectable(true)
.title(group)
.build();
for record in records {
e.add_row(&{
let a = ActionRow::builder()
.activatable(true)
// @TODO use button widget to open the links on click
//.title_selectable(true)
.activatable(false)
.title_selectable(true)
.title(match record.title {
Some(title) => title,
None => record.time.format_iso8601().unwrap().to_string(),
@ -88,20 +89,29 @@ impl Bookmarks for adw::PreferencesDialog {
.subtitle(&record.request)
.build();
a.connect_activated({
let a = window_action.clone();
let d = d.clone();
move |_| {
a.append.activate_stateful_once(
Position::After,
Some(record.request.clone()),
false,
true,
true,
true,
);
d.close();
}
a.add_suffix(&{
let b = gtk::Button::builder()
.css_classes(["accent", "circular", "flat"])
.icon_name("mail-forward-symbolic")
.tooltip_text("Open in the new tab")
.valign(gtk::Align::Center)
.build();
b.connect_clicked({
let a = window_action.clone();
let d = d.clone();
move |_| {
a.append.activate_stateful_once(
Position::After,
Some(record.request.clone()),
false,
true,
true,
true,
);
d.close();
}
});
b
});
a
})

59
src/app/browser/history.rs
View File

@ -9,7 +9,11 @@ use adw::{
PreferencesPageExt,
},
};
use gtk::glib::{DateTime, GString, Uri, UriFlags, gformat};
use gtk::{
Align, Button,
glib::{DateTime, GString, Uri, UriFlags, gformat},
prelude::ButtonExt,
};
use indexmap::IndexMap;
use std::rc::Rc;
@ -81,16 +85,14 @@ impl History for adw::PreferencesDialog {
.format_iso8601()
.unwrap(),
)
.title_selectable(true)
.title(group)
.build();
for record in records {
e.add_row(&{
let a = ActionRow::builder()
.activatable(true)
// @TODO use button widget to open the links on click
//.title_selectable(true)
.activatable(false)
.title_selectable(true)
.title(match record.title {
Some(title) => title,
None => gformat!(
@ -99,24 +101,41 @@ impl History for adw::PreferencesDialog {
record.event.count
),
})
.subtitle_selectable(true)
.subtitle(&*record.request)
.subtitle_selectable(true)
.build();
a.connect_activated({
let a = window_action.clone();
let d = d.clone();
move |_| {
a.append.activate_stateful_once(
Position::After,
Some(record.request.to_string()),
false,
true,
true,
true,
);
d.close();
}
a.add_prefix(
&Button::builder()
.css_classes(["circular", "caption-heading"])
.label(record.event.count.to_string())
.tooltip_text("Visit count")
.valign(Align::Center)
.build(),
);
a.add_suffix(&{
let b = Button::builder()
.css_classes(["accent", "circular", "flat"])
.icon_name("mail-forward-symbolic")
.tooltip_text("Open in the new tab")
.valign(Align::Center)
.build();
b.connect_clicked({
let a = window_action.clone();
let d = d.clone();
move |_| {
a.append.activate_stateful_once(
Position::After,
Some(record.request.to_string()),
false,
true,
true,
true,
);
d.close();
}
});
b
});
a
})