From 10a307f45bbbf3301e9b20fba526c671cf6290bb Mon Sep 17 00:00:00 2001 From: cryptofyre Date: Mon, 25 Apr 2022 21:30:06 -0500 Subject: [PATCH 01/73] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4b2b54da..34d1257f 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "cider", "applicationId": "Cider", "productName": "Cider", - "version": "1.4.4", + "version": "1.4.5", "description": "A new cross-platform Apple Music experience based on Electron and Vue.js written from scratch with performance in mind.", "license": "AGPL-3.0", "main": "./build/index.js", From 8ef2ca6b6542fdad8f8bed331c77e7e0dcabaa3a Mon Sep 17 00:00:00 2001 From: cryptofyre Date: Mon, 25 Apr 2022 21:31:35 -0500 Subject: [PATCH 02/73] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 34d1257f..4b2b54da 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "cider", "applicationId": "Cider", "productName": "Cider", - "version": "1.4.5", + "version": "1.4.4", "description": "A new cross-platform Apple Music experience based on Electron and Vue.js written from scratch with performance in mind.", "license": "AGPL-3.0", "main": "./build/index.js", From 3453a9733b3f895c16bd317a1333668736ade27f Mon Sep 17 00:00:00 2001 From: Mefsaal Date: Thu, 28 Apr 2022 19:59:58 -0300 Subject: [PATCH 03/73] some test --- src/i18n/en_US.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index 78413968..64eec84b 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -263,6 +263,14 @@ "action.cast.scanning": "Scanning...", "action.createNew": "Create New...", "action.openArtworkInBrowser": "Open artwork in browser", + "menubar.options.about": "About", + "menubar.options.settings": "Settings", + "menubar.options.services": "Services", + "menubar.options.hide": "Hide Cider", + "menubar.options.hideothers": "Hide Others", + "menubar.options.unhide": "Show All", + "menubar.options.quit": "Quit Cider", + "settings.header.general": "General", "settings.header.general.description": "Adjust the general settings for Cider.", "settings.option.general.language": "Language", From b33cf304a794dca33ec48d7cb830f0f1a42f4d13 Mon Sep 17 00:00:00 2001 From: Mefsaal Date: Fri, 29 Apr 2022 21:47:05 -0300 Subject: [PATCH 04/73] Cider Strings RE-Work --- src/main/plugins/menubar.ts | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts index b47dcabe..fb5e7594 100644 --- a/src/main/plugins/menubar.ts +++ b/src/main/plugins/menubar.ts @@ -3,6 +3,7 @@ import {utils} from "../base/utils"; export default class Thumbar { + private i18n: any = undefined; /** * Base Plugin Details (Eventually implemented into a GUI in settings) */ @@ -22,23 +23,23 @@ export default class Thumbar { label: app.getName(), submenu: [ { - label: 'About', + label: utils.getLocale('About', 'menubar.options.about'), click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('about')`) }, {type: 'separator'}, { - label: 'Settings', + label: utils.getLocale('Settings', 'menubar.options.settings'), accelerator: utils.getStoreValue("general.keybindings.settings").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('settings')`) }, {type: 'separator'}, - {role: 'services'}, + {role: 'services', label: utils.getLocale('services', 'menubar.options.services')}, {type: 'separator'}, - {role: 'hide'}, - {role: 'hideOthers'}, - {role: 'unhide'}, + {role: 'hide', label: utils.getLocale('hide', 'menubar.options.hide')}, + {role: 'hideOthers', label: utils.getLocale('hideOthers', 'menubar.options.hideothers')}, + {role: 'unhide', label: utils.getLocale('unhide', 'menubar.options.unhide')}, {type: 'separator'}, - {role: 'quit'} + {role: 'quit', label: utils.getLocale('quit', 'menubar.options.quit')} ] }, { From 0d686439d3407ab0f599007241ff21b880ea1549 Mon Sep 17 00:00:00 2001 From: Mefsaal Date: Fri, 29 Apr 2022 22:23:50 -0300 Subject: [PATCH 05/73] Part 2 set strings in en_US.json pending add to readme file --- src/i18n/en_US.json | 51 +++++++++++++++++++++++++++++++++++++ src/main/plugins/menubar.ts | 4 +-- 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index 64eec84b..a6830119 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -270,7 +270,58 @@ "menubar.options.hideothers": "Hide Others", "menubar.options.unhide": "Show All", "menubar.options.quit": "Quit Cider", + "menubar.options.view": "View ", + "menubar.options.reload": "Reload", + "menubar.options.forcereload": "Force Reload", + "menubar.options.toggledevtools": "Toggle Developer Tools", + "menubar.options.resetzoom": "Reset Zoom", + "menubar.options.zoomin": "Zoom In", + "menubar.options.zoomout": "Zoom Out", + "menubar.options.togglefullscreen": "Toggle Fullscreen", + "menubar.options.window": "Window", + "menubar.options.minimize": "Minimize", + "menubar.options.show": "Show", + "menubar.options.zoom": "Zoom", + "menubar.options.front": "Front", + "menubar.options.close": "Close", + "menubar.options.edit": "Edit", + "menubar.options.update": "Undo", + "menubar.options.redo": "Redo", + "menubar.options.cut": "Cut", + "menubar.options.copy": "Copy", + "menubar.options.paste": "Paste", + "menubar.options.toggleprivate": "Toggle Private Session", + "menubar.options.webremote": "Web Remote", + "menubar.options.audio": "Audio Settings", + "menubar.options.plugins": "Plu-gins Menu", + "menubar.options.control": "Controls", + "menubar.options.next": "Next", + "menubar.options.previous ": "Previous", + "menubar.options.volumeup": "Volume Up", + "menubar.options.volumedown": "Volume Down", + "menubar.options.browse": "Browse", + "menubar.options.artists": "Artists", + "menubar.options.search": "Search", + "menubar.options.albums": "Albums", + "menubar.options.cast": "Cast To Devices", + "menubar.options.account": "Account", + "menubar.options.accountsettings": "Account Settings", + "menubar.options.signout": "Sign Out", + "menubar.options.support": "Support", + "menubar.options.help": "Help", + "menubar.options.discord": "Discord", + "menubar.options.gihu": "GitHub Wiki", + "menubar.options.report": "Report a...", + "menubar.options.bug": "Bug", + "menubar.options.feature": "Feature Request", + "menubar.options.trans": "Translation Report/Request", + "menubar.options.license": "View License", + "menubar.options.conf": "Open Configuration File in Editor", + + + + "settings.header.general": "General", "settings.header.general.description": "Adjust the general settings for Cider.", "settings.option.general.language": "Language", diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts index fb5e7594..c7388912 100644 --- a/src/main/plugins/menubar.ts +++ b/src/main/plugins/menubar.ts @@ -43,9 +43,9 @@ export default class Thumbar { ] }, { - label: 'View', + label: utils.getLocale('View', 'menubar.options.view'), submenu: [ - {role: 'reload'}, + {role: 'reload', label: utils.getLocale('reload', 'menubar.view.reload')}, {role: 'forceReload'}, {role: 'toggleDevTools'}, {type: 'separator'}, From 518b870f0ff6f764ae01167e4dd464163bbc6d1c Mon Sep 17 00:00:00 2001 From: Mefsaal Date: Fri, 29 Apr 2022 22:46:54 -0300 Subject: [PATCH 06/73] fully translation menubar strings (No more Hardcoded) --- src/i18n/en_US.json | 7 +-- src/main/plugins/menubar.ts | 98 ++++++++++++++++++------------------- 2 files changed, 53 insertions(+), 52 deletions(-) diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index a6830119..dbec1149 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -294,8 +294,9 @@ "menubar.options.webremote": "Web Remote", "menubar.options.audio": "Audio Settings", "menubar.options.plugins": "Plu-gins Menu", - "menubar.options.control": "Controls", + "menubar.options.controls": "Controls", "menubar.options.next": "Next", + "menubar.options.playpause": "Play/Pause", "menubar.options.previous ": "Previous", "menubar.options.volumeup": "Volume Up", "menubar.options.volumedown": "Volume Down", @@ -310,14 +311,14 @@ "menubar.options.support": "Support", "menubar.options.help": "Help", "menubar.options.discord": "Discord", - "menubar.options.gihu": "GitHub Wiki", + "menubar.options.github": "GitHub Wiki", "menubar.options.report": "Report a...", "menubar.options.bug": "Bug", "menubar.options.feature": "Feature Request", "menubar.options.trans": "Translation Report/Request", "menubar.options.license": "View License", "menubar.options.conf": "Open Configuration File in Editor", - + diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts index c7388912..e4aa67e2 100644 --- a/src/main/plugins/menubar.ts +++ b/src/main/plugins/menubar.ts @@ -45,185 +45,185 @@ export default class Thumbar { { label: utils.getLocale('View', 'menubar.options.view'), submenu: [ - {role: 'reload', label: utils.getLocale('reload', 'menubar.view.reload')}, - {role: 'forceReload'}, - {role: 'toggleDevTools'}, + {role: 'reload', label: utils.getLocale('reload', 'menubar.options.reloads')}, + {role: 'forceReload', label: utils.getLocale('forceReload', 'menubar.options.forcereload')}, + {role: 'toggleDevTools', label: utils.getLocale('toggleDevTools', 'menubar.options.toggledevtools')}, {type: 'separator'}, - {role: 'resetZoom'}, - {role: 'zoomIn'}, - {role: 'zoomOut'}, + {role: 'resetZoom', label: utils.getLocale('resetZoom', 'menubar.options.resetzoom')}, + {role: 'zoomIn', label: utils.getLocale('zoomIn', 'menubar.options.zoomin')}, + {role: 'zoomOut', label: utils.getLocale('zoomOut', 'menubar.options.zoomout')}, {type: 'separator'}, - {role: 'togglefullscreen'}, + {role: 'togglefullscreen', label: utils.getLocale('togglefullscreen', 'menubar.options.togglefullscreen')}, ] }, { - label: 'Window', + label: utils.getLocale('Window', 'menubar.options.window'), submenu: [ - {role: 'minimize'}, + {role: 'minimize', label: utils.getLocale('minimize', 'menubar.options.minimize')}, { - label: 'Show', + label: utils.getLocale('Show', 'menubar.options.show'), click: () => utils.getWindow().show() }, - {role: 'zoom'}, + {role: 'zoom', label: utils.getLocale('zoom', 'menubar.options.zoom')}, ...(this.isMac ? [ {type: 'separator'}, - {role: 'front'}, - {role: 'close'}, + {role: 'front', label: utils.getLocale('front', 'menubar.options.front')}, + {role: 'close', label: utils.getLocale('close', 'menubar.options.close')}, ] : [ - {role: 'close'}, + {role: 'close', label: utils.getLocale('close', 'menubar.options.close')}, ]), { - label: 'Edit', + label: utils.getLocale('Edit', 'menubar.options.edit'), submenu: [ - {role: 'undo'}, - {role: 'redo'}, + {role: 'undo', label: utils.getLocale('undo', 'menubar.options.undo')}, + {role: 'redo', label: utils.getLocale('redo', 'menubar.options.redo')}, {type: 'separator'}, - {role: 'cut'}, - {role: 'copy'}, - {role: 'paste'}, + {role: 'cut', label: utils.getLocale('cut', 'menubar.options.cut')}, + {role: 'copy', label: utils.getLocale('copy', 'menubar.options.copy')}, + {role: 'paste', label: utils.getLocale('paste', 'menubar.options.paste')}, ] }, {type: 'separator'}, { - label: 'Toggle Private Session', + label: utils.getLocale('Toggle Private Session', 'menubar.options.toggleprivate'), accelerator: utils.getStoreValue("general.keybindings.togglePrivateSession").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.cfg.general.privateEnabled = !app.cfg.general.privateEnabled`) }, {type: 'separator'}, { - label: 'Web Remote', + label: utils.getLocale('Web Remote', 'menubar.options.webremote'), accelerator: utils.getStoreValue("general.keybindings.webRemote").join('+'), sublabel: 'Opens in external window', click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('remote-pair')`) }, { - label: 'Audio Settings', + label: utils.getLocale('Audio Settings', 'menubar.options.audio'), accelerator: utils.getStoreValue("general.keybindings.audioSettings").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.modals.audioSettings = true`) }, { - label: 'Plug-in Menu', + label: utils.getLocale('Plug-in Menu', 'menubar.options.plugins'), accelerator: utils.getStoreValue("general.keybindings.pluginMenu").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.modals.pluginMenu = true`) } ] }, { - label: 'Controls', + label: utils.getLocale('Controls', 'menubar.options.controls'), submenu: [ { - label: 'Pause / Play', + label: utils.getLocale('Pause / Play', 'menubar.options.playpause'), accelerator: 'Space', click: () => utils.getWindow().webContents.executeJavaScript(`app.SpacePause()`) }, { - label: 'Next', + label: utils.getLocale('Next', 'menubar.options.next'), accelerator: 'CommandOrControl+Right', click: () => utils.getWindow().webContents.executeJavaScript(`MusicKitInterop.next()`) }, { - label: 'Previous', + label: utils.getLocale('Previous', 'menubar.options.previous'), accelerator: 'CommandOrControl+Left', click: () => utils.getWindow().webContents.executeJavaScript(`MusicKitInterop.previous()`) }, {type: 'separator'}, { - label: 'Volume Up', + label: utils.getLocale('Volume Up', 'menubar.options.volumeup'), accelerator: 'CommandOrControl+Up', click: () => utils.getWindow().webContents.executeJavaScript(`app.volumeUp()`) }, { - label: 'Volume Down', + label: utils.getLocale('Volume Down', 'menubar.options.volumedown'), accelerator: 'CommandOrControl+Down', click: () => utils.getWindow().webContents.executeJavaScript(`app.volumeDown()`) }, { - label: 'Browse', + label: utils.getLocale('Browse', 'menubar.options.browse'), accelerator: utils.getStoreValue("general.keybindings.browse").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('browse')`) }, {type: 'separator'}, { - label: 'Artists', + label: utils.getLocale('Artists', 'menubar.options.artists'), accelerator: utils.getStoreValue("general.keybindings.artists").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('library-artists')`) }, { - label: 'Search', + label: utils.getLocale('Search', 'menubar.options.search'), accelerator: utils.getStoreValue("general.keybindings.search").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('search')`) }, {type: 'separator'}, { - label: 'Album', + label: utils.getLocale('Album', 'menubar.options.albums'), accelerator: utils.getStoreValue("general.keybindings.albums").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('library-albums')`) }, {type: 'separator'}, { - label: 'Cast To Devices', + label: utils.getLocale('Cast To Devices', 'menubar.options.cast'), accelerator: utils.getStoreValue("general.keybindings.castToDevices").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.modals.castMenu = true`) } ] }, { - label: 'Account', + label: utils.getLocale('Account', 'menubar.options.account'), submenu: [ { - label: 'Account Settings', + label: utils.getLocale('Account Settings', 'menubar.options.accountsettings'), click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('apple-account-settings')`) }, { - label: 'Sign Out', + label: utils.getLocale('Sign Out', 'menubar.options.signout'), click: () => utils.getWindow().webContents.executeJavaScript(`app.unauthorize()`) } ] }, { - label: 'Support', - role: 'help', + label: utils.getLocale('Support', 'menubar.options.support'), + role: utils.getLocale('help', 'menubar.options.help'), submenu: [ { - label: 'Discord', + label: utils.getLocale('Discord', 'menubar.options.discord'), click: () => shell.openExternal("https://discord.gg/AppleMusic").catch(console.error) }, { - label: 'GitHub Wiki', + label: utils.getLocale('GitHub Wiki', 'menubar.options.github'), click: () => shell.openExternal("https://github.com/ciderapp/Cider/wiki/Troubleshooting").catch(console.error) }, {type: 'separator'}, { - label: 'Report a...', + label: utils.getLocale('Report a...', 'menubar.options.report'), submenu: [ { - label: 'Bug', + label: utils.getLocale('Bug', 'menubar.options.bug'), click: () => shell.openExternal("https://github.com/ciderapp/Cider/issues/new?assignees=&labels=bug%2Ctriage&template=bug_report.yaml&title=%5BBug%5D%3A+").catch(console.error) }, { - label: 'Feature Request', + label: utils.getLocale('Feature Request', 'menubar.options.feature'), click: () => shell.openExternal("https://github.com/ciderapp/Cider/discussions/new?category=feature-request").catch(console.error) }, { - label: 'Translation Report/Request', + label: utils.getLocale('Translation Report/Request', 'menubar.options.trans'), click: () => shell.openExternal("https://github.com/ciderapp/Cider/issues/new?assignees=&labels=%F0%9F%8C%90+Translations&template=translation.yaml&title=%5BTranslation%5D%3A+").catch(console.error) }, ] }, {type: 'separator'}, { - label: 'View License', + label: utils.getLocale('View License', 'menubar.options.license'), click: () => shell.openExternal("https://github.com/ciderapp/Cider/blob/main/LICENSE").catch(console.error) }, {type: 'separator'}, { - label: 'Toggle Developer Tools', + label: utils.getLocale('Toggle Developer Tools', 'menubar.options.devtools'), accelerator: utils.getStoreValue("general.keybindings.openDeveloperTools").join('+'), click: () => utils.getWindow().webContents.openDevTools() }, { - label: 'Open Configuration File in Editor', + label: utils.getLocale('Open Configuration File in Editor', 'menubar.options.conf'), click: () => utils.getStoreInstance().openInEditor() } ] From d317df2f2058beedf1f646b46fee102128073d53 Mon Sep 17 00:00:00 2001 From: Mefsaal Date: Fri, 29 Apr 2022 23:05:16 -0300 Subject: [PATCH 07/73] bugfix --- src/i18n/en_US.json | 2 +- src/main/plugins/menubar.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index dbec1149..f975a81e 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -297,7 +297,7 @@ "menubar.options.controls": "Controls", "menubar.options.next": "Next", "menubar.options.playpause": "Play/Pause", - "menubar.options.previous ": "Previous", + "menubar.options.previous": "Previous", "menubar.options.volumeup": "Volume Up", "menubar.options.volumedown": "Volume Down", "menubar.options.browse": "Browse", diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts index e4aa67e2..07c860d1 100644 --- a/src/main/plugins/menubar.ts +++ b/src/main/plugins/menubar.ts @@ -218,7 +218,7 @@ export default class Thumbar { }, {type: 'separator'}, { - label: utils.getLocale('Toggle Developer Tools', 'menubar.options.devtools'), + label: utils.getLocale('Toggle Developer Tools', 'menubar.options.toggledevtools'), accelerator: utils.getStoreValue("general.keybindings.openDeveloperTools").join('+'), click: () => utils.getWindow().webContents.openDevTools() }, From 4b07eff71cfd08cef3559c3f789e3e74751950c1 Mon Sep 17 00:00:00 2001 From: Mefsaal Date: Sat, 30 Apr 2022 00:19:26 -0300 Subject: [PATCH 08/73] update documentation for now. added strings for readme and en_US source file pending found string to web pair (not found) --- src/i18n/README.md | 58 ++++++++++++++++++++++++++++++++++++++ src/i18n/en_US.json | 6 +--- src/i18n/source/en_US.json | 55 ++++++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+), 5 deletions(-) diff --git a/src/i18n/README.md b/src/i18n/README.md index 4246957d..5531ab28 100644 --- a/src/i18n/README.md +++ b/src/i18n/README.md @@ -297,5 +297,63 @@ Update 28/04/2022 21:45 UTC * `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` + +Update 29/04/2022 00:00 UTC + + * `menubar.options.about`: Added for `en_US` + * `menubar.options.settings`: Added for `en_US` + * `menubar.options.services`: Added for `en_US` + * `menubar.options.hide`: Added for `en_US` + * `menubar.options.hideothers`: Added for `en_US` + * `menubar.options.unhide`: Added for `en_US` + * `menubar.options.quit`: Added for `en_US` + * `menubar.options.view`: Added for `en_US` + * `menubar.options.reload`: Added for `en_US` + * `menubar.options.forcereload`: Added for `en_US` + * `menubar.options.toggledevtools`: Added for `en_US` + * `menubar.options.resetzoom`: Added for `en_US` + * `menubar.options.zoomin`: Added for `en_US` + * `menubar.options.zoomout`: Added for `en_US` + * `menubar.options.togglefullscreen`: Added for `en_US` + * `menubar.options.window`: Added for `en_US` + * `menubar.options.minimize`: Added for `en_US` + * `menubar.options.show`: Added for `en_US` + * `menubar.options.zoom`: Added for `en_US` + * `menubar.options.front`: Added for `en_US` + * `menubar.options.close`: Added for `en_US` + * `menubar.options.edit`: Added for `en_US` + * `menubar.options.update`: Added for `en_US` + * `menubar.options.redo`: Added for `en_US` + * `menubar.options.cut`: Added for `en_US` + * `menubar.options.copy`: Added for `en_US` + * `menubar.options.paste`: Added for `en_US` + * `menubar.options.toggleprivate`: Added for `en_US` + * `menubar.options.webremote`: Added for `en_US` + * `menubar.options.audio`: Added for `en_US` + * `menubar.options.plugins`: Added for `en_US` + * `menubar.options.control`: Added for `en_US` + * `menubar.options.next`: "Added for `en_US` + * `menubar.options.previous`: Added for `en_US` + * `menubar.options.volumeup`: Added for `en_US` + * `menubar.options.volumedown`: Added for `en_US` + * `menubar.options.browse`: Added for `en_US` + * `menubar.options.artists`: Added for `en_US` + * `menubar.options.search`: Added for `en_US` + * `menubar.options.albums`: Added for `en_US` + * `menubar.options.cast`: Added for `en_US` + * `menubar.options.account`: Added for `en_US` + * `menubar.options.accountsettings`: Added for `en_US` + * `menubar.options.signout`: Added for `en_US` + * `menubar.options.support`: Added for `en_US` + * `menubar.options.help`: Added for `en_US` + * `menubar.options.discord`: Added for `en_US` + * `menubar.options.gihu`: Added for `en_US` + * `menubar.options.report`: Added for `en_US` + * `menubar.options.bug`: Added for `en_US` + * `menubar.options.feature`: Added for `en_US` + * `menubar.options.trans`: Added for `en_US` + * `menubar.options.license`: Added for `en_US` + * `menubar.options.conf`: Added for `en_US` diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index f975a81e..89134fba 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -73,6 +73,7 @@ "term.viewAs": "View As", "term.viewAs.coverArt": "Cover Art", "term.viewAs.list": "List", + "term.dynamic": "Dynamic", "term.size": "Size", "term.size.normal": "Normal", "term.size.compact": "Compact", @@ -318,11 +319,6 @@ "menubar.options.trans": "Translation Report/Request", "menubar.options.license": "View License", "menubar.options.conf": "Open Configuration File in Editor", - - - - - "settings.header.general": "General", "settings.header.general.description": "Adjust the general settings for Cider.", "settings.option.general.language": "Language", diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json index 71d7a3d8..89134fba 100644 --- a/src/i18n/source/en_US.json +++ b/src/i18n/source/en_US.json @@ -264,6 +264,61 @@ "action.cast.scanning": "Scanning...", "action.createNew": "Create New...", "action.openArtworkInBrowser": "Open artwork in browser", + "menubar.options.about": "About", + "menubar.options.settings": "Settings", + "menubar.options.services": "Services", + "menubar.options.hide": "Hide Cider", + "menubar.options.hideothers": "Hide Others", + "menubar.options.unhide": "Show All", + "menubar.options.quit": "Quit Cider", + "menubar.options.view": "View ", + "menubar.options.reload": "Reload", + "menubar.options.forcereload": "Force Reload", + "menubar.options.toggledevtools": "Toggle Developer Tools", + "menubar.options.resetzoom": "Reset Zoom", + "menubar.options.zoomin": "Zoom In", + "menubar.options.zoomout": "Zoom Out", + "menubar.options.togglefullscreen": "Toggle Fullscreen", + "menubar.options.window": "Window", + "menubar.options.minimize": "Minimize", + "menubar.options.show": "Show", + "menubar.options.zoom": "Zoom", + "menubar.options.front": "Front", + "menubar.options.close": "Close", + "menubar.options.edit": "Edit", + "menubar.options.update": "Undo", + "menubar.options.redo": "Redo", + "menubar.options.cut": "Cut", + "menubar.options.copy": "Copy", + "menubar.options.paste": "Paste", + "menubar.options.toggleprivate": "Toggle Private Session", + "menubar.options.webremote": "Web Remote", + "menubar.options.audio": "Audio Settings", + "menubar.options.plugins": "Plu-gins Menu", + "menubar.options.controls": "Controls", + "menubar.options.next": "Next", + "menubar.options.playpause": "Play/Pause", + "menubar.options.previous": "Previous", + "menubar.options.volumeup": "Volume Up", + "menubar.options.volumedown": "Volume Down", + "menubar.options.browse": "Browse", + "menubar.options.artists": "Artists", + "menubar.options.search": "Search", + "menubar.options.albums": "Albums", + "menubar.options.cast": "Cast To Devices", + "menubar.options.account": "Account", + "menubar.options.accountsettings": "Account Settings", + "menubar.options.signout": "Sign Out", + "menubar.options.support": "Support", + "menubar.options.help": "Help", + "menubar.options.discord": "Discord", + "menubar.options.github": "GitHub Wiki", + "menubar.options.report": "Report a...", + "menubar.options.bug": "Bug", + "menubar.options.feature": "Feature Request", + "menubar.options.trans": "Translation Report/Request", + "menubar.options.license": "View License", + "menubar.options.conf": "Open Configuration File in Editor", "settings.header.general": "General", "settings.header.general.description": "Adjust the general settings for Cider.", "settings.option.general.language": "Language", From 092a1931ace0b20f81df7a27153d35e6fb22fb71 Mon Sep 17 00:00:00 2001 From: Mefsaal Date: Sat, 30 Apr 2022 01:00:22 -0300 Subject: [PATCH 09/73] some bugfixes and updated es_ES json file to last string in cider --- src/i18n/README.md | 2 +- src/i18n/en_US.json | 2 +- src/i18n/es_ES.json | 70 +++++++++++++++++++++++++++++++++++++- src/i18n/source/en_US.json | 2 +- 4 files changed, 72 insertions(+), 4 deletions(-) diff --git a/src/i18n/README.md b/src/i18n/README.md index 5531ab28..cec535da 100644 --- a/src/i18n/README.md +++ b/src/i18n/README.md @@ -323,7 +323,7 @@ Update 29/04/2022 00:00 UTC * `menubar.options.front`: Added for `en_US` * `menubar.options.close`: Added for `en_US` * `menubar.options.edit`: Added for `en_US` - * `menubar.options.update`: Added for `en_US` + * `menubar.options.undo`: Added for `en_US` * `menubar.options.redo`: Added for `en_US` * `menubar.options.cut`: Added for `en_US` * `menubar.options.copy`: Added for `en_US` diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index 89134fba..9dafaf53 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -286,7 +286,7 @@ "menubar.options.front": "Front", "menubar.options.close": "Close", "menubar.options.edit": "Edit", - "menubar.options.update": "Undo", + "menubar.options.undo": "Undo", "menubar.options.redo": "Redo", "menubar.options.cut": "Cut", "menubar.options.copy": "Copy", diff --git a/src/i18n/es_ES.json b/src/i18n/es_ES.json index e10bab53..51701558 100644 --- a/src/i18n/es_ES.json +++ b/src/i18n/es_ES.json @@ -73,6 +73,7 @@ "term.viewAs": "Ver como", "term.viewAs.coverArt": "Portada", "term.viewAs.list": "Lista", + "term.dynamic": "Dinámico", "term.size": "Tamaño", "term.size.normal": "Normal", "term.size.compact": "Compacto", @@ -199,6 +200,9 @@ "podcast.episodes": "Episodios", "podcast.playEpisode": "Reproducir Episodio", "podcast.website": "Sitio web de Podcasts", + "action.edit": "Editar", + "action.done": "Hecho", + "action.editTracklist": "Edit Tracklist", "action.addToLibrary": "Agregar a la Biblioteca", "action.addToLibrary.success": "Agregado a la Biblioteca", "action.addToLibrary.error": "Error al agregar a la Biblioteca", @@ -260,6 +264,61 @@ "action.cast.scanning": "Escaneando...", "action.createNew": "Crear Nuevo...", "action.openArtworkInBrowser": "Abrir Ilustración en el navegador", + "menubar.options.about": "Acerca de", + "menubar.options.settings": "Ajustes", + "menubar.options.services": "Servicios", + "menubar.options.hide": "Ocultar Cider", + "menubar.options.hideothers": "Ocultar Otros", + "menubar.options.unhide": "Mostrar Todos", + "menubar.options.quit": "Salir", + "menubar.options.view": "Ver", + "menubar.options.reload": "Recargar", + "menubar.options.forcereload": "Forzar Recarga", + "menubar.options.toggledevtools": "Herramientas de Desarrollo", + "menubar.options.resetzoom": "Restablecer Zoom", + "menubar.options.zoomin": "Acercar", + "menubar.options.zoomout": "Alejar", + "menubar.options.togglefullscreen": "Pantalla Completa", + "menubar.options.window": "Ventana", + "menubar.options.minimize": "Minimizar", + "menubar.options.show": "Mostrar", + "menubar.options.zoom": "Zoom", + "menubar.options.front": "Frente", + "menubar.options.close": "Cerrar", + "menubar.options.edit": "Editar", + "menubar.options.undo": "Deshacer", + "menubar.options.redo": "Rehacer", + "menubar.options.cut": "Cortar", + "menubar.options.copy": "Copiar", + "menubar.options.paste": "Pegar", + "menubar.options.toggleprivate": "Cambiar Sesión Privada", + "menubar.options.webremote": "Web Remoto", + "menubar.options.audio": "Configuraciones de Audio", + "menubar.options.plugins": "Menu de Plu-gins", + "menubar.options.controls": "Controles", + "menubar.options.next": "Siguiente", + "menubar.options.playpause": "Reproducir/Pausar", + "menubar.options.previous": "Anterior", + "menubar.options.volumeup": "Subir Volumen", + "menubar.options.volumedown": "Bajar Volumen", + "menubar.options.browse": "Explorar", + "menubar.options.artists": "Artistas", + "menubar.options.search": "Buscar", + "menubar.options.albums": "Álbumes", + "menubar.options.cast": "Transmitir a Dispositivos", + "menubar.options.account": "Cuenta", + "menubar.options.accountsettings": "Ajustes de Cuenta", + "menubar.options.signout": "Cerrar Sesión", + "menubar.options.support": "Soporte", + "menubar.options.help": "Ayuda", + "menubar.options.discord": "Discord", + "menubar.options.github": "GitHub Wiki", + "menubar.options.report": "Reportar a...", + "menubar.options.bug": "Bug", + "menubar.options.feature": "Solicitud de características", + "menubar.options.trans": "Solicitud de Informe/Traducción", + "menubar.options.license": "Ver licencia", + "menubar.options.conf": "Abrir archivo de configuración en el editor", "settings.header.general": "General", "settings.header.general.description": "Ajuste la configuración general de Cider.", "settings.option.general.language": "Idioma", @@ -269,6 +328,10 @@ "settings.option.general.resumebehavior.locally.description": "Cider reanudará su última sesión en esta PC.", "settings.option.general.resumebehavior.history": "Histórico", "settings.option.general.resumebehavior.history.description": "Cider pondrá en cola la última canción de su historial general de Apple Music, en todos sus dispositivos.", + "settings.option.general.resumetabs" : "Abrir pestaña al iniciar", + "settings.option.general.resumetabs.description" : "Puede elegir qué pestaña desea abrir cuando inicie Cider.", + "settings.option.general.resumetabs.dynamic" : "Dinámico", + "settings.option.general.resumetabs.dynamic.description" : "Cider abrirá la pestaña que utilizó por última vez.", "settings.option.general.language.main": "Idiomas", "settings.option.general.language.fun": "Idiomas Fun (Parodias)", "settings.option.general.language.unsorted": "Sin Clasificar", @@ -280,6 +343,8 @@ "settings.option.general.customizeSidebar": "Personalizar elementos de la barra lateral", "settings.option.general.customizeSidebar.customize": "Personalizar", "settings.option.general.keybindings": "Combinaciones de Teclas", + "settings.notyf.general.keybindings.update.success": "Combinación de teclas actualizada correctamente", + "settings.prompt.general.keybindings.update.success": "La combinación de teclas se actualizó correctamente. Pulsa OK para reiniciar Cider", "settings.option.general.keybindings.open": "Abrir", "settings.description.search": "Buscar", "settings.description.albums": "Álbumes de la biblioteca", @@ -410,6 +475,7 @@ "settings.option.lyrics.enableMusixmatchKaraoke": "Habilitar el modo Karaoke (solo Musixmatch)", "settings.option.lyrics.musixmatchPreferredLanguage": "Idioma preferido de traducción de Musixmatch", "settings.option.lyrics.enableYoutubeLyrics": "Habilitar letras de YouTube para videos musicales", + "settings.option.lyrics.enableQQLyrics": "Habilitar letras de QQ", "settings.header.connectivity": "Conectividad", "settings.header.connectivity.description": "Ajuste la configuración de conectividad para Cider.", "settings.option.connectivity.playbackNotifications": "Notificaciones de Reproducción", @@ -442,7 +508,9 @@ "settings.option.visual.transparent.description": "Marco transparente (necesita compatibilidad con temas, requiere reiniciar)", "settings.header.advanced": "Avanzado", "settings.header.connect": "Conectar", - "spatial.notTurnedOn": "La espacialización de audio está deshabilitada. Para usar, habilítelo primero.", + "settings.option.connect.link_account": "Habilitar sincronización con Cider Connect", + "settings.option.connect.link_account.description": "Vincular su cuenta de Discord con Cider Connect le permite almacenar datos de usuario que incluyen configuraciones, ecualizadores y eventualmente más, una vez que haya terminado. (Trabajo en progreso)", + "spatial.notTurnedOn": "La Espacialización de audio está deshabilitada. Para usar, habilítelo primero.", "spatial.spatialProperties": "Propiedades de Espacialización", "spatial.width": "Ancho", "spatial.height": "Alto", diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json index 89134fba..9dafaf53 100644 --- a/src/i18n/source/en_US.json +++ b/src/i18n/source/en_US.json @@ -286,7 +286,7 @@ "menubar.options.front": "Front", "menubar.options.close": "Close", "menubar.options.edit": "Edit", - "menubar.options.update": "Undo", + "menubar.options.undo": "Undo", "menubar.options.redo": "Redo", "menubar.options.cut": "Cut", "menubar.options.copy": "Copy", From b0c4240c17e0dcd6c869d92ae88ed9a6293aad65 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Sat, 30 Apr 2022 18:37:21 +0100 Subject: [PATCH 10/73] Update config.yml --- .circleci/config.yml | 162 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 130 insertions(+), 32 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 62dc1183..c9484eb6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,18 +1,21 @@ version: 2.1 -orbs: # adds orbs to your configuration - jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible -branches: - only: - - main - - develop -jobs: - build: - working_directory: ~/Cider + +executors: + cider-ci: docker: - image: circleci/node:16 - + working_directory: ~/Cider + +orbs: # adds orbs to your configuration + jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible + +# The jobs for this project +jobs: + prepare-build: + executor: cider-ci steps: - checkout + - run: ls -la - run: name: Set App Version command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV @@ -32,50 +35,145 @@ jobs: paths: - ~/.cache/yarn - run: - name: Install system build dependencies - command: | - sudo apt-get update -y - curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg - echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null - sudo apt-get install -y dpkg fakeroot wine64 - sudo dpkg --add-architecture i386 - sudo apt-get update -y - sudo apt-get install -y wine32 - sudo apt install -y gh + name: TypeScript Compile + command: yarn build + - persist_to_workspace: + # Must be an absolute path, or relative path from working_directory. This is a directory on the container which is + # taken to be the root directory of the workspace. + root: . + # Must be relative path from root + paths: + - node_modules + - build + - resources + - yarn.lock + - package.json + - winget.json # winget.json is a file that is generated by the winget package manager + - LICENSE + - license.txt + + build-linux: + executor: cider-ci + steps: + - attach_workspace: + at: ~/Cider - run: name: Fix Versioning and Add Channel command: yarn circle:script - - run: - name: TypeScript Compile - command: yarn build - run: name: Generate Builds (Linux) command: yarn electron-builder -l -p never post-steps: - jira/notify + - persist_to_workspace: + root: . + paths: + - dist/*.deb + - dist/*.AppImage + - dist/*.snap + - dist/latest-linux.yml + + build-windows: + executor: cider-ci + steps: + - attach_workspace: + at: ~/Cider + - run: + name: Install Windows System Build Dependencies + command: | + sudo apt-get update -y + sudo apt-get install -y dpkg fakeroot wine64 + sudo dpkg --add-architecture i386 + sudo apt-get update -y + sudo apt-get install -y wine32 + - run: + name: Fix Versioning and Add Channel + command: yarn circle:script - run: name: Generate Builds (Windows) command: yarn electron-builder -w --x64 -p never post-steps: - jira/notify + - persist_to_workspace: + root: . + paths: + - dist/*.exe + - dist/Cider-Setup-*.exe.blockmap + - dist/latest.yml + + build-winget: + executor: cider-ci + steps: + - attach_workspace: + at: ~/Cider + - run: + name: Install Windows System Build Dependencies + command: | + sudo apt-get update -y + sudo apt-get install -y dpkg fakeroot wine64 + sudo dpkg --add-architecture i386 + sudo apt-get update -y + sudo apt-get install -y wine32 + - run: + name: Fix Versioning and Add Channel + command: yarn circle:script - run: name: Generate Builds (Winget) command: yarn electron-builder --win -c winget.json -p never post-steps: - jira/notify + - persist_to_workspace: + root: . + paths: + - dist/*.exe + - dist/Cider-Setup-winget-*.exe.blockmap + + release: + executor: cider-ci + steps: + - attach_workspace: + at: ~/Cider/ + - run: + name: Installing GitHub Command Line Interface + command: | + sudo apt-get update -y + curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg + echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null + sudo apt-get update -y + sudo apt install -y gh - run: name: Move Build Files command: | - mkdir ~/Cider/dist/artifacts/ - mv ~/Cider/dist/*.exe ~/Cider/dist/artifacts - mv ~/Cider/dist/*.deb ~/Cider/dist/artifacts - mv ~/Cider/dist/*.AppImage ~/Cider/dist/artifacts - mv ~/Cider/dist/*.snap ~/Cider/dist/artifacts - mv ~/Cider/dist/*.yml ~/Cider/dist/artifacts - mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts + mkdir ~/Cider/dist/artifacts/ + mv ~/Cider/dist/*.exe ~/Cider/dist/artifacts + mv ~/Cider/dist/*.deb ~/Cider/dist/artifacts + mv ~/Cider/dist/*.AppImage ~/Cider/dist/artifacts + mv ~/Cider/dist/*.snap ~/Cider/dist/artifacts + mv ~/Cider/dist/*.yml ~/Cider/dist/artifacts + mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts - store_artifacts: - path: ~/Cider/dist/artifacts + path: ~/Cider/dist/artifacts - run: name: Publish Release command: | - gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap + gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap + +# Orchestrate our job run sequence +workflows: + build_and_release: + jobs: + - prepare-build + - build-windows: + requires: + - prepare-build + - build-linux: + requires: + - prepare-build + - build-winget: + requires: + - prepare-build + - release: + requires: + - build-windows + - build-linux + - build-winget From 0baafbf447330edb3cf766406b4b9fa3da223198 Mon Sep 17 00:00:00 2001 From: Mefsaal Date: Sat, 30 Apr 2022 23:22:15 -0300 Subject: [PATCH 11/73] Now works with other languages pending MacOS Strings deletes --- src/main/plugins/menubar.ts | 110 ++++++++++++++++++------------------ 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts index 07c860d1..54092c80 100644 --- a/src/main/plugins/menubar.ts +++ b/src/main/plugins/menubar.ts @@ -3,7 +3,7 @@ import {utils} from "../base/utils"; export default class Thumbar { - private i18n: any = undefined; + /** * Base Plugin Details (Eventually implemented into a GUI in settings) */ @@ -17,173 +17,173 @@ export default class Thumbar { * Menubar Assets * @private */ - private isMac: boolean = process.platform === 'darwin'; + private isMac: boolean = process.platform === 'darwin'; private _menuTemplate: any = [ { label: app.getName(), submenu: [ { - label: utils.getLocale('About', 'menubar.options.about'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.about'), click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('about')`) }, {type: 'separator'}, { - label: utils.getLocale('Settings', 'menubar.options.settings'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.settings'), accelerator: utils.getStoreValue("general.keybindings.settings").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('settings')`) }, {type: 'separator'}, - {role: 'services', label: utils.getLocale('services', 'menubar.options.services')}, + {role: 'services', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.services')}, {type: 'separator'}, - {role: 'hide', label: utils.getLocale('hide', 'menubar.options.hide')}, - {role: 'hideOthers', label: utils.getLocale('hideOthers', 'menubar.options.hideothers')}, - {role: 'unhide', label: utils.getLocale('unhide', 'menubar.options.unhide')}, + {role: 'hide', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.hide')}, + {role: 'hideOthers', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.hideothers')}, + {role: 'unhide', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.unhide')}, {type: 'separator'}, - {role: 'quit', label: utils.getLocale('quit', 'menubar.options.quit')} + {role: 'quit', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.quit')} ] }, { - label: utils.getLocale('View', 'menubar.options.view'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.view'), submenu: [ - {role: 'reload', label: utils.getLocale('reload', 'menubar.options.reloads')}, - {role: 'forceReload', label: utils.getLocale('forceReload', 'menubar.options.forcereload')}, - {role: 'toggleDevTools', label: utils.getLocale('toggleDevTools', 'menubar.options.toggledevtools')}, + {role: 'reload', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.reloads')}, + {role: 'forceReload', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.forcereload')}, + {role: 'toggleDevTools', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.toggledevtools')}, {type: 'separator'}, - {role: 'resetZoom', label: utils.getLocale('resetZoom', 'menubar.options.resetzoom')}, - {role: 'zoomIn', label: utils.getLocale('zoomIn', 'menubar.options.zoomin')}, - {role: 'zoomOut', label: utils.getLocale('zoomOut', 'menubar.options.zoomout')}, + {role: 'resetZoom', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.resetzoom')}, + {role: 'zoomIn', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.zoomin')}, + {role: 'zoomOut', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.zoomout')}, {type: 'separator'}, - {role: 'togglefullscreen', label: utils.getLocale('togglefullscreen', 'menubar.options.togglefullscreen')}, + {role: 'togglefullscreen', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.togglefullscreen')}, ] }, { - label: utils.getLocale('Window', 'menubar.options.window'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.window'), submenu: [ - {role: 'minimize', label: utils.getLocale('minimize', 'menubar.options.minimize')}, + {role: 'minimize', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.minimize')}, { - label: utils.getLocale('Show', 'menubar.options.show'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.show'), click: () => utils.getWindow().show() }, - {role: 'zoom', label: utils.getLocale('zoom', 'menubar.options.zoom')}, + {role: 'zoom', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.zoom')}, ...(this.isMac ? [ {type: 'separator'}, {role: 'front', label: utils.getLocale('front', 'menubar.options.front')}, {role: 'close', label: utils.getLocale('close', 'menubar.options.close')}, ] : [ - {role: 'close', label: utils.getLocale('close', 'menubar.options.close')}, + {role: 'close', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.close')}, ]), { - label: utils.getLocale('Edit', 'menubar.options.edit'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.edit'), submenu: [ - {role: 'undo', label: utils.getLocale('undo', 'menubar.options.undo')}, - {role: 'redo', label: utils.getLocale('redo', 'menubar.options.redo')}, + {role: 'undo', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.undo')}, + {role: 'redo', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.redo')}, {type: 'separator'}, - {role: 'cut', label: utils.getLocale('cut', 'menubar.options.cut')}, - {role: 'copy', label: utils.getLocale('copy', 'menubar.options.copy')}, - {role: 'paste', label: utils.getLocale('paste', 'menubar.options.paste')}, + {role: 'cut', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.cut')}, + {role: 'copy', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.copy')}, + {role: 'paste', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.paste')}, ] }, {type: 'separator'}, { - label: utils.getLocale('Toggle Private Session', 'menubar.options.toggleprivate'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.toggleprivate'), accelerator: utils.getStoreValue("general.keybindings.togglePrivateSession").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.cfg.general.privateEnabled = !app.cfg.general.privateEnabled`) }, {type: 'separator'}, { - label: utils.getLocale('Web Remote', 'menubar.options.webremote'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.webremote'), accelerator: utils.getStoreValue("general.keybindings.webRemote").join('+'), sublabel: 'Opens in external window', click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('remote-pair')`) }, { - label: utils.getLocale('Audio Settings', 'menubar.options.audio'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.audio'), accelerator: utils.getStoreValue("general.keybindings.audioSettings").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.modals.audioSettings = true`) }, { - label: utils.getLocale('Plug-in Menu', 'menubar.options.plugins'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.plugins'), accelerator: utils.getStoreValue("general.keybindings.pluginMenu").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.modals.pluginMenu = true`) } ] }, { - label: utils.getLocale('Controls', 'menubar.options.controls'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.controls'), submenu: [ { - label: utils.getLocale('Pause / Play', 'menubar.options.playpause'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.playpause'), accelerator: 'Space', click: () => utils.getWindow().webContents.executeJavaScript(`app.SpacePause()`) }, { - label: utils.getLocale('Next', 'menubar.options.next'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.next'), accelerator: 'CommandOrControl+Right', click: () => utils.getWindow().webContents.executeJavaScript(`MusicKitInterop.next()`) }, { - label: utils.getLocale('Previous', 'menubar.options.previous'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.previous'), accelerator: 'CommandOrControl+Left', click: () => utils.getWindow().webContents.executeJavaScript(`MusicKitInterop.previous()`) }, {type: 'separator'}, { - label: utils.getLocale('Volume Up', 'menubar.options.volumeup'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.volumeup'), accelerator: 'CommandOrControl+Up', click: () => utils.getWindow().webContents.executeJavaScript(`app.volumeUp()`) }, { - label: utils.getLocale('Volume Down', 'menubar.options.volumedown'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.volumedown'), accelerator: 'CommandOrControl+Down', click: () => utils.getWindow().webContents.executeJavaScript(`app.volumeDown()`) }, { - label: utils.getLocale('Browse', 'menubar.options.browse'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.browse'), accelerator: utils.getStoreValue("general.keybindings.browse").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('browse')`) }, {type: 'separator'}, { - label: utils.getLocale('Artists', 'menubar.options.artists'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.artists'), accelerator: utils.getStoreValue("general.keybindings.artists").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('library-artists')`) }, { - label: utils.getLocale('Search', 'menubar.options.search'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.search'), accelerator: utils.getStoreValue("general.keybindings.search").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('search')`) }, {type: 'separator'}, { - label: utils.getLocale('Album', 'menubar.options.albums'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.albums'), accelerator: utils.getStoreValue("general.keybindings.albums").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('library-albums')`) }, {type: 'separator'}, { - label: utils.getLocale('Cast To Devices', 'menubar.options.cast'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.cast'), accelerator: utils.getStoreValue("general.keybindings.castToDevices").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.modals.castMenu = true`) } ] }, { - label: utils.getLocale('Account', 'menubar.options.account'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.account'), submenu: [ { - label: utils.getLocale('Account Settings', 'menubar.options.accountsettings'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.accountsettings'), click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('apple-account-settings')`) }, { - label: utils.getLocale('Sign Out', 'menubar.options.signout'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.signout'), click: () => utils.getWindow().webContents.executeJavaScript(`app.unauthorize()`) } ] }, { - label: utils.getLocale('Support', 'menubar.options.support'), - role: utils.getLocale('help', 'menubar.options.help'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.support'), + role: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.help'), submenu: [ { label: utils.getLocale('Discord', 'menubar.options.discord'), @@ -195,35 +195,35 @@ export default class Thumbar { }, {type: 'separator'}, { - label: utils.getLocale('Report a...', 'menubar.options.report'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.report'), submenu: [ { - label: utils.getLocale('Bug', 'menubar.options.bug'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.bug'), click: () => shell.openExternal("https://github.com/ciderapp/Cider/issues/new?assignees=&labels=bug%2Ctriage&template=bug_report.yaml&title=%5BBug%5D%3A+").catch(console.error) }, { - label: utils.getLocale('Feature Request', 'menubar.options.feature'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.feature'), click: () => shell.openExternal("https://github.com/ciderapp/Cider/discussions/new?category=feature-request").catch(console.error) }, { - label: utils.getLocale('Translation Report/Request', 'menubar.options.trans'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.trans'), click: () => shell.openExternal("https://github.com/ciderapp/Cider/issues/new?assignees=&labels=%F0%9F%8C%90+Translations&template=translation.yaml&title=%5BTranslation%5D%3A+").catch(console.error) }, ] }, {type: 'separator'}, { - label: utils.getLocale('View License', 'menubar.options.license'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.license'), click: () => shell.openExternal("https://github.com/ciderapp/Cider/blob/main/LICENSE").catch(console.error) }, {type: 'separator'}, { - label: utils.getLocale('Toggle Developer Tools', 'menubar.options.toggledevtools'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.toggledevtools'), accelerator: utils.getStoreValue("general.keybindings.openDeveloperTools").join('+'), click: () => utils.getWindow().webContents.openDevTools() }, { - label: utils.getLocale('Open Configuration File in Editor', 'menubar.options.conf'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.conf'), click: () => utils.getStoreInstance().openInEditor() } ] From 609eb9225f175599723e7bd867ac1b1b8d9b1506 Mon Sep 17 00:00:00 2001 From: Mefsaal Date: Sun, 1 May 2022 06:47:55 -0300 Subject: [PATCH 12/73] MacOS Localizated only MacOS strings --- src/main/plugins/menubar.ts | 52 +++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts index 54092c80..14bd8b48 100644 --- a/src/main/plugins/menubar.ts +++ b/src/main/plugins/menubar.ts @@ -30,22 +30,27 @@ export default class Thumbar { { label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.settings'), accelerator: utils.getStoreValue("general.keybindings.settings").join('+'), - click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('settings')`) + click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('settings')`), }, + ...(this.isMac ? [ {type: 'separator'}, - {role: 'services', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.services')}, + {role: 'services'}, {type: 'separator'}, - {role: 'hide', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.hide')}, - {role: 'hideOthers', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.hideothers')}, - {role: 'unhide', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.unhide')}, + {role: 'hide'}, + {role: 'hideOthers'}, + {role: 'unhide'}, + ]: [ {type: 'separator'}, - {role: 'quit', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.quit')} - ] + {role: 'quit', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.quit')}, + ]), + ], }, + + { label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.view'), submenu: [ - {role: 'reload', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.reloads')}, + {role: 'reload', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.reload')}, {role: 'forceReload', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.forcereload')}, {role: 'toggleDevTools', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.toggledevtools')}, {type: 'separator'}, @@ -60,30 +65,33 @@ export default class Thumbar { label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.window'), submenu: [ {role: 'minimize', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.minimize')}, + ...(this.isMac ? [ { - label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.show'), + label: 'Show', click: () => utils.getWindow().show() }, - {role: 'zoom', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.zoom')}, - ...(this.isMac ? [ + {role: 'zoom'}, + {type: 'separator'}, - {role: 'front', label: utils.getLocale('front', 'menubar.options.front')}, - {role: 'close', label: utils.getLocale('close', 'menubar.options.close')}, - ] : [ - {role: 'close', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.close')}, - ]), + {role: 'front'}, + {role: 'close'}, + + {role: 'close'}, + { - label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.edit'), + label: 'Edit', submenu: [ - {role: 'undo', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.undo')}, - {role: 'redo', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.redo')}, + {role: 'undo'}, + {role: 'redo'}, {type: 'separator'}, - {role: 'cut', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.cut')}, - {role: 'copy', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.copy')}, - {role: 'paste', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.paste')}, + {role: 'cut'}, + {role: 'copy'}, + {role: 'paste'}, ] }, + ] : [] + ), {type: 'separator'}, { label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.toggleprivate'), From d5e142608a4258ced1cd737b25cb648121ccead4 Mon Sep 17 00:00:00 2001 From: Mefsaal Date: Sun, 1 May 2022 07:00:49 -0300 Subject: [PATCH 13/73] linux dont need this --- src/main/plugins/menubar.ts | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts index 14bd8b48..4783c0a4 100644 --- a/src/main/plugins/menubar.ts +++ b/src/main/plugins/menubar.ts @@ -52,14 +52,17 @@ export default class Thumbar { submenu: [ {role: 'reload', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.reload')}, {role: 'forceReload', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.forcereload')}, - {role: 'toggleDevTools', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.toggledevtools')}, + ...(this.isMac ? [ + {role: 'toggleDevTools'}, {type: 'separator'}, - {role: 'resetZoom', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.resetzoom')}, - {role: 'zoomIn', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.zoomin')}, - {role: 'zoomOut', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.zoomout')}, + {role: 'resetZoom'}, + {role: 'zoomIn'}, + {role: 'zoomOut'}, {type: 'separator'}, - {role: 'togglefullscreen', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.togglefullscreen')}, - ] + {role: 'togglefullscreen'}, + + ]: []), + ], }, { label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.window'), From b0bf97fcb50a2f3a8e271f46ef6535fad622ce79 Mon Sep 17 00:00:00 2001 From: Mefsaal Date: Sun, 1 May 2022 07:28:30 -0300 Subject: [PATCH 14/73] Update Documentation --- src/i18n/README.md | 19 ------------------- src/i18n/en_US.json | 19 ------------------- src/i18n/es_ES.json | 19 ------------------- src/i18n/source/en_US.json | 19 ------------------- src/main/plugins/menubar.ts | 2 +- 5 files changed, 1 insertion(+), 77 deletions(-) diff --git a/src/i18n/README.md b/src/i18n/README.md index cec535da..1622644a 100644 --- a/src/i18n/README.md +++ b/src/i18n/README.md @@ -303,31 +303,13 @@ Update 29/04/2022 00:00 UTC * `menubar.options.about`: Added for `en_US` * `menubar.options.settings`: Added for `en_US` - * `menubar.options.services`: Added for `en_US` - * `menubar.options.hide`: Added for `en_US` - * `menubar.options.hideothers`: Added for `en_US` - * `menubar.options.unhide`: Added for `en_US` * `menubar.options.quit`: Added for `en_US` * `menubar.options.view`: Added for `en_US` * `menubar.options.reload`: Added for `en_US` * `menubar.options.forcereload`: Added for `en_US` * `menubar.options.toggledevtools`: Added for `en_US` - * `menubar.options.resetzoom`: Added for `en_US` - * `menubar.options.zoomin`: Added for `en_US` - * `menubar.options.zoomout`: Added for `en_US` - * `menubar.options.togglefullscreen`: Added for `en_US` * `menubar.options.window`: Added for `en_US` * `menubar.options.minimize`: Added for `en_US` - * `menubar.options.show`: Added for `en_US` - * `menubar.options.zoom`: Added for `en_US` - * `menubar.options.front`: Added for `en_US` - * `menubar.options.close`: Added for `en_US` - * `menubar.options.edit`: Added for `en_US` - * `menubar.options.undo`: Added for `en_US` - * `menubar.options.redo`: Added for `en_US` - * `menubar.options.cut`: Added for `en_US` - * `menubar.options.copy`: Added for `en_US` - * `menubar.options.paste`: Added for `en_US` * `menubar.options.toggleprivate`: Added for `en_US` * `menubar.options.webremote`: Added for `en_US` * `menubar.options.audio`: Added for `en_US` @@ -346,7 +328,6 @@ Update 29/04/2022 00:00 UTC * `menubar.options.accountsettings`: Added for `en_US` * `menubar.options.signout`: Added for `en_US` * `menubar.options.support`: Added for `en_US` - * `menubar.options.help`: Added for `en_US` * `menubar.options.discord`: Added for `en_US` * `menubar.options.gihu`: Added for `en_US` * `menubar.options.report`: Added for `en_US` diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index 9dafaf53..bd3edd6a 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -266,31 +266,13 @@ "action.openArtworkInBrowser": "Open artwork in browser", "menubar.options.about": "About", "menubar.options.settings": "Settings", - "menubar.options.services": "Services", - "menubar.options.hide": "Hide Cider", - "menubar.options.hideothers": "Hide Others", - "menubar.options.unhide": "Show All", "menubar.options.quit": "Quit Cider", "menubar.options.view": "View ", "menubar.options.reload": "Reload", "menubar.options.forcereload": "Force Reload", "menubar.options.toggledevtools": "Toggle Developer Tools", - "menubar.options.resetzoom": "Reset Zoom", - "menubar.options.zoomin": "Zoom In", - "menubar.options.zoomout": "Zoom Out", - "menubar.options.togglefullscreen": "Toggle Fullscreen", "menubar.options.window": "Window", "menubar.options.minimize": "Minimize", - "menubar.options.show": "Show", - "menubar.options.zoom": "Zoom", - "menubar.options.front": "Front", - "menubar.options.close": "Close", - "menubar.options.edit": "Edit", - "menubar.options.undo": "Undo", - "menubar.options.redo": "Redo", - "menubar.options.cut": "Cut", - "menubar.options.copy": "Copy", - "menubar.options.paste": "Paste", "menubar.options.toggleprivate": "Toggle Private Session", "menubar.options.webremote": "Web Remote", "menubar.options.audio": "Audio Settings", @@ -310,7 +292,6 @@ "menubar.options.accountsettings": "Account Settings", "menubar.options.signout": "Sign Out", "menubar.options.support": "Support", - "menubar.options.help": "Help", "menubar.options.discord": "Discord", "menubar.options.github": "GitHub Wiki", "menubar.options.report": "Report a...", diff --git a/src/i18n/es_ES.json b/src/i18n/es_ES.json index 51701558..eb31ea60 100644 --- a/src/i18n/es_ES.json +++ b/src/i18n/es_ES.json @@ -266,31 +266,13 @@ "action.openArtworkInBrowser": "Abrir Ilustración en el navegador", "menubar.options.about": "Acerca de", "menubar.options.settings": "Ajustes", - "menubar.options.services": "Servicios", - "menubar.options.hide": "Ocultar Cider", - "menubar.options.hideothers": "Ocultar Otros", - "menubar.options.unhide": "Mostrar Todos", "menubar.options.quit": "Salir", "menubar.options.view": "Ver", "menubar.options.reload": "Recargar", "menubar.options.forcereload": "Forzar Recarga", "menubar.options.toggledevtools": "Herramientas de Desarrollo", - "menubar.options.resetzoom": "Restablecer Zoom", - "menubar.options.zoomin": "Acercar", - "menubar.options.zoomout": "Alejar", - "menubar.options.togglefullscreen": "Pantalla Completa", "menubar.options.window": "Ventana", "menubar.options.minimize": "Minimizar", - "menubar.options.show": "Mostrar", - "menubar.options.zoom": "Zoom", - "menubar.options.front": "Frente", - "menubar.options.close": "Cerrar", - "menubar.options.edit": "Editar", - "menubar.options.undo": "Deshacer", - "menubar.options.redo": "Rehacer", - "menubar.options.cut": "Cortar", - "menubar.options.copy": "Copiar", - "menubar.options.paste": "Pegar", "menubar.options.toggleprivate": "Cambiar Sesión Privada", "menubar.options.webremote": "Web Remoto", "menubar.options.audio": "Configuraciones de Audio", @@ -310,7 +292,6 @@ "menubar.options.accountsettings": "Ajustes de Cuenta", "menubar.options.signout": "Cerrar Sesión", "menubar.options.support": "Soporte", - "menubar.options.help": "Ayuda", "menubar.options.discord": "Discord", "menubar.options.github": "GitHub Wiki", "menubar.options.report": "Reportar a...", diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json index 9dafaf53..bd3edd6a 100644 --- a/src/i18n/source/en_US.json +++ b/src/i18n/source/en_US.json @@ -266,31 +266,13 @@ "action.openArtworkInBrowser": "Open artwork in browser", "menubar.options.about": "About", "menubar.options.settings": "Settings", - "menubar.options.services": "Services", - "menubar.options.hide": "Hide Cider", - "menubar.options.hideothers": "Hide Others", - "menubar.options.unhide": "Show All", "menubar.options.quit": "Quit Cider", "menubar.options.view": "View ", "menubar.options.reload": "Reload", "menubar.options.forcereload": "Force Reload", "menubar.options.toggledevtools": "Toggle Developer Tools", - "menubar.options.resetzoom": "Reset Zoom", - "menubar.options.zoomin": "Zoom In", - "menubar.options.zoomout": "Zoom Out", - "menubar.options.togglefullscreen": "Toggle Fullscreen", "menubar.options.window": "Window", "menubar.options.minimize": "Minimize", - "menubar.options.show": "Show", - "menubar.options.zoom": "Zoom", - "menubar.options.front": "Front", - "menubar.options.close": "Close", - "menubar.options.edit": "Edit", - "menubar.options.undo": "Undo", - "menubar.options.redo": "Redo", - "menubar.options.cut": "Cut", - "menubar.options.copy": "Copy", - "menubar.options.paste": "Paste", "menubar.options.toggleprivate": "Toggle Private Session", "menubar.options.webremote": "Web Remote", "menubar.options.audio": "Audio Settings", @@ -310,7 +292,6 @@ "menubar.options.accountsettings": "Account Settings", "menubar.options.signout": "Sign Out", "menubar.options.support": "Support", - "menubar.options.help": "Help", "menubar.options.discord": "Discord", "menubar.options.github": "GitHub Wiki", "menubar.options.report": "Report a...", diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts index 4783c0a4..a9d73428 100644 --- a/src/main/plugins/menubar.ts +++ b/src/main/plugins/menubar.ts @@ -194,7 +194,7 @@ export default class Thumbar { }, { label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.support'), - role: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.help'), + role: 'help', submenu: [ { label: utils.getLocale('Discord', 'menubar.options.discord'), From 5ee5eac35ab665ea426e6b86d59199cc42faa63a Mon Sep 17 00:00:00 2001 From: Monochromish Date: Mon, 2 May 2022 06:52:07 +1000 Subject: [PATCH 15/73] Fixed the weird merging of heart and explicit icons and made a few changes. In this PR: * The Explicit and Love icon(s) don't merge and are of same size * Added Display of unlove icon as well in case song is not loved Screenshots: --- src/renderer/assets/feather/heart-fill.svg | 2 +- src/renderer/assets/feather/heart.svg | 2 +- src/renderer/less/elements.css | 19 ++++++++++++++--- src/renderer/less/elements.less | 21 +++++++++++++++---- .../views/components/mediaitem-list-item.ejs | 5 +++-- 5 files changed, 38 insertions(+), 11 deletions(-) diff --git a/src/renderer/assets/feather/heart-fill.svg b/src/renderer/assets/feather/heart-fill.svg index 1f790aad..4daaa2c8 100644 --- a/src/renderer/assets/feather/heart-fill.svg +++ b/src/renderer/assets/feather/heart-fill.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/renderer/assets/feather/heart.svg b/src/renderer/assets/feather/heart.svg index a083b7e2..973edba4 100644 --- a/src/renderer/assets/feather/heart.svg +++ b/src/renderer/assets/feather/heart.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/renderer/less/elements.css b/src/renderer/less/elements.css index 20323ac9..0c54721e 100644 --- a/src/renderer/less/elements.css +++ b/src/renderer/less/elements.css @@ -364,6 +364,21 @@ align-items: center; justify-content: center; } +.cd-mediaitem-list-item .heart-unfilled { + background-image: url("assets/feather/heart.svg"); + height: 12px; + width: 36px; + filter: contrast(0); + background-repeat: no-repeat; +} + +.cd-mediaitem-list-item .heart-filled { + background-image: url("assets/feather/heart-fill.svg"); + height: 12px; + width: 36px; + filter: contrast(0); + background-repeat: no-repeat; +} .cd-mediaitem-list-item .explicit-icon { background-image: url("assets/explicit.svg"); height: 12px; @@ -372,9 +387,7 @@ background-repeat: no-repeat; } .heart-icon { - position: absolute; - filter: contrast(0); - background-repeat: no-repeat; + display: flex } @keyframes load-bar { 10% { diff --git a/src/renderer/less/elements.less b/src/renderer/less/elements.less index b2ee7753..27418eca 100644 --- a/src/renderer/less/elements.less +++ b/src/renderer/less/elements.less @@ -448,6 +448,22 @@ justify-content: center; } + .heart-unfilled { + background-image: url("assets/feather/heart.svg"); + height: 12px; + width: 36px; + filter: contrast(0); + background-repeat: no-repeat; + } + + .heart-filled { + background-image: url("assets/feather/heart-fill.svg"); + height: 12px; + width: 36px; + filter: contrast(0); + background-repeat: no-repeat; + } + .explicit-icon { background-image: url("./assets/explicit.svg"); height: 12px; @@ -457,10 +473,7 @@ } .heart-icon { - position: absolute; - right:0; - filter: contrast(0); - background-repeat: no-repeat; + display: flex } /* CSS.gg diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs index c77a50f8..a5ae3ce9 100644 --- a/src/renderer/views/components/mediaitem-list-item.ejs +++ b/src/renderer/views/components/mediaitem-list-item.ejs @@ -65,8 +65,9 @@ -
-
+
+
+
+
+
+
+

