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

Headerbar: simplify the naming scheme a bit.

Browse Source 
The type of the widgets is already a Button so there's no need in
repeating that in the struct field.

Also remove some type annotations since the compiler can infer them
from the type of the struct fields.
This commit is contained in:
Jordan Petridis 2018-05-12 14:45:00 +03:00
parent e8ca2faaa7
commit be1a8df3ef
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
2 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,7 +168,7 @@ Tobias Bernard
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton" id="back_button"> <object class="GtkButton" id="back">
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="no_show_all">True</property> <property name="no_show_all">True</property>
@ -321,7 +321,7 @@ Tobias Bernard
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkModelButton" id="import_button"> <object class="GtkModelButton" id="import">
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property> <property name="sensitive">False</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
@ -335,7 +335,7 @@ Tobias Bernard
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkModelButton" id="export_button"> <object class="GtkModelButton" id="export">
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property> <property name="sensitive">False</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
@ -360,7 +360,7 @@ Tobias Bernard
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkModelButton" id="about_button"> <object class="GtkModelButton" id="about">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>

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

@ -16,15 +16,16 @@ use stacks::Content;
use utils::{itunes_to_rss, refresh}; use utils::{itunes_to_rss, refresh};
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
// TODO: split this into smaller
pub struct Header { pub struct Header {
container: gtk::HeaderBar, container: gtk::HeaderBar,
add_toggle: gtk::MenuButton, add_toggle: gtk::MenuButton,
switch: gtk::StackSwitcher, switch: gtk::StackSwitcher,
back_button: gtk::Button, back: gtk::Button,
show_title: gtk::Label, show_title: gtk::Label,
about_button: gtk::ModelButton, about: gtk::ModelButton,
import_button: gtk::ModelButton, import: gtk::ModelButton,
export_button: gtk::ModelButton, export: gtk::ModelButton,
update_button: gtk::ModelButton, update_button: gtk::ModelButton,
update_box: gtk::Box, update_box: gtk::Box,
update_label: gtk::Label, update_label: gtk::Label,
@ -35,28 +36,28 @@ impl Default for Header {
fn default() -> Header { fn default() -> 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 = builder.get_object("headerbar").unwrap();
let add_toggle: gtk::MenuButton = builder.get_object("add_toggle").unwrap(); let add_toggle = builder.get_object("add_toggle").unwrap();
let switch: gtk::StackSwitcher = builder.get_object("switch").unwrap(); let switch = builder.get_object("switch").unwrap();
let back_button: gtk::Button = builder.get_object("back_button").unwrap(); let back = builder.get_object("back").unwrap();
let show_title: gtk::Label = builder.get_object("show_title").unwrap(); let show_title = builder.get_object("show_title").unwrap();
let import_button: gtk::ModelButton = builder.get_object("import_button").unwrap(); let import = builder.get_object("import").unwrap();
let export_button: gtk::ModelButton = builder.get_object("export_button").unwrap(); let export = builder.get_object("export").unwrap();
let update_button: gtk::ModelButton = builder.get_object("update_button").unwrap(); let update_button = builder.get_object("update_button").unwrap();
let update_box: gtk::Box = builder.get_object("update_notification").unwrap(); let update_box = builder.get_object("update_notification").unwrap();
let update_label: gtk::Label = builder.get_object("update_label").unwrap(); let update_label = builder.get_object("update_label").unwrap();
let update_spinner: gtk::Spinner = builder.get_object("update_spinner").unwrap(); let update_spinner = builder.get_object("update_spinner").unwrap();
let about_button: gtk::ModelButton = builder.get_object("about_button").unwrap(); let about = builder.get_object("about").unwrap();
Header { Header {
container: header, container: header,
add_toggle, add_toggle,
switch, switch,
back_button, back,
show_title, show_title,
about_button, about,
import_button, import,
export_button, export,
update_button, update_button,
update_box, update_box,
update_label, update_label,
@ -106,8 +107,7 @@ impl Header {
})); }));
})); }));
self.about_button self.about.connect_clicked(clone!(window => move |_| {
.connect_clicked(clone!(window => move |_| {
about_dialog(&window); about_dialog(&window);
})); }));
@ -117,7 +117,7 @@ impl Header {
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;
self.back_button.connect_clicked( self.back.connect_clicked(
clone!(switch, add_toggle, show_title, sender => move |back| { clone!(switch, add_toggle, show_title, sender => move |back| {
switch.show(); switch.show();
add_toggle.show(); add_toggle.show();
@ -133,7 +133,7 @@ impl Header {
pub fn switch_to_back(&self, title: &str) { pub fn switch_to_back(&self, title: &str) {
self.switch.hide(); self.switch.hide();
self.add_toggle.hide(); self.add_toggle.hide();
self.back_button.show(); self.back.show();
self.set_show_title(title); self.set_show_title(title);
self.show_title.show(); self.show_title.show();
} }
@ -141,7 +141,7 @@ impl Header {
pub fn switch_to_normal(&self) { pub fn switch_to_normal(&self) {
self.switch.show(); self.switch.show();
self.add_toggle.show(); self.add_toggle.show();
self.back_button.hide(); self.back.hide();
self.show_title.hide(); self.show_title.hide();
} }