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

Headerbar: Remove refresh button.

Browse Source
This commit is contained in:
Jordan Petridis 2017-12-17 13:57:08 +02:00
parent 4c8c1f0013
commit 2eb58eae00
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
2 changed files with 4 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,27 +190,6 @@
</child> </child>
</object> </object>
</child> </child>
<child>
<object class="GtkButton" id="ref_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="valign">center</property>
<property name="use_underline">True</property>
<property name="always_show_image">True</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">view-refresh-symbolic</property>
</object>
</child>
</object>
<packing>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
<child> <child>
<object class="GtkMenuButton" id="menu"> <object class="GtkMenuButton" id="menu">
<property name="visible">True</property> <property name="visible">True</property>

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

@ -12,7 +12,6 @@ use content::Content;
#[derive(Debug)] #[derive(Debug)]
pub struct Header { pub struct Header {
pub container: gtk::HeaderBar, pub container: gtk::HeaderBar,
refresh: gtk::Button,
add_toggle: gtk::MenuButton, add_toggle: gtk::MenuButton,
switch: gtk::StackSwitcher, switch: gtk::StackSwitcher,
back_button: gtk::Button, back_button: gtk::Button,
@ -24,7 +23,6 @@ impl Default for Header {
let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/headerbar.ui"); let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/headerbar.ui");
let header: gtk::HeaderBar = builder.get_object("headerbar").unwrap(); let header: gtk::HeaderBar = builder.get_object("headerbar").unwrap();
let refresh: gtk::Button = builder.get_object("ref_button").unwrap();
let add_toggle: gtk::MenuButton = builder.get_object("add_toggle_button").unwrap(); let add_toggle: gtk::MenuButton = builder.get_object("add_toggle_button").unwrap();
let switch: gtk::StackSwitcher = builder.get_object("switch").unwrap(); let switch: gtk::StackSwitcher = builder.get_object("switch").unwrap();
let back_button: gtk::Button = builder.get_object("back_button").unwrap(); let back_button: gtk::Button = builder.get_object("back_button").unwrap();
@ -35,7 +33,6 @@ impl Default for Header {
Header { Header {
container: header, container: header,
refresh,
add_toggle, add_toggle,
switch, switch,
back_button, back_button,
@ -73,11 +70,6 @@ impl Header {
})); }));
self.add_toggle.set_popover(&add_popover); self.add_toggle.set_popover(&add_popover);
// FIXME: There appears to be a memmory leak here.
self.refresh.connect_clicked(clone!(content => move |_| {
utils::refresh_feed(content.clone(), None);
}));
let switch = &self.switch; let switch = &self.switch;
let add_toggle = &self.add_toggle; let add_toggle = &self.add_toggle;
let show_title = &self.show_title; let show_title = &self.show_title;
@ -96,7 +88,7 @@ impl Header {
self.switch.hide(); self.switch.hide();
self.add_toggle.hide(); self.add_toggle.hide();
self.back_button.show(); self.back_button.show();
self.show_title.set_text(title); self.set_show_title(title);
self.show_title.show(); self.show_title.show();
} }
@ -107,9 +99,9 @@ impl Header {
self.show_title.hide(); self.show_title.hide();
} }
// pub fn set_show_title(&self, title: &str) { pub fn set_show_title(&self, title: &str) {
// self.show_title.set_text(title) self.show_title.set_text(title)
// } }
} }
fn on_add_bttn_clicked(content: Rc<Content>, entry: &gtk::Entry) { fn on_add_bttn_clicked(content: Rc<Content>, entry: &gtk::Entry) {