diff --git a/podcasts-gtk/src/app.rs b/podcasts-gtk/src/app.rs index 456541f..ddb28d6 100644 --- a/podcasts-gtk/src/app.rs +++ b/podcasts-gtk/src/app.rs @@ -52,13 +52,13 @@ use std::sync::Arc; use crate::config::{APP_ID, LOCALEDIR}; use crate::i18n::i18n; -pub struct HmdApplicationPrivate { +pub struct PdApplicationPrivate { window: RefCell>, settings: RefCell>, } -impl ObjectSubclass for HmdApplicationPrivate { - const NAME: &'static str = "HmdApplication"; +impl ObjectSubclass for PdApplicationPrivate { + const NAME: &'static str = "PdApplication"; type ParentType = gtk::Application; type Instance = subclass::simple::InstanceStruct; type Class = subclass::simple::ClassStruct; @@ -73,13 +73,13 @@ impl ObjectSubclass for HmdApplicationPrivate { } } -impl ObjectImpl for HmdApplicationPrivate { +impl ObjectImpl for PdApplicationPrivate { glib_object_impl!(); } -impl gio::subclass::prelude::ApplicationImpl for HmdApplicationPrivate { +impl gio::subclass::prelude::ApplicationImpl for PdApplicationPrivate { fn activate(&self, app: &gio::Application) { - debug!("GtkApplication::activate"); + debug!("GtkApplication::activate"); if let Some(ref window) = *self.window.borrow() { // Ideally Gtk4/GtkBuilder make this irrelvent @@ -89,7 +89,7 @@ impl gio::subclass::prelude::ApplicationImpl for HmdApplicationPrivate { return; } - let app = app.clone().downcast::().expect("How?"); + let app = app.clone().downcast::().expect("How?"); let window = MainWindow::new(&app); window.setup_gactions(); window.show_all(); @@ -100,7 +100,7 @@ impl gio::subclass::prelude::ApplicationImpl for HmdApplicationPrivate { } fn startup(&self, app: &gio::Application) { - debug!("GtkApplication::startup"); + debug!("GtkApplication::startup"); self.parent_startup(app); @@ -112,18 +112,18 @@ impl gio::subclass::prelude::ApplicationImpl for HmdApplicationPrivate { self.settings.replace(Some(settings)); - let app = app.clone().downcast::().expect("How?"); + let app = app.clone().downcast::().expect("How?"); app.setup_timed_callbacks(); } } -impl gtk::subclass::application::GtkApplicationImpl for HmdApplicationPrivate {} +impl gtk::subclass::application::GtkApplicationImpl for PdApplicationPrivate {} glib_wrapper! { - pub struct HmdApplication(Object, subclass::simple::ClassStruct, HmdApplicationClass>) @extends gio::Application, gtk::Application; + pub struct PdApplication(Object, subclass::simple::ClassStruct, PdApplicationClass>) @extends gio::Application, gtk::Application; match fn { - get_type => || HmdApplicationPrivate::get_type().to_glib(), + get_type => || PdApplicationPrivate::get_type().to_glib(), } } @@ -150,17 +150,17 @@ pub(crate) enum Action { RaiseWindow, } -impl HmdApplication { +impl PdApplication { pub(crate) fn new() -> Self { let application = glib::Object::new( - HmdApplication::static_type(), + PdApplication::static_type(), &[ ("application-id", &Some(APP_ID)), ("flags", &ApplicationFlags::empty()), ], ) .expect("Application initialization failed...") - .downcast::() + .downcast::() .expect("Congrats, you have won a prize for triggering an impossible outcome"); application.set_resource_base_path(Some("/org/gnome/Podcasts")); @@ -173,7 +173,7 @@ impl HmdApplication { } fn setup_dark_theme(&self) { - let data = HmdApplicationPrivate::from_instance(self); + let data = PdApplicationPrivate::from_instance(self); if let Some(ref settings) = *data.settings.borrow() { let gtk_settings = gtk::Settings::get_default().unwrap(); settings.bind( @@ -189,7 +189,7 @@ impl HmdApplication { fn setup_action_channel(&self) -> glib::Continue { use crossbeam_channel::TryRecvError; - let data = HmdApplicationPrivate::from_instance(self); + let data = PdApplicationPrivate::from_instance(self); if let Some(ref window) = *data.window.borrow() { let action = match window.receiver.try_recv() { diff --git a/podcasts-gtk/src/main.rs b/podcasts-gtk/src/main.rs index 3657464..3f45655 100644 --- a/podcasts-gtk/src/main.rs +++ b/podcasts-gtk/src/main.rs @@ -94,7 +94,7 @@ mod utils; mod i18n; -use crate::app::HmdApplication; +use crate::app::PdApplication; #[cfg(test)] fn init_gtk_tests() -> Result<(), failure::Error> { @@ -127,7 +127,7 @@ fn main() { 600, ); - HmdApplication::run(); + PdApplication::run(); } #[test] diff --git a/podcasts-gtk/src/window.rs b/podcasts-gtk/src/window.rs index dac09de..481464c 100644 --- a/podcasts-gtk/src/window.rs +++ b/podcasts-gtk/src/window.rs @@ -27,7 +27,7 @@ use gtk::prelude::*; use crossbeam_channel::{unbounded, Receiver, Sender}; -use crate::app::{Action, HmdApplication}; +use crate::app::{Action, PdApplication}; use crate::headerbar::Header; use crate::settings::{self, WindowGeometry}; use crate::stacks::Content; @@ -59,7 +59,7 @@ where #[derive(Debug)] pub struct MainWindow { - app: HmdApplication, + app: PdApplication, pub(crate) window: gtk::ApplicationWindow, pub(crate) overlay: gtk::Overlay, pub(crate) content: Rc, @@ -71,7 +71,7 @@ pub struct MainWindow { } impl MainWindow { - pub fn new(app: &HmdApplication) -> Self { + pub fn new(app: &PdApplication) -> Self { let settings = gio::Settings::new("org.gnome.Podcasts"); let (sender, receiver) = unbounded();