reya/signed
1
0
Fork 0
Code Issues Pull Requests Actions 5 Releases Activity

update ui

Browse Source
This commit is contained in:
reya
2026-09-01 20:07:14 +07:00
parent b3e34b0075
commit 3fa2f4db81
1 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/workspace/src/views/sidebar/settings_dialog.rs
+34 -32
View File
@@ -22,7 +22,8 @@ use gpui_component::separator::Separator;
use gpui_component::setting::NumberFieldOptions; use gpui_component::setting::NumberFieldOptions;
use gpui_component::switch::Switch; use gpui_component::switch::Switch;
use gpui_component::{ use gpui_component::{
ActiveTheme, IconName, IndexPath, Theme, ThemeMode, ThemeRegistry, WindowExt, h_flex, v_flex, ActiveTheme, IconName, IndexPath, Sizable, Theme, ThemeMode, ThemeRegistry, WindowExt, h_flex,
v_flex,
}; };
use nostr::prelude::RelayUrl; use nostr::prelude::RelayUrl;
use settings::{AppearanceMode, Settings, SettingsStore}; use settings::{AppearanceMode, Settings, SettingsStore};
@@ -78,7 +79,7 @@ impl SettingsControls {
let settings = store.read(cx).settings().clone(); let settings = store.read(cx).settings().clone();
let appearance_options = vec![ let appearance_options = vec![
SelectOption::new("system", "Follow system"), SelectOption::new("system", "System"),
SelectOption::new("light", "Light"), SelectOption::new("light", "Light"),
SelectOption::new("dark", "Dark"), SelectOption::new("dark", "Dark"),
]; ];
@@ -275,7 +276,6 @@ impl SettingsControls {
/// Open the Settings dialog. /// Open the Settings dialog.
pub fn open(window: &mut Window, cx: &mut App) { pub fn open(window: &mut Window, cx: &mut App) {
let controls = Rc::new(SettingsControls::new(window, cx)); let controls = Rc::new(SettingsControls::new(window, cx));
let store = SettingsStore::global(cx); let store = SettingsStore::global(cx);
let window_handle = window.window_handle(); let window_handle = window.window_handle();
let store_subscription = cx.observe(&store, move |_, cx| { let store_subscription = cx.observe(&store, move |_, cx| {
@@ -290,7 +290,7 @@ pub fn open(window: &mut Window, cx: &mut App) {
let dialog_state = dialog_state.clone(); let dialog_state = dialog_state.clone();
dialog dialog
.title("Settings") .title("Settings")
.width(px(640.)) .width(px(650.))
.h(px(560.)) .h(px(560.))
.child(settings_view(&dialog_state.0, cx)) .child(settings_view(&dialog_state.0, cx))
}); });
@@ -303,8 +303,9 @@ fn settings_view(controls: &SettingsControls, cx: &mut App) -> impl IntoElement
let settings = store.read(cx).settings().clone(); let settings = store.read(cx).settings().clone();
v_flex() v_flex()
.w_full() .mt_2()
.gap_4() .gap_4()
.w_full()
.child(appearance_section(controls, cx)) .child(appearance_section(controls, cx))
.child(Separator::horizontal()) .child(Separator::horizontal())
.child(theme_section(&settings, controls, cx)) .child(theme_section(&settings, controls, cx))
@@ -319,7 +320,7 @@ fn appearance_section(controls: &SettingsControls, cx: &App) -> impl IntoElement
v_flex().w_full().gap_3().child(setting_row( v_flex().w_full().gap_3().child(setting_row(
cx, cx,
"Appearance", "Appearance",
"How the app picks its appearance: follow the system, or always light or dark.", "Choose whether the app follows the system theme or uses a light/dark theme.",
Select::new(&controls.appearance).w_full(), Select::new(&controls.appearance).w_full(),
)) ))
} }
@@ -328,47 +329,47 @@ fn appearance_section(controls: &SettingsControls, cx: &App) -> impl IntoElement
/// the visual tweaks the application customizes at startup. /// the visual tweaks the application customizes at startup.
fn theme_section(settings: &Settings, controls: &SettingsControls, cx: &App) -> impl IntoElement { fn theme_section(settings: &Settings, controls: &SettingsControls, cx: &App) -> impl IntoElement {
v_flex() v_flex()
.w_full()
.gap_3() .gap_3()
.w_full()
.child(setting_row( .child(setting_row(
cx, cx,
"Light theme", "Light Theme",
"The light theme used when the appearance is light.", "The theme to use when the appearance is light.",
Select::new(&controls.light_theme).w_full(), Select::new(&controls.light_theme).w_full(),
)) ))
.child(setting_row( .child(setting_row(
cx, cx,
"Dark theme", "Dark Theme",
"The dark theme used when the appearance is dark.", "The theme to use when the appearance is dark.",
Select::new(&controls.dark_theme).w_full(), Select::new(&controls.dark_theme).w_full(),
)) ))
.child(setting_row( .child(setting_row(
cx, cx,
"Base font size", "UI Font Size",
"The base font size in pixels.", "Font size for the UI.",
NumberInput::new(&controls.font_size).w_full(), NumberInput::new(&controls.font_size).w_full(),
)) ))
.child(setting_row( .child(setting_row(
cx, cx,
"Monospace font size", "Editor Font Size",
"The monospace font size in pixels.", "Font size for editor text.",
NumberInput::new(&controls.mono_font_size).w_full(), NumberInput::new(&controls.mono_font_size).w_full(),
)) ))
.child(setting_row( .child(setting_row(
cx, cx,
"Corner radius", "Corner Radius",
"The corner radius of general elements in pixels.", "The corner radius for UI elements.",
NumberInput::new(&controls.radius).w_full(), NumberInput::new(&controls.radius).w_full(),
)) ))
.child(setting_row( .child(setting_row(
cx, cx,
"Large corner radius", "Large Corner Radius",
"The corner radius of large elements (dialogs, notifications) in pixels.", "The corner radius for large UI elements (dialogs, notifications).",
NumberInput::new(&controls.radius_lg).w_full(), NumberInput::new(&controls.radius_lg).w_full(),
)) ))
.child(setting_row( .child(setting_row(
cx, cx,
"Focus ring", "Focus Ring",
"Draw a ring around focused controls.", "Draw a ring around focused controls.",
Switch::new("focus-ring") Switch::new("focus-ring")
.checked(settings.theme.focus_ring) .checked(settings.theme.focus_ring)
@@ -383,7 +384,7 @@ fn theme_section(settings: &Settings, controls: &SettingsControls, cx: &App) ->
.child(setting_row( .child(setting_row(
cx, cx,
"Shadows", "Shadows",
"Render shadows.", "The shadow effect for UI elements.",
Switch::new("shadows") Switch::new("shadows")
.checked(settings.theme.shadow) .checked(settings.theme.shadow)
.on_click(move |checked: &bool, _window, cx| { .on_click(move |checked: &bool, _window, cx| {
@@ -406,8 +407,8 @@ fn grasp_servers_section(
v_flex().w_full().gap_3().child(setting_block( v_flex().w_full().gap_3().child(setting_block(
cx, cx,
"Default servers", "Grasp Servers",
"Servers offered when you haven't published a grasp list (kind 10317).", "Servers used to host your git repositories via the Grasp protocol",
grasp_server_editor(&servers, controls, cx), grasp_server_editor(&servers, controls, cx),
)) ))
} }
@@ -500,14 +501,14 @@ fn repositories_section(
.gap_3() .gap_3()
.child(setting_block( .child(setting_block(
cx, cx,
"Scan directories", "Scan Directories",
"Directories scanned for local git repositories.", "Directories scanned for local git repositories.",
scan_paths_editor(&scan_paths, cx), scan_paths_editor(&scan_paths, cx),
)) ))
.child(setting_block( .child(setting_block(
cx, cx,
"Default folder", "Default Folder",
"The folder the Create Repository dialog defaults to.", "The folder for newly created repositories.",
folder_selector(controls), folder_selector(controls),
)) ))
} }
@@ -554,11 +555,12 @@ fn scan_paths_editor(scan_paths: &[PathBuf], cx: &App) -> impl IntoElement {
) )
})) }))
.child( .child(
h_flex().w_full().justify_end().child( h_flex().justify_end().items_center().child(
Button::new("settings-add-path") Button::new("settings-add-path")
.icon(IconName::FolderOpen) .icon(IconName::Plus)
.ghost() .label("Add directory")
.tooltip("Add directory") .secondary()
.small()
.on_click(move |_event, _window, cx| add_scan_path(cx)), .on_click(move |_event, _window, cx| add_scan_path(cx)),
), ),
) )
@@ -579,7 +581,7 @@ fn folder_selector(controls: &SettingsControls) -> impl IntoElement {
) )
.child( .child(
Button::new("settings-choose-folder") Button::new("settings-choose-folder")
.icon(IconName::FolderOpen) .icon(IconName::Folder)
.ghost() .ghost()
.tooltip("Choose folder") .tooltip("Choose folder")
.on_click(move |_event, window, cx| { .on_click(move |_event, window, cx| {
@@ -627,7 +629,7 @@ fn add_scan_path(cx: &mut App) {
files: false, files: false,
directories: true, directories: true,
multiple: true, multiple: true,
prompt: Some("Choose directories to scan".into()), prompt: Some("Choose directories".into()),
}); });
cx.spawn(async move |cx| { cx.spawn(async move |cx| {