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

Show bindings in menu, finish #26

Browse source
This commit is contained in:
Jeremy Soller 2024-01-19 11:03:14 -07:00
parent ff06e6105d
commit 834a385235
No known key found for this signature in database
GPG key ID: DCFCA852D3906975
4 changed files with 57 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

5
i18n/en/cosmic_term.ftl
View file

@ -44,6 +44,11 @@ find = Find
## View ## View
view = View view = View
zoom-in = Larger text
zoom-reset = Default text size
zoom-out = Smaller text
next-tab = Next tab
previous-tab = Previous tab
menu-settings = Settings... menu-settings = Settings...
# Context menu # Context menu

2
src/key_bind.rs
View file

@ -56,6 +56,8 @@ pub fn key_binds() -> HashMap<KeyBind, Action> {
bind!([Ctrl, Shift], A, SelectAll); bind!([Ctrl, Shift], A, SelectAll);
bind!([Ctrl, Shift], C, Copy); bind!([Ctrl, Shift], C, Copy);
bind!([Ctrl, Shift], F, Find); bind!([Ctrl, Shift], F, Find);
bind!([Ctrl, Shift], N, WindowNew);
bind!([Ctrl, Shift], Q, WindowClose);
bind!([Ctrl, Shift], T, TabNew); bind!([Ctrl, Shift], T, TabNew);
bind!([Ctrl, Shift], V, Paste); bind!([Ctrl, Shift], V, Paste);
bind!([Ctrl, Shift], W, TabClose); bind!([Ctrl, Shift], W, TabClose);

29
src/main.rs
View file

@ -162,7 +162,7 @@ pub struct Flags {
term_config: TermConfig, term_config: TermConfig,
} }
#[derive(Clone, Copy, Debug)] #[derive(Clone, Copy, Debug, Eq, PartialEq)]
pub enum Action { pub enum Action {
Copy, Copy,
Find, Find,
@ -190,15 +190,17 @@ pub enum Action {
TabNew, TabNew,
TabNext, TabNext,
TabPrev, TabPrev,
WindowClose,
WindowNew,
ZoomIn, ZoomIn,
ZoomOut, ZoomOut,
ZoomReset, ZoomReset,
} }
impl Action { impl Action {
pub fn message(self, entity: segmented_button::Entity) -> Message { pub fn message(self, entity_opt: Option<segmented_button::Entity>) -> Message {
match self { match self {
Action::Copy => Message::Copy(Some(entity)), Action::Copy => Message::Copy(entity_opt),
Action::Find => Message::Find(true), Action::Find => Message::Find(true),
Action::PaneFocusDown => Message::PaneFocusAdjacent(pane_grid::Direction::Down), Action::PaneFocusDown => Message::PaneFocusAdjacent(pane_grid::Direction::Down),
Action::PaneFocusLeft => Message::PaneFocusAdjacent(pane_grid::Direction::Left), Action::PaneFocusLeft => Message::PaneFocusAdjacent(pane_grid::Direction::Left),
@ -207,8 +209,8 @@ impl Action {
Action::PaneSplitHorizontal => Message::PaneSplit(pane_grid::Axis::Horizontal), Action::PaneSplitHorizontal => Message::PaneSplit(pane_grid::Axis::Horizontal),
Action::PaneSplitVertical => Message::PaneSplit(pane_grid::Axis::Vertical), Action::PaneSplitVertical => Message::PaneSplit(pane_grid::Axis::Vertical),
Action::PaneToggleMaximized => Message::PaneToggleMaximized, Action::PaneToggleMaximized => Message::PaneToggleMaximized,
Action::Paste => Message::Paste(Some(entity)), Action::Paste => Message::Paste(entity_opt),
Action::SelectAll => Message::SelectAll(Some(entity)), Action::SelectAll => Message::SelectAll(entity_opt),
Action::Settings => Message::ToggleContextPage(ContextPage::Settings), Action::Settings => Message::ToggleContextPage(ContextPage::Settings),
Action::ShowHeaderBar(show_headerbar) => Message::ShowHeaderBar(show_headerbar), Action::ShowHeaderBar(show_headerbar) => Message::ShowHeaderBar(show_headerbar),
Action::TabActivate0 => Message::TabActivateJump(0), Action::TabActivate0 => Message::TabActivateJump(0),
@ -220,10 +222,12 @@ impl Action {
Action::TabActivate6 => Message::TabActivateJump(6), Action::TabActivate6 => Message::TabActivateJump(6),
Action::TabActivate7 => Message::TabActivateJump(7), Action::TabActivate7 => Message::TabActivateJump(7),
Action::TabActivate8 => Message::TabActivateJump(8), Action::TabActivate8 => Message::TabActivateJump(8),
Action::TabClose => Message::TabClose(None), Action::TabClose => Message::TabClose(entity_opt),
Action::TabNew => Message::TabNew, Action::TabNew => Message::TabNew,
Action::TabNext => Message::TabNext, Action::TabNext => Message::TabNext,
Action::TabPrev => Message::TabPrev, Action::TabPrev => Message::TabPrev,
Action::WindowClose => Message::WindowClose,
Action::WindowNew => Message::WindowNew,
Action::ZoomIn => Message::ZoomIn, Action::ZoomIn => Message::ZoomIn,
Action::ZoomOut => Message::ZoomOut, Action::ZoomOut => Message::ZoomOut,
Action::ZoomReset => Message::ZoomReset, Action::ZoomReset => Message::ZoomReset,
@ -997,12 +1001,9 @@ impl Application for App {
} }
}, },
Message::Key(modifiers, key_code) => { Message::Key(modifiers, key_code) => {
if let Some(tab_model) = self.pane_model.active() { for (key_bind, action) in self.key_binds.iter() {
let entity = tab_model.active(); if key_bind.matches(modifiers, key_code) {
for (key_bind, action) in self.key_binds.iter() { return self.update(action.message(None));
if key_bind.matches(modifiers, key_code) {
return self.update(action.message(entity));
}
} }
} }
} }
@ -1205,7 +1206,7 @@ impl Application for App {
terminal.context_menu = None; terminal.context_menu = None;
} }
// Run action's message // Run action's message
return self.update(action.message(entity)); return self.update(action.message(Some(entity)));
} }
_ => {} _ => {}
} }
@ -1371,7 +1372,7 @@ impl Application for App {
} }
fn header_start(&self) -> Vec<Element<Self::Message>> { fn header_start(&self) -> Vec<Element<Self::Message>> {
vec![menu_bar().into()] vec![menu_bar(&self.key_binds).into()]
} }
/// Creates a view after each update. /// Creates a view after each update.

55
src/menu.rs
View file

@ -14,8 +14,9 @@ use cosmic::{
}, },
Element, Element,
}; };
use std::collections::HashMap;
use crate::{fl, Action, Config, ContextPage, Message}; use crate::{fl, Action, Config, KeyBind, Message};
macro_rules! menu_button { macro_rules! menu_button {
($($x:expr),+ $(,)?) => ( ($($x:expr),+ $(,)?) => (
@ -59,7 +60,7 @@ pub fn context_menu<'a>(config: &Config, entity: segmented_button::Entity) -> El
menu_action(fl!("pane-toggle-maximize"), Action::PaneToggleMaximized), menu_action(fl!("pane-toggle-maximize"), Action::PaneToggleMaximized),
horizontal_rule(1), horizontal_rule(1),
menu_action(fl!("new-tab"), Action::TabNew), menu_action(fl!("new-tab"), Action::TabNew),
menu_action(fl!("settings"), Action::Settings), menu_action(fl!("menu-settings"), Action::Settings),
menu_checkbox( menu_checkbox(
fl!("show-headerbar"), fl!("show-headerbar"),
config.show_headerbar, config.show_headerbar,
@ -84,7 +85,7 @@ pub fn context_menu<'a>(config: &Config, entity: segmented_button::Entity) -> El
.into() .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 //TODO: port to libcosmic
let menu_root = |label| { let menu_root = |label| {
widget::button(widget::text(label)) widget::button(widget::text(label))
@ -92,20 +93,24 @@ pub fn menu_bar<'a>() -> Element<'a, Message> {
.style(theme::Button::MenuRoot) .style(theme::Button::MenuRoot)
}; };
let find_key = |message: &Message| -> String { let find_key = |action: &Action| -> String {
//TODO: hotkey config for (key_bind, key_action) in key_binds.iter() {
if action == key_action {
return key_bind.to_string();
}
}
String::new() String::new()
}; };
let menu_item = |label, message| { let menu_item = |label, action| {
let key = find_key(&message); let key = find_key(&action);
MenuTree::new( MenuTree::new(
menu_button!( menu_button!(
widget::text(label), widget::text(label),
horizontal_space(Length::Fill), horizontal_space(Length::Fill),
widget::text(key) widget::text(key)
) )
.on_press(message), .on_press(action.message(None)),
) )
}; };
@ -113,30 +118,40 @@ pub fn menu_bar<'a>() -> Element<'a, Message> {
MenuTree::with_children( MenuTree::with_children(
menu_root(fl!("file")), menu_root(fl!("file")),
vec![ vec![
menu_item(fl!("new-tab"), Message::TabNew), menu_item(fl!("new-tab"), Action::TabNew),
menu_item(fl!("new-window"), Message::WindowNew), menu_item(fl!("new-window"), Action::WindowNew),
MenuTree::new(horizontal_rule(1)), 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)), MenuTree::new(horizontal_rule(1)),
menu_item(fl!("quit"), Message::WindowClose), menu_item(fl!("quit"), Action::WindowClose),
], ],
), ),
MenuTree::with_children( MenuTree::with_children(
menu_root(fl!("edit")), menu_root(fl!("edit")),
vec![ vec![
menu_item(fl!("copy"), Message::Copy(None)), menu_item(fl!("copy"), Action::Copy),
menu_item(fl!("paste"), Message::Paste(None)), menu_item(fl!("paste"), Action::Paste),
menu_item(fl!("select-all"), Message::SelectAll(None)), menu_item(fl!("select-all"), Action::SelectAll),
MenuTree::new(horizontal_rule(1)), MenuTree::new(horizontal_rule(1)),
menu_item(fl!("find"), Message::Find(true)), menu_item(fl!("find"), Action::Find),
], ],
), ),
MenuTree::with_children( MenuTree::with_children(
menu_root(fl!("view")), menu_root(fl!("view")),
vec![menu_item( vec![
fl!("menu-settings"), menu_item(fl!("zoom-in"), Action::ZoomIn),
Message::ToggleContextPage(ContextPage::Settings), menu_item(fl!("zoom-reset"), Action::ZoomReset),
)], menu_item(fl!("zoom-out"), Action::ZoomOut),
MenuTree::new(horizontal_rule(1)),
menu_item(fl!("next-tab"), Action::TabNext),
menu_item(fl!("previous-tab"), Action::TabPrev),
MenuTree::new(horizontal_rule(1)),
menu_item(fl!("split-horizontal"), Action::PaneSplitHorizontal),
menu_item(fl!("split-vertical"), Action::PaneSplitVertical),
menu_item(fl!("pane-toggle-maximize"), Action::PaneToggleMaximized),
MenuTree::new(horizontal_rule(1)),
menu_item(fl!("menu-settings"), Action::Settings),
],
), ),
]) ])
.item_height(ItemHeight::Dynamic(40)) .item_height(ItemHeight::Dynamic(40))