Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move feedback to overflow menu and help menu

Browse source
This commit is contained in:
Mikayla Maki 2023-03-10 12:48:11 -08:00
parent bb721a08f5
commit e45104a1c0
5 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -1259,6 +1259,7 @@ dependencies = [
"collections", "collections",
"context_menu", "context_menu",
"editor", "editor",
"feedback",
"futures 0.3.25", "futures 0.3.25",
"fuzzy", "fuzzy",
"gpui", "gpui",

1
crates/collab_ui/Cargo.toml
View file

@ -29,6 +29,7 @@ clock = { path = "../clock" }
collections = { path = "../collections" } collections = { path = "../collections" }
context_menu = { path = "../context_menu" } context_menu = { path = "../context_menu" }
editor = { path = "../editor" } editor = { path = "../editor" }
feedback = { path = "../feedback" }
fuzzy = { path = "../fuzzy" } fuzzy = { path = "../fuzzy" }
gpui = { path = "../gpui" } gpui = { path = "../gpui" }
menu = { path = "../menu" } menu = { path = "../menu" }

18
crates/collab_ui/src/collab_titlebar_item.rs
View file

@ -304,12 +304,22 @@ impl CollabTitlebarItem {
label: "Sign out".into(), label: "Sign out".into(),
action: Box::new(SignOut), action: Box::new(SignOut),
}, },
ContextMenuItem::Item {
label: "Give Feedback".into(),
action: Box::new(feedback::feedback_editor::GiveFeedback),
},
] ]
} else { } else {
vec![ContextMenuItem::Item { vec![
label: "Sign in".into(), ContextMenuItem::Item {
action: Box::new(Authenticate), label: "Sign in".into(),
}] action: Box::new(Authenticate),
},
ContextMenuItem::Item {
label: "Give Feedback".into(),
action: Box::new(feedback::feedback_editor::GiveFeedback),
},
]
}; };
user_menu.show( user_menu.show(

1
crates/zed/src/menus.rs
View file

@ -140,6 +140,7 @@ pub fn menus() -> Vec<Menu<'static>> {
MenuItem::action("View Telemetry Log", crate::OpenTelemetryLog), MenuItem::action("View Telemetry Log", crate::OpenTelemetryLog),
MenuItem::action("View Dependency Licenses", crate::OpenLicenses), MenuItem::action("View Dependency Licenses", crate::OpenLicenses),
MenuItem::separator(), MenuItem::separator(),
MenuItem::action("Give us feedback", feedback::feedback_editor::GiveFeedback),
MenuItem::action( MenuItem::action(
"Copy System Specs Into Clipboard", "Copy System Specs Into Clipboard",
feedback::CopySystemSpecsIntoClipboard, feedback::CopySystemSpecsIntoClipboard,

3
crates/zed/src/zed.rs
View file

@ -340,10 +340,7 @@ pub fn initialize_workspace(
activity_indicator::ActivityIndicator::new(workspace, app_state.languages.clone(), cx); activity_indicator::ActivityIndicator::new(workspace, app_state.languages.clone(), cx);
let active_buffer_language = cx.add_view(|_| language_selector::ActiveBufferLanguage::new()); let active_buffer_language = cx.add_view(|_| language_selector::ActiveBufferLanguage::new());
let cursor_position = cx.add_view(|_| editor::items::CursorPosition::new()); let cursor_position = cx.add_view(|_| editor::items::CursorPosition::new());
let feedback_button =
cx.add_view(|_| feedback::deploy_feedback_button::DeployFeedbackButton {});
workspace.status_bar().update(cx, |status_bar, cx| { workspace.status_bar().update(cx, |status_bar, cx| {
status_bar.add_left_item(feedback_button, cx);
status_bar.add_left_item(diagnostic_summary, cx); status_bar.add_left_item(diagnostic_summary, cx);
status_bar.add_left_item(activity_indicator, cx); status_bar.add_left_item(activity_indicator, cx);
status_bar.add_right_item(active_buffer_language, cx); status_bar.add_right_item(active_buffer_language, cx);