diff --git a/crates/collab_ui/src/collab_titlebar_item.rs b/crates/collab_ui/src/collab_titlebar_item.rs index 2df240564e..1f82188667 100644 --- a/crates/collab_ui/src/collab_titlebar_item.rs +++ b/crates/collab_ui/src/collab_titlebar_item.rs @@ -698,9 +698,9 @@ impl CollabTitlebarItem { ContextMenu::build(cx, |menu, _| { menu.action("Settings", zed_actions::OpenSettings.boxed_clone()) .action("Extensions", extensions_ui::Extensions.boxed_clone()) - .action("Theme", theme_selector::Toggle.boxed_clone()) + .action("Theme...", theme_selector::Toggle.boxed_clone()) .separator() - .action("Share Feedback", feedback::GiveFeedback.boxed_clone()) + .action("Share Feedback...", feedback::GiveFeedback.boxed_clone()) .action("Sign Out", client::SignOut.boxed_clone()) }) .into() @@ -722,10 +722,10 @@ impl CollabTitlebarItem { .menu(|cx| { ContextMenu::build(cx, |menu, _| { menu.action("Settings", zed_actions::OpenSettings.boxed_clone()) - .action("Theme", theme_selector::Toggle.boxed_clone()) + .action("Theme...", theme_selector::Toggle.boxed_clone()) .action("Extensions", extensions_ui::Extensions.boxed_clone()) .separator() - .action("Share Feedback", feedback::GiveFeedback.boxed_clone()) + .action("Share Feedback...", feedback::GiveFeedback.boxed_clone()) }) .into() }) diff --git a/crates/zed/src/app_menus.rs b/crates/zed/src/app_menus.rs index 12a88ed216..cde567318c 100644 --- a/crates/zed/src/app_menus.rs +++ b/crates/zed/src/app_menus.rs @@ -1,4 +1,6 @@ +use collab_ui::collab_panel; use gpui::{Menu, MenuItem, OsAction}; +use terminal_view::terminal_panel; pub fn app_menus() -> Vec> { use zed_actions::Quit; @@ -18,7 +20,7 @@ pub fn app_menus() -> Vec> { MenuItem::action("Open Default Settings", super::OpenDefaultSettings), MenuItem::action("Open Default Key Bindings", super::OpenDefaultKeymap), MenuItem::action("Open Local Settings", super::OpenLocalSettings), - MenuItem::action("Select Theme", theme_selector::Toggle), + MenuItem::action("Select Theme...", theme_selector::Toggle), ], }), MenuItem::action("Extensions", extensions_ui::Extensions), @@ -122,7 +124,9 @@ pub fn app_menus() -> Vec> { }), MenuItem::separator(), MenuItem::action("Project Panel", project_panel::ToggleFocus), - MenuItem::action("Command Palette", command_palette::Toggle), + MenuItem::action("Collab Panel", collab_panel::ToggleFocus), + MenuItem::action("Terminal Panel", terminal_panel::ToggleFocus), + MenuItem::separator(), MenuItem::action("Diagnostics", diagnostics::Deploy), MenuItem::separator(), ], @@ -133,13 +137,16 @@ pub fn app_menus() -> Vec> { MenuItem::action("Back", workspace::GoBack), MenuItem::action("Forward", workspace::GoForward), MenuItem::separator(), - MenuItem::action("Go to File", file_finder::Toggle), + MenuItem::action("Command Palette...", command_palette::Toggle), + MenuItem::separator(), + MenuItem::action("Go to File...", file_finder::Toggle), // MenuItem::action("Go to Symbol in Project", project_symbols::Toggle), - MenuItem::action("Go to Symbol in Editor", outline::Toggle), + MenuItem::action("Go to Symbol in Editor...", outline::Toggle), + MenuItem::action("Go to Line/Column...", go_to_line::Toggle), + MenuItem::separator(), MenuItem::action("Go to Definition", editor::actions::GoToDefinition), MenuItem::action("Go to Type Definition", editor::actions::GoToTypeDefinition), MenuItem::action("Find All References", editor::actions::FindAllReferences), - MenuItem::action("Go to Line/Column", go_to_line::Toggle), MenuItem::separator(), MenuItem::action("Next Problem", editor::actions::GoToDiagnostic), MenuItem::action("Previous Problem", editor::actions::GoToPrevDiagnostic), @@ -156,8 +163,6 @@ pub fn app_menus() -> Vec> { Menu { name: "Help", items: vec![ - MenuItem::action("Command Palette", command_palette::Toggle), - MenuItem::separator(), MenuItem::action("View Telemetry", crate::OpenTelemetryLog), MenuItem::action("View Dependency Licenses", crate::OpenLicenses), MenuItem::action("Show Welcome", workspace::Welcome),