Change journal location setting name to "path" and default to ~

This commit is contained in:
Joseph T Lyons 2022-09-29 16:18:16 -04:00
parent f8da5ab2e7
commit 3c62de34f7
5 changed files with 39 additions and 24 deletions

View file

@ -103,17 +103,19 @@ pub enum Autosave {
OnWindowChange,
}
#[derive(Clone, Debug, Default, Deserialize, JsonSchema)]
#[derive(Clone, Debug, Deserialize, JsonSchema)]
pub struct JournalSettings {
pub journal_directory: Option<JournalDirectory>,
pub path: Option<String>,
pub hour_format: Option<HourFormat>,
}
#[derive(Clone, Debug, Deserialize, JsonSchema)]
#[serde(rename_all = "snake_case")]
pub enum JournalDirectory {
AlwaysHome,
Always { directory: String },
impl Default for JournalSettings {
fn default() -> Self {
Self {
path: Some("~".into()),
hour_format: Some(Default::default()),
}
}
}
#[derive(Clone, Debug, Deserialize, JsonSchema)]
@ -123,6 +125,12 @@ pub enum HourFormat {
Hour24,
}
impl Default for HourFormat {
fn default() -> Self {
Self::Hour12
}
}
#[derive(Clone, Debug, Default, Deserialize, JsonSchema)]
pub struct TerminalSettings {
pub shell: Option<Shell>,