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

Update Resume Tabs feature

Browse source
This commit is contained in:
Amaru8 2022-04-29 00:26:16 +02:00
parent d3d20868c4
commit 517e2fb89c
7 changed files with 33 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/i18n/README.md
View file

@ -291,7 +291,11 @@ Update 25/04/2022 00:21 UTC
* `settings.description.settings`: Added for `en_US` * `settings.description.settings`: Added for `en_US`
* `settings.description.developer`: Added for `en_US` * `settings.description.developer`: Added for `en_US`
Update 28/04/2022 21:30 UTC Update 28/04/2022 21:45 UTC
* `settings.option.general.resumetabs`: Added for `en_US`
* `settings.option.general.resumetabs.description`: Added for `en_US`
* `settings.option.general.resumetabs.dynamic`: Added for `en_US`
* `settings.option.general.resumetabs.dynamic.description`: Added for `en_US`
* `term.dynamic`: Added for `en_US`

5
src/i18n/en_US.json
View file

@ -73,7 +73,6 @@
"term.viewAs": "View As", "term.viewAs": "View As",
"term.viewAs.coverArt": "Cover Art", "term.viewAs.coverArt": "Cover Art",
"term.viewAs.list": "List", "term.viewAs.list": "List",
"term.dynamic": "Dynamic",
"term.size": "Size", "term.size": "Size",
"term.size.normal": "Normal", "term.size.normal": "Normal",
"term.size.compact": "Compact", "term.size.compact": "Compact",
@ -273,6 +272,10 @@
"settings.option.general.resumebehavior.locally.description": "Cider will resume your last session on this machine.", "settings.option.general.resumebehavior.locally.description": "Cider will resume your last session on this machine.",
"settings.option.general.resumebehavior.history": "History", "settings.option.general.resumebehavior.history": "History",
"settings.option.general.resumebehavior.history.description": "Cider will queue the last song from your overall Apple Music history, across devices.", "settings.option.general.resumebehavior.history.description": "Cider will queue the last song from your overall Apple Music history, across devices.",
"settings.option.general.resumetabs" : "Open Tab on Launch",
"settings.option.general.resumetabs.description" : "You can choose what tab you want to open when you launch Cider.",
"settings.option.general.resumetabs.dynamic" : "Dynamic",
"settings.option.general.resumetabs.dynamic.description" : "Cider will open the tab that you last used.",
"settings.option.general.language.main": "Languages", "settings.option.general.language.main": "Languages",
"settings.option.general.language.fun": "Fun Languages", "settings.option.general.language.fun": "Fun Languages",
"settings.option.general.language.unsorted": "Unsorted", "settings.option.general.language.unsorted": "Unsorted",

4
src/i18n/hu_HU.json
View file

@ -270,6 +270,10 @@
"settings.option.general.resumebehavior.locally.description": "A Cider az ezen az eszközön utoljára játszott zenét fogja folytatni.", "settings.option.general.resumebehavior.locally.description": "A Cider az ezen az eszközön utoljára játszott zenét fogja folytatni.",
"settings.option.general.resumebehavior.history": "Előzmények", "settings.option.general.resumebehavior.history": "Előzmények",
"settings.option.general.resumebehavior.history.description": "A Cider az utolsó zeneszámot fogja lekérni az Apple Music előzményeidből, eszközökön keresztül.", "settings.option.general.resumebehavior.history.description": "A Cider az utolsó zeneszámot fogja lekérni az Apple Music előzményeidből, eszközökön keresztül.",
"settings.option.general.resumetabs" : "Fül megnyitása indításkor",
"settings.option.general.resumetabs.description" : "Itt tudod kiválasztani, hogy a Ciderbe való visszatérésnél melyik fül nyíljon meg.",
"settings.option.general.resumetabs.dynamic" : "Dinamikus",
"settings.option.general.resumetabs.dynamic.description" : "A Cider a legutóbb használt fület fogja megnyitni.",
"settings.option.general.language.main": "Nyelvek", "settings.option.general.language.main": "Nyelvek",
"settings.option.general.language.fun": "Fantázianyelvek", "settings.option.general.language.fun": "Fantázianyelvek",
"settings.option.general.language.unsorted": "Kategorizálatlan", "settings.option.general.language.unsorted": "Kategorizálatlan",

4
src/i18n/source/en_US.json
View file

@ -273,6 +273,10 @@
"settings.option.general.resumebehavior.locally.description": "Cider will resume your last session on this machine.", "settings.option.general.resumebehavior.locally.description": "Cider will resume your last session on this machine.",
"settings.option.general.resumebehavior.history": "History", "settings.option.general.resumebehavior.history": "History",
"settings.option.general.resumebehavior.history.description": "Cider will queue the last song from your overall Apple Music history, across devices.", "settings.option.general.resumebehavior.history.description": "Cider will queue the last song from your overall Apple Music history, across devices.",
"settings.option.general.resumetabs" : "Open Tab on Launch",
"settings.option.general.resumetabs.description" : "You can choose what tab you want to open when you launch Cider.",
"settings.option.general.resumetabs.dynamic" : "Dynamic",
"settings.option.general.resumetabs.dynamic.description" : "Cider will open the tab that you last used.",
"settings.option.general.language.main": "Languages", "settings.option.general.language.main": "Languages",
"settings.option.general.language.fun": "Fun Languages", "settings.option.general.language.fun": "Fun Languages",
"settings.option.general.language.unsorted": "Unsorted", "settings.option.general.language.unsorted": "Unsorted",

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

