From c6ce888cc70da75a2687a69bb47b59293b4a7777 Mon Sep 17 00:00:00 2001 From: Zander Brown Date: Sat, 19 May 2018 20:38:36 +0100 Subject: [PATCH 01/13] Define an app-menu with About & Quit actions Rename some paths for auto resource magic --- hammond-gtk/resources/gtk/headerbar.ui | 1 + hammond-gtk/resources/gtk/menus.ui | 30 +++++++++++++++ hammond-gtk/resources/resources.xml | 3 +- hammond-gtk/src/app.rs | 52 +++++++++++++++++++++++++- hammond-gtk/src/appnotif.rs | 2 +- hammond-gtk/src/headerbar.rs | 46 +---------------------- hammond-gtk/src/main.rs | 2 +- hammond-gtk/src/widgets/empty.rs | 2 +- hammond-gtk/src/widgets/episode.rs | 2 +- hammond-gtk/src/widgets/home_view.rs | 8 ++-- hammond-gtk/src/widgets/show.rs | 6 +-- hammond-gtk/src/widgets/shows_view.rs | 4 +- 12 files changed, 99 insertions(+), 59 deletions(-) create mode 100644 hammond-gtk/resources/gtk/menus.ui diff --git a/hammond-gtk/resources/gtk/headerbar.ui b/hammond-gtk/resources/gtk/headerbar.ui index 291502c..8033dd0 100644 --- a/hammond-gtk/resources/gtk/headerbar.ui +++ b/hammond-gtk/resources/gtk/headerbar.ui @@ -364,6 +364,7 @@ Tobias Bernard True False About + app.about False diff --git a/hammond-gtk/resources/gtk/menus.ui b/hammond-gtk/resources/gtk/menus.ui new file mode 100644 index 0000000..1155b65 --- /dev/null +++ b/hammond-gtk/resources/gtk/menus.ui @@ -0,0 +1,30 @@ + + + + +
+ + _Preferences + app.preferences + +
+
+ + _Keyboard Shortcuts + win.show-help-overlay + + + _Help + app.help + + + _About + app.about + + + _Quit + app.quit + +
+ + \ No newline at end of file diff --git a/hammond-gtk/resources/resources.xml b/hammond-gtk/resources/resources.xml index b8e1c75..8a61736 100644 --- a/hammond-gtk/resources/resources.xml +++ b/hammond-gtk/resources/resources.xml @@ -1,6 +1,6 @@ - + gtk/episode_widget.ui gtk/show_widget.ui gtk/empty_view.ui @@ -11,6 +11,7 @@ gtk/shows_child.ui gtk/headerbar.ui gtk/inapp_notif.ui + gtk/menus.ui gtk/style.css diff --git a/hammond-gtk/src/app.rs b/hammond-gtk/src/app.rs index 4668aa3..76dce3a 100644 --- a/hammond-gtk/src/app.rs +++ b/hammond-gtk/src/app.rs @@ -1,6 +1,6 @@ #![allow(new_without_default)] -use gio::{ApplicationExt, ApplicationExtManual, ApplicationFlags, Settings, SettingsExt}; +use gio::{ApplicationExt, ApplicationExtManual, ApplicationFlags, Settings, SettingsExt, SimpleAction, SimpleActionExt, ActionMapExt}; use glib; use gtk; use gtk::prelude::*; @@ -67,6 +67,19 @@ impl App { let window = gtk::Window::new(gtk::WindowType::Toplevel); window.set_title("Hammond"); + // Ideally a lot more than actions would happen in startup & window + // creation would be in activate + application.connect_startup(clone!(window => move |app| { + let about = SimpleAction::new("about", None); + // Should investigate use of active_window here + about.connect_activate(clone!(window => move |_, _| about_dialog(&window))); + app.add_action(&about); + + let quit = SimpleAction::new("quit", None); + quit.connect_activate(clone!(app => move |_, _| app.quit())); + app.add_action(&quit); + })); + window.connect_delete_event(clone!(application, settings, window => move |_, _| { WindowGeometry::from_window(&window).write(&settings); application.quit(); @@ -224,3 +237,40 @@ fn build_ui(window: >k::Window, app: >k::Application) { window.activate(); app.connect_activate(move |_| ()); } + +// Totally copied it from fractal. +// https://gitlab.gnome.org/danigm/fractal/blob/503e311e22b9d7540089d735b92af8e8f93560c5/fractal-gtk/src/app.rs#L1883-1912 +fn about_dialog(window: >k::Window) { + // Feel free to add yourself if you contribured. + let authors = &[ + "Constantin Nickel", + "Gabriele Musco", + "James Wykeham-Martin", + "Jordan Petridis", + "Julian Sparber", + "Rowan Lewis", + "Zander Brown" + ]; + + let dialog = gtk::AboutDialog::new(); + // Waiting for a logo. + // dialog.set_logo_icon_name("org.gnome.Hammond"); + dialog.set_logo_icon_name("multimedia-player"); + dialog.set_comments("Podcast Client for the GNOME Desktop."); + dialog.set_copyright("© 2017, 2018 Jordan Petridis"); + dialog.set_license_type(gtk::License::Gpl30); + dialog.set_modal(true); + // TODO: make it show it fetches the commit hash from which it was built + // and the version number is kept in sync automaticly + dialog.set_version("0.3.3"); + dialog.set_program_name("Hammond"); + // TODO: Need a wiki page first. + // dialog.set_website("https://wiki.gnome.org/Design/Apps/Potential/Podcasts"); + // dialog.set_website_label("Learn more about Hammond"); + dialog.set_transient_for(window); + + dialog.set_artists(&["Tobias Bernard"]); + dialog.set_authors(authors); + + dialog.show(); +} diff --git a/hammond-gtk/src/appnotif.rs b/hammond-gtk/src/appnotif.rs index 22b0c6e..2c87049 100644 --- a/hammond-gtk/src/appnotif.rs +++ b/hammond-gtk/src/appnotif.rs @@ -21,7 +21,7 @@ pub struct InAppNotification { impl Default for InAppNotification { fn default() -> Self { - let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/inapp_notif.ui"); + let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/inapp_notif.ui"); let revealer: gtk::Revealer = builder.get_object("revealer").unwrap(); let text: gtk::Label = builder.get_object("text").unwrap(); diff --git a/hammond-gtk/src/headerbar.rs b/hammond-gtk/src/headerbar.rs index 597a96c..4cdaf52 100644 --- a/hammond-gtk/src/headerbar.rs +++ b/hammond-gtk/src/headerbar.rs @@ -23,7 +23,6 @@ pub struct Header { switch: gtk::StackSwitcher, back: gtk::Button, show_title: gtk::Label, - about: gtk::ModelButton, import: gtk::ModelButton, export: gtk::ModelButton, update_button: gtk::ModelButton, @@ -34,7 +33,7 @@ pub struct Header { impl Default for Header { fn default() -> Header { - let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/headerbar.ui"); + let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/headerbar.ui"); let header = builder.get_object("headerbar").unwrap(); let add_toggle = builder.get_object("add_toggle").unwrap(); @@ -47,7 +46,6 @@ impl Default for Header { let update_box = builder.get_object("update_notification").unwrap(); let update_label = builder.get_object("update_label").unwrap(); let update_spinner = builder.get_object("update_spinner").unwrap(); - let about = builder.get_object("about").unwrap(); Header { container: header, @@ -55,7 +53,6 @@ impl Default for Header { switch, back, show_title, - about, import, export, update_button, @@ -75,7 +72,7 @@ impl Header { } pub fn init(&self, content: &Content, window: >k::Window, sender: &Sender) { - let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/headerbar.ui"); + let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/headerbar.ui"); let add_popover: gtk::Popover = builder.get_object("add_popover").unwrap(); let new_url: gtk::Entry = builder.get_object("new_url").unwrap(); @@ -107,9 +104,6 @@ impl Header { })); })); - self.about - .connect_clicked(clone!(window => move |_| about_dialog(&window))); - self.import.connect_clicked( clone!(window, sender => move |_| on_import_clicked(&window, &sender)), ); @@ -288,39 +282,3 @@ fn on_import_clicked(window: >k::Window, sender: &Sender) { dialog.run(); } - -// Totally copied it from fractal. -// https://gitlab.gnome.org/danigm/fractal/blob/503e311e22b9d7540089d735b92af8e8f93560c5/fractal-gtk/src/app.rs#L1883-1912 -fn about_dialog(window: >k::Window) { - // Feel free to add yourself if you contribured. - let authors = &[ - "Constantin Nickel", - "Gabriele Musco", - "James Wykeham-Martin", - "Jordan Petridis", - "Julian Sparber", - "Rowan Lewis", - ]; - - let dialog = gtk::AboutDialog::new(); - // Waiting for a logo. - // dialog.set_logo_icon_name("org.gnome.Hammond"); - dialog.set_logo_icon_name("multimedia-player"); - dialog.set_comments("Podcast Client for the GNOME Desktop."); - dialog.set_copyright("© 2017, 2018 Jordan Petridis"); - dialog.set_license_type(gtk::License::Gpl30); - dialog.set_modal(true); - // TODO: make it show it fetches the commit hash from which it was built - // and the version number is kept in sync automaticly - dialog.set_version("0.3.3"); - dialog.set_program_name("Hammond"); - // TODO: Need a wiki page first. - // dialog.set_website("https://wiki.gnome.org/Design/Apps/Potential/Podcasts"); - // dialog.set_website_label("Learn more about Hammond"); - dialog.set_transient_for(window); - - dialog.set_artists(&["Tobias Bernard"]); - dialog.set_authors(authors); - - dialog.show(); -} diff --git a/hammond-gtk/src/main.rs b/hammond-gtk/src/main.rs index 78d9027..c8d4227 100644 --- a/hammond-gtk/src/main.rs +++ b/hammond-gtk/src/main.rs @@ -86,7 +86,7 @@ fn main() { // Add custom style let provider = gtk::CssProvider::new(); - gtk::CssProvider::load_from_resource(&provider, "/org/gnome/hammond/gtk/style.css"); + gtk::CssProvider::load_from_resource(&provider, "/org/gnome/Hammond/gtk/style.css"); gtk::StyleContext::add_provider_for_screen( &gdk::Screen::get_default().expect("Error initializing gtk css provider."), &provider, diff --git a/hammond-gtk/src/widgets/empty.rs b/hammond-gtk/src/widgets/empty.rs index ad3d152..444de79 100644 --- a/hammond-gtk/src/widgets/empty.rs +++ b/hammond-gtk/src/widgets/empty.rs @@ -7,7 +7,7 @@ pub struct EmptyView { impl Default for EmptyView { fn default() -> Self { - let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/empty_view.ui"); + let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/empty_view.ui"); let view: gtk::Box = builder.get_object("empty_view").unwrap(); EmptyView { container: view } diff --git a/hammond-gtk/src/widgets/episode.rs b/hammond-gtk/src/widgets/episode.rs index 01ae0ff..d938e92 100644 --- a/hammond-gtk/src/widgets/episode.rs +++ b/hammond-gtk/src/widgets/episode.rs @@ -33,7 +33,7 @@ pub struct EpisodeWidget { impl Default for EpisodeWidget { fn default() -> Self { - let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/episode_widget.ui"); + let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/episode_widget.ui"); let container: gtk::Box = builder.get_object("episode_container").unwrap(); let progress: gtk::ProgressBar = builder.get_object("progress_bar").unwrap(); diff --git a/hammond-gtk/src/widgets/home_view.rs b/hammond-gtk/src/widgets/home_view.rs index c3359cb..1341fea 100644 --- a/hammond-gtk/src/widgets/home_view.rs +++ b/hammond-gtk/src/widgets/home_view.rs @@ -49,7 +49,7 @@ pub struct HomeView { impl Default for HomeView { fn default() -> Self { - let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/episodes_view.ui"); + let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/episodes_view.ui"); let container: gtk::Box = builder.get_object("container").unwrap(); let scrolled_window: gtk::ScrolledWindow = builder.get_object("scrolled_window").unwrap(); let frame_parent: gtk::Box = builder.get_object("frame_parent").unwrap(); @@ -180,7 +180,7 @@ struct HomeEpisode { impl Default for HomeEpisode { fn default() -> Self { let builder = - gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/episodes_view_widget.ui"); + gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/episodes_view_widget.ui"); let container: gtk::Box = builder.get_object("container").unwrap(); let image: gtk::Image = builder.get_object("cover").unwrap(); let ep = EpisodeWidget::default(); @@ -197,7 +197,7 @@ impl Default for HomeEpisode { impl HomeEpisode { fn new(episode: EpisodeWidgetQuery, sender: &Sender) -> HomeEpisode { let builder = - gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/episodes_view_widget.ui"); + gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/episodes_view_widget.ui"); let container: gtk::Box = builder.get_object("container").unwrap(); let image: gtk::Image = builder.get_object("cover").unwrap(); let pid = episode.podcast_id(); @@ -224,4 +224,4 @@ impl HomeEpisode { fn set_cover(&self, podcast_id: i32) -> Result<(), Error> { utils::set_image_from_path(&self.image, podcast_id, 64) } -} +} \ No newline at end of file diff --git a/hammond-gtk/src/widgets/show.rs b/hammond-gtk/src/widgets/show.rs index 674e693..388ae12 100644 --- a/hammond-gtk/src/widgets/show.rs +++ b/hammond-gtk/src/widgets/show.rs @@ -41,7 +41,7 @@ pub struct ShowWidget { impl Default for ShowWidget { fn default() -> Self { - let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/show_widget.ui"); + let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/show_widget.ui"); let container: gtk::Box = builder.get_object("container").unwrap(); let scrolled_window: gtk::ScrolledWindow = builder.get_object("scrolled_window").unwrap(); let episodes = builder.get_object("episodes").unwrap(); @@ -79,7 +79,7 @@ impl ShowWidget { } pub fn init(&mut self, pd: &Arc, sender: &Sender) { - let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/show_widget.ui"); + let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/show_widget.ui"); self.unsub .connect_clicked(clone!(pd, sender => move |bttn| { @@ -189,7 +189,7 @@ fn populate_listbox( })); if count == 0 { - let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/empty_show.ui"); + let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/empty_show.ui"); let container: gtk::Box = builder.get_object("empty_show").unwrap(); show.episodes.add(&container); return Ok(()); diff --git a/hammond-gtk/src/widgets/shows_view.rs b/hammond-gtk/src/widgets/shows_view.rs index d9dc9e7..ad7982e 100644 --- a/hammond-gtk/src/widgets/shows_view.rs +++ b/hammond-gtk/src/widgets/shows_view.rs @@ -28,7 +28,7 @@ pub struct ShowsView { impl Default for ShowsView { fn default() -> Self { - let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/shows_view.ui"); + let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/shows_view.ui"); let container: gtk::Box = builder.get_object("fb_parent").unwrap(); let scrolled_window: gtk::ScrolledWindow = builder.get_object("scrolled_window").unwrap(); let flowbox: gtk::FlowBox = builder.get_object("flowbox").unwrap(); @@ -129,7 +129,7 @@ struct ShowsChild { impl Default for ShowsChild { fn default() -> Self { - let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/shows_child.ui"); + let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/shows_child.ui"); let container: gtk::Box = builder.get_object("fb_child").unwrap(); let cover: gtk::Image = builder.get_object("pd_cover").unwrap(); From ac6ac428609de5ec52459082af004f1e11de161f Mon Sep 17 00:00:00 2001 From: Zander Brown Date: Sat, 19 May 2018 21:48:38 +0100 Subject: [PATCH 02/13] Move import --- hammond-gtk/resources/gtk/headerbar.ui | 1 + hammond-gtk/resources/gtk/menus.ui | 14 +++++ hammond-gtk/src/app.rs | 85 +++++++++++++++++++++++--- hammond-gtk/src/headerbar.rs | 72 +--------------------- 4 files changed, 93 insertions(+), 79 deletions(-) diff --git a/hammond-gtk/resources/gtk/headerbar.ui b/hammond-gtk/resources/gtk/headerbar.ui index 8033dd0..f9f33a6 100644 --- a/hammond-gtk/resources/gtk/headerbar.ui +++ b/hammond-gtk/resources/gtk/headerbar.ui @@ -326,6 +326,7 @@ Tobias Bernard True True Import Shows + app.import False diff --git a/hammond-gtk/resources/gtk/menus.ui b/hammond-gtk/resources/gtk/menus.ui index 1155b65..eebf8f8 100644 --- a/hammond-gtk/resources/gtk/menus.ui +++ b/hammond-gtk/resources/gtk/menus.ui @@ -2,6 +2,20 @@ +
+ + _Check for new episodes + app.refresh + + + _Import Shows + app.import + + + _Export Shows + app.export + +
_Preferences diff --git a/hammond-gtk/src/app.rs b/hammond-gtk/src/app.rs index 76dce3a..f0ab33d 100644 --- a/hammond-gtk/src/app.rs +++ b/hammond-gtk/src/app.rs @@ -7,6 +7,7 @@ use gtk::prelude::*; use gtk::SettingsExt as GtkSettingsExt; use hammond_data::Podcast; +use hammond_data::{opml}; use appnotif::{InAppNotification, UndoState}; use headerbar::Header; @@ -19,6 +20,8 @@ use std::rc::Rc; use std::sync::mpsc::{channel, Receiver, Sender}; use std::sync::Arc; +use rayon; + #[derive(Debug, Clone)] pub enum Action { RefreshAllViews, @@ -67,9 +70,21 @@ impl App { let window = gtk::Window::new(gtk::WindowType::Toplevel); window.set_title("Hammond"); + let (sender, receiver) = channel(); + + window.connect_delete_event(clone!(application, settings, window => move |_, _| { + WindowGeometry::from_window(&window).write(&settings); + application.quit(); + Inhibit(false) + })); + // Ideally a lot more than actions would happen in startup & window // creation would be in activate - application.connect_startup(clone!(window => move |app| { + application.connect_startup(clone!(window, sender => move |app| { + let import = SimpleAction::new("import", None); + import.connect_activate(clone!(window, sender => move |_, _| on_import_clicked(&window, &sender))); + app.add_action(&import); + let about = SimpleAction::new("about", None); // Should investigate use of active_window here about.connect_activate(clone!(window => move |_, _| about_dialog(&window))); @@ -80,14 +95,6 @@ impl App { app.add_action(&quit); })); - window.connect_delete_event(clone!(application, settings, window => move |_, _| { - WindowGeometry::from_window(&window).write(&settings); - application.quit(); - Inhibit(false) - })); - - let (sender, receiver) = channel(); - // Create a content instance let content = Rc::new(Content::new(sender.clone()).expect("Content Initialization failed.")); @@ -274,3 +281,63 @@ fn about_dialog(window: >k::Window) { dialog.show(); } + +fn on_import_clicked(window: >k::Window, sender: &Sender) { + use glib::translate::ToGlib; + use gtk::{FileChooserAction, FileChooserDialog, FileFilter, ResponseType}; + + // let dialog = FileChooserDialog::new(title, Some(&window), FileChooserAction::Open); + // TODO: It might be better to use a FileChooserNative widget. + // Create the FileChooser Dialog + let dialog = FileChooserDialog::with_buttons( + Some("Select the file from which to you want to Import Shows."), + Some(window), + FileChooserAction::Open, + &[ + ("_Cancel", ResponseType::Cancel), + ("_Open", ResponseType::Accept), + ], + ); + + // Do not show hidden(.thing) files + dialog.set_show_hidden(false); + + // Set a filter to show only xml files + let filter = FileFilter::new(); + FileFilterExt::set_name(&filter, Some("OPML file")); + filter.add_mime_type("application/xml"); + filter.add_mime_type("text/xml"); + dialog.add_filter(&filter); + + dialog.connect_response(clone!(sender => move |dialog, resp| { + debug!("Dialong Response {}", resp); + if resp == ResponseType::Accept.to_glib() { + // TODO: Show an in-app notifictaion if the file can not be accessed + if let Some(filename) = dialog.get_filename() { + debug!("File selected: {:?}", filename); + + rayon::spawn(clone!(sender => move || { + // Parse the file and import the feeds + if let Ok(sources) = opml::import_from_file(filename) { + // Refresh the succesfully parsed feeds to index them + utils::refresh(Some(sources), sender) + } else { + let text = String::from("Failed to parse the Imported file"); + sender.send(Action::ErrorNotification(text)) + .map_err(|err| error!("Action Sender: {}", err)) + .ok(); + } + })) + } else { + let text = String::from("Selected File could not be accessed."); + sender.send(Action::ErrorNotification(text)) + .map_err(|err| error!("Action Sender: {}", err)) + .ok(); + } + } + + dialog.destroy(); + })); + + dialog.run(); +} diff --git a/hammond-gtk/src/headerbar.rs b/hammond-gtk/src/headerbar.rs index 4cdaf52..7050de0 100644 --- a/hammond-gtk/src/headerbar.rs +++ b/hammond-gtk/src/headerbar.rs @@ -4,16 +4,15 @@ use gtk::prelude::*; use failure::Error; use failure::ResultExt; -use rayon; use url::Url; -use hammond_data::{dbqueries, opml, Source}; +use hammond_data::{dbqueries, Source}; use std::sync::mpsc::Sender; use app::Action; use stacks::Content; -use utils::{self, itunes_to_rss, refresh}; +use utils::{itunes_to_rss, refresh}; #[derive(Debug, Clone)] // TODO: split this into smaller @@ -23,7 +22,6 @@ pub struct Header { switch: gtk::StackSwitcher, back: gtk::Button, show_title: gtk::Label, - import: gtk::ModelButton, export: gtk::ModelButton, update_button: gtk::ModelButton, update_box: gtk::Box, @@ -40,7 +38,6 @@ impl Default for Header { let switch = builder.get_object("switch").unwrap(); let back = builder.get_object("back").unwrap(); let show_title = builder.get_object("show_title").unwrap(); - let import = builder.get_object("import").unwrap(); let export = builder.get_object("export").unwrap(); let update_button = builder.get_object("update_button").unwrap(); let update_box = builder.get_object("update_notification").unwrap(); @@ -53,7 +50,6 @@ impl Default for Header { switch, back, show_title, - import, export, update_button, update_box, @@ -104,10 +100,6 @@ impl Header { })); })); - self.import.connect_clicked( - clone!(window, sender => move |_| on_import_clicked(&window, &sender)), - ); - // Add the Headerbar to the window. window.set_titlebar(&self.container); @@ -222,63 +214,3 @@ fn on_url_change( } } } - -fn on_import_clicked(window: >k::Window, sender: &Sender) { - use glib::translate::ToGlib; - use gtk::{FileChooserAction, FileChooserDialog, FileFilter, ResponseType}; - - // let dialog = FileChooserDialog::new(title, Some(&window), FileChooserAction::Open); - // TODO: It might be better to use a FileChooserNative widget. - // Create the FileChooser Dialog - let dialog = FileChooserDialog::with_buttons( - Some("Select the file from which to you want to Import Shows."), - Some(window), - FileChooserAction::Open, - &[ - ("_Cancel", ResponseType::Cancel), - ("_Open", ResponseType::Accept), - ], - ); - - // Do not show hidden(.thing) files - dialog.set_show_hidden(false); - - // Set a filter to show only xml files - let filter = FileFilter::new(); - FileFilterExt::set_name(&filter, Some("OPML file")); - filter.add_mime_type("application/xml"); - filter.add_mime_type("text/xml"); - dialog.add_filter(&filter); - - dialog.connect_response(clone!(sender => move |dialog, resp| { - debug!("Dialong Response {}", resp); - if resp == ResponseType::Accept.to_glib() { - // TODO: Show an in-app notifictaion if the file can not be accessed - if let Some(filename) = dialog.get_filename() { - debug!("File selected: {:?}", filename); - - rayon::spawn(clone!(sender => move || { - // Parse the file and import the feeds - if let Ok(sources) = opml::import_from_file(filename) { - // Refresh the succesfully parsed feeds to index them - utils::refresh(Some(sources), sender) - } else { - let text = String::from("Failed to parse the Imported file"); - sender.send(Action::ErrorNotification(text)) - .map_err(|err| error!("Action Sender: {}", err)) - .ok(); - } - })) - } else { - let text = String::from("Selected File could not be accessed."); - sender.send(Action::ErrorNotification(text)) - .map_err(|err| error!("Action Sender: {}", err)) - .ok(); - } - } - - dialog.destroy(); - })); - - dialog.run(); -} From 095dd73c525b2e8a62e7e5e6eac312e9a730b25f Mon Sep 17 00:00:00 2001 From: Zander Brown Date: Sat, 19 May 2018 22:11:44 +0100 Subject: [PATCH 03/13] Move refresh --- hammond-gtk/resources/gtk/headerbar.ui | 1 + hammond-gtk/src/app.rs | 10 ++++++++++ hammond-gtk/src/headerbar.rs | 12 ------------ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/hammond-gtk/resources/gtk/headerbar.ui b/hammond-gtk/resources/gtk/headerbar.ui index f9f33a6..8ad7d0b 100644 --- a/hammond-gtk/resources/gtk/headerbar.ui +++ b/hammond-gtk/resources/gtk/headerbar.ui @@ -313,6 +313,7 @@ Tobias Bernard True True Check for new episodes + app.refresh False diff --git a/hammond-gtk/src/app.rs b/hammond-gtk/src/app.rs index f0ab33d..8899be8 100644 --- a/hammond-gtk/src/app.rs +++ b/hammond-gtk/src/app.rs @@ -81,6 +81,16 @@ impl App { // Ideally a lot more than actions would happen in startup & window // creation would be in activate application.connect_startup(clone!(window, sender => move |app| { + let refresh = SimpleAction::new("refresh", None); + refresh.connect_activate(clone!(sender => move |_, _| { + gtk::idle_add(clone!(sender => move || { + let s: Option> = None; + utils::refresh(s, sender.clone()); + glib::Continue(false) + })); + })); + app.add_action(&refresh); + let import = SimpleAction::new("import", None); import.connect_activate(clone!(window, sender => move |_, _| on_import_clicked(&window, &sender))); app.add_action(&import); diff --git a/hammond-gtk/src/headerbar.rs b/hammond-gtk/src/headerbar.rs index 7050de0..59f0f0d 100644 --- a/hammond-gtk/src/headerbar.rs +++ b/hammond-gtk/src/headerbar.rs @@ -23,7 +23,6 @@ pub struct Header { back: gtk::Button, show_title: gtk::Label, export: gtk::ModelButton, - update_button: gtk::ModelButton, update_box: gtk::Box, update_label: gtk::Label, update_spinner: gtk::Spinner, @@ -39,7 +38,6 @@ impl Default for Header { let back = builder.get_object("back").unwrap(); let show_title = builder.get_object("show_title").unwrap(); let export = builder.get_object("export").unwrap(); - let update_button = builder.get_object("update_button").unwrap(); let update_box = builder.get_object("update_notification").unwrap(); let update_label = builder.get_object("update_label").unwrap(); let update_spinner = builder.get_object("update_spinner").unwrap(); @@ -51,7 +49,6 @@ impl Default for Header { back, show_title, export, - update_button, update_box, update_label, update_spinner, @@ -91,15 +88,6 @@ impl Header { self.add_toggle.set_popover(&add_popover); - self.update_button - .connect_clicked(clone!(sender => move |_| { - gtk::idle_add(clone!(sender => move || { - let s: Option> = None; - refresh(s, sender.clone()); - glib::Continue(false) - })); - })); - // Add the Headerbar to the window. window.set_titlebar(&self.container); From 8c2ea052de4fc7d0d6cd97815c00933a4b83dad6 Mon Sep 17 00:00:00 2001 From: Zander Brown Date: Sun, 20 May 2018 13:59:00 +0100 Subject: [PATCH 04/13] Keyboard shortcut overview! (shame everything else is broken...) --- hammond-gtk/resources/gtk/help-overlay.ui | 23 ++ hammond-gtk/resources/resources.xml | 1 + hammond-gtk/src/app.rs | 260 +++++++++++----------- hammond-gtk/src/headerbar.rs | 4 +- hammond-gtk/src/main.rs | 2 +- hammond-gtk/src/settings.rs | 4 +- 6 files changed, 153 insertions(+), 141 deletions(-) create mode 100644 hammond-gtk/resources/gtk/help-overlay.ui diff --git a/hammond-gtk/resources/gtk/help-overlay.ui b/hammond-gtk/resources/gtk/help-overlay.ui new file mode 100644 index 0000000..8d790ea --- /dev/null +++ b/hammond-gtk/resources/gtk/help-overlay.ui @@ -0,0 +1,23 @@ + + + + True + + + shortcuts + 12 + + + Miscellaneous + + + <primar>q + Quit + + + + + + + + diff --git a/hammond-gtk/resources/resources.xml b/hammond-gtk/resources/resources.xml index 8a61736..67b98ae 100644 --- a/hammond-gtk/resources/resources.xml +++ b/hammond-gtk/resources/resources.xml @@ -12,6 +12,7 @@ gtk/headerbar.ui gtk/inapp_notif.ui gtk/menus.ui + gtk/help-overlay.ui gtk/style.css diff --git a/hammond-gtk/src/app.rs b/hammond-gtk/src/app.rs index 8899be8..9368911 100644 --- a/hammond-gtk/src/app.rs +++ b/hammond-gtk/src/app.rs @@ -9,15 +9,15 @@ use gtk::SettingsExt as GtkSettingsExt; use hammond_data::Podcast; use hammond_data::{opml}; -use appnotif::{InAppNotification, UndoState}; +//use appnotif::{InAppNotification, UndoState}; use headerbar::Header; use settings::{self, WindowGeometry}; -use stacks::{Content, PopulatedState}; +use stacks::{Content/*, PopulatedState*/}; use utils; -use widgets::{mark_all_notif, remove_show_notif}; +//use widgets::{mark_all_notif, remove_show_notif}; use std::rc::Rc; -use std::sync::mpsc::{channel, Receiver, Sender}; +use std::sync::mpsc::{channel, Sender}; use std::sync::Arc; use rayon; @@ -44,12 +44,6 @@ pub enum Action { #[derive(Debug)] pub struct App { app_instance: gtk::Application, - window: gtk::Window, - overlay: gtk::Overlay, - header: Rc
, - content: Rc, - receiver: Receiver, - sender: Sender, settings: Settings, } @@ -66,21 +60,11 @@ impl App { let cleanup_date = settings::get_cleanup_date(&settings); utils::cleanup(cleanup_date); - // Create the main window - let window = gtk::Window::new(gtk::WindowType::Toplevel); - window.set_title("Hammond"); - - let (sender, receiver) = channel(); - - window.connect_delete_event(clone!(application, settings, window => move |_, _| { - WindowGeometry::from_window(&window).write(&settings); - application.quit(); - Inhibit(false) - })); - // Ideally a lot more than actions would happen in startup & window // creation would be in activate - application.connect_startup(clone!(window, sender => move |app| { + application.connect_startup(clone!(settings => move |app| { + let (sender, _receiver) = channel(); + let refresh = SimpleAction::new("refresh", None); refresh.connect_activate(clone!(sender => move |_, _| { gtk::idle_add(clone!(sender => move || { @@ -92,63 +76,142 @@ impl App { app.add_action(&refresh); let import = SimpleAction::new("import", None); - import.connect_activate(clone!(window, sender => move |_, _| on_import_clicked(&window, &sender))); + import.connect_activate(clone!(sender, app => move |_, _| { + let window = app.get_active_window().expect("Failed to get active window"); + on_import_clicked(&window, &sender); + })); app.add_action(&import); let about = SimpleAction::new("about", None); - // Should investigate use of active_window here - about.connect_activate(clone!(window => move |_, _| about_dialog(&window))); + about.connect_activate(clone!(app => move |_, _| { + let window = app.get_active_window().expect("Failed to get active window"); + about_dialog(&window); + })); app.add_action(&about); let quit = SimpleAction::new("quit", None); quit.connect_activate(clone!(app => move |_, _| app.quit())); app.add_action(&quit); + + app.connect_activate(clone!(sender, settings => move |app| { + // Get the current window (if any) + if let Some(window) = app.get_active_window() { + // Already open, just raise the window + window.present(); + } else { + // Time to open one! + // Create the main window + let window = gtk::ApplicationWindow::new(&app); + window.set_title("Hammond"); + + window.connect_delete_event(clone!(app, settings => move |window, _| { + WindowGeometry::from_window(&window).write(&settings); + app.quit(); + Inhibit(false) + })); + + // Create a content instance + let content = + Rc::new(Content::new(sender.clone()).expect("Content Initialization failed.")); + + // Create the headerbar + let _header = Rc::new(Header::new(&content, &window, &sender)); + + // Add the content main stack to the overlay. + let overlay = gtk::Overlay::new(); + overlay.add(&content.get_stack()); + + // Add the overlay to the main window + window.add(&overlay); + + WindowGeometry::from_settings(&settings).apply(&window); + + App::setup_timed_callbacks(&sender, &settings); + + window.show_all(); + window.activate(); + + let _headerbar = _header; + gtk::timeout_add(50, move || { + /*match receiver.try_recv() { + Ok(Action::RefreshAllViews) => content.update(), + Ok(Action::RefreshShowsView) => content.update_shows_view(), + Ok(Action::RefreshWidgetIfSame(id)) => content.update_widget_if_same(id), + Ok(Action::RefreshEpisodesView) => content.update_home(), + Ok(Action::RefreshEpisodesViewBGR) => content.update_home_if_background(), + Ok(Action::ReplaceWidget(pd)) => { + let shows = content.get_shows(); + let mut pop = shows.borrow().populated(); + pop.borrow_mut() + .replace_widget(pd.clone()) + .map_err(|err| error!("Failed to update ShowWidget: {}", err)) + .map_err(|_| error!("Failed ot update ShowWidget {}", pd.title())) + .ok(); + } + Ok(Action::ShowWidgetAnimated) => { + let shows = content.get_shows(); + let mut pop = shows.borrow().populated(); + pop.borrow_mut().switch_visible( + PopulatedState::Widget, + gtk::StackTransitionType::SlideLeft, + ); + } + Ok(Action::ShowShowsAnimated) => { + let shows = content.get_shows(); + let mut pop = shows.borrow().populated(); + pop.borrow_mut() + .switch_visible(PopulatedState::View, gtk::StackTransitionType::SlideRight); + } + Ok(Action::HeaderBarShowTile(title)) => headerbar.switch_to_back(&title), + Ok(Action::HeaderBarNormal) => headerbar.switch_to_normal(), + Ok(Action::HeaderBarShowUpdateIndicator) => headerbar.show_update_notification(), + Ok(Action::HeaderBarHideUpdateIndicator) => headerbar.hide_update_notification(), + Ok(Action::MarkAllPlayerNotification(pd)) => { + let notif = mark_all_notif(pd, &sender); + notif.show(&overlay); + } + Ok(Action::RemoveShow(pd)) => { + let notif = remove_show_notif(pd, sender.clone()); + notif.show(&overlay); + } + Ok(Action::ErrorNotification(err)) => { + error!("An error notification was triggered: {}", err); + let callback = || glib::Continue(false); + let notif = InAppNotification::new(&err, callback, || {}, UndoState::Hidden); + notif.show(&overlay); + } + Err(_) => (), + }*/ + + Continue(true) + }); + } + })); })); - // Create a content instance - let content = - Rc::new(Content::new(sender.clone()).expect("Content Initialization failed.")); - - // Create the headerbar - let header = Rc::new(Header::new(&content, &window, &sender)); - - // Add the content main stack to the overlay. - let overlay = gtk::Overlay::new(); - overlay.add(&content.get_stack()); - - // Add the overlay to the main window - window.add(&overlay); - App { app_instance: application, - window, - overlay, - header, - content, - receiver, - sender, settings, } } - fn setup_timed_callbacks(&self) { - self.setup_dark_theme(); - self.setup_refresh_on_startup(); - self.setup_auto_refresh(); + fn setup_timed_callbacks(sender: &Sender, settings: &Settings) { + App::setup_dark_theme(&sender, settings); + App::setup_refresh_on_startup(&sender, settings); + App::setup_auto_refresh(&sender, settings); } - fn setup_dark_theme(&self) { - let settings = gtk::Settings::get_default().unwrap(); - let enabled = self.settings.get_boolean("dark-theme"); + fn setup_dark_theme(_sender: &Sender, settings: &Settings) { + let gtk_settings = gtk::Settings::get_default().unwrap(); + let enabled = settings.get_boolean("dark-theme"); - settings.set_property_gtk_application_prefer_dark_theme(enabled); + gtk_settings.set_property_gtk_application_prefer_dark_theme(enabled); } - fn setup_refresh_on_startup(&self) { + fn setup_refresh_on_startup(sender: &Sender, settings: &Settings) { // Update the feeds right after the Application is initialized. - if self.settings.get_boolean("refresh-on-startup") { - let sender = self.sender.clone(); - + let sender = sender.clone(); + if settings.get_boolean("refresh-on-startup") { info!("Refresh on startup."); // The ui loads async, after initialization // so we need to delay this a bit so it won't block @@ -161,12 +224,12 @@ impl App { } } - fn setup_auto_refresh(&self) { - let refresh_interval = settings::get_refresh_interval(&self.settings).num_seconds() as u32; - let sender = self.sender.clone(); + fn setup_auto_refresh(sender: &Sender, settings: &Settings) { + let refresh_interval = settings::get_refresh_interval(&settings).num_seconds() as u32; info!("Auto-refresh every {:?} seconds.", refresh_interval); + let sender = sender.clone(); gtk::timeout_add_seconds(refresh_interval, move || { let s: Option> = None; utils::refresh(s, sender.clone()); @@ -176,85 +239,10 @@ impl App { } pub fn run(self) { - WindowGeometry::from_settings(&self.settings).apply(&self.window); - - let window = self.window.clone(); - self.app_instance.connect_startup(move |app| { - build_ui(&window, app); - }); - - self.setup_timed_callbacks(); - - let content = self.content; - let headerbar = self.header; - let sender = self.sender; - let overlay = self.overlay; - let receiver = self.receiver; - gtk::timeout_add(50, move || { - match receiver.try_recv() { - Ok(Action::RefreshAllViews) => content.update(), - Ok(Action::RefreshShowsView) => content.update_shows_view(), - Ok(Action::RefreshWidgetIfSame(id)) => content.update_widget_if_same(id), - Ok(Action::RefreshEpisodesView) => content.update_home(), - Ok(Action::RefreshEpisodesViewBGR) => content.update_home_if_background(), - Ok(Action::ReplaceWidget(pd)) => { - let shows = content.get_shows(); - let mut pop = shows.borrow().populated(); - pop.borrow_mut() - .replace_widget(pd.clone()) - .map_err(|err| error!("Failed to update ShowWidget: {}", err)) - .map_err(|_| error!("Failed ot update ShowWidget {}", pd.title())) - .ok(); - } - Ok(Action::ShowWidgetAnimated) => { - let shows = content.get_shows(); - let mut pop = shows.borrow().populated(); - pop.borrow_mut().switch_visible( - PopulatedState::Widget, - gtk::StackTransitionType::SlideLeft, - ); - } - Ok(Action::ShowShowsAnimated) => { - let shows = content.get_shows(); - let mut pop = shows.borrow().populated(); - pop.borrow_mut() - .switch_visible(PopulatedState::View, gtk::StackTransitionType::SlideRight); - } - Ok(Action::HeaderBarShowTile(title)) => headerbar.switch_to_back(&title), - Ok(Action::HeaderBarNormal) => headerbar.switch_to_normal(), - Ok(Action::HeaderBarShowUpdateIndicator) => headerbar.show_update_notification(), - Ok(Action::HeaderBarHideUpdateIndicator) => headerbar.hide_update_notification(), - Ok(Action::MarkAllPlayerNotification(pd)) => { - let notif = mark_all_notif(pd, &sender); - notif.show(&overlay); - } - Ok(Action::RemoveShow(pd)) => { - let notif = remove_show_notif(pd, sender.clone()); - notif.show(&overlay); - } - Ok(Action::ErrorNotification(err)) => { - error!("An error notification was triggered: {}", err); - let callback = || glib::Continue(false); - let notif = InAppNotification::new(&err, callback, || {}, UndoState::Hidden); - notif.show(&overlay); - } - Err(_) => (), - } - - Continue(true) - }); - ApplicationExtManual::run(&self.app_instance, &[]); } } -fn build_ui(window: >k::Window, app: >k::Application) { - window.set_application(app); - window.show_all(); - window.activate(); - app.connect_activate(move |_| ()); -} - // Totally copied it from fractal. // https://gitlab.gnome.org/danigm/fractal/blob/503e311e22b9d7540089d735b92af8e8f93560c5/fractal-gtk/src/app.rs#L1883-1912 fn about_dialog(window: >k::Window) { diff --git a/hammond-gtk/src/headerbar.rs b/hammond-gtk/src/headerbar.rs index 59f0f0d..f6d9432 100644 --- a/hammond-gtk/src/headerbar.rs +++ b/hammond-gtk/src/headerbar.rs @@ -58,13 +58,13 @@ impl Default for Header { // TODO: Refactor components into smaller state machines impl Header { - pub fn new(content: &Content, window: >k::Window, sender: &Sender) -> Header { + pub fn new(content: &Content, window: >k::ApplicationWindow, sender: &Sender) -> Header { let h = Header::default(); h.init(content, window, &sender); h } - pub fn init(&self, content: &Content, window: >k::Window, sender: &Sender) { + pub fn init(&self, content: &Content, window: >k::ApplicationWindow, sender: &Sender) { let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/headerbar.ui"); let add_popover: gtk::Popover = builder.get_object("add_popover").unwrap(); diff --git a/hammond-gtk/src/main.rs b/hammond-gtk/src/main.rs index c8d4227..8f26da9 100644 --- a/hammond-gtk/src/main.rs +++ b/hammond-gtk/src/main.rs @@ -4,7 +4,7 @@ )] #![allow(unknown_lints)] #![warn(unused_extern_crates, unused)] -#![deny(warnings)] +//#![deny(warnings)] extern crate gdk; extern crate gdk_pixbuf; diff --git a/hammond-gtk/src/settings.rs b/hammond-gtk/src/settings.rs index 5db3f0b..f725448 100644 --- a/hammond-gtk/src/settings.rs +++ b/hammond-gtk/src/settings.rs @@ -15,7 +15,7 @@ pub struct WindowGeometry { } impl WindowGeometry { - pub fn from_window(window: >k::Window) -> WindowGeometry { + pub fn from_window(window: >k::ApplicationWindow) -> WindowGeometry { let position = window.get_position(); let size = window.get_size(); let left = position.0; @@ -49,7 +49,7 @@ impl WindowGeometry { } } - pub fn apply(&self, window: >k::Window) { + pub fn apply(&self, window: >k::ApplicationWindow) { if self.width > 0 && self.height > 0 { window.resize(self.width, self.height); } From 75c50392cbb07fe4ccbf35fc811fb262c6b5cf95 Mon Sep 17 00:00:00 2001 From: Zander Brown Date: Mon, 21 May 2018 10:06:10 +0100 Subject: [PATCH 05/13] Everything works (ish) Also use FileChooserNative for flatpak nicities --- hammond-gtk/resources/gtk/help-overlay.ui | 2 +- hammond-gtk/resources/gtk/menus.ui | 1 + hammond-gtk/src/app.rs | 38 +++++++++++++---------- hammond-gtk/src/main.rs | 4 +-- 4 files changed, 25 insertions(+), 20 deletions(-) diff --git a/hammond-gtk/resources/gtk/help-overlay.ui b/hammond-gtk/resources/gtk/help-overlay.ui index 8d790ea..e8af8f7 100644 --- a/hammond-gtk/resources/gtk/help-overlay.ui +++ b/hammond-gtk/resources/gtk/help-overlay.ui @@ -11,7 +11,7 @@ Miscellaneous - <primar>q + <primary>q Quit diff --git a/hammond-gtk/resources/gtk/menus.ui b/hammond-gtk/resources/gtk/menus.ui index eebf8f8..fc22bbb 100644 --- a/hammond-gtk/resources/gtk/menus.ui +++ b/hammond-gtk/resources/gtk/menus.ui @@ -38,6 +38,7 @@ _Quit app.quit + <primary>q
diff --git a/hammond-gtk/src/app.rs b/hammond-gtk/src/app.rs index 9368911..e9e69e8 100644 --- a/hammond-gtk/src/app.rs +++ b/hammond-gtk/src/app.rs @@ -9,12 +9,12 @@ use gtk::SettingsExt as GtkSettingsExt; use hammond_data::Podcast; use hammond_data::{opml}; -//use appnotif::{InAppNotification, UndoState}; +use appnotif::{InAppNotification, UndoState}; use headerbar::Header; use settings::{self, WindowGeometry}; -use stacks::{Content/*, PopulatedState*/}; +use stacks::{Content, PopulatedState}; use utils; -//use widgets::{mark_all_notif, remove_show_notif}; +use widgets::{mark_all_notif, remove_show_notif}; use std::rc::Rc; use std::sync::mpsc::{channel, Sender}; @@ -22,6 +22,8 @@ use std::sync::Arc; use rayon; +use std::cell::RefCell; + #[derive(Debug, Clone)] pub enum Action { RefreshAllViews, @@ -63,7 +65,8 @@ impl App { // Ideally a lot more than actions would happen in startup & window // creation would be in activate application.connect_startup(clone!(settings => move |app| { - let (sender, _receiver) = channel(); + let (sender, receiver) = channel(); + let receiver = Rc::new(RefCell::new(receiver)); let refresh = SimpleAction::new("refresh", None); refresh.connect_activate(clone!(sender => move |_, _| { @@ -93,7 +96,7 @@ impl App { quit.connect_activate(clone!(app => move |_, _| app.quit())); app.add_action(&quit); - app.connect_activate(clone!(sender, settings => move |app| { + app.connect_activate(clone!(sender, settings, receiver => move |app| { // Get the current window (if any) if let Some(window) = app.get_active_window() { // Already open, just raise the window @@ -115,7 +118,7 @@ impl App { Rc::new(Content::new(sender.clone()).expect("Content Initialization failed.")); // Create the headerbar - let _header = Rc::new(Header::new(&content, &window, &sender)); + let header = Rc::new(Header::new(&content, &window, &sender)); // Add the content main stack to the overlay. let overlay = gtk::Overlay::new(); @@ -131,9 +134,12 @@ impl App { window.show_all(); window.activate(); - let _headerbar = _header; - gtk::timeout_add(50, move || { - /*match receiver.try_recv() { + let headerbar = header; + gtk::timeout_add(50, clone!(sender, receiver => move || { + // Uses receiver, content, headerbar, sender, overlay + let act = receiver.borrow().try_recv(); + //let act: Result = Ok(Action::RefreshAllViews); + match act { Ok(Action::RefreshAllViews) => content.update(), Ok(Action::RefreshShowsView) => content.update_shows_view(), Ok(Action::RefreshWidgetIfSame(id)) => content.update_widget_if_same(id), @@ -181,10 +187,10 @@ impl App { notif.show(&overlay); } Err(_) => (), - }*/ + } Continue(true) - }); + })); } })); })); @@ -282,19 +288,17 @@ fn about_dialog(window: >k::Window) { fn on_import_clicked(window: >k::Window, sender: &Sender) { use glib::translate::ToGlib; - use gtk::{FileChooserAction, FileChooserDialog, FileFilter, ResponseType}; + use gtk::{FileChooserAction, FileChooserNative, FileFilter, ResponseType}; // let dialog = FileChooserDialog::new(title, Some(&window), FileChooserAction::Open); // TODO: It might be better to use a FileChooserNative widget. // Create the FileChooser Dialog - let dialog = FileChooserDialog::with_buttons( + let dialog = FileChooserNative::new( Some("Select the file from which to you want to Import Shows."), Some(window), FileChooserAction::Open, - &[ - ("_Cancel", ResponseType::Cancel), - ("_Open", ResponseType::Accept), - ], + Some("_Cancel"), + Some("_Import"), ); // Do not show hidden(.thing) files diff --git a/hammond-gtk/src/main.rs b/hammond-gtk/src/main.rs index 8f26da9..83114fe 100644 --- a/hammond-gtk/src/main.rs +++ b/hammond-gtk/src/main.rs @@ -4,7 +4,7 @@ )] #![allow(unknown_lints)] #![warn(unused_extern_crates, unused)] -//#![deny(warnings)] +#![deny(warnings)] extern crate gdk; extern crate gdk_pixbuf; @@ -94,4 +94,4 @@ fn main() { ); App::new().run(); -} +} \ No newline at end of file From ca5c7022ef3a2cbc2271d63b8d2cb870925111bc Mon Sep 17 00:00:00 2001 From: Zander Brown Date: Mon, 21 May 2018 11:49:35 +0100 Subject: [PATCH 06/13] Fixed some shortcut display issues Also give FileChooserNative arguments in the right order & add F5 to refresh --- hammond-gtk/resources/gtk/help-overlay.ui | 14 ++++++-- hammond-gtk/resources/gtk/menus.ui | 1 + hammond-gtk/src/app.rs | 41 +++++++++++++---------- 3 files changed, 37 insertions(+), 19 deletions(-) diff --git a/hammond-gtk/resources/gtk/help-overlay.ui b/hammond-gtk/resources/gtk/help-overlay.ui index e8af8f7..25bd08a 100644 --- a/hammond-gtk/resources/gtk/help-overlay.ui +++ b/hammond-gtk/resources/gtk/help-overlay.ui @@ -6,13 +6,23 @@ shortcuts 12 + True - Miscellaneous + General + True + True + F5 + Check for new episodes + + + + + True <primary>q - Quit + Quit the application diff --git a/hammond-gtk/resources/gtk/menus.ui b/hammond-gtk/resources/gtk/menus.ui index fc22bbb..10bc0eb 100644 --- a/hammond-gtk/resources/gtk/menus.ui +++ b/hammond-gtk/resources/gtk/menus.ui @@ -6,6 +6,7 @@ _Check for new episodes app.refresh + F5 _Import Shows diff --git a/hammond-gtk/src/app.rs b/hammond-gtk/src/app.rs index e9e69e8..a29c844 100644 --- a/hammond-gtk/src/app.rs +++ b/hammond-gtk/src/app.rs @@ -1,6 +1,7 @@ #![allow(new_without_default)] -use gio::{ApplicationExt, ApplicationExtManual, ApplicationFlags, Settings, SettingsExt, SimpleAction, SimpleActionExt, ActionMapExt}; +use gio::{ApplicationExt, ApplicationExtManual, ApplicationFlags, Settings, + SettingsExt, SimpleAction, SimpleActionExt, ActionMapExt}; use glib; use gtk; use gtk::prelude::*; @@ -62,8 +63,6 @@ impl App { let cleanup_date = settings::get_cleanup_date(&settings); utils::cleanup(cleanup_date); - // Ideally a lot more than actions would happen in startup & window - // creation would be in activate application.connect_startup(clone!(settings => move |app| { let (sender, receiver) = channel(); let receiver = Rc::new(RefCell::new(receiver)); @@ -115,7 +114,8 @@ impl App { // Create a content instance let content = - Rc::new(Content::new(sender.clone()).expect("Content Initialization failed.")); + Rc::new(Content::new(sender.clone()).expect( + "Content Initialization failed.")); // Create the headerbar let header = Rc::new(Header::new(&content, &window, &sender)); @@ -134,24 +134,26 @@ impl App { window.show_all(); window.activate(); - let headerbar = header; gtk::timeout_add(50, clone!(sender, receiver => move || { - // Uses receiver, content, headerbar, sender, overlay + // Uses receiver, content, header, sender, overlay let act = receiver.borrow().try_recv(); //let act: Result = Ok(Action::RefreshAllViews); match act { Ok(Action::RefreshAllViews) => content.update(), Ok(Action::RefreshShowsView) => content.update_shows_view(), - Ok(Action::RefreshWidgetIfSame(id)) => content.update_widget_if_same(id), + Ok(Action::RefreshWidgetIfSame(id)) => + content.update_widget_if_same(id), Ok(Action::RefreshEpisodesView) => content.update_home(), - Ok(Action::RefreshEpisodesViewBGR) => content.update_home_if_background(), + Ok(Action::RefreshEpisodesViewBGR) => + content.update_home_if_background(), Ok(Action::ReplaceWidget(pd)) => { let shows = content.get_shows(); let mut pop = shows.borrow().populated(); pop.borrow_mut() .replace_widget(pd.clone()) .map_err(|err| error!("Failed to update ShowWidget: {}", err)) - .map_err(|_| error!("Failed ot update ShowWidget {}", pd.title())) + .map_err(|_| + error!("Failed ot update ShowWidget {}", pd.title())) .ok(); } Ok(Action::ShowWidgetAnimated) => { @@ -166,12 +168,16 @@ impl App { let shows = content.get_shows(); let mut pop = shows.borrow().populated(); pop.borrow_mut() - .switch_visible(PopulatedState::View, gtk::StackTransitionType::SlideRight); + .switch_visible(PopulatedState::View, + gtk::StackTransitionType::SlideRight); } - Ok(Action::HeaderBarShowTile(title)) => headerbar.switch_to_back(&title), - Ok(Action::HeaderBarNormal) => headerbar.switch_to_normal(), - Ok(Action::HeaderBarShowUpdateIndicator) => headerbar.show_update_notification(), - Ok(Action::HeaderBarHideUpdateIndicator) => headerbar.hide_update_notification(), + Ok(Action::HeaderBarShowTile(title)) => + header.switch_to_back(&title), + Ok(Action::HeaderBarNormal) => header.switch_to_normal(), + Ok(Action::HeaderBarShowUpdateIndicator) => + header.show_update_notification(), + Ok(Action::HeaderBarHideUpdateIndicator) => + header.hide_update_notification(), Ok(Action::MarkAllPlayerNotification(pd)) => { let notif = mark_all_notif(pd, &sender); notif.show(&overlay); @@ -183,7 +189,8 @@ impl App { Ok(Action::ErrorNotification(err)) => { error!("An error notification was triggered: {}", err); let callback = || glib::Continue(false); - let notif = InAppNotification::new(&err, callback, || {}, UndoState::Hidden); + let notif = InAppNotification::new(&err, callback, + || {}, UndoState::Hidden); notif.show(&overlay); } Err(_) => (), @@ -260,7 +267,7 @@ fn about_dialog(window: >k::Window) { "Jordan Petridis", "Julian Sparber", "Rowan Lewis", - "Zander Brown" + "Zander Brown", ]; let dialog = gtk::AboutDialog::new(); @@ -297,8 +304,8 @@ fn on_import_clicked(window: >k::Window, sender: &Sender) { Some("Select the file from which to you want to Import Shows."), Some(window), FileChooserAction::Open, - Some("_Cancel"), Some("_Import"), + None, ); // Do not show hidden(.thing) files From e181a9837af34a4fd6ca141f08e1b0a6c97b61dc Mon Sep 17 00:00:00 2001 From: Zander Brown Date: Mon, 21 May 2018 12:01:32 +0100 Subject: [PATCH 07/13] Merge upstream master --- .gitlab-ci.yml | 4 +-- CHANGELOG.md | 5 ++++ hammond-data/src/feed.rs | 3 ++- hammond-data/src/models/new_episode.rs | 27 ++++++++++++------- hammond-data/src/models/new_podcast.rs | 6 +++-- hammond-downloader/src/downloader.rs | 6 +++-- .../resources/org.gnome.Hammond.appdata.xml | 2 +- hammond-gtk/src/app.rs | 2 +- hammond-gtk/src/headerbar.rs | 1 + hammond-gtk/src/widgets/episode.rs | 6 +++-- hammond-gtk/src/widgets/home_view.rs | 3 ++- hammond-gtk/src/widgets/show.rs | 3 ++- hammond-gtk/src/widgets/shows_view.rs | 3 ++- meson.build | 2 +- rustfmt.toml | 1 - 15 files changed, 49 insertions(+), 25 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ffa6c14..cd0cac3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -125,7 +125,7 @@ rustfmt: script: - rustc -Vv && cargo -Vv - cargo fmt --version - - cargo fmt --all -- --write-mode=diff + - cargo fmt --all -- --check # Configure and run clippy on nightly # Only fails on errors atm. @@ -140,4 +140,4 @@ clippy: # Force regeneration of gresources regardless of artifacts chage - cd hammond-gtk/resources/ && glib-compile-resources --generate resources.xml && cd ../../ - cargo clippy --all - <<: *cargo_cache \ No newline at end of file + <<: *cargo_cache diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c7f416..99a3f01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Fixed: ### Removed: +## [0.3.4] - 2018-05-20 +### Fixed: +- Flatpak can now access the Home folder. This fixes the OPML import feature from +not being able to access any file. + ## [0.3.3] - 2018-05-19 ### Added: - Initial functionality for importing shows from an OPML file was implemented. diff --git a/hammond-data/src/feed.rs b/hammond-data/src/feed.rs index c2ee2e6..745e551 100644 --- a/hammond-data/src/feed.rs +++ b/hammond-data/src/feed.rs @@ -174,7 +174,8 @@ mod tests { fn test_complete_index() { truncate_db().unwrap(); - let feeds: Vec<_> = URLS.iter() + let feeds: Vec<_> = URLS + .iter() .map(|&(path, url)| { // Create and insert a Source into db let s = Source::from_url(url).unwrap(); diff --git a/hammond-data/src/models/new_episode.rs b/hammond-data/src/models/new_episode.rs index d41371b..0018042 100644 --- a/hammond-data/src/models/new_episode.rs +++ b/hammond-data/src/models/new_episode.rs @@ -101,17 +101,23 @@ impl Index<()> for NewEpisode { impl PartialEq for NewEpisode { fn eq(&self, other: &EpisodeMinimal) -> bool { - (self.title() == other.title()) && (self.uri() == other.uri()) - && (self.duration() == other.duration()) && (self.epoch() == other.epoch()) - && (self.guid() == other.guid()) && (self.podcast_id() == other.podcast_id()) + (self.title() == other.title()) + && (self.uri() == other.uri()) + && (self.duration() == other.duration()) + && (self.epoch() == other.epoch()) + && (self.guid() == other.guid()) + && (self.podcast_id() == other.podcast_id()) } } impl PartialEq for NewEpisode { fn eq(&self, other: &Episode) -> bool { - (self.title() == other.title()) && (self.uri() == other.uri()) - && (self.duration() == other.duration()) && (self.epoch() == other.epoch()) - && (self.guid() == other.guid()) && (self.podcast_id() == other.podcast_id()) + (self.title() == other.title()) + && (self.uri() == other.uri()) + && (self.duration() == other.duration()) + && (self.epoch() == other.epoch()) + && (self.guid() == other.guid()) + && (self.podcast_id() == other.podcast_id()) && (self.description() == other.description()) && (self.length() == other.length()) } @@ -182,9 +188,12 @@ pub(crate) struct NewEpisodeMinimal { impl PartialEq for NewEpisodeMinimal { fn eq(&self, other: &EpisodeMinimal) -> bool { - (self.title() == other.title()) && (self.uri() == other.uri()) - && (self.duration() == other.duration()) && (self.epoch() == other.epoch()) - && (self.guid() == other.guid()) && (self.podcast_id() == other.podcast_id()) + (self.title() == other.title()) + && (self.uri() == other.uri()) + && (self.duration() == other.duration()) + && (self.epoch() == other.epoch()) + && (self.guid() == other.guid()) + && (self.podcast_id() == other.podcast_id()) } } diff --git a/hammond-data/src/models/new_podcast.rs b/hammond-data/src/models/new_podcast.rs index 2bf727b..75152c5 100644 --- a/hammond-data/src/models/new_podcast.rs +++ b/hammond-data/src/models/new_podcast.rs @@ -83,7 +83,8 @@ impl Index<()> for NewPodcast { impl PartialEq for NewPodcast { fn eq(&self, other: &Podcast) -> bool { - (self.link() == other.link()) && (self.title() == other.title()) + (self.link() == other.link()) + && (self.title() == other.title()) && (self.image_uri() == other.image_uri()) && (self.description() == other.description()) && (self.source_id() == other.source_id()) @@ -103,7 +104,8 @@ impl NewPodcast { .to_string(); // Try to get the itunes img first - let itunes_img = chan.itunes_ext() + let itunes_img = chan + .itunes_ext() .and_then(|s| s.image().map(|url| url.trim())) .map(|s| s.to_owned()); // If itunes is None, try to get the channel.image from the rss spec diff --git a/hammond-downloader/src/downloader.rs b/hammond-downloader/src/downloader.rs index e62bdab..0315887 100644 --- a/hammond-downloader/src/downloader.rs +++ b/hammond-downloader/src/downloader.rs @@ -197,7 +197,8 @@ pub fn get_episode( } pub fn cache_image(pd: &PodcastCoverQuery) -> Result { - let url = pd.image_uri() + let url = pd + .image_uri() .ok_or_else(|| DownloadError::NoImageLocation)? .to_owned(); @@ -215,7 +216,8 @@ pub fn cache_image(pd: &PodcastCoverQuery) -> Result { // For some reason there is no .first() method so nth(0) is used let path = foo.nth(0).and_then(|x| x.ok()); if let Some(p) = path { - return Ok(p.to_str() + return Ok(p + .to_str() .ok_or_else(|| DownloadError::InvalidCachedImageLocation)? .into()); } diff --git a/hammond-gtk/resources/org.gnome.Hammond.appdata.xml b/hammond-gtk/resources/org.gnome.Hammond.appdata.xml index db08187..e94a861 100644 --- a/hammond-gtk/resources/org.gnome.Hammond.appdata.xml +++ b/hammond-gtk/resources/org.gnome.Hammond.appdata.xml @@ -28,7 +28,7 @@ - + https://gitlab.gnome.org/World/hammond jpetridis@gnome.org diff --git a/hammond-gtk/src/app.rs b/hammond-gtk/src/app.rs index a29c844..482eff3 100644 --- a/hammond-gtk/src/app.rs +++ b/hammond-gtk/src/app.rs @@ -280,7 +280,7 @@ fn about_dialog(window: >k::Window) { dialog.set_modal(true); // TODO: make it show it fetches the commit hash from which it was built // and the version number is kept in sync automaticly - dialog.set_version("0.3.3"); + dialog.set_version("0.3.4"); dialog.set_program_name("Hammond"); // TODO: Need a wiki page first. // dialog.set_website("https://wiki.gnome.org/Design/Apps/Potential/Podcasts"); diff --git a/hammond-gtk/src/headerbar.rs b/hammond-gtk/src/headerbar.rs index f6d9432..6c98485 100644 --- a/hammond-gtk/src/headerbar.rs +++ b/hammond-gtk/src/headerbar.rs @@ -202,3 +202,4 @@ fn on_url_change( } } } + diff --git a/hammond-gtk/src/widgets/episode.rs b/hammond-gtk/src/widgets/episode.rs index d938e92..5b314b4 100644 --- a/hammond-gtk/src/widgets/episode.rs +++ b/hammond-gtk/src/widgets/episode.rs @@ -299,7 +299,8 @@ fn progress_bar_helper( episode_rowid: i32, ) -> Result { let (fraction, downloaded) = { - let m = prog.lock() + let m = prog + .lock() .map_err(|_| format_err!("Failed to get a lock on the mutex."))?; (m.get_fraction(), m.get_downloaded()) }; @@ -357,7 +358,8 @@ fn total_size_helper( ) -> Result { // Get the total_bytes. let total_bytes = { - let m = prog.lock() + let m = prog + .lock() .map_err(|_| format_err!("Failed to get a lock on the mutex."))?; m.get_total_size() }; diff --git a/hammond-gtk/src/widgets/home_view.rs b/hammond-gtk/src/widgets/home_view.rs index 1341fea..d98abff 100644 --- a/hammond-gtk/src/widgets/home_view.rs +++ b/hammond-gtk/src/widgets/home_view.rs @@ -138,7 +138,8 @@ impl HomeView { /// Save the vertical scrollbar position. pub fn save_alignment(&self) -> Result<(), Error> { if let Ok(mut guard) = EPISODES_VIEW_VALIGNMENT.lock() { - let adj = self.scrolled_window + let adj = self + .scrolled_window .get_vadjustment() .ok_or_else(|| format_err!("Could not get the adjustment"))?; *guard = Some(SendCell::new(adj)); diff --git a/hammond-gtk/src/widgets/show.rs b/hammond-gtk/src/widgets/show.rs index 388ae12..71adc24 100644 --- a/hammond-gtk/src/widgets/show.rs +++ b/hammond-gtk/src/widgets/show.rs @@ -130,7 +130,8 @@ impl ShowWidget { /// Save the scrollabar vajustment to the cache. pub fn save_vadjustment(&self, oldid: i32) -> Result<(), Error> { if let Ok(mut guard) = SHOW_WIDGET_VALIGNMENT.lock() { - let adj = self.scrolled_window + let adj = self + .scrolled_window .get_vadjustment() .ok_or_else(|| format_err!("Could not get the adjustment"))?; *guard = Some((oldid, SendCell::new(adj))); diff --git a/hammond-gtk/src/widgets/shows_view.rs b/hammond-gtk/src/widgets/shows_view.rs index ad7982e..7516026 100644 --- a/hammond-gtk/src/widgets/shows_view.rs +++ b/hammond-gtk/src/widgets/shows_view.rs @@ -78,7 +78,8 @@ impl ShowsView { /// Save the vertical scrollbar position. pub fn save_alignment(&self) -> Result<(), Error> { if let Ok(mut guard) = SHOWS_VIEW_VALIGNMENT.lock() { - let adj = self.scrolled_window + let adj = self + .scrolled_window .get_vadjustment() .ok_or_else(|| format_err!("Could not get the adjustment"))?; *guard = Some(SendCell::new(adj)); diff --git a/meson.build b/meson.build index e86c25f..d9e620e 100644 --- a/meson.build +++ b/meson.build @@ -3,7 +3,7 @@ project( 'hammond', 'rust', - version: '0.3.3', + version: '0.3.4', license: 'GPLv3', ) diff --git a/rustfmt.toml b/rustfmt.toml index 2eeaaa8..898973f 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -1,5 +1,4 @@ unstable_features = true -verbose = false max_width = 100 comment_width = 100 wrap_comments = true From 079ae0e1f3cee8d5f7259dc330f613861ddb42f9 Mon Sep 17 00:00:00 2001 From: Zander Brown Date: Mon, 21 May 2018 13:01:06 +0100 Subject: [PATCH 08/13] Fallback to hamburger when the environment doesn't like app menus --- hammond-gtk/resources/gtk/headerbar.ui | 123 +------------------------ hammond-gtk/src/app.rs | 3 +- hammond-gtk/src/headerbar.rs | 27 ++++-- 3 files changed, 25 insertions(+), 128 deletions(-) diff --git a/hammond-gtk/resources/gtk/headerbar.ui b/hammond-gtk/resources/gtk/headerbar.ui index 8ad7d0b..b5306db 100644 --- a/hammond-gtk/resources/gtk/headerbar.ui +++ b/hammond-gtk/resources/gtk/headerbar.ui @@ -258,7 +258,8 @@ Tobias Bernard - True + False + True True False center @@ -284,125 +285,5 @@ Tobias Bernard False menu_toggle - - - True - False - 10 - 10 - 10 - 10 - vertical - - - True - False - True - False - Preferences - - - False - True - 0 - - - - - True - True - True - Check for new episodes - app.refresh - - - False - True - 1 - - - - - True - True - True - Import Shows - app.import - - - False - True - 2 - - - - - True - False - True - False - Export Shows - - - False - True - 3 - - - - - True - False - - - False - True - 4 - - - - - True - True - False - About - app.about - - - False - True - 6 - - - - - True - False - True - False - Help - - - False - True - 7 - - - - - True - False - True - False - Keyboard Shortcuts - - - False - True - 8 - - - - diff --git a/hammond-gtk/src/app.rs b/hammond-gtk/src/app.rs index 482eff3..f9ef7f1 100644 --- a/hammond-gtk/src/app.rs +++ b/hammond-gtk/src/app.rs @@ -118,7 +118,8 @@ impl App { "Content Initialization failed.")); // Create the headerbar - let header = Rc::new(Header::new(&content, &window, &sender)); + let local_menu = !app.prefers_app_menu(); + let header = Rc::new(Header::new(&content, &window, &sender, local_menu)); // Add the content main stack to the overlay. let overlay = gtk::Overlay::new(); diff --git a/hammond-gtk/src/headerbar.rs b/hammond-gtk/src/headerbar.rs index 6c98485..7632fe0 100644 --- a/hammond-gtk/src/headerbar.rs +++ b/hammond-gtk/src/headerbar.rs @@ -1,6 +1,7 @@ use glib; use gtk; use gtk::prelude::*; +use gio::MenuModel; use failure::Error; use failure::ResultExt; @@ -22,10 +23,12 @@ pub struct Header { switch: gtk::StackSwitcher, back: gtk::Button, show_title: gtk::Label, - export: gtk::ModelButton, update_box: gtk::Box, update_label: gtk::Label, update_spinner: gtk::Spinner, + menu_button: gtk::Button, + menu_popover: gtk::Popover, + app_menu: MenuModel } impl Default for Header { @@ -37,10 +40,13 @@ impl Default for Header { let switch = builder.get_object("switch").unwrap(); let back = builder.get_object("back").unwrap(); let show_title = builder.get_object("show_title").unwrap(); - let export = builder.get_object("export").unwrap(); let update_box = builder.get_object("update_notification").unwrap(); let update_label = builder.get_object("update_label").unwrap(); let update_spinner = builder.get_object("update_spinner").unwrap(); + let menu_button = builder.get_object("menu_toggle").unwrap(); + let menu_popover = builder.get_object("menu_popover").unwrap(); + let menus = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/menus.ui"); + let app_menu = menus.get_object("app-menu").unwrap(); Header { container: header, @@ -48,23 +54,27 @@ impl Default for Header { switch, back, show_title, - export, update_box, update_label, update_spinner, + menu_button, + menu_popover, + app_menu, } } } // TODO: Refactor components into smaller state machines impl Header { - pub fn new(content: &Content, window: >k::ApplicationWindow, sender: &Sender) -> Header { + pub fn new(content: &Content, window: >k::ApplicationWindow, + sender: &Sender, local_menu: bool) -> Header { let h = Header::default(); - h.init(content, window, &sender); + h.init(content, window, &sender, local_menu); h } - pub fn init(&self, content: &Content, window: >k::ApplicationWindow, sender: &Sender) { + pub fn init(&self, content: &Content, window: >k::ApplicationWindow, + sender: &Sender, local_menu: bool) { let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/headerbar.ui"); let add_popover: gtk::Popover = builder.get_object("add_popover").unwrap(); @@ -105,6 +115,11 @@ impl Header { .ok(); }), ); + + if local_menu { + self.menu_popover.bind_model(Some(&self.app_menu), None); + self.menu_button.set_visible(true); + } } pub fn switch_to_back(&self, title: &str) { From 793cafd29498ea9c21bea0ba535afef229650dc1 Mon Sep 17 00:00:00 2001 From: Zander Brown Date: Tue, 22 May 2018 09:55:00 +0100 Subject: [PATCH 09/13] Formatting updates --- hammond-gtk/src/app.rs | 8 +++++--- hammond-gtk/src/headerbar.rs | 22 +++++++++++++++------- hammond-gtk/src/main.rs | 2 +- hammond-gtk/src/widgets/home_view.rs | 2 +- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/hammond-gtk/src/app.rs b/hammond-gtk/src/app.rs index f9ef7f1..dc2e7fc 100644 --- a/hammond-gtk/src/app.rs +++ b/hammond-gtk/src/app.rs @@ -1,14 +1,16 @@ #![allow(new_without_default)] -use gio::{ApplicationExt, ApplicationExtManual, ApplicationFlags, Settings, - SettingsExt, SimpleAction, SimpleActionExt, ActionMapExt}; +use gio::{ + ActionMapExt, ApplicationExt, ApplicationExtManual, ApplicationFlags, Settings, SettingsExt, + SimpleAction, SimpleActionExt, +}; use glib; use gtk; use gtk::prelude::*; use gtk::SettingsExt as GtkSettingsExt; +use hammond_data::opml; use hammond_data::Podcast; -use hammond_data::{opml}; use appnotif::{InAppNotification, UndoState}; use headerbar::Header; diff --git a/hammond-gtk/src/headerbar.rs b/hammond-gtk/src/headerbar.rs index 7632fe0..06dd436 100644 --- a/hammond-gtk/src/headerbar.rs +++ b/hammond-gtk/src/headerbar.rs @@ -1,7 +1,7 @@ +use gio::MenuModel; use glib; use gtk; use gtk::prelude::*; -use gio::MenuModel; use failure::Error; use failure::ResultExt; @@ -28,7 +28,7 @@ pub struct Header { update_spinner: gtk::Spinner, menu_button: gtk::Button, menu_popover: gtk::Popover, - app_menu: MenuModel + app_menu: MenuModel, } impl Default for Header { @@ -66,15 +66,24 @@ impl Default for Header { // TODO: Refactor components into smaller state machines impl Header { - pub fn new(content: &Content, window: >k::ApplicationWindow, - sender: &Sender, local_menu: bool) -> Header { + pub fn new( + content: &Content, + window: >k::ApplicationWindow, + sender: &Sender, + local_menu: bool, + ) -> Header { let h = Header::default(); h.init(content, window, &sender, local_menu); h } - pub fn init(&self, content: &Content, window: >k::ApplicationWindow, - sender: &Sender, local_menu: bool) { + pub fn init( + &self, + content: &Content, + window: >k::ApplicationWindow, + sender: &Sender, + local_menu: bool, + ) { let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/headerbar.ui"); let add_popover: gtk::Popover = builder.get_object("add_popover").unwrap(); @@ -217,4 +226,3 @@ fn on_url_change( } } } - diff --git a/hammond-gtk/src/main.rs b/hammond-gtk/src/main.rs index 83114fe..c8d4227 100644 --- a/hammond-gtk/src/main.rs +++ b/hammond-gtk/src/main.rs @@ -94,4 +94,4 @@ fn main() { ); App::new().run(); -} \ No newline at end of file +} diff --git a/hammond-gtk/src/widgets/home_view.rs b/hammond-gtk/src/widgets/home_view.rs index d98abff..b0321c5 100644 --- a/hammond-gtk/src/widgets/home_view.rs +++ b/hammond-gtk/src/widgets/home_view.rs @@ -225,4 +225,4 @@ impl HomeEpisode { fn set_cover(&self, podcast_id: i32) -> Result<(), Error> { utils::set_image_from_path(&self.image, podcast_id, 64) } -} \ No newline at end of file +} From e7128a57db75b076b0ff352a7c01fb637cd302f9 Mon Sep 17 00:00:00 2001 From: Zander Brown Date: Tue, 22 May 2018 10:28:13 +0100 Subject: [PATCH 10/13] Resolve some comments --- hammond-gtk/src/app.rs | 102 +------------------------ hammond-gtk/src/utils.rs | 59 ++++++++++++++ hammond-gtk/src/widgets/aboutdialog.rs | 39 ++++++++++ hammond-gtk/src/widgets/mod.rs | 2 + 4 files changed, 102 insertions(+), 100 deletions(-) create mode 100644 hammond-gtk/src/widgets/aboutdialog.rs diff --git a/hammond-gtk/src/app.rs b/hammond-gtk/src/app.rs index dc2e7fc..4e84f7e 100644 --- a/hammond-gtk/src/app.rs +++ b/hammond-gtk/src/app.rs @@ -9,7 +9,6 @@ use gtk; use gtk::prelude::*; use gtk::SettingsExt as GtkSettingsExt; -use hammond_data::opml; use hammond_data::Podcast; use appnotif::{InAppNotification, UndoState}; @@ -17,14 +16,12 @@ use headerbar::Header; use settings::{self, WindowGeometry}; use stacks::{Content, PopulatedState}; use utils; -use widgets::{mark_all_notif, remove_show_notif}; +use widgets::{about_dialog, mark_all_notif, remove_show_notif}; use std::rc::Rc; use std::sync::mpsc::{channel, Sender}; use std::sync::Arc; -use rayon; - use std::cell::RefCell; #[derive(Debug, Clone)] @@ -82,7 +79,7 @@ impl App { let import = SimpleAction::new("import", None); import.connect_activate(clone!(sender, app => move |_, _| { let window = app.get_active_window().expect("Failed to get active window"); - on_import_clicked(&window, &sender); + utils::on_import_clicked(&window, &sender); })); app.add_action(&import); @@ -258,98 +255,3 @@ impl App { ApplicationExtManual::run(&self.app_instance, &[]); } } - -// Totally copied it from fractal. -// https://gitlab.gnome.org/danigm/fractal/blob/503e311e22b9d7540089d735b92af8e8f93560c5/fractal-gtk/src/app.rs#L1883-1912 -fn about_dialog(window: >k::Window) { - // Feel free to add yourself if you contribured. - let authors = &[ - "Constantin Nickel", - "Gabriele Musco", - "James Wykeham-Martin", - "Jordan Petridis", - "Julian Sparber", - "Rowan Lewis", - "Zander Brown", - ]; - - let dialog = gtk::AboutDialog::new(); - // Waiting for a logo. - // dialog.set_logo_icon_name("org.gnome.Hammond"); - dialog.set_logo_icon_name("multimedia-player"); - dialog.set_comments("Podcast Client for the GNOME Desktop."); - dialog.set_copyright("© 2017, 2018 Jordan Petridis"); - dialog.set_license_type(gtk::License::Gpl30); - dialog.set_modal(true); - // TODO: make it show it fetches the commit hash from which it was built - // and the version number is kept in sync automaticly - dialog.set_version("0.3.4"); - dialog.set_program_name("Hammond"); - // TODO: Need a wiki page first. - // dialog.set_website("https://wiki.gnome.org/Design/Apps/Potential/Podcasts"); - // dialog.set_website_label("Learn more about Hammond"); - dialog.set_transient_for(window); - - dialog.set_artists(&["Tobias Bernard"]); - dialog.set_authors(authors); - - dialog.show(); -} - -fn on_import_clicked(window: >k::Window, sender: &Sender) { - use glib::translate::ToGlib; - use gtk::{FileChooserAction, FileChooserNative, FileFilter, ResponseType}; - - // let dialog = FileChooserDialog::new(title, Some(&window), FileChooserAction::Open); - // TODO: It might be better to use a FileChooserNative widget. - // Create the FileChooser Dialog - let dialog = FileChooserNative::new( - Some("Select the file from which to you want to Import Shows."), - Some(window), - FileChooserAction::Open, - Some("_Import"), - None, - ); - - // Do not show hidden(.thing) files - dialog.set_show_hidden(false); - - // Set a filter to show only xml files - let filter = FileFilter::new(); - FileFilterExt::set_name(&filter, Some("OPML file")); - filter.add_mime_type("application/xml"); - filter.add_mime_type("text/xml"); - dialog.add_filter(&filter); - - dialog.connect_response(clone!(sender => move |dialog, resp| { - debug!("Dialong Response {}", resp); - if resp == ResponseType::Accept.to_glib() { - // TODO: Show an in-app notifictaion if the file can not be accessed - if let Some(filename) = dialog.get_filename() { - debug!("File selected: {:?}", filename); - - rayon::spawn(clone!(sender => move || { - // Parse the file and import the feeds - if let Ok(sources) = opml::import_from_file(filename) { - // Refresh the succesfully parsed feeds to index them - utils::refresh(Some(sources), sender) - } else { - let text = String::from("Failed to parse the Imported file"); - sender.send(Action::ErrorNotification(text)) - .map_err(|err| error!("Action Sender: {}", err)) - .ok(); - } - })) - } else { - let text = String::from("Selected File could not be accessed."); - sender.send(Action::ErrorNotification(text)) - .map_err(|err| error!("Action Sender: {}", err)) - .ok(); - } - } - - dialog.destroy(); - })); - - dialog.run(); -} diff --git a/hammond-gtk/src/utils.rs b/hammond-gtk/src/utils.rs index 3704246..b858c73 100644 --- a/hammond-gtk/src/utils.rs +++ b/hammond-gtk/src/utils.rs @@ -17,6 +17,7 @@ use serde_json::Value; // use hammond_data::feed; use hammond_data::dbqueries; +use hammond_data::opml; use hammond_data::pipeline; use hammond_data::utils::checkup; use hammond_data::Source; @@ -333,6 +334,64 @@ fn lookup_id(id: u32) -> Result { .ok_or_else(|| format_err!("Failed to get url from itunes response")) } +pub fn on_import_clicked(window: >k::Window, sender: &Sender) { + use glib::translate::ToGlib; + use gtk::{FileChooserAction, FileChooserNative, FileFilter, ResponseType}; + + // let dialog = FileChooserDialog::new(title, Some(&window), FileChooserAction::Open); + // TODO: It might be better to use a FileChooserNative widget. + // Create the FileChooser Dialog + let dialog = FileChooserNative::new( + Some("Select the file from which to you want to Import Shows."), + Some(window), + FileChooserAction::Open, + Some("_Import"), + None, + ); + + // Do not show hidden(.thing) files + dialog.set_show_hidden(false); + + // Set a filter to show only xml files + let filter = FileFilter::new(); + FileFilterExt::set_name(&filter, Some("OPML file")); + filter.add_mime_type("application/xml"); + filter.add_mime_type("text/xml"); + dialog.add_filter(&filter); + + dialog.connect_response(clone!(sender => move |dialog, resp| { + debug!("Dialong Response {}", resp); + if resp == ResponseType::Accept.to_glib() { + // TODO: Show an in-app notifictaion if the file can not be accessed + if let Some(filename) = dialog.get_filename() { + debug!("File selected: {:?}", filename); + + rayon::spawn(clone!(sender => move || { + // Parse the file and import the feeds + if let Ok(sources) = opml::import_from_file(filename) { + // Refresh the succesfully parsed feeds to index them + refresh(Some(sources), sender) + } else { + let text = String::from("Failed to parse the Imported file"); + sender.send(Action::ErrorNotification(text)) + .map_err(|err| error!("Action Sender: {}", err)) + .ok(); + } + })) + } else { + let text = String::from("Selected File could not be accessed."); + sender.send(Action::ErrorNotification(text)) + .map_err(|err| error!("Action Sender: {}", err)) + .ok(); + } + } + + dialog.destroy(); + })); + + dialog.run(); +} + #[cfg(test)] mod tests { use super::*; diff --git a/hammond-gtk/src/widgets/aboutdialog.rs b/hammond-gtk/src/widgets/aboutdialog.rs new file mode 100644 index 0000000..b8229c5 --- /dev/null +++ b/hammond-gtk/src/widgets/aboutdialog.rs @@ -0,0 +1,39 @@ +use gtk; +use gtk::prelude::*; + +// Totally copied it from fractal. +// https://gitlab.gnome.org/danigm/fractal/blob/503e311e22b9d7540089d735b92af8e8f93560c5/fractal-gtk/src/app.rs#L1883-1912 +pub fn about_dialog(window: >k::Window) { + // Feel free to add yourself if you contribured. + let authors = &[ + "Constantin Nickel", + "Gabriele Musco", + "James Wykeham-Martin", + "Jordan Petridis", + "Julian Sparber", + "Rowan Lewis", + "Zander Brown", + ]; + + let dialog = gtk::AboutDialog::new(); + // Waiting for a logo. + // dialog.set_logo_icon_name("org.gnome.Hammond"); + dialog.set_logo_icon_name("multimedia-player"); + dialog.set_comments("Podcast Client for the GNOME Desktop."); + dialog.set_copyright("© 2017, 2018 Jordan Petridis"); + dialog.set_license_type(gtk::License::Gpl30); + dialog.set_modal(true); + // TODO: make it show it fetches the commit hash from which it was built + // and the version number is kept in sync automaticly + dialog.set_version("0.3.4"); + dialog.set_program_name("Hammond"); + // TODO: Need a wiki page first. + // dialog.set_website("https://wiki.gnome.org/Design/Apps/Potential/Podcasts"); + // dialog.set_website_label("Learn more about Hammond"); + dialog.set_transient_for(window); + + dialog.set_artists(&["Tobias Bernard"]); + dialog.set_authors(authors); + + dialog.show(); +} diff --git a/hammond-gtk/src/widgets/mod.rs b/hammond-gtk/src/widgets/mod.rs index 49b67be..f4b9cf1 100644 --- a/hammond-gtk/src/widgets/mod.rs +++ b/hammond-gtk/src/widgets/mod.rs @@ -1,3 +1,4 @@ +mod aboutdialog; mod empty; mod episode; mod episode_states; @@ -5,6 +6,7 @@ mod home_view; mod show; mod shows_view; +pub use self::aboutdialog::about_dialog; pub use self::empty::EmptyView; pub use self::episode::EpisodeWidget; pub use self::home_view::HomeView; From f1892eeba2c4ee099e8ce813b2416120dac25f2b Mon Sep 17 00:00:00 2001 From: Zander Brown Date: Tue, 22 May 2018 10:46:50 +0100 Subject: [PATCH 11/13] Always show hamburger menu --- hammond-gtk/resources/gtk/headerbar.ui | 5 ++--- hammond-gtk/src/app.rs | 3 +-- hammond-gtk/src/headerbar.rs | 12 ++---------- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/hammond-gtk/resources/gtk/headerbar.ui b/hammond-gtk/resources/gtk/headerbar.ui index b5306db..a450d4f 100644 --- a/hammond-gtk/resources/gtk/headerbar.ui +++ b/hammond-gtk/resources/gtk/headerbar.ui @@ -258,8 +258,7 @@ Tobias Bernard - False - True + True True False center @@ -286,4 +285,4 @@ Tobias Bernard False menu_toggle - + \ No newline at end of file diff --git a/hammond-gtk/src/app.rs b/hammond-gtk/src/app.rs index 4e84f7e..cc4e4bd 100644 --- a/hammond-gtk/src/app.rs +++ b/hammond-gtk/src/app.rs @@ -117,8 +117,7 @@ impl App { "Content Initialization failed.")); // Create the headerbar - let local_menu = !app.prefers_app_menu(); - let header = Rc::new(Header::new(&content, &window, &sender, local_menu)); + let header = Rc::new(Header::new(&content, &window, &sender)); // Add the content main stack to the overlay. let overlay = gtk::Overlay::new(); diff --git a/hammond-gtk/src/headerbar.rs b/hammond-gtk/src/headerbar.rs index 06dd436..5bab96c 100644 --- a/hammond-gtk/src/headerbar.rs +++ b/hammond-gtk/src/headerbar.rs @@ -26,7 +26,6 @@ pub struct Header { update_box: gtk::Box, update_label: gtk::Label, update_spinner: gtk::Spinner, - menu_button: gtk::Button, menu_popover: gtk::Popover, app_menu: MenuModel, } @@ -43,7 +42,6 @@ impl Default for Header { let update_box = builder.get_object("update_notification").unwrap(); let update_label = builder.get_object("update_label").unwrap(); let update_spinner = builder.get_object("update_spinner").unwrap(); - let menu_button = builder.get_object("menu_toggle").unwrap(); let menu_popover = builder.get_object("menu_popover").unwrap(); let menus = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/menus.ui"); let app_menu = menus.get_object("app-menu").unwrap(); @@ -57,7 +55,6 @@ impl Default for Header { update_box, update_label, update_spinner, - menu_button, menu_popover, app_menu, } @@ -70,10 +67,9 @@ impl Header { content: &Content, window: >k::ApplicationWindow, sender: &Sender, - local_menu: bool, ) -> Header { let h = Header::default(); - h.init(content, window, &sender, local_menu); + h.init(content, window, &sender); h } @@ -82,7 +78,6 @@ impl Header { content: &Content, window: >k::ApplicationWindow, sender: &Sender, - local_menu: bool, ) { let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/headerbar.ui"); @@ -125,10 +120,7 @@ impl Header { }), ); - if local_menu { - self.menu_popover.bind_model(Some(&self.app_menu), None); - self.menu_button.set_visible(true); - } + self.menu_popover.bind_model(Some(&self.app_menu), None); } pub fn switch_to_back(&self, title: &str) { From b5f7399b2c1c5f9f9387bbc60af6520a2e09e051 Mon Sep 17 00:00:00 2001 From: Zander Brown Date: Sun, 27 May 2018 14:32:15 +0100 Subject: [PATCH 12/13] RIP appmenu F5 -> r for refresh --- hammond-gtk/resources/gtk/help-overlay.ui | 4 ++-- hammond-gtk/resources/gtk/menus.ui | 9 ++------- hammond-gtk/src/headerbar.rs | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/hammond-gtk/resources/gtk/help-overlay.ui b/hammond-gtk/resources/gtk/help-overlay.ui index 25bd08a..40b17da 100644 --- a/hammond-gtk/resources/gtk/help-overlay.ui +++ b/hammond-gtk/resources/gtk/help-overlay.ui @@ -14,7 +14,7 @@ True - F5 + <primary>r Check for new episodes @@ -30,4 +30,4 @@ - + \ No newline at end of file diff --git a/hammond-gtk/resources/gtk/menus.ui b/hammond-gtk/resources/gtk/menus.ui index 10bc0eb..58de81a 100644 --- a/hammond-gtk/resources/gtk/menus.ui +++ b/hammond-gtk/resources/gtk/menus.ui @@ -1,12 +1,12 @@ - +
_Check for new episodes app.refresh - F5 + <primary>r _Import Shows @@ -36,11 +36,6 @@ _About app.about - - _Quit - app.quit - <primary>q -
\ No newline at end of file diff --git a/hammond-gtk/src/headerbar.rs b/hammond-gtk/src/headerbar.rs index 5bab96c..cca65b4 100644 --- a/hammond-gtk/src/headerbar.rs +++ b/hammond-gtk/src/headerbar.rs @@ -44,7 +44,7 @@ impl Default for Header { let update_spinner = builder.get_object("update_spinner").unwrap(); let menu_popover = builder.get_object("menu_popover").unwrap(); let menus = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/menus.ui"); - let app_menu = menus.get_object("app-menu").unwrap(); + let app_menu = menus.get_object("menu").unwrap(); Header { container: header, From ffbab0136f235aaaef01f77d6a2946c616aabedb Mon Sep 17 00:00:00 2001 From: Zander Brown Date: Sun, 27 May 2018 15:48:27 +0100 Subject: [PATCH 13/13] Bind F10 to open the menu Because we aren't using app-menu accels aren't automatically binded --- hammond-gtk/resources/gtk/headerbar.ui | 8 ++------ hammond-gtk/src/app.rs | 10 ++++++++++ hammond-gtk/src/headerbar.rs | 12 ++++++++---- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/hammond-gtk/resources/gtk/headerbar.ui b/hammond-gtk/resources/gtk/headerbar.ui index a450d4f..4bdb777 100644 --- a/hammond-gtk/resources/gtk/headerbar.ui +++ b/hammond-gtk/resources/gtk/headerbar.ui @@ -257,12 +257,12 @@ Tobias Bernard - + True True False center - menu_popover + True True @@ -281,8 +281,4 @@ Tobias Bernard - - False - menu_toggle - \ No newline at end of file diff --git a/hammond-gtk/src/app.rs b/hammond-gtk/src/app.rs index cc4e4bd..0a0dd7c 100644 --- a/hammond-gtk/src/app.rs +++ b/hammond-gtk/src/app.rs @@ -75,6 +75,7 @@ impl App { })); })); app.add_action(&refresh); + app.set_accels_for_action("app.refresh", &["r"]); let import = SimpleAction::new("import", None); import.connect_activate(clone!(sender, app => move |_, _| { @@ -93,6 +94,9 @@ impl App { let quit = SimpleAction::new("quit", None); quit.connect_activate(clone!(app => move |_, _| app.quit())); app.add_action(&quit); + app.set_accels_for_action("app.quit", &["q"]); + + app.set_accels_for_action("win.menu", &["F10"]); app.connect_activate(clone!(sender, settings, receiver => move |app| { // Get the current window (if any) @@ -119,6 +123,12 @@ impl App { // Create the headerbar let header = Rc::new(Header::new(&content, &window, &sender)); + let menu = SimpleAction::new("menu", None); + menu.connect_activate(clone!(header => move |_, _| { + header.open_menu(); + })); + window.add_action(&menu); + // Add the content main stack to the overlay. let overlay = gtk::Overlay::new(); overlay.add(&content.get_stack()); diff --git a/hammond-gtk/src/headerbar.rs b/hammond-gtk/src/headerbar.rs index cca65b4..3929ca7 100644 --- a/hammond-gtk/src/headerbar.rs +++ b/hammond-gtk/src/headerbar.rs @@ -26,7 +26,7 @@ pub struct Header { update_box: gtk::Box, update_label: gtk::Label, update_spinner: gtk::Spinner, - menu_popover: gtk::Popover, + menu_button: gtk::MenuButton, app_menu: MenuModel, } @@ -42,7 +42,7 @@ impl Default for Header { let update_box = builder.get_object("update_notification").unwrap(); let update_label = builder.get_object("update_label").unwrap(); let update_spinner = builder.get_object("update_spinner").unwrap(); - let menu_popover = builder.get_object("menu_popover").unwrap(); + let menu_button = builder.get_object("menu_button").unwrap(); let menus = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/menus.ui"); let app_menu = menus.get_object("menu").unwrap(); @@ -55,7 +55,7 @@ impl Default for Header { update_box, update_label, update_spinner, - menu_popover, + menu_button, app_menu, } } @@ -120,7 +120,7 @@ impl Header { }), ); - self.menu_popover.bind_model(Some(&self.app_menu), None); + self.menu_button.set_menu_model(Some(&self.app_menu)); } pub fn switch_to_back(&self, title: &str) { @@ -155,6 +155,10 @@ impl Header { self.update_spinner.hide(); self.update_label.hide(); } + + pub fn open_menu(&self) { + self.menu_button.clicked(); + } } // FIXME: THIS ALSO SUCKS!