{{ item.title }}

+
+
+ + + + + +
+ + \ No newline at end of file diff --git a/src/renderer/views/pages/radio.ejs b/src/renderer/views/pages/radio.ejs index e69de29b..f993f117 100644 --- a/src/renderer/views/pages/radio.ejs +++ b/src/renderer/views/pages/radio.ejs @@ -0,0 +1,23 @@ + + + \ No newline at end of file From 81e58868cf369bfc0437f95e2cb7cac5e48d8b96 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Sat, 7 May 2022 05:38:48 +0100 Subject: [PATCH 70/73] Nope --- src/renderer/main/vueapp.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index fa4751c5..f0e271bb 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -2542,7 +2542,7 @@ const app = new Vue({ return } try { - this.radio.personal.title = app.getLz('term.personal') + this.radio.personal.title = app.getLz('term.personalStations') this.radio.recent.title = app.getLz('term.recentStations') this.radio.amlive.title = app.getLz('term.amLive') From c593a491352defe6e75f8dc0e13f6a6977197660 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Sat, 7 May 2022 05:58:37 +0100 Subject: [PATCH 71/73] Merge pull request #997 from ciderapp/enhancement/circleci Enhancement/circleci --- .circleci/config.yml | 181 +++++++++++++++++++++++++++++++++++-------- resources/circle.js | 65 +++++++--------- 2 files changed, 177 insertions(+), 69 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 62dc1183..2d7b5b75 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,21 +1,26 @@ version: 2.1 -orbs: # adds orbs to your configuration - jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible -branches: - only: - - main - - develop -jobs: - build: - working_directory: ~/Cider + +executors: + cider-ci: docker: - image: circleci/node:16 - + working_directory: ~/Cider + +orbs: # Add orbs to your configuration + jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible + +# The jobs for this project +jobs: + prepare-build: + executor: cider-ci steps: - checkout - run: name: Set App Version command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV + # - run: + # name: Rename Repository + # command: sed -i 's/github:ciderapp\/Cider/github:ciderapp\/cider-releases/' package.json - run: name: Update Package Managers command: sudo npm update -g npm yarn @@ -24,7 +29,7 @@ jobs: keys: - yarn-packages-{{ checksum "cider.lock" }} - run: - name: Install Dependencies + name: Install Node Dependencies command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn - save_cache: name: Save Yarn Package Cache @@ -32,50 +37,160 @@ jobs: paths: - ~/.cache/yarn - run: - name: Install system build dependencies - command: | - sudo apt-get update -y - curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg - echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null - sudo apt-get install -y dpkg fakeroot wine64 - sudo dpkg --add-architecture i386 - sudo apt-get update -y - sudo apt-get install -y wine32 - sudo apt install -y gh + name: TypeScript Compile + command: yarn build + - persist_to_workspace: + # Must be an absolute path, or relative path from working_directory. This is a directory on the container which is + # taken to be the root directory of the workspace. + root: . + # Must be relative path from root + paths: + - node_modules + - build + - resources + - yarn.lock + - package.json + - winget.json # winget.json is a file that is generated by the winget package manager + - LICENSE + - license.txt + + build-linux: + executor: cider-ci + steps: + - attach_workspace: + at: ~/Cider - run: name: Fix Versioning and Add Channel command: yarn circle:script - - run: - name: TypeScript Compile - command: yarn build - run: name: Generate Builds (Linux) command: yarn electron-builder -l -p never post-steps: - jira/notify + - persist_to_workspace: + root: . + paths: + - dist/*.deb + - dist/*.AppImage + - dist/*.snap + - dist/latest-linux.yml + + build-windows: + executor: cider-ci + steps: + - attach_workspace: + at: ~/Cider + - run: + name: Install Windows System Build Dependencies + command: | + sudo apt-get update -y + sudo apt-get install -y dpkg fakeroot wine64 + sudo dpkg --add-architecture i386 + sudo apt-get update -y + sudo apt-get install -y wine32 + - run: + name: Fix Versioning and Add Channel + command: yarn circle:script - run: name: Generate Builds (Windows) command: yarn electron-builder -w --x64 -p never post-steps: - jira/notify + - persist_to_workspace: + root: . + paths: + - dist/*.exe + - dist/Cider-Setup-*.exe.blockmap + - dist/latest.yml + + build-winget: + executor: cider-ci + steps: + - attach_workspace: + at: ~/Cider + - run: + name: Install Windows System Build Dependencies + command: | + sudo apt-get update -y + sudo apt-get install -y dpkg fakeroot wine64 + sudo dpkg --add-architecture i386 + sudo apt-get update -y + sudo apt-get install -y wine32 + - run: + name: Fix Versioning and Add Channel + command: yarn circle:script - run: name: Generate Builds (Winget) command: yarn electron-builder --win -c winget.json -p never post-steps: - jira/notify + - persist_to_workspace: + root: . + paths: + - dist/*.exe + - dist/Cider-Setup-winget-*.exe.blockmap + + release: + executor: cider-ci + steps: + - attach_workspace: + at: ~/Cider/ + - run: + name: Installing GitHub Command Line Interface + command: | + sudo apt-get update -y + curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg + echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null + sudo apt-get update -y + sudo apt install -y gh - run: name: Move Build Files command: | - mkdir ~/Cider/dist/artifacts/ - mv ~/Cider/dist/*.exe ~/Cider/dist/artifacts - mv ~/Cider/dist/*.deb ~/Cider/dist/artifacts - mv ~/Cider/dist/*.AppImage ~/Cider/dist/artifacts - mv ~/Cider/dist/*.snap ~/Cider/dist/artifacts - mv ~/Cider/dist/*.yml ~/Cider/dist/artifacts - mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts + mkdir ~/Cider/dist/artifacts/ + mv ~/Cider/dist/*.exe ~/Cider/dist/artifacts + mv ~/Cider/dist/*.deb ~/Cider/dist/artifacts + mv ~/Cider/dist/*.AppImage ~/Cider/dist/artifacts + mv ~/Cider/dist/*.snap ~/Cider/dist/artifacts + mv ~/Cider/dist/*.yml ~/Cider/dist/artifacts + mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts - store_artifacts: - path: ~/Cider/dist/artifacts + path: ~/Cider/dist/artifacts - run: name: Publish Release command: | - gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap + gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap + +# Orchestrate our job run sequence +workflows: + build_and_release: + jobs: + - prepare-build: + filters: + branches: + only: main + - build-windows: + requires: + - prepare-build + filters: + branches: + only: main + - build-linux: + requires: + - prepare-build + filters: + branches: + only: main + - build-winget: + requires: + - prepare-build + filters: + branches: + only: main + - release: + requires: + - build-windows + - build-linux + - build-winget + filters: + branches: + only: main diff --git a/resources/circle.js b/resources/circle.js index dcf1d0ef..80e7c8cf 100644 --- a/resources/circle.js +++ b/resources/circle.js @@ -1,53 +1,46 @@ - - if (!process.env['CIRCLECI']) { - console.log(`[CIRCLECI SCRIPT] CircleCI not found... Aborting script`) - return + console.log(`[CIRCLECI SCRIPT] CircleCI not found... Aborting script`) + return } -let fs = require('fs') +const {readFileSync, writeFile} = require('fs') +const pkg = JSON.parse(readFileSync('package.json').toString()); +let channel = process.env['CIRCLE_BRANCH']; -var data = fs.readFileSync('package.json'); -var package = JSON.parse(data); - - - -let channel; if (process.env['CIRCLE_BRANCH'] === 'lts') { - channel = 'latest' + channel = 'latest' } else if (process.env['CIRCLE_BRANCH'] === 'main') { - channel = 'beta' + channel = 'beta' } else if (process.env['CIRCLE_BRANCH'] === 'develop') { - channel = 'alpha' -} else { - channel = process.env['CIRCLE_BRANCH'] // It won't have auto update support + channel = 'alpha' } - +channel = channel.split('/').join('-') // https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables -var pvers = package.version.split('.') -package.version = `${pvers[0]}.${pvers[1]}.${pvers[2]}-${channel}.${process.env['CIRCLE_BUILD_NUM']}` +const version = pkg.version.split('.'); +pkg.version = `${version[0]}.${version[1]}.${version[2]}-${channel}` // package.build.channel = channel -package.publish = { - "provider": "github", - "repo": "cider-releases", - "owner": "ciderapp", - "vPrefixedTagName": true, - "tag": `v${package.version}`, - "channel": channel, - "releaseType": "release" +pkg.publish = { + "provider": "github", + "repo": "cider-releases", + "owner": "ciderapp", + "vPrefixedTagName": true, + "tag": `v${pkg.version}`, + "channel": channel, + "releaseType": "release" } -let {exec} = require('child_process') -exec('echo $APP_VERSION', {env: {'APP_VERSION': package.version}}, function (error, stdout, stderr) -{ - console.log(stdout, stderr, error); -}); -fs.writeFile('package.json', JSON.stringify(package), err => { - // error checking - if(err) throw err; - console.log(`VERSION CHANGED TO ${package.version}`); +const {exec} = require('child_process') + +exec('echo $APP_VERSION', {env: {'APP_VERSION': pkg.version}}, function (error, stdout, stderr) { + console.log(stdout, stderr, error); +}); + +writeFile('package.json', JSON.stringify(pkg), err => { + // error checking + if (err) throw err; + console.log(`VERSION CHANGED TO ${pkg.version}`); }); From baf234085e0edfaa8f69c1d88eaae15fbdcba231 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Sat, 7 May 2022 06:41:39 +0100 Subject: [PATCH 72/73] Revert "Radio improvement, needs optimisation." This reverts commit c0c12bc2bad242bbf41636f06b48ff79c64d1f2c. --- src/i18n/README.md | 4 +-- src/i18n/en_US.json | 2 -- src/i18n/source/en_US.json | 2 -- src/main/base/browserwindow.ts | 7 ---- src/renderer/main/vueapp.js | 33 ++----------------- src/renderer/views/app/app-content.ejs | 9 +++++ src/renderer/views/app/sidebar.ejs | 4 +-- src/renderer/views/components/radio-child.ejs | 31 ----------------- src/renderer/views/pages/radio.ejs | 23 ------------- 9 files changed, 15 insertions(+), 100 deletions(-) delete mode 100644 src/renderer/views/components/radio-child.ejs diff --git a/src/i18n/README.md b/src/i18n/README.md index c43468ec..3422daa7 100644 --- a/src/i18n/README.md +++ b/src/i18n/README.md @@ -337,6 +337,4 @@ Update 29/04/2022 00:00 UTC * `menubar.options.license`: Added for `en_US` * `menubar.options.conf`: Added for `en_US` -Update 07/05/2022 04:00 UTC -* `term.personalStations`: Added for `en_US` - `term.amLive`: Added for `en_US` + diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index 9536fb79..8f1b77dc 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -121,8 +121,6 @@ "term.audioControls": "Volume Controls", "term.clearAll": "Clear All", "term.recentStations": "Recent Stations", - "term.personalStations": "Personal Stations", - "term.amLive": "Apple Music Live", "term.language": "Language", "term.funLanguages": "Fun", "term.noLyrics": "Loading... / Lyrics not found./ Instrumental.", diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json index 5d91201c..c76a5c01 100644 --- a/src/i18n/source/en_US.json +++ b/src/i18n/source/en_US.json @@ -121,8 +121,6 @@ "term.audioControls": "Volume Controls", "term.clearAll": "Clear All", "term.recentStations": "Recent Stations", - "term.personalStations": "Personal Stations", - "term.amLive": "Apple Music Live", "term.language": "Language", "term.funLanguages": "Fun", "term.noLyrics": "Loading... / Lyrics not found./ Instrumental.", diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts index 680f176d..99300827 100644 --- a/src/main/base/browserwindow.ts +++ b/src/main/base/browserwindow.ts @@ -59,7 +59,6 @@ export class BrowserWindow { "pages/settings", "pages/installed-themes", "pages/listen_now", - "pages/radio", "pages/home", "pages/artist-feed", "pages/cider-playlist", @@ -113,7 +112,6 @@ export class BrowserWindow { "components/artist-chip", "components/hello-world", "components/inline-collection-list", - "components/radio-child", ], appRoutes: [ { @@ -188,11 +186,6 @@ export class BrowserWindow { component: ``, condition: `page == 'listen_now'`, onEnter: `` - }, { - page: "radio", - component: ``, - condition: `page == 'radio'`, - onEnter: `` }, { page: "settings", component: ``, diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index f0e271bb..8218881d 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -42,9 +42,7 @@ const app = new Vue({ listennow: [], madeforyou: [], radio: { - personal: {}, - recent: {}, - amlive: {}, + personal: [] }, mklang: 'en', webview: { @@ -324,7 +322,6 @@ const app = new Vue({ try { this.listennow.timestamp = 0; this.browsepage.timestamp = 0; - this.radio.timestamp = 0; } catch (e) { } }, /** @@ -2535,39 +2532,15 @@ const app = new Vue({ } }, async getRadioStations(attempt = 0) { - if (this.radio.timestamp > Date.now() - 120000) { - return - } if (attempt > 3) { return } try { - this.radio.personal.title = app.getLz('term.personalStations') - this.radio.recent.title = app.getLz('term.recentStations') - this.radio.amlive.title = app.getLz('term.amLive') - - app.mk.api.v3.music(`/v1/catalog/${app.mk.api.v3.storefrontId}/stations`, { - "filter[identity]": "personal", - }).then(res => { - this.radio.personal.data = res.data.data - }) - - app.mk.api.v3.music(`/v1/me/recent/radio-stations`, { + this.radio.personal = (await app.mk.api.v3.music(`/v1/me/recent/radio-stations`, { "platform": "web", "art[url]": "f", l: this.mklang - }).then(res => { - this.radio.recent.data = res.data.data - }) - - app.mk.api.v3.music(`/v1/catalog/${app.mk.api.v3.storefrontId}/stations`, { - "filter[featured]": "apple-music-live-radio", - }).then(res => { - this.radio.amlive.data = res.data.data - }) - - this.radio.timestamp = Date.now() - console.debug(this.radio) + })).data.data; } catch (e) { console.log(e) this.getRadioStations(attempt + 1) diff --git a/src/renderer/views/app/app-content.ejs b/src/renderer/views/app/app-content.ejs index 1134fe9f..dfa1cb33 100644 --- a/src/renderer/views/app/app-content.ejs +++ b/src/renderer/views/app/app-content.ejs @@ -25,6 +25,15 @@ <% } %> + + + <%- include('../pages/library-recentlyadded') %>'); diff --git a/src/renderer/views/app/sidebar.ejs b/src/renderer/views/app/sidebar.ejs index ead0d4aa..979db2f5 100644 --- a/src/renderer/views/app/sidebar.ejs +++ b/src/renderer/views/app/sidebar.ejs @@ -39,8 +39,8 @@ - + +
-
-
-
-

{{ item.title }}

-
-
- - - - - -
- - \ No newline at end of file diff --git a/src/renderer/views/pages/radio.ejs b/src/renderer/views/pages/radio.ejs index f993f117..e69de29b 100644 --- a/src/renderer/views/pages/radio.ejs +++ b/src/renderer/views/pages/radio.ejs @@ -1,23 +0,0 @@ - - - \ No newline at end of file From 9e66fd3d681cde38a367bda658a076bd3e0a7f13 Mon Sep 17 00:00:00 2001 From: cryptofyre Date: Sat, 7 May 2022 10:39:10 -0500 Subject: [PATCH 73/73] Restore window position. --- src/main/base/browserwindow.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts index 680f176d..2374e25b 100644 --- a/src/main/base/browserwindow.ts +++ b/src/main/base/browserwindow.ts @@ -342,6 +342,8 @@ export class BrowserWindow { }); this.options.width = windowState.width; this.options.height = windowState.height; + this.options.x = windowState.x; + this.options.y = windowState.y; switch (process.platform) { default: