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

Add Update Cider Branch selection

Browse source
This commit is contained in:
GamingLiamStudios 2022-02-07 21:20:49 +11:00
parent 7b9a0c941f
commit b19b0d4e39
No known key found for this signature in database
GPG key ID: 3650DE4EAFF62ADD
3 changed files with 40 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/i18n/en_US.jsonc
View file

@ -122,7 +122,6 @@
"term.menu": "Menu",
"term.check": "Check",
"term.aboutArtist": "About {{artistName}}", // e.g. 'About Doja Cat'
"term.updateCider": "Update Cider",
"term.topResult": "Top Result", // Search Results
"term.sharedPlaylists": "Shared Playlists", // Search Results
"term.people": "People", // Search Results
@ -299,6 +298,11 @@
"settings.option.experimental.close_button_hide": "Close Button Should Hide the Application",
"settings.option.experimental.copy_log": "Copy logs to clipboard",
"settings.option.experimental.inline_playlists": "Inline Playlists and Albums",
"settings.option.experimental.updateCider": "Update Cider", // Button. Refer to term.check for the check button
"settings.option.experimental.updateCider.branch": "Cider Update Branch", // Dropdown
"settings.option.experimental.updateCider.branch.description": "Select the branch to update Cider to",
"settings.option.experimental.updateCider.branch.main": "Stable",
"settings.option.experimental.updateCider.branch.develop": "Development",
// Refer to term.disabled & term.enabled
// Spatialization Menu
"spatial.notTurnedOn": "Audio Spatialization is disabled. To use, please enable it first.",

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

@ -11,7 +11,8 @@ export class Store {
"discord_rpc": 1, // 0 = disabled, 1 = enabled as Cider, 2 = enabled as Apple Music
"discord_rpc_clear_on_pause": true,
"language": "en_US", // electron.app.getLocale().replace('-', '_') this can be used in future
"playbackNotifications": true
"playbackNotifications": true,
"update_branch": "main"
},
"home": {
"followedArtists": [],
@ -60,10 +61,10 @@ export class Store {
"equalizer": {
'preset': "default",
'frequencies': [32, 63, 125, 250, 500, 1000, 2000, 4000, 8000, 16000],
'gain': [0,0,0,0,0,0,0,0,0,0],
'Q' : [1,1,1,1,1,1,1,1,1,1],
'mix' : 1,
'vibrantBass' : 0,
'gain': [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
'Q': [1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
'mix': 1,
'vibrantBass': 0,
'presets': [],
'userGenerated': false
},

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

@ -655,7 +655,7 @@
</div>
<div class="md-option-line">
<div class="md-option-segment">
{{$root.getLz('term.updateCider')}}
{{$root.getLz('settings.option.experimental.updateCider')}}
</div>
<div class="md-option-segment md-option-segment_auto">
<button class="md-btn" @click="app.checkForUpdate()">
@ -663,6 +663,22 @@
</button>
</div>
</div>
<div class="md-option-line">
<div class="md-option-segment">
{{$root.getLz('settings.option.experimental.updateCider.branch')}}<br>
<small>({{$root.getLz('settings.option.experimental.updateCider.branch.description')}})</small>
</div>
<div class="md-option-segment md-option-segment_auto">
<select class="md-select" style="width:180px;" v-model="app.cfg.general.update_branch">
<option value="main">
{{$root.getLz('settings.option.experimental.updateCider.branch.main')}}
</option>
<option value="develop">
{{$root.getLz('settings.option.experimental.updateCider.branch.develop')}}
</option>
</select>
</div>
</div>
<div class="md-option-line">
<div class="md-option-segment">
{{$root.getLz('settings.option.experimental.copy_log')}}
@ -807,14 +823,16 @@
ciderPPE: function () {
if (app.cfg.advanced.ciderPPE) {
if (app.cfg.audio.spatial) {
app.cfg.advanced.ciderPPE = false;
notyf.error("CAP is not compatible with Spatialization. Please disable Spatialization to continue.")
app.cfg.advanced.ciderPPE = false;
notyf.error("CAP is not compatible with Spatialization. Please disable Spatialization to continue.")
}
}},
}
},
toggleSpatial: function () {
if (app.cfg.audio.spatial) {
if (!app.cfg.advanced.ciderPPE) {
CiderAudio.spatialOn()}
CiderAudio.spatialOn()
}
else {
CiderAudio.spatialOff()
app.cfg.audio.spatial = false;
@ -825,8 +843,9 @@
}
},
changeAudioQuality: function () {1
app.mk.bitrate = MusicKit.PlaybackBitrate[app.cfg.audio.quality];
changeAudioQuality: function () {
1
app.mk.bitrate = MusicKit.PlaybackBitrate[app.cfg.audio.quality];
},
toggleUserInfo: function () {
app.chrome.hideUserInfo = !app.cfg.visual.showuserinfo