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

Headerbar: Do more stuff through glade, cut some code.

Browse Source
This commit is contained in:
Jordan Petridis 2017-12-30 21:19:29 +02:00
parent 5730e71e2a
commit 3c84d889fd
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,8 @@
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Add a new feed</property>
<property name="valign">center</property>
<property name="relative_to">add_toggle</property>
<property name="position">bottom</property>
<child>
<object class="GtkBox" id="add_box">
<property name="visible">True</property>
@ -123,6 +125,7 @@
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Add a new feed</property>
<property name="valign">center</property>
<property name="popover">add_popover</property>
<child>
<object class="GtkImage" id="add-button-image2">
<property name="visible">True</property>
@ -230,8 +233,8 @@
<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>
<property name="popover">menu_popover</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
@ -250,8 +253,9 @@
</packing>
</child>
</object>
<object class="GtkPopoverMenu" id="menu_popover">
<object class="GtkPopover" id="menu_popover">
<property name="can_focus">False</property>
<property name="relative_to">menu_toggle</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
@ -265,7 +269,7 @@
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="text" translatable="yes">Preferences</property>
</object>
@ -304,7 +308,7 @@
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="text" translatable="yes">About</property>
</object>
@ -318,7 +322,7 @@
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="text" translatable="yes">Help</property>
</object>
@ -332,7 +336,7 @@
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="text" translatable="yes">Keyboard Shortcuts</property>
</object>
@ -343,10 +347,6 @@
</packing>
</child>
</object>
<packing>
<property name="submenu">submenu0</property>
<property name="position">1</property>
</packing>
</child>
</object>
</interface>

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

@ -12,7 +12,6 @@ use content::Content;
pub struct Header {
pub container: gtk::HeaderBar,
add_toggle: gtk::MenuButton,
menu_toggle: gtk::MenuButton,
switch: gtk::StackSwitcher,
back_button: gtk::Button,
show_title: gtk::Label,
@ -27,7 +26,6 @@ impl Default for Header {
let header: gtk::HeaderBar = builder.get_object("headerbar").unwrap();
let add_toggle: gtk::MenuButton = builder.get_object("add_toggle").unwrap();
let menu_toggle: gtk::MenuButton = builder.get_object("menu_toggle").unwrap();
let switch: gtk::StackSwitcher = builder.get_object("switch").unwrap();
let back_button: gtk::Button = builder.get_object("back_button").unwrap();
let show_title: gtk::Label = builder.get_object("show_title").unwrap();
@ -38,7 +36,6 @@ impl Default for Header {
Header {
container: header,
add_toggle,
menu_toggle,
switch,
back_button,
show_title,
@ -61,7 +58,6 @@ impl Header {
let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/headerbar.ui");
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();
self.switch.set_stack(&content.get_stack());
@ -76,9 +72,6 @@ impl Header {
add_popover.hide();
}));
self.add_toggle.set_popover(&add_popover);
self.menu_toggle.set_popover(&menu_popover);
let switch = &self.switch;
let add_toggle = &self.add_toggle;
let show_title = &self.show_title;