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

5
crates/client2/src/client2.rs
View file

@ -24,6 +24,7 @@ use rand::prelude::*;
use rpc::proto::{AnyTypedEnvelope, EntityMessage, EnvelopedMessage, PeerId, RequestMessage};
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
use settings2::Settings;
use std::{
any::TypeId,
collections::HashMap,
@ -78,7 +79,7 @@ pub struct SignOut;
pub struct Reconnect;
pub fn init_settings(cx: &mut AppContext) {
settings2::register::<TelemetrySettings>(cx);
TelemetrySettings::register(cx);
}
pub fn init(client: &Arc<Client>, cx: &mut AppContext) {
@ -371,7 +372,7 @@ pub struct TelemetrySettingsContent {
pub metrics: Option<bool>,
}
impl settings2::Setting for TelemetrySettings {
impl settings2::Settings for TelemetrySettings {
const KEY: Option<&'static str> = Some("telemetry");
type FileContent = TelemetrySettingsContent;