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

Rename glade files.

Browse Source
This commit is contained in:
Jordan Petridis 2017-12-13 12:21:34 +02:00
parent 82a59d80dd
commit 0a52f87f3a
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
6 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
hammond-gtk/resources/gtk/podcast_widget.ui → hammond-gtk/resources/gtk/show_widget.ui
View File

0
hammond-gtk/resources/gtk/podcasts_child.ui → hammond-gtk/resources/gtk/shows_child.ui
View File

0
hammond-gtk/resources/gtk/podcasts_view.ui → hammond-gtk/resources/gtk/shows_view.ui
View File

6
hammond-gtk/resources/resources.xml
View File

@ -3,10 +3,10 @@
<gresource prefix="/org/gnome/hammond/"> <gresource prefix="/org/gnome/hammond/">
<file>banner.png</file> <file>banner.png</file>
<file preprocess="xml-stripblanks">gtk/episode_widget.ui</file> <file preprocess="xml-stripblanks">gtk/episode_widget.ui</file>
<file preprocess="xml-stripblanks">gtk/podcast_widget.ui</file> <file preprocess="xml-stripblanks">gtk/show_widget.ui</file>
<file preprocess="xml-stripblanks">gtk/empty_view.ui</file> <file preprocess="xml-stripblanks">gtk/empty_view.ui</file>
<file preprocess="xml-stripblanks">gtk/podcasts_view.ui</file> <file preprocess="xml-stripblanks">gtk/shows_view.ui</file>
<file preprocess="xml-stripblanks">gtk/podcasts_child.ui</file> <file preprocess="xml-stripblanks">gtk/shows_child.ui</file>
<file preprocess="xml-stripblanks">gtk/headerbar.ui</file> <file preprocess="xml-stripblanks">gtk/headerbar.ui</file>
</gresource> </gresource>
</gresources> </gresources>

7
hammond-gtk/src/views/shows.rs
View File

@ -30,7 +30,7 @@ struct ShowsChild {
impl ShowsPopulated { impl ShowsPopulated {
pub fn new() -> ShowsPopulated { pub fn new() -> ShowsPopulated {
let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/podcasts_view.ui"); let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/shows_view.ui");
let container: gtk::Box = builder.get_object("fb_parent").unwrap(); let container: gtk::Box = builder.get_object("fb_parent").unwrap();
let flowbox: gtk::FlowBox = builder.get_object("flowbox").unwrap(); let flowbox: gtk::FlowBox = builder.get_object("flowbox").unwrap();
let viewport: gtk::Viewport = builder.get_object("viewport").unwrap(); let viewport: gtk::Viewport = builder.get_object("viewport").unwrap();
@ -53,10 +53,7 @@ impl ShowsPopulated {
use gtk::WidgetExt; use gtk::WidgetExt;
// TODO: handle unwraps. // TODO: handle unwraps.
// Note: flowbox_activation always adds "widnget" into the stack and switch to it,
// TODO: implement back button. // TODO: implement back button.
// so back button should always remove "widget" and destroy it.
let show = show.clone();
self.flowbox self.flowbox
.connect_child_activated(clone!(show => move |_, child| { .connect_child_activated(clone!(show => move |_, child| {
// This is such an ugly hack... // This is such an ugly hack...
@ -89,7 +86,7 @@ impl ShowsPopulated {
impl ShowsChild { impl ShowsChild {
fn new() -> ShowsChild { fn new() -> ShowsChild {
let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/podcasts_child.ui"); let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/shows_child.ui");
// Copy of gnome-music AlbumWidget // Copy of gnome-music AlbumWidget
let container: gtk::Box = builder.get_object("fb_child").unwrap(); let container: gtk::Box = builder.get_object("fb_child").unwrap();

2
hammond-gtk/src/widgets/show.rs
View File

@ -27,7 +27,7 @@ pub struct ShowWidget {
impl ShowWidget { impl ShowWidget {
pub fn new() -> ShowWidget { pub fn new() -> ShowWidget {
// Adapted from gnome-music AlbumWidget // Adapted from gnome-music AlbumWidget
let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/podcast_widget.ui"); let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/show_widget.ui");
let container: gtk::Box = builder.get_object("podcast_widget").unwrap(); let container: gtk::Box = builder.get_object("podcast_widget").unwrap();
let cover: gtk::Image = builder.get_object("cover").unwrap(); let cover: gtk::Image = builder.get_object("cover").unwrap();