diff --git a/assets/icons/delete.svg b/assets/icons/delete.svg index 1068cb65f2..a7edbb6158 100644 --- a/assets/icons/delete.svg +++ b/assets/icons/delete.svg @@ -1,4 +1 @@ - - - - + diff --git a/assets/icons/escape.svg b/assets/icons/escape.svg new file mode 100644 index 0000000000..00c772a2ad --- /dev/null +++ b/assets/icons/escape.svg @@ -0,0 +1 @@ + diff --git a/assets/icons/return.svg b/assets/icons/return.svg index 683519c306..16cfeeda2e 100644 --- a/assets/icons/return.svg +++ b/assets/icons/return.svg @@ -1,3 +1 @@ - - - + diff --git a/assets/icons/space.svg b/assets/icons/space.svg new file mode 100644 index 0000000000..63718fb4aa --- /dev/null +++ b/assets/icons/space.svg @@ -0,0 +1 @@ + diff --git a/assets/icons/tab.svg b/assets/icons/tab.svg new file mode 100644 index 0000000000..49a3536bed --- /dev/null +++ b/assets/icons/tab.svg @@ -0,0 +1 @@ + diff --git a/crates/ui2/src/components/icon.rs b/crates/ui2/src/components/icon.rs index 0c618f2915..d445b3d702 100644 --- a/crates/ui2/src/components/icon.rs +++ b/crates/ui2/src/components/icon.rs @@ -24,10 +24,10 @@ impl IconSize { #[derive(Debug, PartialEq, Copy, Clone, EnumIter)] pub enum Icon { Ai, - ArrowLeft, - ArrowUp, ArrowDown, + ArrowLeft, ArrowRight, + ArrowUp, ArrowUpRight, AtSign, AudioOff, @@ -39,25 +39,28 @@ pub enum Icon { Bolt, CaseSensitive, Check, - Copy, ChevronDown, ChevronLeft, ChevronRight, ChevronUp, Close, Collab, + Command, + Control, Copilot, - CopilotInit, - CopilotError, CopilotDisabled, + CopilotError, + CopilotInit, + Copy, Dash, Delete, Disconnected, Ellipsis, Envelope, - ExternalLink, + Escape, ExclamationTriangle, Exit, + ExternalLink, File, FileDoc, FileGeneric, @@ -78,30 +81,30 @@ pub enum Icon { MagnifyingGlass, MailOpen, Maximize, - Minimize, Menu, MessageBubbles, Mic, MicMute, + Minimize, + Option, Plus, Public, Quote, Replace, ReplaceAll, ReplaceNext, + Return, Screen, SelectAll, - Split, + Shift, Snip, + Space, + Split, + Tab, Terminal, + Update, WholeWord, XCircle, - Command, - Control, - Shift, - Option, - Return, - Update, ZedXCopilot, } @@ -109,10 +112,10 @@ impl Icon { pub fn path(self) -> &'static str { match self { Icon::Ai => "icons/ai.svg", + Icon::ArrowDown => "icons/arrow_down.svg", Icon::ArrowLeft => "icons/arrow_left.svg", Icon::ArrowRight => "icons/arrow_right.svg", Icon::ArrowUp => "icons/arrow_up.svg", - Icon::ArrowDown => "icons/arrow_down.svg", Icon::ArrowUpRight => "icons/arrow_up_right.svg", Icon::AtSign => "icons/at-sign.svg", Icon::AudioOff => "icons/speaker-off.svg", @@ -124,25 +127,28 @@ impl Icon { Icon::Bolt => "icons/bolt.svg", Icon::CaseSensitive => "icons/case_insensitive.svg", Icon::Check => "icons/check.svg", - Icon::Copy => "icons/copy.svg", Icon::ChevronDown => "icons/chevron_down.svg", Icon::ChevronLeft => "icons/chevron_left.svg", Icon::ChevronRight => "icons/chevron_right.svg", Icon::ChevronUp => "icons/chevron_up.svg", Icon::Close => "icons/x.svg", Icon::Collab => "icons/user_group_16.svg", + Icon::Command => "icons/command.svg", + Icon::Control => "icons/control.svg", Icon::Copilot => "icons/copilot.svg", - Icon::CopilotInit => "icons/copilot_init.svg", - Icon::CopilotError => "icons/copilot_error.svg", Icon::CopilotDisabled => "icons/copilot_disabled.svg", + Icon::CopilotError => "icons/copilot_error.svg", + Icon::CopilotInit => "icons/copilot_init.svg", + Icon::Copy => "icons/copy.svg", Icon::Dash => "icons/dash.svg", Icon::Delete => "icons/delete.svg", Icon::Disconnected => "icons/disconnected.svg", Icon::Ellipsis => "icons/ellipsis.svg", Icon::Envelope => "icons/feedback.svg", + Icon::Escape => "icons/escape.svg", Icon::ExclamationTriangle => "icons/warning.svg", - Icon::ExternalLink => "icons/external_link.svg", Icon::Exit => "icons/exit.svg", + Icon::ExternalLink => "icons/external_link.svg", Icon::File => "icons/file.svg", Icon::FileDoc => "icons/file_icons/book.svg", Icon::FileGeneric => "icons/file_icons/file.svg", @@ -163,30 +169,30 @@ impl Icon { Icon::MagnifyingGlass => "icons/magnifying_glass.svg", Icon::MailOpen => "icons/mail-open.svg", Icon::Maximize => "icons/maximize.svg", - Icon::Minimize => "icons/minimize.svg", Icon::Menu => "icons/menu.svg", Icon::MessageBubbles => "icons/conversations.svg", Icon::Mic => "icons/mic.svg", Icon::MicMute => "icons/mic-mute.svg", + Icon::Minimize => "icons/minimize.svg", + Icon::Option => "icons/option.svg", Icon::Plus => "icons/plus.svg", Icon::Public => "icons/public.svg", Icon::Quote => "icons/quote.svg", Icon::Replace => "icons/replace.svg", Icon::ReplaceAll => "icons/replace_all.svg", Icon::ReplaceNext => "icons/replace_next.svg", + Icon::Return => "icons/return.svg", Icon::Screen => "icons/desktop.svg", Icon::SelectAll => "icons/select-all.svg", - Icon::Split => "icons/split.svg", + Icon::Shift => "icons/shift.svg", Icon::Snip => "icons/snip.svg", + Icon::Space => "icons/space.svg", + Icon::Split => "icons/split.svg", + Icon::Tab => "icons/tab.svg", Icon::Terminal => "icons/terminal.svg", + Icon::Update => "icons/update.svg", Icon::WholeWord => "icons/word_search.svg", Icon::XCircle => "icons/error.svg", - Icon::Command => "icons/command.svg", - Icon::Control => "icons/control.svg", - Icon::Shift => "icons/shift.svg", - Icon::Option => "icons/option.svg", - Icon::Return => "icons/return.svg", - Icon::Update => "icons/update.svg", Icon::ZedXCopilot => "icons/zed_x_copilot.svg", } } diff --git a/crates/ui2/src/components/keybinding.rs b/crates/ui2/src/components/keybinding.rs index 6f63885489..434f3aeb5e 100644 --- a/crates/ui2/src/components/keybinding.rs +++ b/crates/ui2/src/components/keybinding.rs @@ -72,6 +72,11 @@ impl KeyBinding { "down" => Some(Icon::ArrowDown), "backspace" => Some(Icon::Backspace), "delete" => Some(Icon::Delete), + "enter" => Some(Icon::Return), + "escape" => Some(Icon::Escape), + "return" => Some(Icon::Return), + "space" => Some(Icon::Space), + "tab" => Some(Icon::Tab), _ => None, } }