@ -45,7 +45,7 @@ export class Store {
"enabled": false, "enabled": false,
"hidden": false, "hidden": false,
}, },
"resumeWindow": { "resumeTabs": {
"tab": "home", "tab": "home",
"dynamicData": "" "dynamicData": ""
}, },

16
src/renderer/main/vueapp.js
View file

@ -480,11 +480,11 @@ const app = new Vue({
app.modals[key] = false; app.modals[key] = false;
} }
}, },
restoreTabs() { resumeTabs() {
if (app.cfg.general.resumeWindow.tab == "dynamic") { if (app.cfg.general.resumeTabs.tab == "dynamic") {
this.appRoute(app.cfg.general.resumeWindow.dynamicData) this.appRoute(app.cfg.general.resumeTabs.dynamicData)
} else { } else {
this.appRoute(app.cfg.general.resumeWindow.tab) this.appRoute(app.cfg.general.resumeTabs.tab)
} }
}, },
promptAddToPlaylist() { promptAddToPlaylist() {
@ -903,7 +903,7 @@ const app = new Vue({
this.appRoute(window.location.hash) this.appRoute(window.location.hash)
} }
this.restoreTabs() this.resumeTabs()
this.mediaKeyFixes() this.mediaKeyFixes()
setTimeout(() => { setTimeout(() => {
@ -1572,11 +1572,11 @@ const app = new Vue({
return; return;
} }
route = route.replace(/#/g, "") route = route.replace(/#/g, "")
if (app.cfg.general.resumeWindow.tab == "dynamic") { if (app.cfg.general.resumeTabs.tab == "dynamic") {
if (route == "home" || route == "library-songs" || route == "library-albums" || route == "library-artists" || route == "library-videos" || route == "podcasts") { if (route == "home" || route == "library-songs" || route == "library-albums" || route == "library-artists" || route == "library-videos" || route == "podcasts") {
app.cfg.general.resumeWindow.dynamicData = route app.cfg.general.resumeTabs.dynamicData = route
} else { } else {
app.cfg.general.resumeWindow.dynamicData = "home" app.cfg.general.resumeTabs.dynamicData = "home"
} }
} }
// if the route contains does not include a / then route to the page directly // if the route contains does not include a / then route to the page directly

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

@ -63,13 +63,15 @@
</div> </div>
<div class="md-option-line"> <div class="md-option-line">
<div class="md-option-segment"> <div class="md-option-segment">
Open Tab on Launch<br> {{$root.getLz('settings.option.general.resumetabs')}}<br>
<small> <small>
({{$root.getLz('settings.option.visual.hardwareAcceleration.description')}}) {{$root.getLz('settings.option.general.resumetabs.description')}}<br>
<b>{{$root.getLz('settings.option.general.resumetabs.dynamic')}}: </b>
{{$root.getLz('settings.option.general.resumetabs.dynamic.description')}}
</small> </small>
</div> </div>
<div class="md-option-segment md-option-segment_auto"> <div class="md-option-segment md-option-segment_auto">
<select class="md-select" style="width:180px;" v-model="$root.cfg.general.resumeWindow.tab"> <select class="md-select" style="width:180px;" v-model="$root.cfg.general.resumeTabs.tab">
<option value="home">{{$root.getLz('home.title')}}</option> <option value="home">{{$root.getLz('home.title')}}</option>
<option value="library-recentlyadded">{{$root.getLz('term.recentlyAdded')}}</option> <option value="library-recentlyadded">{{$root.getLz('term.recentlyAdded')}}</option>
<option value="library-songs">{{$root.getLz('term.songs')}}</option> <option value="library-songs">{{$root.getLz('term.songs')}}</option>
@ -77,7 +79,7 @@
<option value="library-artists">{{$root.getLz('term.artists')}}</option> <option value="library-artists">{{$root.getLz('term.artists')}}</option>
<option value="library-videos">{{$root.getLz('term.videos')}}</option> <option value="library-videos">{{$root.getLz('term.videos')}}</option>
<option value="podcasts">{{$root.getLz('term.podcasts')}}</option> <option value="podcasts">{{$root.getLz('term.podcasts')}}</option>
<option value="dynamic">{{$root.getLz('term.dynamic')}}</option> <option value="dynamic">{{$root.getLz('settings.option.general.resumetabs.dynamic')}}</option>
</select> </select>
</div> </div>
</div> </div>