Custom font selection (#226)

src-tauri/yaak-models/src/models.rs

@@ -103,9 +103,13 @@ pub struct Settings {
     pub updated_at: NaiveDateTime,
 
     pub appearance: String,
+    pub colored_methods: bool,
+    pub editor_font: Option<String>,
     pub editor_font_size: i32,
+    pub editor_keymap: EditorKeymap,
     pub editor_soft_wrap: bool,
     pub hide_window_controls: bool,
+    pub interface_font: Option<String>,
     pub interface_font_size: i32,
     pub interface_scale: f32,
     pub open_workspace_new_window: Option<bool>,
@@ -113,8 +117,6 @@ pub struct Settings {
     pub theme_dark: String,
     pub theme_light: String,
     pub update_channel: String,
-    pub editor_keymap: EditorKeymap,
-    pub colored_methods: bool,
 }
 
 impl UpsertModelInfo for Settings {
@@ -154,6 +156,8 @@ impl UpsertModelInfo for Settings {
             (EditorFontSize, self.editor_font_size.into()),
             (EditorKeymap, self.editor_keymap.to_string().into()),
             (EditorSoftWrap, self.editor_soft_wrap.into()),
+            (EditorFont, self.editor_font.into()),
+            (InterfaceFont, self.interface_font.into()),
             (InterfaceFontSize, self.interface_font_size.into()),
             (InterfaceScale, self.interface_scale.into()),
             (HideWindowControls, self.hide_window_controls.into()),
@@ -173,8 +177,10 @@ impl UpsertModelInfo for Settings {
             SettingsIden::EditorFontSize,
             SettingsIden::EditorKeymap,
             SettingsIden::EditorSoftWrap,
+            SettingsIden::EditorFont,
             SettingsIden::InterfaceFontSize,
             SettingsIden::InterfaceScale,
+            SettingsIden::InterfaceFont,
             SettingsIden::HideWindowControls,
             SettingsIden::OpenWorkspaceNewWindow,
             SettingsIden::Proxy,
@@ -198,10 +204,12 @@ impl UpsertModelInfo for Settings {
             updated_at: row.get("updated_at")?,
             appearance: row.get("appearance")?,
             editor_font_size: row.get("editor_font_size")?,
+            editor_font: row.get("editor_font")?,
             editor_keymap: EditorKeymap::from_str(editor_keymap.as_str()).unwrap(),
             editor_soft_wrap: row.get("editor_soft_wrap")?,
             interface_font_size: row.get("interface_font_size")?,
             interface_scale: row.get("interface_scale")?,
+            interface_font: row.get("interface_font")?,
             open_workspace_new_window: row.get("open_workspace_new_window")?,
             proxy: proxy.map(|p| -> ProxySetting { serde_json::from_str(p.as_str()).unwrap() }),
             theme_dark: row.get("theme_dark")?,

src-tauri/yaak-models/src/queries/settings.rs

@@ -19,10 +19,12 @@ impl<'a> DbContext<'a> {
 
             appearance: "system".to_string(),
             editor_font_size: 13,
+            editor_font: None,
             editor_keymap: EditorKeymap::Default,
             editor_soft_wrap: true,
             interface_font_size: 15,
             interface_scale: 1.0,
+            interface_font: None,
             hide_window_controls: false,
             open_workspace_new_window: None,
             proxy: None,