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

Headerbar: rename menu-button to hamburger.

Browse Source
This commit is contained in:
Jordan Petridis 2018-07-25 04:57:00 +03:00
parent cfcdba5aea
commit 5a7ab9795d
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
podcasts-gtk/resources/gtk/headerbar.ui
View File

@ -257,6 +257,29 @@ Tobias Bernard
</child> </child>
</object> </object>
</child> </child>
<child>
<object class="GtkMenuButton" id="hamburger">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">open-menu-symbolic</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">2</property>
</packing>
</child>
<child> <child>
<object class="GtkMenuButton" id="secondary_menu"> <object class="GtkMenuButton" id="secondary_menu">
<property name="can_focus">True</property> <property name="can_focus">True</property>
@ -280,28 +303,5 @@ Tobias Bernard
<property name="position">2</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkMenuButton" id="menu_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">open-menu-symbolic</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">2</property>
</packing>
</child>
</object> </object>
</interface> </interface>

14
podcasts-gtk/src/headerbar.rs
View File

@ -23,7 +23,7 @@ pub struct Header {
switch: gtk::StackSwitcher, switch: gtk::StackSwitcher,
back: gtk::Button, back: gtk::Button,
show_title: gtk::Label, show_title: gtk::Label,
menu_button: gtk::MenuButton, hamburger: gtk::MenuButton,
updater: UpdateIndicator, updater: UpdateIndicator,
add: AddPopover, add: AddPopover,
dots: gtk::MenuButton, dots: gtk::MenuButton,
@ -149,9 +149,9 @@ impl Default for Header {
let show_title = builder.get_object("show_title").unwrap(); let show_title = builder.get_object("show_title").unwrap();
// The hamburger menu // The hamburger menu
let menu_button: gtk::MenuButton = builder.get_object("menu_button").unwrap(); let hamburger: gtk::MenuButton = builder.get_object("hamburger").unwrap();
let app_menu: gio::MenuModel = menus.get_object("menu").unwrap(); let app_menu: gio::MenuModel = menus.get_object("menu").unwrap();
menu_button.set_menu_model(Some(&app_menu)); hamburger.set_menu_model(Some(&app_menu));
// The 3 dots secondary menu // The 3 dots secondary menu
let dots = builder.get_object("secondary_menu").unwrap(); let dots = builder.get_object("secondary_menu").unwrap();
@ -184,7 +184,7 @@ impl Default for Header {
switch, switch,
back, back,
show_title, show_title,
menu_button, hamburger,
updater, updater,
add, add,
dots, dots,
@ -229,7 +229,7 @@ impl Header {
self.back.show(); self.back.show();
self.set_show_title(title); self.set_show_title(title);
self.show_title.show(); self.show_title.show();
self.menu_button.hide(); self.hamburger.hide();
self.dots.show(); self.dots.show();
} }
@ -238,7 +238,7 @@ impl Header {
self.add.toggle.show(); self.add.toggle.show();
self.back.hide(); self.back.hide();
self.show_title.hide(); self.show_title.hide();
self.menu_button.show(); self.hamburger.show();
self.dots.hide(); self.dots.hide();
} }
@ -255,7 +255,7 @@ impl Header {
} }
pub fn open_menu(&self) { pub fn open_menu(&self) {
self.menu_button.clicked(); self.hamburger.clicked();
} }
pub fn set_secondary_menu(&self, pop: &gtk::PopoverMenu) { pub fn set_secondary_menu(&self, pop: &gtk::PopoverMenu) {