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

hammond-gtk: Remove app menu.

Browse Source
This commit is contained in:
Jordan Petridis 2017-12-23 10:39:20 +02:00
parent 5234ecb2a7
commit f9d17afad3
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
1 changed files with 11 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
hammond-gtk/src/main.rs
View File

@ -27,7 +27,7 @@ use log::LogLevel;
use hammond_data::utils::checkup;
use gtk::prelude::*;
use gio::{ActionMapExt, ApplicationExt, MenuExt, SimpleActionExt};
use gio::ApplicationExt;
use std::rc::Rc;
// http://gtk-rs.org/tuto/closures
@ -58,19 +58,9 @@ mod utils;
mod static_resource;
fn build_ui(app: &gtk::Application) {
let menu = gio::Menu::new();
menu.append("Quit", "app.quit");
menu.append("Checkup", "app.check");
menu.append("Update feeds", "app.update");
app.set_app_menu(&menu);
// Add custom style
let provider = gtk::CssProvider::new();
gtk::CssProvider::load_from_resource(&provider, "/org/gnome/hammond/gtk/style.css");
gtk::StyleContext::add_provider_for_screen(&gdk::Screen::get_default().unwrap(), &provider, 600);
// Get the main window
let window = gtk::ApplicationWindow::new(app);
window.set_default_size(1024, 576);
window.set_default_size(860, 640);
// Get the headerbar
let header = Rc::new(headerbar::Header::default());
@ -84,28 +74,6 @@ fn build_ui(app: &gtk::Application) {
Inhibit(false)
});
// Setup quit in the app menu since default is overwritten.
let quit = gio::SimpleAction::new("quit", None);
let window2 = window.clone();
quit.connect_activate(move |_, _| {
window2.destroy();
});
app.add_action(&quit);
// Setup the checkup in the app menu.
let check = gio::SimpleAction::new("check", None);
check.connect_activate(move |_, _| {
let _ = checkup();
});
app.add_action(&check);
let update = gio::SimpleAction::new("update", None);
let ct_clone = ct.clone();
update.connect_activate(move |_, _| {
utils::refresh_feed(ct_clone.clone(), None);
});
app.add_action(&update);
// Update on startup
gtk::timeout_add_seconds(
30,
@ -114,7 +82,6 @@ fn build_ui(app: &gtk::Application) {
glib::Continue(false)
}),
);
// Auto-updater, runs every hour.
// TODO: expose the interval in which it run to a user setting.
// TODO: show notifications.
@ -146,6 +113,15 @@ fn main() {
let application = gtk::Application::new("org.gnome.Hammond", gio::ApplicationFlags::empty())
.expect("Initialization failed...");
// Add custom style
let provider = gtk::CssProvider::new();
gtk::CssProvider::load_from_resource(&provider, "/org/gnome/hammond/gtk/style.css");
gtk::StyleContext::add_provider_for_screen(
&gdk::Screen::get_default().unwrap(),
&provider,
600,
);
application.connect_startup(move |app| {
build_ui(app);
});