Merge pull request #837 from h3poteto/iss-515
fixes #515 Reload app general config after change preferences
This commit is contained in:
commit
c59169fa88
|
@ -27,5 +27,16 @@
|
||||||
"l": "Switch the focus to right column",
|
"l": "Switch the focus to right column",
|
||||||
"?": "Show this help"
|
"?": "Show this help"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"preferences": {
|
||||||
|
"general": {
|
||||||
|
"timeline": {
|
||||||
|
"title": "Timeline",
|
||||||
|
"description": "Customize view in your timelines.",
|
||||||
|
"cw": "Always ignore contents warnings",
|
||||||
|
"nfsw": "Always ignore NFSW of medias",
|
||||||
|
"hideAllAttachments": "Hide all medias"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,5 +27,16 @@
|
||||||
"l": "Switch the focus to right column",
|
"l": "Switch the focus to right column",
|
||||||
"?": "Show this help"
|
"?": "Show this help"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"preferences": {
|
||||||
|
"general": {
|
||||||
|
"timeline": {
|
||||||
|
"title": "Timeline",
|
||||||
|
"description": "Customize view in your timelines.",
|
||||||
|
"cw": "Always ignore contents warnings",
|
||||||
|
"nfsw": "Always ignore NFSW of medias",
|
||||||
|
"hideAllAttachments": "Hide all medias"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -115,6 +115,13 @@
|
||||||
"description": "操作時の効果音を設定",
|
"description": "操作時の効果音を設定",
|
||||||
"fav_rb": "お気に入り,ブースト時",
|
"fav_rb": "お気に入り,ブースト時",
|
||||||
"toot": "トゥート時"
|
"toot": "トゥート時"
|
||||||
|
},
|
||||||
|
"timeline": {
|
||||||
|
"title": "タイムライン",
|
||||||
|
"description": "タイムラインをカスタマイズ",
|
||||||
|
"cw": "常にCWを表示する",
|
||||||
|
"nfsw": "常にNFSWを表示する",
|
||||||
|
"hideAllAttachments": "すべてのメディアを非表示にする"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"appearance": {
|
"appearance": {
|
||||||
|
|
|
@ -0,0 +1,13 @@
|
||||||
|
{
|
||||||
|
"preferences": {
|
||||||
|
"general": {
|
||||||
|
"timeline": {
|
||||||
|
"title": "Timeline",
|
||||||
|
"description": "Customize view in your timelines.",
|
||||||
|
"cw": "Always ignore contents warnings",
|
||||||
|
"nfsw": "Always ignore NFSW of medias",
|
||||||
|
"hideAllAttachments": "Hide all medias"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -27,5 +27,16 @@
|
||||||
"l": "Switch the focus to right column",
|
"l": "Switch the focus to right column",
|
||||||
"?": "Show this help"
|
"?": "Show this help"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"preferences": {
|
||||||
|
"general": {
|
||||||
|
"timeline": {
|
||||||
|
"title": "Timeline",
|
||||||
|
"description": "Customize view in your timelines.",
|
||||||
|
"cw": "Always ignore contents warnings",
|
||||||
|
"nfsw": "Always ignore NFSW of medias",
|
||||||
|
"hideAllAttachments": "Hide all medias"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -66,7 +66,7 @@ const General = {
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
updateTimeline ({ commit, state }, timeline) {
|
updateTimeline ({ commit, state, dispatch }, timeline) {
|
||||||
commit('changeLoading', true)
|
commit('changeLoading', true)
|
||||||
const newTimeline = Object.assign({}, state.general.timeline, timeline)
|
const newTimeline = Object.assign({}, state.general.timeline, timeline)
|
||||||
const newGeneral = Object.assign({}, state.general, {
|
const newGeneral = Object.assign({}, state.general, {
|
||||||
|
@ -85,6 +85,7 @@ const General = {
|
||||||
ipcRenderer.removeAllListeners('error-update-preferences')
|
ipcRenderer.removeAllListeners('error-update-preferences')
|
||||||
commit('updateGeneral', conf.general)
|
commit('updateGeneral', conf.general)
|
||||||
commit('changeLoading', false)
|
commit('changeLoading', false)
|
||||||
|
dispatch('App/loadPreferences', null, { root: true })
|
||||||
resolve(conf)
|
resolve(conf)
|
||||||
})
|
})
|
||||||
ipcRenderer.send('update-preferences', config)
|
ipcRenderer.send('update-preferences', config)
|
||||||
|
|
Loading…
Reference in New Issue