From eaaee7a36172b033e2fec45707390dce43486640 Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Thu, 21 Apr 2022 21:43:38 +0200 Subject: [PATCH 01/10] Create basic modal --- src/renderer/style.css | 7 ++++ src/renderer/style.less | 8 ++++ src/renderer/views/pages/settings.ejs | 54 +++++++++++++++++++++++++++ 3 files changed, 69 insertions(+) diff --git a/src/renderer/style.css b/src/renderer/style.css index 42702b6e..fbfe6743 100644 --- a/src/renderer/style.css +++ b/src/renderer/style.css @@ -12826,6 +12826,13 @@ body.no-gpu .drawertransition-leave-to { body.no-gpu .lyric-line:hover::after { display: none; } +.keybindings-border { + padding-left: 15px; + padding-right: 15px; + border-style: solid; + border-radius: 5px; + border-color: #CBCBCB; +} .qrimg { width: -webkit-fill-available; max-block-size: -webkit-fill-available; diff --git a/src/renderer/style.less b/src/renderer/style.less index 80934d6f..ff98f58a 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -3123,6 +3123,14 @@ body.no-gpu { } } +.keybindings-border { + padding-left: 15px; + padding-right: 15px; + border-style: solid; + border-radius: 5px; + border-color: #CBCBCB; +} + .qrimg { width: -webkit-fill-available; max-block-size: -webkit-fill-available; diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index e72a036a..c3e70599 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -123,6 +123,60 @@ +
+
+ {{$root.getLz('settings.option.general.customizeSidebar')}} +
+
+ +
+ +
+
+
+ Web Remote +
+
+

CTRL + Shift + W

+
+
+
+
+ Audio Settings +
+
+

CTRL + Shift + A

+
+
+
+
+ Plugin Menu +
+
+

CTRL + Shift + P

+
+
+
+
+ Cast to Devices +
+
+

CTRL + Shift + C

+
+
+
+
+ Open Developer Tools +
+
+

CTRL + Shift + I

+
+
+
+ +
From 2c8dfdc3693f9f742ee7fbce76b04a77d8666540 Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Thu, 21 Apr 2022 21:48:27 +0200 Subject: [PATCH 02/10] Create i18n strings --- src/i18n/README.md | 5 +++++ src/i18n/en_US.json | 2 ++ src/i18n/source/en_US.json | 2 ++ 3 files changed, 9 insertions(+) diff --git a/src/i18n/README.md b/src/i18n/README.md index c4220aa0..eb18409e 100644 --- a/src/i18n/README.md +++ b/src/i18n/README.md @@ -258,3 +258,8 @@ Update 16/04/2022 9:30 UTC * `settings.header.connect`: Added for `en_US` +Update 21/04/2022 20:00 UTC + +* `settings.option.general.keybindings`: Added for `en_US` +* `settings.option.general.keybindings.open`: Added for `en_US` + diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index 3b92951b..a53175aa 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -279,6 +279,8 @@ "settings.option.general.updateCider.branch.develop": "Development", "settings.option.general.customizeSidebar": "Customize Sidebar Items", "settings.option.general.customizeSidebar.customize": "Customize", + "settings.option.general.keybindings": "Keybindings", + "settings.option.general.keybindings.open": "Open", "settings.notyf.updateCider.update-not-available": "No update available", "settings.notyf.updateCider.update-downloaded": "Update has been downloaded, restart to apply", "settings.notyf.updateCider.update-error": "Error updating Cider", diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json index 2d5f4bf5..f0432330 100644 --- a/src/i18n/source/en_US.json +++ b/src/i18n/source/en_US.json @@ -279,6 +279,8 @@ "settings.option.general.updateCider.branch.develop": "Development", "settings.option.general.customizeSidebar": "Customize Sidebar Items", "settings.option.general.customizeSidebar.customize": "Customize", + "settings.option.general.keybindings": "Keybindings", + "settings.option.general.keybindings.open": "Open", "settings.notyf.updateCider.update-not-available": "No update available", "settings.notyf.updateCider.update-downloaded": "Update has been downloaded, restart to apply", "settings.notyf.updateCider.update-error": "Error updating Cider", From dd9d1d0fbdcee35723a2ede3db7ee27a82f8e5cb Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Thu, 21 Apr 2022 21:49:16 +0200 Subject: [PATCH 03/10] Use new i18n strings --- src/renderer/views/pages/settings.ejs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index c3e70599..75fb9ee2 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -125,14 +125,14 @@
- {{$root.getLz('settings.option.general.customizeSidebar')}} + {{$root.getLz('settings.option.general.keybindings')}}
- +
From 0547ecf014aa0908e0d8f3ea838d77ac0921c300 Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Thu, 21 Apr 2022 22:22:00 +0200 Subject: [PATCH 04/10] Align rectangels --- src/renderer/style.css | 3 +++ src/renderer/style.less | 4 ++++ src/renderer/views/pages/settings.ejs | 10 +++++----- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/renderer/style.css b/src/renderer/style.css index fbfe6743..3b988439 100644 --- a/src/renderer/style.css +++ b/src/renderer/style.css @@ -12833,6 +12833,9 @@ body.no-gpu .lyric-line:hover::after { border-radius: 5px; border-color: #CBCBCB; } +.keybinding-text { + width: 110px; +} .qrimg { width: -webkit-fill-available; max-block-size: -webkit-fill-available; diff --git a/src/renderer/style.less b/src/renderer/style.less index ff98f58a..b5b01bd8 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -3131,6 +3131,10 @@ body.no-gpu { border-color: #CBCBCB; } +.keybinding-text { + width: 110px; +} + .qrimg { width: -webkit-fill-available; max-block-size: -webkit-fill-available; diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index 75fb9ee2..98772e1e 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -139,7 +139,7 @@ Web Remote
-

CTRL + Shift + W

+

CTRL + Shift + W

@@ -147,7 +147,7 @@ Audio Settings
-

CTRL + Shift + A

+

CTRL + Shift + A

@@ -155,7 +155,7 @@ Plugin Menu
-

CTRL + Shift + P

+

CTRL + Shift + P

@@ -163,7 +163,7 @@ Cast to Devices
-

CTRL + Shift + C

+

CTRL + Shift + C

@@ -171,7 +171,7 @@ Open Developer Tools
-

CTRL + Shift + I

+

CTRL + Shift + I

From 929a52179545d7dc9b27bbfe0cd5fc9382a54218 Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Thu, 21 Apr 2022 22:31:30 +0200 Subject: [PATCH 05/10] Create getCommandOrControl function --- src/renderer/views/pages/settings.ejs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index 98772e1e..b9f3c6f4 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -134,6 +134,7 @@
+
Web Remote @@ -1178,6 +1179,9 @@ } }, methods: { + getCommandOrControl() { + return app.cfg.os == "darwin" ? "⌘" : "Ctrl"; + }, windowBgStyleChange() { this.$root.getNowPlayingArtworkBG(undefined, true) if (this.$root.cfg.visual.window_background_style == "mica") { From 1f157ade289f64a4c181e4fc72d1e2202613dc31 Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Fri, 22 Apr 2022 11:45:54 +0200 Subject: [PATCH 06/10] Modal finished --- src/renderer/style.css | 5 ++++- src/renderer/style.less | 5 ++++- src/renderer/views/pages/settings.ejs | 20 ++++++++++++++------ 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/renderer/style.css b/src/renderer/style.css index 3b988439..33e4b4db 100644 --- a/src/renderer/style.css +++ b/src/renderer/style.css @@ -12834,7 +12834,10 @@ body.no-gpu .lyric-line:hover::after { border-color: #CBCBCB; } .keybinding-text { - width: 110px; + width: 95px; + display: flex; + justify-content: center; + align-items: center; } .qrimg { width: -webkit-fill-available; diff --git a/src/renderer/style.less b/src/renderer/style.less index b5b01bd8..80344407 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -3132,7 +3132,10 @@ body.no-gpu { } .keybinding-text { - width: 110px; + width: 95px; + display: flex; + justify-content: center; + align-items: center; } .qrimg { diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index b9f3c6f4..e8876812 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -135,12 +135,20 @@
+
+
+ Toggle Private Session +
+
+

{{ getCommandOrControl() }} + P

+
+
Web Remote
-

CTRL + Shift + W

+

{{ getCommandOrControl() }} + Shift + W

@@ -148,7 +156,7 @@ Audio Settings
-

CTRL + Shift + A

+

{{ getCommandOrControl() }} + Shift + A

@@ -156,7 +164,7 @@ Plugin Menu
-

CTRL + Shift + P

+

{{ getCommandOrControl() }} + Shift + P

@@ -164,7 +172,7 @@ Cast to Devices
-

CTRL + Shift + C

+

{{ getCommandOrControl() }} + Shift + C

@@ -172,7 +180,7 @@ Open Developer Tools
-

CTRL + Shift + I

+

{{ getCommandOrControl() }} + Shift + I

@@ -1180,7 +1188,7 @@ }, methods: { getCommandOrControl() { - return app.cfg.os == "darwin" ? "⌘" : "Ctrl"; + return app.platform == "darwin" ? "⌘" : "Ctrl"; }, windowBgStyleChange() { this.$root.getNowPlayingArtworkBG(undefined, true) From 1e793cf172f2ac2f5e207ee5f18adae65fdc03bd Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Fri, 22 Apr 2022 11:48:57 +0200 Subject: [PATCH 07/10] Add ok-only to modal and remove comment --- src/renderer/views/pages/settings.ejs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index e8876812..ef4a90d9 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -132,9 +132,8 @@ {{$root.getLz('settings.option.general.keybindings.open')}} - +
-
Toggle Private Session From 6d75bf83fa97f5311ee641eba4f6720f60c83122 Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Fri, 22 Apr 2022 12:09:23 +0200 Subject: [PATCH 08/10] Add function for DevTools keys --- src/renderer/views/pages/settings.ejs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index bb7366e5..1de80810 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -179,7 +179,7 @@ Open Developer Tools
-

{{ getCommandOrControl() }} + Shift + I

+

{{ getCommandOrControl() }} + {{ getOptionOrShift() }} + I

@@ -1191,6 +1191,9 @@ getCommandOrControl() { return app.platform == "darwin" ? "⌘" : "Ctrl"; }, + getOptionOrShift() { + return app.platform == "darwin" ? "⌥" : "Shift"; + }, windowBgStyleChange() { this.$root.getNowPlayingArtworkBG(undefined, true) if (this.$root.cfg.visual.window_background_style == "mica") { From 1d9cefa7cd777303acb83bc0ccfe38be2c7418f1 Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Fri, 22 Apr 2022 12:10:36 +0200 Subject: [PATCH 09/10] Translate strings to Hungarian (hu_HU) --- src/i18n/hu_HU.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/i18n/hu_HU.json b/src/i18n/hu_HU.json index 1c42b123..5ebe3a07 100644 --- a/src/i18n/hu_HU.json +++ b/src/i18n/hu_HU.json @@ -279,6 +279,8 @@ "settings.option.general.updateCider.branch.develop": "Fejlesztői", "settings.option.general.customizeSidebar": "Oldalsáv elemeinek testreszabása", "settings.option.general.customizeSidebar.customize": "Testreszabás", + "settings.option.general.keybindings": "Billentyűparancsok", + "settings.option.general.keybindings.open": "Megnyitás", "settings.notyf.updateCider.update-not-available": "Nem található frissítés", "settings.notyf.updateCider.update-downloaded": "A frissítés le lett töltve, a telepítéshez indítsa újra az alkalmazást", "settings.notyf.updateCider.update-error": "Hiba történt a frissítés közben", From 63b58e99e96f3b1b1756f7bacb10b9015ba1b909 Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Fri, 22 Apr 2022 12:12:23 +0200 Subject: [PATCH 10/10] Update i18n README --- src/i18n/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/README.md b/src/i18n/README.md index c10275ec..eba2e4b7 100644 --- a/src/i18n/README.md +++ b/src/i18n/README.md @@ -262,7 +262,7 @@ Update 16/04/2022 9:30 UTC * `settings.header.connect`: Added for `en_US` -Update 21/04/2022 20:00 UTC +Update 22/04/2022 13:00 UTC * `settings.option.general.keybindings`: Added for `en_US` * `settings.option.general.keybindings.open`: Added for `en_US`