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

Minor cleanup.

Browse Source
This commit is contained in:
Jordan Petridis 2018-01-03 08:12:55 +02:00
parent c33b493dcd
commit 67bc3e5225
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hammond-gtk/src/content.rs
View File

@ -26,7 +26,7 @@ impl Content {
pub fn new(sender: Sender<Action>) -> Rc<Content> { pub fn new(sender: Sender<Action>) -> Rc<Content> {
let stack = gtk::Stack::new(); let stack = gtk::Stack::new();
let episodes = EpisodeStack::new(sender.clone()); let episodes = EpisodeStack::new(sender.clone());
let shows = ShowStack::new(episodes.clone(), sender.clone()); let shows = ShowStack::new(sender.clone());
stack.add_titled(&episodes.stack, "episodes", "Episodes"); stack.add_titled(&episodes.stack, "episodes", "Episodes");
stack.add_titled(&shows.stack, "shows", "Shows"); stack.add_titled(&shows.stack, "shows", "Shows");
@ -70,17 +70,15 @@ impl Content {
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct ShowStack { pub struct ShowStack {
stack: gtk::Stack, stack: gtk::Stack,
epstack: Rc<EpisodeStack>,
sender: Sender<Action>, sender: Sender<Action>,
} }
impl ShowStack { impl ShowStack {
fn new(epstack: Rc<EpisodeStack>, sender: Sender<Action>) -> Rc<ShowStack> { fn new(sender: Sender<Action>) -> Rc<ShowStack> {
let stack = gtk::Stack::new(); let stack = gtk::Stack::new();
let show = Rc::new(ShowStack { let show = Rc::new(ShowStack {
stack, stack,
epstack,
sender: sender.clone(), sender: sender.clone(),
}); });
@ -114,8 +112,7 @@ impl ShowStack {
let vis = self.stack.get_visible_child_name().unwrap(); let vis = self.stack.get_visible_child_name().unwrap();
let old = self.stack.get_child_by_name("podcasts").unwrap(); let old = self.stack.get_child_by_name("podcasts").unwrap();
let pop = ShowsPopulated::default(); let pop = ShowsPopulated::new(Rc::new(self.clone()), self.sender.clone());
pop.init(Rc::new(self.clone()), self.sender.clone());
self.stack.remove(&old); self.stack.remove(&old);
self.stack.add_named(&pop.container, "podcasts"); self.stack.add_named(&pop.container, "podcasts");
@ -173,8 +170,6 @@ impl ShowStack {
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct EpisodeStack { pub struct EpisodeStack {
// populated: RecentEpisodes,
// empty: EmptyView,
stack: gtk::Stack, stack: gtk::Stack,
sender: Sender<Action>, sender: Sender<Action>,
} }