okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of https://github.com/ciderapp/Cider into develop

Browse source
This commit is contained in:
yazninja 2022-05-16 13:58:29 +08:00
commit 166f9b9167
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/main/base/store.ts
View file

@ -52,39 +52,39 @@ export class Store {
},
"keybindings": {
"search": [
process.platform == "darwin" ? "Command" : "Control",
"CommandOrControl",
"F"
],
"listnow": [
process.platform == "darwin" ? "Command" : "Control",
"CommandOrControl",
"L"
],
"browse": [
process.platform == "darwin" ? "Command" : "Control",
"CommandOrControl",
"B"
],
"recentAdd": [
process.platform == "darwin" ? "Command" : "Control",
"CommandOrControl",
"G"
],
"songs" : [
process.platform == "darwin" ? "Command" : "Control",
"CommandOrControl",
"J"
],
"albums": [
process.platform == "darwin" ? "Command" : "Control",
"S"
"CommandOrControl",
"A"
],
"artists": [
process.platform == "darwin" ? "Command" : "Control",
"CommandOrControl",
"D"
],
"togglePrivateSession": [
process.platform == "darwin" ? "Command" : "Control",
"CommandOrControl",
"P"
],
"webRemote": [
process.platform == "darwin" ? "Command" : "Control",
"CommandOrControl",
"W"
],
"audioSettings": [
@ -100,12 +100,12 @@ export class Store {
"C"
],
"settings": [
process.platform == "darwin" ? "Option" : "Shift",
"CommandOrControl", // Who the hell uses a different key for this? Fucking Option?
"S"
],
"openDeveloperTools": [
process.platform == "darwin" ? "Command" : "Control",
process.platform == "darwin" ? "Option" : "Shift",
"CommandOrControl",
"Shift",
"I"
]
},

2
src/renderer/views/pages/settings.ejs
View file

@ -1275,7 +1275,7 @@
</div>
<div class="md-option-segment md-option-segment_auto">
<label>
<input type="checkbox" disabled a-v-model="app.cfg.connectUser.sync.settings"
<input type="checkbox" a-v-model="app.cfg.connectUser.sync.settings"
@click="app.cfg.connectUser.sync.settings = !app.cfg.connectUser.sync.settings"
switch/>
</label>