From 8b4701f1a1eaf5afe550124b3f09cccd3ec86fe4 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Wed, 15 Nov 2017 14:55:26 +0200 Subject: [PATCH] Renamed Gresource path in order to be less confusing. --- CONTRIBUTING.md | 4 ---- hammond-gtk/resources/resources.xml | 2 +- hammond-gtk/src/headerbar.rs | 2 +- hammond-gtk/src/views/podcasts_view.rs | 8 ++++---- hammond-gtk/src/widgets/episode.rs | 2 +- hammond-gtk/src/widgets/podcast.rs | 4 ++-- 6 files changed, 9 insertions(+), 13 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6934194..be49c77 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,9 +1,5 @@ -> Adapted from Gnome-TODO -> https://gitlab.gnome.org/GNOME/gnome-todo/blob/582f9a57b84f92dc629b2042b887188878578cdb/CONTRIBUTING.md ## Contributing -Contributing - When contributing to the development of Hammond, please first discuss the change you wish to make via issue, email, or any other method with the maintainers before making a change. Please note we have a code of conduct, please follow it in all your interactions with the project. diff --git a/hammond-gtk/resources/resources.xml b/hammond-gtk/resources/resources.xml index 8933cc4..df3f3cd 100644 --- a/hammond-gtk/resources/resources.xml +++ b/hammond-gtk/resources/resources.xml @@ -1,6 +1,6 @@ - + banner.png gtk/episode_widget.ui gtk/podcast_widget.ui diff --git a/hammond-gtk/src/headerbar.rs b/hammond-gtk/src/headerbar.rs index a61dd65..f8837a4 100644 --- a/hammond-gtk/src/headerbar.rs +++ b/hammond-gtk/src/headerbar.rs @@ -8,7 +8,7 @@ use podcasts_view::update_podcasts_view; use utils; pub fn get_headerbar(db: &Database, stack: >k::Stack) -> gtk::HeaderBar { - let builder = gtk::Builder::new_from_resource("/org/gtk/hammond/gtk/headerbar.ui"); + let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/headerbar.ui"); let header: gtk::HeaderBar = builder.get_object("headerbar1").unwrap(); let home_button: gtk::Button = builder.get_object("homebutton").unwrap(); diff --git a/hammond-gtk/src/views/podcasts_view.rs b/hammond-gtk/src/views/podcasts_view.rs index e7c7fc5..aabeb79 100644 --- a/hammond-gtk/src/views/podcasts_view.rs +++ b/hammond-gtk/src/views/podcasts_view.rs @@ -9,7 +9,7 @@ use hammond_data::index_feed::Database; use widgets::podcast::*; fn setup_empty_view(stack: >k::Stack) { - let builder = gtk::Builder::new_from_resource("/org/gtk/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(); stack.add_named(&view, "empty"); } @@ -36,7 +36,7 @@ fn populate_flowbox(db: &Database, flowbox: >k::FlowBox) { } fn create_flowbox_child(db: &Database, pd: &Podcast) -> gtk::FlowBoxChild { - let builder = gtk::Builder::new_from_resource("/org/gtk/hammond/gtk/podcasts_child.ui"); + let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/podcasts_child.ui"); // Copy of gnome-music AlbumWidget let box_: gtk::Box = builder.get_object("fb_child").unwrap(); @@ -62,7 +62,7 @@ fn create_flowbox_child(db: &Database, pd: &Podcast) -> gtk::FlowBoxChild { } fn configure_banner(db: &Database, pd: &Podcast, banner: >k::Image, banner_title: >k::Label) { - let bann = Pixbuf::new_from_resource_at_scale("/org/gtk/hammond/banner.png", 256, 256, true); + let bann = Pixbuf::new_from_resource_at_scale("/org/gnome/hammond/banner.png", 256, 256, true); if let Ok(b) = bann { banner.set_from_pixbuf(&b); @@ -95,7 +95,7 @@ fn on_flowbox_child_activate(db: &Database, stack: >k::Stack, parent: &Podcast } fn setup_podcasts_flowbox(db: &Database, stack: >k::Stack) -> gtk::FlowBox { - let builder = gtk::Builder::new_from_resource("/org/gtk/hammond/gtk/podcasts_view.ui"); + let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/podcasts_view.ui"); let fb_parent: gtk::Box = builder.get_object("fb_parent").unwrap(); let flowbox: gtk::FlowBox = builder.get_object("flowbox").unwrap(); init_flowbox(db, stack, &flowbox); diff --git a/hammond-gtk/src/widgets/episode.rs b/hammond-gtk/src/widgets/episode.rs index 279fea9..8b53ab8 100644 --- a/hammond-gtk/src/widgets/episode.rs +++ b/hammond-gtk/src/widgets/episode.rs @@ -25,7 +25,7 @@ thread_local!(static GLOBAL: Foo = RefCell::new(None)); fn epidose_widget(db: &Database, episode: &mut Episode, pd_title: &str) -> gtk::Box { // This is just a prototype and will be reworked probably. - let builder = gtk::Builder::new_from_resource("/org/gtk/hammond/gtk/episode_widget.ui"); + let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/episode_widget.ui"); let ep: gtk::Box = builder.get_object("episode_box").unwrap(); let download_button: gtk::Button = builder.get_object("download_button").unwrap(); diff --git a/hammond-gtk/src/widgets/podcast.rs b/hammond-gtk/src/widgets/podcast.rs index 8526924..b3d1d97 100644 --- a/hammond-gtk/src/widgets/podcast.rs +++ b/hammond-gtk/src/widgets/podcast.rs @@ -14,7 +14,7 @@ use podcasts_view::update_podcasts_view; pub fn podcast_widget(db: &Database, stack: >k::Stack, pd: &Podcast) -> gtk::Box { // Adapted from gnome-music AlbumWidget - let builder = gtk::Builder::new_from_resource("/org/gtk/hammond/gtk/podcast_widget.ui"); + let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/podcast_widget.ui"); let pd_widget: gtk::Box = builder.get_object("podcast_widget").unwrap(); let cover: gtk::Image = builder.get_object("cover").unwrap(); @@ -111,7 +111,7 @@ pub fn get_pixbuf_from_path(pd: &Podcast) -> Option { } pub fn setup_podcast_widget(stack: >k::Stack) { - let builder = gtk::Builder::new_from_resource("/org/gtk/hammond/gtk/podcast_widget.ui"); + let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/podcast_widget.ui"); let pd_widget: gtk::Box = builder.get_object("podcast_widget").unwrap(); stack.add_named(&pd_widget, "pdw");