Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

settings: move update download policy above the update channel

Ilya30d60d82a7b5
diff --git a/apps/desktop-gpui/src/settings_window.rs b/apps/desktop-gpui/src/settings_window.rs
index ddcb111ee..1e2d7fe97 100644
--- a/apps/desktop-gpui/src/settings_window.rs
+++ b/apps/desktop-gpui/src/settings_window.rs
@@ -4421,30 +4421,47 @@ impl SettingsWindow {
.child(
div()
.text_size(px(13.))
- .child(tr::settings::general::updates::channel::label()),
+ .child(tr::settings::general::updates::download_policy::label()),
)
.child(
div()
.text_size(px(12.))
.line_height(px(16.))
.text_color(theme.settings_muted())
- .child(tr::settings::general::updates::channel::description()),
+ .child(
+ tr::settings::general::updates::download_policy::description(),
+ ),
),
)
- .child(self.segmented::<UpdateChannel>(
- "update-channel",
- current,
+ .child(self.segmented_raw(
+ "update-download-policy",
+ vec![
+ ui::SegmentOption::new(
+ tr::settings::general::updates::download_policy::manual(),
+ current_policy == UpdateDownloadPolicy::Manual,
+ ),
+ ui::SegmentOption::new(
+ tr::settings::general::updates::download_policy::auto(),
+ current_policy == UpdateDownloadPolicy::Auto,
+ ),
+ ui::SegmentOption::new(
+ tr::settings::general::updates::download_policy::never(),
+ current_policy == UpdateDownloadPolicy::Never,
+ ),
+ ],
cx,
- |this, value, cx| {
- if this.settings.update_channel == value {
+ |this, index, cx| {
+ let value = match index {
+ 0 => UpdateDownloadPolicy::Manual,
+ 1 => UpdateDownloadPolicy::Auto,
+ _ => UpdateDownloadPolicy::Never,
+ };
+ if this.settings.update_download_policy == value {
return;
}
- this.settings.update_channel = value;
- this.write_enum("updateChannel", value, cx);
- crate::updates::update_channel_changed(
- this.settings.update_channel,
- cx,
- );
+ this.settings.update_download_policy = value;
+ this.write_enum("updateDownloadPolicy", value, cx);
+ crate::updates::update_download_policy_changed(value, cx);
},
)),
)
@@ -4465,47 +4482,30 @@ impl SettingsWindow {
.child(
div()
.text_size(px(13.))
- .child(tr::settings::general::updates::download_policy::label()),
+ .child(tr::settings::general::updates::channel::label()),
)
.child(
div()
.text_size(px(12.))
.line_height(px(16.))
.text_color(theme.settings_muted())
- .child(
- tr::settings::general::updates::download_policy::description(),
- ),
+ .child(tr::settings::general::updates::channel::description()),
),
)
- .child(self.segmented_raw(
- "update-download-policy",
- vec![
- ui::SegmentOption::new(
- tr::settings::general::updates::download_policy::manual(),
- current_policy == UpdateDownloadPolicy::Manual,
- ),
- ui::SegmentOption::new(
- tr::settings::general::updates::download_policy::auto(),
- current_policy == UpdateDownloadPolicy::Auto,
- ),
- ui::SegmentOption::new(
- tr::settings::general::updates::download_policy::never(),
- current_policy == UpdateDownloadPolicy::Never,
- ),
- ],
+ .child(self.segmented::<UpdateChannel>(
+ "update-channel",
+ current,
cx,
- |this, index, cx| {
- let value = match index {
- 0 => UpdateDownloadPolicy::Manual,
- 1 => UpdateDownloadPolicy::Auto,
- _ => UpdateDownloadPolicy::Never,
- };
- if this.settings.update_download_policy == value {
+ |this, value, cx| {
+ if this.settings.update_channel == value {
return;
}
- this.settings.update_download_policy = value;
- this.write_enum("updateDownloadPolicy", value, cx);
- crate::updates::update_download_policy_changed(value, cx);
+ this.settings.update_channel = value;
+ this.write_enum("updateChannel", value, cx);
+ crate::updates::update_channel_changed(
+ this.settings.update_channel,
+ cx,
+ );
},
)),
)