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

Load themes from settings and rework Settings trait

Browse source
This commit is contained in:
Marshall Bowers 2023-10-25 20:37:55 +02:00
parent 98e2490807
commit e67048ee7b
19 changed files with 114 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/zed2/src/main.rs
View file

@ -19,7 +19,9 @@ use log::LevelFilter;
use node_runtime::RealNodeRuntime;
use parking_lot::Mutex;
use serde::{Deserialize, Serialize};
use settings2::{default_settings, handle_settings_file_changes, watch_config_file, SettingsStore};
use settings2::{
default_settings, handle_settings_file_changes, watch_config_file, Settings, SettingsStore,
};
use simplelog::ConfigBuilder;
use smol::process::Command;
use std::{
@ -123,7 +125,7 @@ fn main() {
// cx.set_global(client.clone());
// theme::init(Assets, cx);
theme2::init(cx);
// context_menu::init(cx);
// project::Project::init(&client, cx);
// client::init(&client, cx);
@ -506,7 +508,7 @@ fn init_panic_hook(app: &App, installation_id: Option<String>, session_id: Strin
}
fn upload_previous_panics(http: Arc<dyn HttpClient>, cx: &mut AppContext) {
let telemetry_settings = *settings2::get::<client2::TelemetrySettings>(cx);
let telemetry_settings = *client2::TelemetrySettings::get_global(cx);
cx.executor()
.spawn(async move {