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

app.rs: Group the gactions declarations.

Browse Source
This commit is contained in:
Jordan Petridis 2018-06-27 17:11:32 +03:00
parent f7263c8ab8
commit 49bcf46b4f
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
1 changed files with 24 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,14 +91,6 @@ impl App {
// Create the headerbar // Create the headerbar
let header = Rc::new(Header::new(&content, &window, &sender)); let header = Rc::new(Header::new(&content, &window, &sender));
action!(
window,
"menu",
clone!(header => move |_, _| {
header.open_menu();
})
);
// Add the content main stack to the overlay. // Add the content main stack to the overlay.
let overlay = gtk::Overlay::new(); let overlay = gtk::Overlay::new();
overlay.add(&content.get_stack()); overlay.add(&content.get_stack());
@ -130,22 +122,17 @@ impl App {
fn init(app: &Rc<Self>) { fn init(app: &Rc<Self>) {
let cleanup_date = settings::get_cleanup_date(&app.settings); let cleanup_date = settings::get_cleanup_date(&app.settings);
// Garbage collect watched episodes from the disk
utils::cleanup(cleanup_date); utils::cleanup(cleanup_date);
app.setup_gactions(); app.setup_gactions();
app.setup_timed_callbacks(); app.setup_timed_callbacks();
app.instance
.set_accels_for_action("win.refresh", &["<primary>r"]);
app.instance
.set_accels_for_action("win.quit", &["<primary>q"]);
// Bind the hamburger menu button to `F10`
app.instance.set_accels_for_action("win.menu", &["F10"]);
WindowGeometry::from_settings(&app.settings).apply(&app.window);
app.instance.connect_activate(move |_| ()); app.instance.connect_activate(move |_| ());
// Retrieve the previous window position and size.
WindowGeometry::from_settings(&app.settings).apply(&app.window);
// Setup the Action channel // Setup the Action channel
gtk::timeout_add(25, clone!(app => move || app.setup_action_channel())); gtk::timeout_add(25, clone!(app => move || app.setup_action_channel()));
} }
@ -195,38 +182,41 @@ impl App {
/// Define the `GAction`s. /// Define the `GAction`s.
/// ///
/// Used in menus and the keyboard shortcuts dialog. /// Used in menus and the keyboard shortcuts dialog.
#[cfg_attr(rustfmt, rustfmt_skip)]
fn setup_gactions(&self) { fn setup_gactions(&self) {
let sender = &self.sender; let sender = &self.sender;
let win = &self.window; let win = &self.window;
let instance = &self.instance; let instance = &self.instance;
let header = &self.headerbar;
// Create the `refresh` action. // Create the `refresh` action.
// //
// This will trigger a refresh of all the shows in the database. // This will trigger a refresh of all the shows in the database.
action!( action!(win, "refresh", clone!(sender => move |_, _| {
win,
"refresh",
clone!(sender => move |_, _| {
gtk::idle_add(clone!(sender => move || { gtk::idle_add(clone!(sender => move || {
let s: Option<Vec<_>> = None; let s: Option<Vec<_>> = None;
utils::refresh(s, sender.clone()); utils::refresh(s, sender.clone());
glib::Continue(false) glib::Continue(false)
})); }));
}) }));
); self.instance.set_accels_for_action("win.refresh", &["<primary>r"]);
// Create the `OPML` import action // Create the `OPML` import action
action!( action!(win, "import", clone!(sender, win => move |_, _| {
win, utils::on_import_clicked(&win, &sender)
"import", }));
clone!(sender, win => move |_, _| utils::on_import_clicked(&win, &sender))
);
// Create the action that shows a `gtk::AboutDialog` // Create the action that shows a `gtk::AboutDialog`
action!(win, "about", clone!(win => move |_, _| about_dialog(&win))); action!(win, "about", clone!(win => move |_, _| about_dialog(&win)));
// Create the quit action // Create the quit action
action!(win, "quit", clone!(win => move |_, _| instance.quit())); action!(win, "quit", clone!(instance => move |_, _| instance.quit()));
self.instance.set_accels_for_action("win.quit", &["<primary>q"]);
// Create the menu action
action!(win, "menu",clone!(header => move |_, _| header.open_menu()));
// Bind the hamburger menu button to `F10`
self.instance.set_accels_for_action("win.menu", &["F10"]);
} }
fn setup_action_channel(&self) -> glib::Continue { fn setup_action_channel(&self) -> glib::Continue {