update libcosmic

This commit is contained in:
Vukašin Vojinović 2024-12-02 23:26:14 +01:00 committed by Jeremy Soller
parent fda0850b3b
commit 77be96e1c2
4 changed files with 719 additions and 363 deletions

View file

@ -146,7 +146,7 @@ pub fn color_scheme_menu<'a>(
pub fn menu_bar<'a>(config: &Config, key_binds: &HashMap<KeyBind, Action>) -> Element<'a, Message> {
let mut profile_items = Vec::with_capacity(config.profiles.len());
for (name, id) in config.profile_names() {
profile_items.push(MenuItem::Button(name, Action::ProfileOpen(id)));
profile_items.push(MenuItem::Button(name, None, Action::ProfileOpen(id)));
}
//TODO: what to do if there are no profiles?
@ -157,15 +157,15 @@ pub fn menu_bar<'a>(config: &Config, key_binds: &HashMap<KeyBind, Action>) -> El
menu_items(
key_binds,
vec![
MenuItem::Button(fl!("new-tab"), Action::TabNew),
MenuItem::Button(fl!("new-window"), Action::WindowNew),
MenuItem::Button(fl!("new-tab"), None, Action::TabNew),
MenuItem::Button(fl!("new-window"), None, Action::WindowNew),
MenuItem::Divider,
MenuItem::Folder(fl!("profile"), profile_items),
MenuItem::Button(fl!("menu-profiles"), Action::Profiles),
MenuItem::Button(fl!("menu-profiles"), None, Action::Profiles),
MenuItem::Divider,
MenuItem::Button(fl!("close-tab"), Action::TabClose),
MenuItem::Button(fl!("close-tab"), None, Action::TabClose),
MenuItem::Divider,
MenuItem::Button(fl!("quit"), Action::WindowClose),
MenuItem::Button(fl!("quit"), None, Action::WindowClose),
],
),
),
@ -174,13 +174,13 @@ pub fn menu_bar<'a>(config: &Config, key_binds: &HashMap<KeyBind, Action>) -> El
menu_items(
key_binds,
vec![
MenuItem::Button(fl!("copy"), Action::Copy),
MenuItem::Button(fl!("paste"), Action::Paste),
MenuItem::Button(fl!("select-all"), Action::SelectAll),
MenuItem::Button(fl!("copy"), None, Action::Copy),
MenuItem::Button(fl!("paste"), None, Action::Paste),
MenuItem::Button(fl!("select-all"), None, Action::SelectAll),
MenuItem::Divider,
MenuItem::Button(fl!("clear-scrollback"), Action::ClearScrollback),
MenuItem::Button(fl!("clear-scrollback"), None, Action::ClearScrollback),
MenuItem::Divider,
MenuItem::Button(fl!("find"), Action::Find),
MenuItem::Button(fl!("find"), None, Action::Find),
],
),
),
@ -189,24 +189,29 @@ pub fn menu_bar<'a>(config: &Config, key_binds: &HashMap<KeyBind, Action>) -> El
menu_items(
key_binds,
vec![
MenuItem::Button(fl!("zoom-in"), Action::ZoomIn),
MenuItem::Button(fl!("zoom-reset"), Action::ZoomReset),
MenuItem::Button(fl!("zoom-out"), Action::ZoomOut),
MenuItem::Button(fl!("zoom-in"), None, Action::ZoomIn),
MenuItem::Button(fl!("zoom-reset"), None, Action::ZoomReset),
MenuItem::Button(fl!("zoom-out"), None, Action::ZoomOut),
MenuItem::Divider,
MenuItem::Button(fl!("next-tab"), Action::TabNext),
MenuItem::Button(fl!("previous-tab"), Action::TabPrev),
MenuItem::Button(fl!("next-tab"), None, Action::TabNext),
MenuItem::Button(fl!("previous-tab"), None, Action::TabPrev),
MenuItem::Divider,
MenuItem::Button(fl!("split-horizontal"), Action::PaneSplitHorizontal),
MenuItem::Button(fl!("split-vertical"), Action::PaneSplitVertical),
MenuItem::Button(fl!("pane-toggle-maximize"), Action::PaneToggleMaximized),
MenuItem::Button(fl!("split-horizontal"), None, Action::PaneSplitHorizontal),
MenuItem::Button(fl!("split-vertical"), None, Action::PaneSplitVertical),
MenuItem::Button(
fl!("pane-toggle-maximize"),
None,
Action::PaneToggleMaximized,
),
MenuItem::Divider,
MenuItem::Button(
fl!("menu-color-schemes"),
None,
Action::ColorSchemes(config.color_scheme_kind()),
),
MenuItem::Button(fl!("menu-settings"), Action::Settings),
MenuItem::Button(fl!("menu-settings"), None, Action::Settings),
MenuItem::Divider,
MenuItem::Button(fl!("menu-about"), Action::About),
MenuItem::Button(fl!("menu-about"), None, Action::About),
],
),
),