diff --git a/hammond-gtk/resources/gtk/headerbar.ui b/hammond-gtk/resources/gtk/headerbar.ui index 291502c..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,125 +281,4 @@ 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 - - - False - True - 1 - - - - - True - True - True - Import Shows - - - False - True - 2 - - - - - True - False - True - False - Export Shows - - - False - True - 3 - - - - - True - False - - - False - True - 4 - - - - - True - True - False - About - - - False - True - 6 - - - - - True - False - True - False - Help - - - False - True - 7 - - - - - True - False - True - False - Keyboard Shortcuts - - - False - True - 8 - - - - - - + \ No newline at end of file diff --git a/hammond-gtk/resources/gtk/help-overlay.ui b/hammond-gtk/resources/gtk/help-overlay.ui new file mode 100644 index 0000000..40b17da --- /dev/null +++ b/hammond-gtk/resources/gtk/help-overlay.ui @@ -0,0 +1,33 @@ + + + + True + + + shortcuts + 12 + True + + + General + True + + + True + <primary>r + Check for new episodes + + + + + True + <primary>q + Quit the application + + + + + + + + \ No newline at end of file diff --git a/hammond-gtk/resources/gtk/menus.ui b/hammond-gtk/resources/gtk/menus.ui new file mode 100644 index 0000000..58de81a --- /dev/null +++ b/hammond-gtk/resources/gtk/menus.ui @@ -0,0 +1,41 @@ + + + + +
+ + _Check for new episodes + app.refresh + <primary>r + + + _Import Shows + app.import + + + _Export Shows + app.export + +
+
+ + _Preferences + app.preferences + +
+
+ + _Keyboard Shortcuts + win.show-help-overlay + + + _Help + app.help + + + _About + app.about + +
+ + \ No newline at end of file diff --git a/hammond-gtk/resources/resources.xml b/hammond-gtk/resources/resources.xml index b8e1c75..67b98ae 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,8 @@ gtk/shows_child.ui 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 4668aa3..0a0dd7c 100644 --- a/hammond-gtk/src/app.rs +++ b/hammond-gtk/src/app.rs @@ -1,6 +1,9 @@ #![allow(new_without_default)] -use gio::{ApplicationExt, ApplicationExtManual, ApplicationFlags, Settings, SettingsExt}; +use gio::{ + ActionMapExt, ApplicationExt, ApplicationExtManual, ApplicationFlags, Settings, SettingsExt, + SimpleAction, SimpleActionExt, +}; use glib; use gtk; use gtk::prelude::*; @@ -13,12 +16,14 @@ 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, Receiver, Sender}; +use std::sync::mpsc::{channel, Sender}; use std::sync::Arc; +use std::cell::RefCell; + #[derive(Debug, Clone)] pub enum Action { RefreshAllViews, @@ -41,12 +46,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, } @@ -63,62 +62,178 @@ 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"); + application.connect_startup(clone!(settings => move |app| { + let (sender, receiver) = channel(); + let receiver = Rc::new(RefCell::new(receiver)); - window.connect_delete_event(clone!(application, settings, window => move |_, _| { - WindowGeometry::from_window(&window).write(&settings); - application.quit(); - Inhibit(false) + 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); + app.set_accels_for_action("app.refresh", &["r"]); + + 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"); + utils::on_import_clicked(&window, &sender); + })); + app.add_action(&import); + + let about = SimpleAction::new("about", None); + 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.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) + 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)); + + 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()); + + // 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(); + + gtk::timeout_add(50, clone!(sender, receiver => move || { + // 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::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)) => + 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); + } + 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) + })); + } + })); })); - let (sender, receiver) = channel(); - - // 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 @@ -131,12 +246,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()); @@ -146,81 +261,6 @@ 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 |_| ()); -} 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 8fddaa6..3929ca7 100644 --- a/hammond-gtk/src/headerbar.rs +++ b/hammond-gtk/src/headerbar.rs @@ -1,19 +1,19 @@ +use gio::MenuModel; use glib; use gtk; 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,31 +23,28 @@ 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, update_box: gtk::Box, update_label: gtk::Label, update_spinner: gtk::Spinner, + menu_button: gtk::MenuButton, + app_menu: MenuModel, } 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(); 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(); 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(); + 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(); Header { container: header, @@ -55,27 +52,34 @@ impl Default for Header { switch, back, show_title, - about, - import, - export, - update_button, update_box, update_label, update_spinner, + menu_button, + app_menu, } } } // 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) { - let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/headerbar.ui"); + 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(); let new_url: gtk::Entry = builder.get_object("new_url").unwrap(); @@ -98,22 +102,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) - })); - })); - - self.about - .connect_clicked(clone!(window => move |_| about_dialog(&window))); - - self.import.connect_clicked( - clone!(window, sender => move |_| on_import_clicked(&window, &sender)), - ); - // Add the Headerbar to the window. window.set_titlebar(&self.container); @@ -131,6 +119,8 @@ impl Header { .ok(); }), ); + + self.menu_button.set_menu_model(Some(&self.app_menu)); } pub fn switch_to_back(&self, title: &str) { @@ -165,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! @@ -228,99 +222,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(); -} - -// 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.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/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/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); } 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/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 cc2e468..5b314b4 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 f598e3e..b0321c5 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(); @@ -181,7 +181,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(); @@ -198,7 +198,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(); 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; diff --git a/hammond-gtk/src/widgets/show.rs b/hammond-gtk/src/widgets/show.rs index fb1f023..71adc24 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| { @@ -190,7 +190,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 b282918..7516026 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(); @@ -130,7 +130,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();