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

Rename podcasts_view module.

Browse Source
This commit is contained in:
Jordan Petridis 2017-11-30 21:10:05 +02:00
parent 1fbcfa47ac
commit b32e35c574
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hammond-gtk/src/headerbar.rs
View File

@ -4,7 +4,7 @@ use gtk::prelude::*;
use hammond_data::Source; use hammond_data::Source;
use hammond_data::utils::url_cleaner; use hammond_data::utils::url_cleaner;
use podcasts_view::update_podcasts_view; use views::podcasts::update_podcasts_view;
use utils; use utils;
#[derive(Debug)] #[derive(Debug)]

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

@ -1,3 +1,5 @@
#![allow(dead_code)]
extern crate gdk; extern crate gdk;
extern crate gdk_pixbuf; extern crate gdk_pixbuf;
extern crate gio; extern crate gio;
@ -47,7 +49,7 @@ mod headerbar;
mod utils; mod utils;
mod static_resource; mod static_resource;
use views::podcasts_view; use views::podcasts;
/* /*
THIS IS STILL A PROTOTYPE. THIS IS STILL A PROTOTYPE.
@ -63,7 +65,7 @@ fn build_ui(app: &gtk::Application) {
let window = gtk::ApplicationWindow::new(app); let window = gtk::ApplicationWindow::new(app);
window.set_default_size(1150, 650); window.set_default_size(1150, 650);
// Setup the Stack that will manage the switch between podcasts_view and podcast_widget. // Setup the Stack that will manage the switch between podcasts_view and podcast_widget.
let stack = podcasts_view::setup_stack(); let stack = podcasts::setup_stack();
window.add(&stack); window.add(&stack);
window.connect_delete_event(|w, _| { window.connect_delete_event(|w, _| {

4
hammond-gtk/src/utils.rs
View File

@ -8,7 +8,7 @@ use std::{thread, time};
use std::cell::RefCell; use std::cell::RefCell;
use std::sync::mpsc::{channel, Receiver}; use std::sync::mpsc::{channel, Receiver};
use views::podcasts_view; use views::podcasts;
type Foo = RefCell<Option<(gtk::Stack, Receiver<bool>)>>; type Foo = RefCell<Option<(gtk::Stack, Receiver<bool>)>>;
@ -55,7 +55,7 @@ fn refresh_podcasts_view() -> glib::Continue {
GLOBAL.with(|global| { GLOBAL.with(|global| {
if let Some((ref stack, ref reciever)) = *global.borrow() { if let Some((ref stack, ref reciever)) = *global.borrow() {
if reciever.try_recv().is_ok() { if reciever.try_recv().is_ok() {
podcasts_view::update_podcasts_view(stack); podcasts::update_podcasts_view(stack);
} }
} }
}); });

2
hammond-gtk/src/views/mod.rs
View File

@ -1 +1 @@
pub mod podcasts_view; pub mod podcasts;

0
hammond-gtk/src/views/podcasts_view.rs → hammond-gtk/src/views/podcasts.rs
View File

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

@ -9,7 +9,7 @@ use hammond_data::Podcast;
use hammond_downloader::downloader; use hammond_downloader::downloader;
use widgets::episode::episodes_listbox; use widgets::episode::episodes_listbox;
use podcasts_view::update_podcasts_view; use views::podcasts::update_podcasts_view;
pub fn podcast_widget(stack: &gtk::Stack, pd: &Podcast) -> gtk::Box { pub fn podcast_widget(stack: &gtk::Stack, pd: &Podcast) -> gtk::Box {
// Adapted from gnome-music AlbumWidget // Adapted from gnome-music AlbumWidget