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

Remove home button.

Browse Source
This commit is contained in:
Jordan Petridis 2017-12-10 19:15:32 +02:00
parent e127941d8a
commit 2461dca94d
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
3 changed files with 15 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
hammond-gtk/resources/gtk/headerbar.ui
View File

@ -115,21 +115,28 @@
<property name="has_subtitle">False</property>
<property name="show_close_button">True</property>
<child>
<object class="GtkButton" id="homebutton">
<object class="GtkMenuButton" id="add-toggle-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Add a new feed</property>
<property name="valign">center</property>
<property name="always_show_image">True</property>
<child>
<object class="GtkImage">
<object class="GtkImage" id="add-button-image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-home</property>
<property name="stock">gtk-add</property>
<property name="use_fallback">True</property>
<property name="icon_size">1</property>
</object>
</child>
<style>
<class name="image-button"/>
</style>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkStackSwitcher" id="switch">
@ -137,10 +144,9 @@
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
</object>
<packing>
<property name="position">3</property>
<property name="position">2</property>
</packing>
</child>
<child>
@ -162,32 +168,7 @@
</object>
<packing>
<property name="pack_type">end</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkMenuButton" id="add-toggle-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Add a new feed</property>
<property name="valign">center</property>
<child>
<object class="GtkImage" id="add-button-image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-add</property>
<property name="use_fallback">True</property>
<property name="icon_size">1</property>
</object>
</child>
<style>
<class name="image-button"/>
</style>
</object>
<packing>
<property name="pack_type">end</property>
<property name="position">3</property>
<property name="position">-1</property>
</packing>
</child>
</object>

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

@ -259,13 +259,3 @@ pub fn on_podcasts_child_activate(stack: &gtk::Stack, pd: &Podcast) {
update_widget(stack, pd);
stack.set_visible_child_full("widget", gtk::StackTransitionType::SlideLeft);
}
pub fn on_home_button_activate(stack: &gtk::Stack) {
let vis = stack.get_visible_child_name().unwrap();
if vis != "widget" {
update_podcasts(stack);
}
show_podcasts(stack);
}

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

@ -5,12 +5,11 @@ use hammond_data::Source;
use hammond_data::utils::url_cleaner;
use utils;
use content;
// use content;
#[derive(Debug)]
pub struct Header {
pub container: gtk::HeaderBar,
home: gtk::Button,
refresh: gtk::Button,
add_toggle: gtk::MenuButton,
switch: gtk::StackSwitcher,
@ -21,7 +20,6 @@ impl Header {
let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/headerbar.ui");
let header: gtk::HeaderBar = builder.get_object("headerbar1").unwrap();
let home: gtk::Button = builder.get_object("homebutton").unwrap();
let refresh: gtk::Button = builder.get_object("refbutton").unwrap();
let add_toggle: gtk::MenuButton = builder.get_object("add-toggle-button").unwrap();
let switch: gtk::StackSwitcher = builder.get_object("switch").unwrap();
@ -30,7 +28,6 @@ impl Header {
Header {
container: header,
home,
refresh,
add_toggle,
switch,
@ -64,12 +61,6 @@ impl Header {
}));
self.add_toggle.set_popover(&add_popover);
// TODO: make it a back arrow button, that will hide when appropriate,
// and add a StackSwitcher when more views are added.
self.home.connect_clicked(clone!(stack => move |_| {
content::on_home_button_activate(&stack);
}));
// FIXME: There appears to be a memmory leak here.
self.refresh.connect_clicked(clone!(stack => move |_| {
utils::refresh_feed(&stack, None, None);