From 0a47b91913e4dbef6144dd49b2c481a51e404457 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Mon, 25 Dec 2017 22:03:37 +0200 Subject: [PATCH] Headerbar: Wire menu refresh button. --- hammond-gtk/resources/gtk/headerbar.ui | 16 ++++++++-------- hammond-gtk/src/headerbar.rs | 10 ++++++++-- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/hammond-gtk/resources/gtk/headerbar.ui b/hammond-gtk/resources/gtk/headerbar.ui index c71c916..de6028b 100644 --- a/hammond-gtk/resources/gtk/headerbar.ui +++ b/hammond-gtk/resources/gtk/headerbar.ui @@ -7,7 +7,7 @@ Add a new feed center - + True False center @@ -18,7 +18,7 @@ vertical 6 - + True False start @@ -35,12 +35,12 @@ - + True False 6 - + True True 30 @@ -53,12 +53,12 @@ - + True True True - + Add True True @@ -99,7 +99,7 @@ - + False start You are already subscribed to that feed! @@ -240,7 +240,7 @@ - + True True True diff --git a/hammond-gtk/src/headerbar.rs b/hammond-gtk/src/headerbar.rs index fb2e087..96a3ecc 100644 --- a/hammond-gtk/src/headerbar.rs +++ b/hammond-gtk/src/headerbar.rs @@ -57,8 +57,9 @@ impl Header { let add_popover: gtk::Popover = builder.get_object("add_popover").unwrap(); let menu_popover: gtk::PopoverMenu = builder.get_object("menu_popover").unwrap(); - let new_url: gtk::Entry = builder.get_object("new-url").unwrap(); - let add_button: gtk::Button = builder.get_object("add-button").unwrap(); + let new_url: gtk::Entry = builder.get_object("new_url").unwrap(); + let add_button: gtk::Button = builder.get_object("add_button").unwrap(); + let refresh_button: gtk::Button = builder.get_object("refresh_button").unwrap(); self.switch.set_stack(&content.stack); new_url.connect_changed(move |url| { @@ -72,6 +73,11 @@ impl Header { // TODO: map the spinner add_popover.hide(); })); + + refresh_button.connect_clicked(clone!(content => move |_| { + utils::refresh_feed(content.clone(), None); + })); + self.add_toggle.set_popover(&add_popover); self.menu_toggle.set_popover(&menu_popover);