leyoda/cosmic-files
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Show key bindings in menu

Browse source
This commit is contained in:
Jeremy Soller 2024-01-29 12:21:54 -07:00
parent 380a3b2ff7
commit 004fd617ea
No known key found for this signature in database
GPG key ID: D02FD439211AF56F
3 changed files with 140 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/menu.rs
View file

@ -11,8 +11,9 @@ use cosmic::{
},
Element,
};
use std::collections::HashMap;
use crate::{fl, tab, Action, ContextPage, Location, Message, Tab};
use crate::{fl, KeyBind, tab, Action, ContextPage, Location, Message, Tab};
macro_rules! menu_button {
($($x:expr),+ $(,)?) => (
@ -30,6 +31,7 @@ macro_rules! menu_button {
}
pub fn context_menu<'a>(entity: segmented_button::Entity, tab: &Tab) -> Element<'a, Message> {
//TODO: show key bindings in context menu?
let menu_action = |label, action| {
menu_button!(widget::text(label)).on_press(Message::TabContextAction(entity, action))
};
@ -87,7 +89,7 @@ pub fn context_menu<'a>(entity: segmented_button::Entity, tab: &Tab) -> Element<
.into()
}
pub fn menu_bar<'a>() -> Element<'a, Message> {
pub fn menu_bar<'a>(key_binds: &HashMap<KeyBind, Action>) -> Element<'a, Message> {
//TODO: port to libcosmic
let menu_root = |label| {
widget::button(widget::text(label))
@ -95,20 +97,24 @@ pub fn menu_bar<'a>() -> Element<'a, Message> {
.style(theme::Button::MenuRoot)
};
let find_key = |message: &Message| -> String {
//TODO: hotkey config
let find_key = |action: &Action| -> String {
for (key_bind, key_action) in key_binds.iter() {
if action == key_action {
return key_bind.to_string();
}
}
String::new()
};
let menu_item = |label, message| {
let key = find_key(&message);
let menu_item = |label, action| {
let key = find_key(&action);
MenuTree::new(
menu_button!(
widget::text(label),
widget::horizontal_space(Length::Fill),
widget::text(key)
)
.on_press(message),
.on_press(action.message(None)),
)
};
@ -116,23 +122,23 @@ pub fn menu_bar<'a>() -> Element<'a, Message> {
MenuTree::with_children(
menu_root(fl!("file")),
vec![
menu_item(fl!("new-tab"), Message::TabNew),
menu_item(fl!("new-window"), Message::WindowNew),
menu_item(fl!("new-file"), Message::NewFile(None)),
menu_item(fl!("new-folder"), Message::NewFolder(None)),
menu_item(fl!("new-tab"), Action::TabNew),
menu_item(fl!("new-window"), Action::WindowNew),
menu_item(fl!("new-file"), Action::NewFile),
menu_item(fl!("new-folder"), Action::NewFolder),
MenuTree::new(horizontal_rule(1)),
menu_item(fl!("close-tab"), Message::TabClose(None)),
menu_item(fl!("close-tab"), Action::TabClose),
MenuTree::new(horizontal_rule(1)),
menu_item(fl!("quit"), Message::WindowClose),
menu_item(fl!("quit"), Action::WindowClose),
],
),
MenuTree::with_children(
menu_root(fl!("edit")),
vec![
menu_item(fl!("cut"), Message::Cut(None)),
menu_item(fl!("copy"), Message::Copy(None)),
menu_item(fl!("paste"), Message::Paste(None)),
menu_item(fl!("select-all"), Message::SelectAll(None)),
menu_item(fl!("cut"), Action::Cut),
menu_item(fl!("copy"), Action::Copy),
menu_item(fl!("paste"), Action::Paste),
menu_item(fl!("select-all"), Action::SelectAll),
],
),
MenuTree::with_children(
@ -140,16 +146,16 @@ pub fn menu_bar<'a>() -> Element<'a, Message> {
vec![
menu_item(
fl!("grid-view"),
Message::TabMessage(None, tab::Message::View(tab::View::Grid)),
Action::TabViewGrid
),
menu_item(
fl!("list-view"),
Message::TabMessage(None, tab::Message::View(tab::View::List)),
Action::TabViewList
),
MenuTree::new(horizontal_rule(1)),
menu_item(
fl!("menu-settings"),
Message::ToggleContextPage(ContextPage::Settings),
Action::Settings,
),
],
),