Merge pull request #229 from maikirakiwi/upcoming

Pull Request of the day - 26 January 2022

src/i18n/en_GB.jsonc

@@ -1,4 +1,9 @@
 {
+        // i18n Info
+    "i18n.languageName": "English (UK)",        // name of language in native language
+    "i18n.languageNameEnglish": "English (UK)", // name of language in English
+    "i18n.category": "main", // main = real language, fun = fun community languages
+    "i18n.authors": "", // Authors, if you contribute to this file feel free to add your name seperated with a space
     "date.format": "${d} ${m}, ${y}",
 
     "home.friendsListeningTo": "Bruv's Listening To"

src/i18n/en_US.jsonc

@@ -1,8 +1,8 @@
 { // Base File
 
   // i18n Info
-  "i18n.languageName": "English US",        // name of language in native language
+  "i18n.languageName": "English (US)",        // name of language in native language
-  "i18n.languageNameEnglish": "English US", // name of language in English
+  "i18n.languageNameEnglish": "English (US)", // name of language in English
   "i18n.category": "main", // main = real language, fun = fun community languages
   "i18n.authors": "@maikirakiwi", // Authors, if you contribute to this file feel free to add your name seperated with a space
 
@@ -249,7 +249,7 @@
   "settings.header.experimental": "Experimental",
   "settings.header.experimental.description": "Adjust the experimental settings for Cider.",
   "settings.option.experimental.compactUI": "Compact UI", // Toggle
-  "settings.option.experimental.closeButtonBehaviour": "Close Button Behaviour",
+  "settings.option.experimental.closeButtonBehaviour": "Close Button Behavior",
   "settings.option.experimental.closeButtonBehaviour.quit": "Quit Cider",
   "settings.option.experimental.closeButtonBehaviour.minimizeTaskbar": "Minimize to taskbar",
   "settings.option.experimental.closeButtonBehaviour.minimizeTray": "Minimize to system tray",

src/i18n/ja_JP.jsonc

@@ -238,6 +238,10 @@
   "settings.header.experimental": "試験的な機能",
   "settings.header.experimental.description": "開発中の実験的な機能は不完全で不安定である可能性があります",
   "settings.option.experimental.compactUI": "コンパクトインターフェース", // Toggle
+  "settings.option.experimental.closeButtonBehaviour": "「閉じる」ボタンの動作", // Dropdown
+  "settings.option.experimental.closeButtonBehaviour.quit": "アプリを終了する",
+  "settings.option.experimental.closeButtonBehaviour.minimizeTaskbar": "タスクバーに最小化する",
+  "settings.option.experimental.closeButtonBehaviour.minimizeTray": "トレイに最小化する",
   // Refer to term.disabled & term.enabled
   
   // Spatialization Menu

src/i18n/zh_CN.jsonc

@@ -5,8 +5,8 @@
   "date.format": "${y}年${m}月${d}日",
 
     // i18n Info
-  "i18n.languageName": "中文（中国）",        // name of language in native language
+  "i18n.languageName": "简体中文（中国）",        // name of language in native language
-  "i18n.languageNameEnglish": "Chinese (China)", // name of language in English
+  "i18n.languageNameEnglish": "Simp. Chinese (China)", // name of language in English
   "i18n.category": "main", // main = real language, fun = fun community languages
   "i18n.authors": "@maikirakiwi", // Authors, if you contribute to this file feel free to add your name seperated with a space
 
@@ -240,6 +240,10 @@
   "settings.header.experimental": "实验性功能",
   "settings.header.experimental.description": "调整Cider的实验性功能",
   "settings.option.experimental.compactUI": "紧凑型 UI", // Toggle
+  "settings.option.experimental.closeButtonBehaviour": "点击关闭按钮时",
+  "settings.option.experimental.closeButtonBehaviour.quit": "退出 Cider",
+  "settings.option.experimental.closeButtonBehaviour.minimizeTaskbar": "最小化到任务栏",
+  "settings.option.experimental.closeButtonBehaviour.minimizeTray": "最小化到系统托盘",
   // Refer to term.disabled & term.enabled
   
   // Spatialization Menu

src/i18n/zh_HK.jsonc

@@ -1,7 +1,7 @@
 {
   // i18n Info
   "i18n.languageName": "繁體中文（香港）",        // name of language in native language
-  "i18n.languageNameEnglish": "Traditional Chinese (Hong Kong)", // name of language in English
+  "i18n.languageNameEnglish": "Trad. Chinese (Hong Kong)", // name of language in English
   "i18n.category": "main", // main = real language, fun = fun community languages
   "i18n.authors": "@kyw504100 @maikirakiwi", // Authors, if you contribute to this file feel free to add your name seperated with a space
 

src/i18n/zh_TW.jsonc

@@ -5,8 +5,8 @@
   "date.format": "${y}年${m}月${d}日",
  
   // i18n Info
-  "i18n.languageName": "中文（台湾）",        // name of language in native language
+  "i18n.languageName": "繁體中文（台灣）",        // name of language in native language
-  "i18n.languageNameEnglish": "Chinese (Taiwan)", // name of language in English
+  "i18n.languageNameEnglish": "Trad. Chinese (Taiwan)", // name of language in English
   "i18n.category": "main", // main = real language, fun = fun community languages
   "i18n.authors": "@maikirakiwi", // Authors, if you contribute to this file feel free to add your name seperated with a space
 
@@ -239,6 +239,10 @@
   "settings.header.experimental": "實驗性功能",
   "settings.header.experimental.description": "調整 Cider 的實驗性功能",
   "settings.option.experimental.compactUI": "緊凑型 UI", // Toggle
+  "settings.option.experimental.closeButtonBehaviour": "關閉按鈕行為", // Dropdown
+  "settings.option.experimental.closeButtonBehaviour.quit": "退出 Cider",
+  "settings.option.experimental.closeButtonBehaviour.minimizeTaskbar": "最小化到工作列",
+  "settings.option.experimental.closeButtonBehaviour.minimizeTray": "最小化到系統匣",
   // Refer to term.disabled & term.enabled
   
   // Spatialization Menu

src/main/base/store.ts

@@ -32,6 +32,9 @@ export class ConfigStore {
             "normalization": false,
             "spatial": false,
             "maxVolume": 1,
+            "volumePrecision": 0.1,
+            "volumeRoundMax": 0.9,
+            "volumeRoundMin": 0.1,
             "spatial_properties": {
                 "presets": [],
                 "gain": 0.8,

src/renderer/index.js

@@ -171,7 +171,7 @@ const app = new Vue({
             data: {},
         },
         library: {
-            downloadNotification: {
+            backgroundNotification: {
                 show: false,
                 message: "",
                 total: 0,
@@ -605,9 +605,9 @@ const app = new Vue({
 
             // Load saved quality
             switch (app.cfg.audio.quality) {
-                case "extreme":
+                /** case "extreme":
                     app.mk.bitrate = app.cfg.audio.quality = 990
-                    break;
+                    break; **/
                 case "high":
                     app.mk.bitrate = app.cfg.audio.quality = 256
                     break;
@@ -1736,8 +1736,8 @@ const app = new Vue({
                 return
             }
             this.library.songs.downloadState = 1
-            this.library.downloadNotification.show = true
+            this.library.backgroundNotification.show = true
-            this.library.downloadNotification.message = app.getLz('notification.updatingLibrarySongs')
+            this.library.backgroundNotification.message = app.getLz('notification.updatingLibrarySongs')
 
             function downloadChunk() {
                 const params = {
@@ -1769,10 +1769,10 @@ const app = new Vue({
             function processChunk(response) {
                 downloaded = response
                 library = library.concat(downloaded.data)
-                self.library.downloadNotification.show = true
+                self.library.backgroundNotification.show = true
-                self.library.downloadNotification.message = app.getLz('notification.updatingLibrarySongs')
+                self.library.backgroundNotification.message = app.getLz('notification.updatingLibrarySongs')
-                self.library.downloadNotification.total = downloaded.meta.total
+                self.library.backgroundNotification.total = downloaded.meta.total
-                self.library.downloadNotification.progress = library.length
+                self.library.backgroundNotification.progress = library.length
 
                 if (downloaded.meta.total == 0) {
                     self.library.songs.downloadState = 3
@@ -1782,7 +1782,7 @@ const app = new Vue({
                     console.log("downloaded.next is undefined")
                     self.library.songs.listing = library
                     self.library.songs.downloadState = 2
-                    self.library.downloadNotification.show = false
+                    self.library.backgroundNotification.show = false
                     self.searchLibrarySongs()
                     localStorage.setItem("librarySongs", JSON.stringify(library))
                 }
@@ -1792,7 +1792,7 @@ const app = new Vue({
                 } else {
                     self.library.songs.listing = library
                     self.library.songs.downloadState = 2
-                    self.library.downloadNotification.show = false
+                    self.library.backgroundNotification.show = false
                     self.searchLibrarySongs()
                     localStorage.setItem("librarySongs", JSON.stringify(library))
                     console.log(library)
@@ -1817,8 +1817,8 @@ const app = new Vue({
                 return
             }
             this.library.albums.downloadState = 1
-            this.library.downloadNotification.show = true
+            this.library.backgroundNotification.show = true
-            this.library.downloadNotification.message = app.getLz('notification.updatingLibraryAlbums')
+            this.library.backgroundNotification.message = app.getLz('notification.updatingLibraryAlbums')
 
             function downloadChunk() {
                 self.library.albums.downloadState = 1
@@ -1849,10 +1849,10 @@ const app = new Vue({
             function processChunk(response) {
                 downloaded = response
                 library = library.concat(downloaded.data)
-                self.library.downloadNotification.show = true
+                self.library.backgroundNotification.show = true
-                self.library.downloadNotification.message = app.getLz('notification.updatingLibraryAlbums')
+                self.library.backgroundNotification.message = app.getLz('notification.updatingLibraryAlbums')
-                self.library.downloadNotification.total = downloaded.meta.total
+                self.library.backgroundNotification.total = downloaded.meta.total
-                self.library.downloadNotification.progress = library.length
+                self.library.backgroundNotification.progress = library.length
                 if (downloaded.meta.total == 0) {
                     self.library.albums.downloadState = 3
                     return
@@ -1861,7 +1861,7 @@ const app = new Vue({
                     console.log("downloaded.next is undefined")
                     self.library.albums.listing = library
                     self.library.albums.downloadState = 2
-                    self.library.downloadNotification.show = false
+                    self.library.backgroundNotification.show = false
                     localStorage.setItem("libraryAlbums", JSON.stringify(library))
                     self.searchLibraryAlbums(index)
                 }
@@ -1872,7 +1872,7 @@ const app = new Vue({
                 } else {
                     self.library.albums.listing = library
                     self.library.albums.downloadState = 2
-                    self.library.downloadNotification.show = false
+                    self.library.backgroundNotification.show = false
                     localStorage.setItem("libraryAlbums", JSON.stringify(library))
                     self.searchLibraryAlbums(index)
                     console.log(library)
@@ -1897,8 +1897,8 @@ const app = new Vue({
                 return
             }
             this.library.artists.downloadState = 1
-            this.library.downloadNotification.show = true
+            this.library.backgroundNotification.show = true
-            this.library.downloadNotification.message = app.getLz('notification.updatingLibraryArtists')
+            this.library.backgroundNotification.message = app.getLz('notification.updatingLibraryArtists')
 
             function downloadChunk() {
                 self.library.artists.downloadState = 1
@@ -1932,10 +1932,10 @@ const app = new Vue({
             function processChunk(response) {
                 downloaded = response
                 library = library.concat(downloaded.data)
-                self.library.downloadNotification.show = true
+                self.library.backgroundNotification.show = true
-                self.library.downloadNotification.message = app.getLz('notification.updatingLibraryArtists')
+                self.library.backgroundNotification.message = app.getLz('notification.updatingLibraryArtists')
-                self.library.downloadNotification.total = downloaded.meta.total
+                self.library.backgroundNotification.total = downloaded.meta.total
-                self.library.downloadNotification.progress = library.length
+                self.library.backgroundNotification.progress = library.length
                 if (downloaded.meta.total == 0) {
                     self.library.albums.downloadState = 3
                     return
@@ -1955,7 +1955,7 @@ const app = new Vue({
                 } else {
                     self.library.artists.listing = library
                     self.library.artists.downloadState = 2
-                    self.library.downloadNotification.show = false
+                    self.library.backgroundNotification.show = false
                     localStorage.setItem("libraryArtists", JSON.stringify(library))
                     self.searchLibraryArtists(index)
                     console.log(library)
@@ -3088,18 +3088,23 @@ const app = new Vue({
             })
         },
         volumeWheel(event) {
+            if (this.cfg.audio.maxVolume < 1.0 && this.cfg.audio.maxVolume > 0.01) {
+                this.cfg.audio.volumePrecision = 0.01
+                this.cfg.audio.volumeRoundMax = this.cfg.audio.maxVolume - 0.01
+                this.cfg.audio.volumeRoundMin = 0.01
+            }
             if (event.deltaY < 0) {
-                if (this.mk.volume < 1) {
+                if (this.mk.volume < this.cfg.audio.maxVolume) {
-                    if (this.mk.volume <= 0.9) {
+                    if (this.mk.volume <= this.cfg.audio.volumeRoundMax) {
-                        this.mk.volume += 0.1
+                        this.mk.volume += this.cfg.audio.volumePrecision
                     } else {
                         this.mk.volume = this.cfg.audio.maxVolume
                     }
                 }
             } else if (event.deltaY > 0) {
                 if (this.mk.volume > 0) {
-                    if (this.mk.volume >= 0.1) {
+                    if (this.mk.volume >= this.cfg.audio.volumeRoundMin) {
-                        this.mk.volume -= 0.1
+                        this.mk.volume -= this.cfg.audio.volumePrecision
                     } else {
                         this.mk.volume = 0
                     }

src/renderer/views/main.ejs

@@ -360,10 +360,10 @@
                             </div>
                         </button>
                     </div>
-                    <div class="app-sidebar-notification libraryNotification"
+                    <div class="app-sidebar-notification backgroundNotification"
-                         v-if="library.downloadNotification.show">
+                         v-if="library.backgroundNotification.show">
-                        <div class="message">{{ library.downloadNotification.message }} ({{
+                        <div class="message">{{ library.backgroundNotification.message }} ({{
-                            library.downloadNotification.progress }} / {{ library.downloadNotification.total }})
+                            library.backgroundNotification.progress }} / {{ library.backgroundNotification.total }})
                         </div>
                     </div>
                 </div>