gwen: Disable sign in by default and show upstream baseline in About

assets/settings/default.json

@@ -623,7 +623,7 @@
     // Whether to show the user menu in the titlebar.
     "show_user_menu": true,
     // Whether to show the sign in button in the titlebar.
-    "show_sign_in": true,
+    "show_sign_in": false,
     // Whether to show the menus in the titlebar.
     "show_menus": false,
     // The layout of window control buttons in the title bar (Linux only).

crates/cli/src/main.rs

@@ -924,13 +924,14 @@ mod linux {
     impl InstalledApp for App {
         fn zed_version_string(&self) -> String {
             format!(
-                "Gwen {}{}{}(based on zed 1.22.0) – {}",
+                "Gwen {}{}{}(based on {}) – {}",
                 "".to_string(),
                 option_env!("RELEASE_VERSION").unwrap_or_default(),
                 match option_env!("ZED_COMMIT_SHA") {
                     Some(commit_sha) => format!(" {commit_sha} "),
                     None => "".to_string(),
                 },
+                release_channel::UPSTREAM_BASELINE,
                 self.0.display(),
             )
         }
@@ -1197,13 +1198,14 @@ mod windows {
     impl InstalledApp for App {
         fn zed_version_string(&self) -> String {
             format!(
-                "Gwen {}{}{}(based on zed 1.22.0) – {}",
+                "Gwen {}{}{}(based on {}) – {}",
                 "".to_string(),
                 option_env!("RELEASE_VERSION").unwrap_or_default(),
                 match option_env!("ZED_COMMIT_SHA") {
                     Some(commit_sha) => format!(" {commit_sha} "),
                     None => "".to_string(),
                 },
+                release_channel::UPSTREAM_BASELINE,
                 self.0.display(),
             )
         }

crates/release_channel/src/lib.rs

@@ -177,6 +177,9 @@ pub fn docs_url(slug: &str, cx: &App) -> String {
         .docs_url(slug)
 }
 
+/// The Zed version this fork is based on, shown in user-facing version strings.
+pub const UPSTREAM_BASELINE: &str = "zed 1.22.0";
+
 impl ReleaseChannel {
     /// All release channels.
     pub const ALL: [ReleaseChannel; 4] = [
@@ -227,10 +230,10 @@ impl ReleaseChannel {
     /// This also has to match the bundle identifier for Zed on macOS.
     pub fn app_id(&self) -> &'static str {
         match self {
-            ReleaseChannel::Dev => "dev.zed.Zed-Dev",
-            ReleaseChannel::Nightly => "dev.zed.Zed-Nightly",
-            ReleaseChannel::Preview => "dev.zed.Zed-Preview",
-            ReleaseChannel::Stable => "dev.zed.Zed",
+            ReleaseChannel::Dev => "com.yrkaierx.Gwen",
+            ReleaseChannel::Nightly => "com.yrkaierx.Gwen-Nightly",
+            ReleaseChannel::Preview => "com.yrkaierx.Gwen-Preview",
+            ReleaseChannel::Stable => "com.yrkaierx.Gwen",
         }
     }
 

crates/zed/src/zed.rs

@@ -1543,6 +1543,7 @@ fn open_about_window(cx: &mut App) {
         message: SharedString,
         commit: Option<SharedString>,
         full_version: SharedString,
+        based_on: SharedString,
     }
 
     impl AboutWindow {
@@ -1571,6 +1572,7 @@ fn open_about_window(cx: &mut App) {
                 message,
                 commit,
                 full_version,
+                based_on: release_channel::UPSTREAM_BASELINE.into(),
             }
         }
 
@@ -1578,11 +1580,14 @@ fn open_about_window(cx: &mut App) {
             let content = match self.commit.as_ref() {
                 Some(commit) => {
                     format!(
-                        "{}\nCommit: {}\nVersion: {}",
-                        self.message, commit, self.full_version
+                        "{}\nCommit: {}\nVersion: {}\nBased on: {}",
+                        self.message, commit, self.full_version, self.based_on
                     )
                 }
-                None => format!("{}\nVersion: {}", self.message, self.full_version),
+                None => format!(
+                    "{}\nVersion: {}\nBased on: {}",
+                    self.message, self.full_version, self.based_on
+                ),
             };
             cx.write_to_clipboard(ClipboardItem::new_string(content));
             window.remove_window();
@@ -1630,7 +1635,13 @@ fn open_about_window(cx: &mut App) {
                                     .color(Color::Muted)
                                     .size(LabelSize::XSmall),
                             )
-                            .child(Label::new(self.full_version.clone()).size(LabelSize::Small)),
+                            .child(Label::new(self.full_version.clone()).size(LabelSize::Small))
+                            .child(
+                                Label::new("Based on")
+                                    .color(Color::Muted)
+                                    .size(LabelSize::XSmall),
+                            )
+                            .child(Label::new(self.based_on.clone()).size(LabelSize::Small)),
                     )
                     .child(
                         h_flex()
@@ -1711,7 +1722,7 @@ fn open_about_window(cx: &mut App) {
     cx.open_window(
         WindowOptions {
             titlebar: Some(TitlebarOptions {
-                title: Some("About Zed".into()),
+                title: Some("About Gwen".into()),
                 appears_transparent: true,
                 traffic_light_position: Some(point(px(12.), px(12.))),
             }),

crates/zed/src/zed/app_menus.rs

@@ -71,7 +71,7 @@ pub fn app_menus(cx: &mut App) -> Vec<Menu> {
             name: "Gwen".into(),
             disabled: false,
             items: vec![
-                MenuItem::action("About Zed", zed_actions::About),
+                MenuItem::action("About Gwen", zed_actions::About),
                 MenuItem::action("Check for Updates", auto_update::Check),
                 MenuItem::separator(),
                 MenuItem::submenu(Menu::new("Settings").items([