toxblh/podcasts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed some shortcut display issues

Browse Source 
Also give FileChooserNative arguments in the right order & add F5 to refresh
This commit is contained in:
Zander Brown 2018-05-21 11:49:35 +01:00
parent 75c50392cb
commit ca5c7022ef
3 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hammond-gtk/resources/gtk/help-overlay.ui
View File

@ -6,13 +6,23 @@
<object class="GtkShortcutsSection"> <object class="GtkShortcutsSection">
<property name="section-name">shortcuts</property> <property name="section-name">shortcuts</property>
<property name="max-height">12</property> <property name="max-height">12</property>
<property name="visible">True</property>
<child> <child>
<object class="GtkShortcutsGroup"> <object class="GtkShortcutsGroup">
<property name="title" translatable="yes">Miscellaneous</property> <property name="title" translatable="yes">General</property>
<property name="visible">True</property>
<child> <child>
<object class="GtkShortcutsShortcut"> <object class="GtkShortcutsShortcut">
<property name="visible">True</property>
<property name="accelerator">F5</property>
<property name="title" translatable="yes" context="shortcut window">Check for new episodes</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
<property name="accelerator">&lt;primary&gt;q</property> <property name="accelerator">&lt;primary&gt;q</property>
<property name="title" translatable="yes">Quit</property> <property name="title" translatable="yes" context="shortcut window">Quit the application</property>
</object> </object>
</child> </child>
</object> </object>

1
hammond-gtk/resources/gtk/menus.ui
View File

@ -6,6 +6,7 @@
<item> <item>
<attribute name="label" translatable="yes">_Check for new episodes</attribute> <attribute name="label" translatable="yes">_Check for new episodes</attribute>
<attribute name="action">app.refresh</attribute> <attribute name="action">app.refresh</attribute>
<attribute name="accel">F5</attribute>
</item> </item>
<item> <item>
<attribute name="label" translatable="yes">_Import Shows</attribute> <attribute name="label" translatable="yes">_Import Shows</attribute>

41
hammond-gtk/src/app.rs
View File

@ -1,6 +1,7 @@
#![allow(new_without_default)] #![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 glib;
use gtk; use gtk;
use gtk::prelude::*; use gtk::prelude::*;
@ -62,8 +63,6 @@ impl App {
let cleanup_date = settings::get_cleanup_date(&settings); let cleanup_date = settings::get_cleanup_date(&settings);
utils::cleanup(cleanup_date); 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| { application.connect_startup(clone!(settings => move |app| {
let (sender, receiver) = channel(); let (sender, receiver) = channel();
let receiver = Rc::new(RefCell::new(receiver)); let receiver = Rc::new(RefCell::new(receiver));
@ -115,7 +114,8 @@ impl App {
// Create a content instance // Create a content instance
let content = 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 // Create the headerbar
let header = Rc::new(Header::new(&content, &window, &sender)); let header = Rc::new(Header::new(&content, &window, &sender));
@ -134,24 +134,26 @@ impl App {
window.show_all(); window.show_all();
window.activate(); window.activate();
let headerbar = header;
gtk::timeout_add(50, clone!(sender, receiver => move || { 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 = receiver.borrow().try_recv();
//let act: Result<Action, RecvError> = Ok(Action::RefreshAllViews); //let act: Result<Action, RecvError> = Ok(Action::RefreshAllViews);
match act { match act {
Ok(Action::RefreshAllViews) => content.update(), Ok(Action::RefreshAllViews) => content.update(),
Ok(Action::RefreshShowsView) => content.update_shows_view(), 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::RefreshEpisodesView) => content.update_home(),
Ok(Action::RefreshEpisodesViewBGR) => content.update_home_if_background(), Ok(Action::RefreshEpisodesViewBGR) =>
content.update_home_if_background(),
Ok(Action::ReplaceWidget(pd)) => { Ok(Action::ReplaceWidget(pd)) => {
let shows = content.get_shows(); let shows = content.get_shows();
let mut pop = shows.borrow().populated(); let mut pop = shows.borrow().populated();
pop.borrow_mut() pop.borrow_mut()
.replace_widget(pd.clone()) .replace_widget(pd.clone())
.map_err(|err| error!("Failed to update ShowWidget: {}", err)) .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();
} }
Ok(Action::ShowWidgetAnimated) => { Ok(Action::ShowWidgetAnimated) => {
@ -166,12 +168,16 @@ impl App {
let shows = content.get_shows(); let shows = content.get_shows();
let mut pop = shows.borrow().populated(); let mut pop = shows.borrow().populated();
pop.borrow_mut() 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::HeaderBarShowTile(title)) =>
Ok(Action::HeaderBarNormal) => headerbar.switch_to_normal(), header.switch_to_back(&title),
Ok(Action::HeaderBarShowUpdateIndicator) => headerbar.show_update_notification(), Ok(Action::HeaderBarNormal) => header.switch_to_normal(),
Ok(Action::HeaderBarHideUpdateIndicator) => headerbar.hide_update_notification(), Ok(Action::HeaderBarShowUpdateIndicator) =>
header.show_update_notification(),
Ok(Action::HeaderBarHideUpdateIndicator) =>
header.hide_update_notification(),
Ok(Action::MarkAllPlayerNotification(pd)) => { Ok(Action::MarkAllPlayerNotification(pd)) => {
let notif = mark_all_notif(pd, &sender); let notif = mark_all_notif(pd, &sender);
notif.show(&overlay); notif.show(&overlay);
@ -183,7 +189,8 @@ impl App {
Ok(Action::ErrorNotification(err)) => { Ok(Action::ErrorNotification(err)) => {
error!("An error notification was triggered: {}", err); error!("An error notification was triggered: {}", err);
let callback = || glib::Continue(false); let callback = || glib::Continue(false);
let notif = InAppNotification::new(&err, callback, || {}, UndoState::Hidden); let notif = InAppNotification::new(&err, callback,
|| {}, UndoState::Hidden);
notif.show(&overlay); notif.show(&overlay);
} }
Err(_) => (), Err(_) => (),
@ -260,7 +267,7 @@ fn about_dialog(window: &gtk::Window) {
"Jordan Petridis", "Jordan Petridis",
"Julian Sparber", "Julian Sparber",
"Rowan Lewis", "Rowan Lewis",
"Zander Brown" "Zander Brown",
]; ];
let dialog = gtk::AboutDialog::new(); let dialog = gtk::AboutDialog::new();
@ -297,8 +304,8 @@ fn on_import_clicked(window: &gtk::Window, sender: &Sender<Action>) {
Some("Select the file from which to you want to Import Shows."), Some("Select the file from which to you want to Import Shows."),
Some(window), Some(window),
FileChooserAction::Open, FileChooserAction::Open,
Some("_Cancel"),
Some("_Import"), Some("_Import"),
None,
); );
// Do not show hidden(.thing) files // Do not show hidden(.thing) files