Move feedback to overflow menu and help menu

Mikayla Maki created 2 years ago

Change summary

Cargo.lock                                   |  1 +
crates/collab_ui/Cargo.toml                  |  1 +
crates/collab_ui/src/collab_titlebar_item.rs | 18 ++++++++++++++----
crates/zed/src/menus.rs                      |  1 +
crates/zed/src/zed.rs                        |  3 ---
5 files changed, 17 insertions(+), 7 deletions(-)

Detailed changes

Cargo.lock

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

crates/collab_ui/Cargo.toml

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

crates/collab_ui/src/collab_titlebar_item.rs

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

crates/zed/src/menus.rs

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

crates/zed/src/zed.rs

@@ -340,10 +340,7 @@ pub fn initialize_workspace(
         activity_indicator::ActivityIndicator::new(workspace, app_state.languages.clone(), cx);
     let active_buffer_language = cx.add_view(|_| language_selector::ActiveBufferLanguage::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| {
-        status_bar.add_left_item(feedback_button, cx);
         status_bar.add_left_item(diagnostic_summary, cx);
         status_bar.add_left_item(activity_indicator, cx);
         status_bar.add_right_item(active_buffer_language, cx);