diff options
| -rw-r--r-- | build.rs | 5 | ||||
| -rw-r--r-- | src/preferences/window.rs | 22 |
2 files changed, 15 insertions, 12 deletions
@@ -5,8 +5,13 @@ fn main() { None::<&str>, None::<&str>, [ + "agenda", + "build", "image-regular", + "map", "menu-large", + "papyrus", + "settings", "split-vertical-regular", "split-horizontal-regular", "zoom-in-regular", diff --git a/src/preferences/window.rs b/src/preferences/window.rs index b7db8c5..8207b71 100644 --- a/src/preferences/window.rs +++ b/src/preferences/window.rs @@ -21,6 +21,7 @@ use std::path::PathBuf; use gtk::prelude::*; use relm4::{ComponentParts, ComponentSender, SimpleComponent, adw, gtk}; +use crate::icon_names::shipped::{AGENDA, BUILD, MAP, PAPYRUS, SETTINGS}; use crate::tr; @@ -113,26 +114,23 @@ impl SimpleComponent for PreferencesWindow { gtk::glib::Propagation::Proceed }, - gtk::Box { - set_orientation: gtk::Orientation::Vertical, - - gtk::HeaderBar { + adw::ToolbarView { + add_top_bar = &adw::HeaderBar { #[wrap(Some)] - set_title_widget = >k::StackSwitcher { + set_title_widget = &adw::ViewSwitcher { set_stack: Some(&stack), }, }, #[name = "stack"] - gtk::Stack { - set_transition_type: gtk::StackTransitionType::SlideLeftRight, + adw::ViewStack { set_vexpand: true, - add_titled[Some("general"), &tr!("preferences.menu.general")] = &model.general_page.widget() -> gtk::Box {}, - add_titled[Some("editor"), &tr!("preferences.menu.editor")] = &model.editor_page.widget() -> gtk::Box {}, - add_titled[Some("map"), &tr!("preferences.menu.map")] = &model.map_page.widget() -> gtk::Box {}, - add_titled[Some("stages"), &tr!("preferences.menu.stages")] = &model.stages_page.widget() -> gtk::Box {}, - add_titled[Some("templates"), &tr!("preferences.menu.templates")] = &model.templates_page.widget() -> gtk::Box {}, + add_titled_with_icon[Some("general"), &tr!("preferences.menu.general"), SETTINGS] = &model.general_page.widget() -> gtk::Box {}, + add_titled_with_icon[Some("editor"), &tr!("preferences.menu.editor"), BUILD] = &model.editor_page.widget() -> gtk::Box {}, + add_titled_with_icon[Some("map"), &tr!("preferences.menu.map"), MAP] = &model.map_page.widget() -> gtk::Box {}, + add_titled_with_icon[Some("stages"), &tr!("preferences.menu.stages"), AGENDA] = &model.stages_page.widget() -> gtk::Box {}, + add_titled_with_icon[Some("templates"), &tr!("preferences.menu.templates"), PAPYRUS] = &model.templates_page.widget() -> gtk::Box {}, }, }, } |