From b6fd0ed7ce9352a6822499bb316fec922061c0c7 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Fri, 20 Oct 2017 04:58:45 +0300 Subject: [PATCH] renamed gtk/podcasts_grid.ui to gtk/podcasts_view.ui --- hammond-gtk/gtk/{podcasts_grid.ui => podcasts_view.ui} | 0 hammond-gtk/src/main.rs | 2 +- hammond-gtk/src/views/podcasts_view.rs | 2 +- hammond-gtk/src/widgets/episode.rs | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) rename hammond-gtk/gtk/{podcasts_grid.ui => podcasts_view.ui} (100%) diff --git a/hammond-gtk/gtk/podcasts_grid.ui b/hammond-gtk/gtk/podcasts_view.ui similarity index 100% rename from hammond-gtk/gtk/podcasts_grid.ui rename to hammond-gtk/gtk/podcasts_view.ui diff --git a/hammond-gtk/src/main.rs b/hammond-gtk/src/main.rs index 1446305..543b8d1 100644 --- a/hammond-gtk/src/main.rs +++ b/hammond-gtk/src/main.rs @@ -6,13 +6,13 @@ extern crate gio; extern crate gtk; extern crate diesel; +extern crate dissolve; extern crate hammond_data; extern crate hammond_downloader; #[macro_use] extern crate log; extern crate loggerv; extern crate open; -extern crate dissolve; use log::LogLevel; use hammond_data::index_feed; diff --git a/hammond-gtk/src/views/podcasts_view.rs b/hammond-gtk/src/views/podcasts_view.rs index ca53ae4..c3a4a5e 100644 --- a/hammond-gtk/src/views/podcasts_view.rs +++ b/hammond-gtk/src/views/podcasts_view.rs @@ -75,7 +75,7 @@ fn setup_podcast_widget(db: Arc>, stack: gtk::Stack) { } fn setup_podcasts_grid(db: Arc>, stack: gtk::Stack) { - let builder = include_str!("../../gtk/podcasts_grid.ui"); + let builder = include_str!("../../gtk/podcasts_view.ui"); let builder = gtk::Builder::new_from_string(builder); let grid: gtk::Grid = builder.get_object("grid").unwrap(); stack.add_named(&grid, "pd_grid"); diff --git a/hammond-gtk/src/widgets/episode.rs b/hammond-gtk/src/widgets/episode.rs index 5f960a1..35f3412 100644 --- a/hammond-gtk/src/widgets/episode.rs +++ b/hammond-gtk/src/widgets/episode.rs @@ -44,8 +44,8 @@ fn epidose_widget( // let mk = utils::html_to_markup(d.to_string()); // desc_label.set_markup(mk.as_str()); let d = episode.description().unwrap().to_owned(); - - expander.connect_activate(move |_|{ + + expander.connect_activate(move |_| { let plain_text = strip_html_tags(&d).join(" "); desc_label.set_text(&plain_text.trim()) });