refs #579 Save fonts when user change fonts
This commit is contained in:
parent
69021bc6d1
commit
7c1bb16147
|
@ -6,6 +6,7 @@ import Theme from '../constants/theme'
|
||||||
import Language from '../constants/language'
|
import Language from '../constants/language'
|
||||||
import TimeFormat from '../constants/timeFormat'
|
import TimeFormat from '../constants/timeFormat'
|
||||||
import { LightTheme } from '../renderer/utils/theme'
|
import { LightTheme } from '../renderer/utils/theme'
|
||||||
|
import DefaultFonts from '../renderer/utils/fonts'
|
||||||
|
|
||||||
const Base = {
|
const Base = {
|
||||||
general: {
|
general: {
|
||||||
|
@ -34,7 +35,8 @@ const Base = {
|
||||||
fontSize: 14,
|
fontSize: 14,
|
||||||
displayNameStyle: DisplayStyle.DisplayNameAndUsername.value,
|
displayNameStyle: DisplayStyle.DisplayNameAndUsername.value,
|
||||||
timeFormat: TimeFormat.Absolute.value,
|
timeFormat: TimeFormat.Absolute.value,
|
||||||
customThemeColor: LightTheme
|
customThemeColor: LightTheme,
|
||||||
|
font: DefaultFonts[0]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -102,8 +102,7 @@ export default {
|
||||||
timeFormats: [
|
timeFormats: [
|
||||||
TimeFormat.Absolute,
|
TimeFormat.Absolute,
|
||||||
TimeFormat.Relative
|
TimeFormat.Relative
|
||||||
],
|
]
|
||||||
font: ''
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
|
@ -137,6 +136,14 @@ export default {
|
||||||
},
|
},
|
||||||
customizeThemeColor () {
|
customizeThemeColor () {
|
||||||
return this.theme === Theme.Custom.key
|
return this.theme === Theme.Custom.key
|
||||||
|
},
|
||||||
|
font: {
|
||||||
|
get () {
|
||||||
|
return this.$store.state.Preferences.Appearance.appearance.font
|
||||||
|
},
|
||||||
|
set (value) {
|
||||||
|
this.$store.dispatch('Preferences/Appearance/updateFont', value)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created () {
|
created () {
|
||||||
|
|
|
@ -13,19 +13,11 @@ export default {
|
||||||
fontSize: 14,
|
fontSize: 14,
|
||||||
displayNameStyle: DisplayStyle.DisplayNameAndUsername.value,
|
displayNameStyle: DisplayStyle.DisplayNameAndUsername.value,
|
||||||
timeFormat: TimeFormat.Absolute.value,
|
timeFormat: TimeFormat.Absolute.value,
|
||||||
customThemeColor: LightTheme
|
customThemeColor: LightTheme,
|
||||||
|
font: DefaultFonts[0]
|
||||||
},
|
},
|
||||||
fonts: []
|
fonts: []
|
||||||
},
|
},
|
||||||
getters: {
|
|
||||||
currentFont: state => {
|
|
||||||
const font = DefaultFonts.find(f => state.fonts.includes(f))
|
|
||||||
if (font) {
|
|
||||||
return font
|
|
||||||
}
|
|
||||||
return DefaultFonts[0]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
mutations: {
|
mutations: {
|
||||||
updateAppearance (state, conf) {
|
updateAppearance (state, conf) {
|
||||||
state.appearance = conf
|
state.appearance = conf
|
||||||
|
@ -58,7 +50,7 @@ export default {
|
||||||
})
|
})
|
||||||
ipcRenderer.once('response-list-fonts', (event, fonts) => {
|
ipcRenderer.once('response-list-fonts', (event, fonts) => {
|
||||||
ipcRenderer.removeAllListeners('error-list-fonts')
|
ipcRenderer.removeAllListeners('error-list-fonts')
|
||||||
commit('updateFonts', fonts)
|
commit('updateFonts', [DefaultFonts[0]].concat(fonts))
|
||||||
resolve(fonts)
|
resolve(fonts)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
@ -148,6 +140,23 @@ export default {
|
||||||
commit('updateAppearance', conf.appearance)
|
commit('updateAppearance', conf.appearance)
|
||||||
dispatch('App/loadPreferences', null, { root: true })
|
dispatch('App/loadPreferences', null, { root: true })
|
||||||
})
|
})
|
||||||
|
},
|
||||||
|
updateFont ({ dispatch, state, commit }, value) {
|
||||||
|
const newAppearance = Object.assign({}, state.appearance, {
|
||||||
|
font: value
|
||||||
|
})
|
||||||
|
const config = {
|
||||||
|
appearance: newAppearance
|
||||||
|
}
|
||||||
|
ipcRenderer.send('update-preferences', config)
|
||||||
|
ipcRenderer.once('error-update-preferences', (event, err) => {
|
||||||
|
ipcRenderer.removeAllListeners('response-update-preferences')
|
||||||
|
})
|
||||||
|
ipcRenderer.once('response-update-preferences', (event, conf) => {
|
||||||
|
ipcRenderer.removeAllListeners('error-update-preferences')
|
||||||
|
commit('updateAppearance', conf.appearance)
|
||||||
|
dispatch('App/loadPreferences', null, { root: true })
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue