Merge pull request #845 from Amaru8/develop

Private Session improvements

src/i18n/README.md

@@ -189,30 +189,30 @@ Update 28/02/2022 13:00 UTC
 * `term.time.days`: Added for `en_US`
 * `term.time.day`: Added for `en_US`
 
-Update 10/3/2022 14:00 UTC
+Update 10/03/2022 14:00 UTC
 * `settings.header.window`: Added for `en_US`
 * `settings.header.window.description`: Added for `en_US`
 * `settings.option.window.openOnStartup`: Added for `en_US`
 * `settings.option.window.openOnStartup.hidden`: Added for `en_US`
 
-Update 20/3/2022 00:01 UTC
+Update 20/03/2022 00:01 UTC
 * `term.creditDesignedBy`: Added for `en_US`
 
-Update 29/3/2022 04:00 UTC
+Update 29/03/2022 04:00 UTC
 * `settings.option.audio.enableAdvancedFunctionality.ciderPPE.description`: Changed for `en_US` (Deleted for all language files)
 
-Update 04/06/2022 0830 UTC 
+Update 06/04/2022 08:30 UTC 
 * `settings.option.general.customizeSidebar`: Added for `en_US`
 * `settings.option.general.customizeSidebar.customize`: Added for `en_US`
 * `settings.option.window.useNativeTitleBar`: Added for `en_US`
 * `settings.option.window.windowControlStyle.right`: Added for `en_US`
 * `settings.option.window.windowControlStyle.left`: Added for `en_US`
 
-Update 04/06/2022 16:45 UTC
+Update 06/04/2022 16:45 UTC
 
 * `settings.option.visual.windowStyle`: Added for `en_US`
 
-Update 04/06/2022 18:45 UTC
+Update 06/04/2022 18:45 UTC
 
 * `action.cast.chromecast`: Added for `en_US`
 * `action.cast.todevices`: Added for `en_US`
@@ -222,7 +222,15 @@ Update 04/06/2022 18:45 UTC
 * `action.cast.scan`: Added for `en_US`
 * `action.cast.scanning`: Added for `en_US`
 
-Update 04/07/2022 14:30 UTC
+Update 07/04/2022 14:30 UTC
 
 * `term.cast`: Added for `en_US`
 
+Update 08/04/2022 08:00 UTC
+
+* `action.createNew`: Added for `en_US`
+
+Update 09/04/2022 11:00 UTC
+
+* `term.disablePrivateSession`: Added for `en_US`	
+

src/i18n/en_OWO.json

@@ -305,7 +305,7 @@
   "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.description": "Changes the intensity of the Anyawog Wawmth Moduwe pwocessing.",
   "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.smooth": "Smooth",
   "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.warm": "Wawm",
-  "settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Cidew Adwenyawinye Pwocessow\u00e2\u201e\u02d8\u010f\u00b8\u0179",
+  "settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Cidew Adwenyawinye Pwocessow™️",
   "settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "Enhances the pewceived audio quawity of 256 kbps AAC audio by using a weaw-time awgowithm that takes advantage of both psychoacoustic modews of human heawing and AAC encoding chawactewistics.",
   "settings.warn.audio.enableAdvancedFunctionality.ciderPPE.compatibility": "CAP is nyot compatibwe with Spatiawization. Pwease disabwe Spatiawization to continyue.",
   "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength": "CAP Stwength",

src/i18n/en_US.json

@@ -23,6 +23,7 @@
   "term.cast": "Cast",
   "term.about": "About",
   "term.privateSession": "Private Session",
+  "term.disablePrivateSession": "Disable Private Session",
   "term.queue": "Queue",
   "term.lyrics": "Lyrics",
   "term.miniplayer": "MiniPlayer",

src/i18n/hu_HU.json

@@ -23,6 +23,7 @@
   "term.cast": "Tükrözés",
   "term.about": "Névjegy",
   "term.privateSession": "Privát hallgatás",
+  "term.disablePrivateSession": "Privát hallgatás kikapcsolása",
   "term.queue": "Várólista",
   "term.lyrics": "Dalszöveg",
   "term.miniplayer": "Minilejátszó",
@@ -256,6 +257,7 @@
   "action.cast.airplay.underdevelopment": "Az AirPlay jelenleg fejlesztés alatt áll",
   "action.cast.scan": "Keresés",
   "action.cast.scanning": "Keresés folyamatban...",
+  "action.createNew": "Új létrehozása...",
   "settings.header.general": "Általános",
   "settings.header.general.description": "A Cider általános beállításainak módosítása.",
   "settings.option.general.language": "Nyelv",
@@ -401,7 +403,7 @@
   "settings.option.experimental.reinstallwidevine": "WidevineCDM újratelepítése",
   "settings.option.experimental.reinstallwidevine.confirm": "Biztos, hogy újra szeretné telepíteni a Widevine-t?",
   "settings.option.experimental.unknownPlugin": "Ismeretlen források",
-  "settings.option.experimental.unknownPlugin.description": "Engedélyezi azon pluginok telepítését is, amik nem tartoznak a Cider Plugin Gyűjteménybe, ezáltal lehetséges biztonsági kockázatot jelentenek",
+  "settings.option.experimental.unknownPlugin.description": "Engedélyezi azon pluginok telepítését is, amik nem tartoznak a Cider Plugin Gyűjteménybe, ezáltal lehetséges biztonsági kockázatot jelenthetnek.",
   "settings.option.experimental.compactUI": "Kompakt felület",
   "settings.option.window.close_button_hide": "A bezárás gomb rejtse el az alkalmazást",
   "settings.option.experimental.inline_playlists": "Ablakon belüli lejátszási listák és albumok",

src/i18n/source/en_US.json

@@ -23,6 +23,7 @@
   "term.cast": "Cast",
   "term.about": "About",
   "term.privateSession": "Private Session",
+  "term.disablePrivateSession": "Disable Private Session",
   "term.queue": "Queue",
   "term.lyrics": "Lyrics",
   "term.miniplayer": "MiniPlayer",

src/renderer/assets/private.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round" class="feather feather-eye-off"><path d="M17.94 17.94A10.07 10.07 0 0 1 12 20c-7 0-11-8-11-8a18.45 18.45 0 0 1 5.06-5.94M9.9 4.24A9.12 9.12 0 0 1 12 4c7 0 11 8 11 8a18.5 18.5 0 0 1-2.16 3.19m-6.72-1.07a3 3 0 1 1-4.24-4.24"></path><line x1="1" y1="1" x2="23" y2="23"></line></svg>

src/renderer/style.css

@@ -11282,6 +11282,18 @@ body[platform="darwin"] .app-chrome .app-chrome-item > .window-controls > div.cl
 }
 .app-chrome .app-chrome-item > .app-playback-controls .ppe-icon {
   background-image: url("assets/ppe.svg") !important;
+  margin-left: 0.5em !important;
+  flex: 1;
+}
+.app-chrome .app-chrome-item > .app-playback-controls .private-icon {
+  background-image: url("assets/private.svg") !important;
+  margin-left: 0.5em !important;
+  flex: 1;
+}
+.chrome-icon-container {
+  display: flex;
+  position: absolute;
+  right: 0px;
 }
 .app-chrome .app-chrome-item > .app-playback-controls .audio-type {
   filter: contrast(0);
@@ -11289,8 +11301,6 @@ body[platform="darwin"] .app-chrome .app-chrome-item > .window-controls > div.cl
   background-size: contain;
   height: 15px;
   width: 15px;
-  position: absolute;
-  right: 0;
   margin-bottom: 15px;
 }
 .app-chrome .app-chrome-item > .app-playback-controls .song-duration p {

src/renderer/style.less

@@ -1191,6 +1191,20 @@ body[platform="darwin"] .app-chrome .app-chrome-item > .window-controls > div.cl
 
   .ppe-icon {
     background-image: url("./assets/ppe.svg") !important;
+    margin-left: 0.5em !important;
+    flex: 1;
+  }
+
+  .private-icon {
+    background-image: url("./assets/private.svg") !important;
+    margin-left: 0.5em !important;
+    flex: 1;
+  }
+
+  .chrome-icon-container {
+    display: flex;
+    position: absolute;
+    right: 0px;
   }
 
   .audio-type {
@@ -1199,8 +1213,6 @@ body[platform="darwin"] .app-chrome .app-chrome-item > .window-controls > div.cl
     background-size: contain;
     height: 15px;
     width: 15px;
-    position: absolute;
-    right: 0;
     margin-bottom: 15px;
   }
 }

src/renderer/views/app/chrome-bottom.ejs

@@ -15,7 +15,10 @@
                                  v-if="mk.nowPlayingItem['attributes']['contentRating'] == 'explicit'"
                                  style="display: inline-block"></div>
                         </div>
-                        <div class="audio-type ppe-icon" v-if="cfg.audio.maikiwiAudio.ciderPPE === true"></div>
+                        <div class="chrome-icon-container">
+                            <div class="audio-type private-icon" v-if="cfg.general.privateEnabled === true"></div>
+                            <div class="audio-type ppe-icon" v-if="cfg.audio.maikiwiAudio.ciderPPE === true"></div>
+                        </div>
                         <div class="song-artist-album">
                             <div class="song-artist-album-content"
                                  :class="[isElementOverflowing('#app-main > .app-chrome .app-chrome-item > .app-playback-controls > div >.song-artist-album > .song-artist-album-content') ? 'marquee' : '']"

src/renderer/views/app/chrome-top.ejs

@@ -66,6 +66,10 @@
                         <mediaitem-artwork :url="currentArtUrl"></mediaitem-artwork>
                     </div>
                     <div class="playback-info">
+                        <div class="chrome-icon-container">
+                            <div class="audio-type private-icon" v-if="cfg.general.privateEnabled === true"></div>
+                            <div class="audio-type ppe-icon" v-if="cfg.audio.maikiwiAudio.ciderPPE === true"></div>
+                        </div>
                         <div class="song-name"
                              :class="[isElementOverflowing('#app-main > div.app-chrome > div.app-chrome--center > div > div > div.playback-info > div.song-name') ? 'marquee' : '']">
                             {{ mk.nowPlayingItem["attributes"]["name"] }}
@@ -73,7 +77,6 @@
                                  v-if="mk.nowPlayingItem['attributes']['contentRating'] == 'explicit'"
                                  style="display: inline-block"></div>
                         </div>
-                        <div class="audio-type ppe-icon" v-if="cfg.audio.maikiwiAudio.ciderPPE === true"></div>
                         <div class="song-artist-album">
                             <div class="song-artist-album-content"
                                  :class="[isElementOverflowing('#app-main > .app-chrome .app-chrome-item > .app-playback-controls > div >.song-artist-album > .song-artist-album-content') ? 'marquee' : '']"

src/renderer/views/app/sidebar.ejs

@@ -129,10 +129,11 @@
                         {{$root.getLz('app.name')}}
                     </div>
                 </button>
-                <button class="usermenu-item" v-if="cfg.general.privateEnabled"
+                <button class="usermenu-item" v-if="cfg.general.privateEnabled" @click="cfg.general.privateEnabled = false">
-                        @click="cfg.general.privateEnabled = false">
+                    <span class="usermenu-item-icon">
-                    <span class="usermenu-item-icon"><%- include("../svg/x.svg") %></span>
+                        <%- include("../svg/x.svg") %>
-                    <span class="usermenu-item-name">{{$root.getLz('term.disable')}} {{$root.getLz('term.privateSession')}}</span>
+                    </span>
+                    <span class="usermenu-item-name">{{$root.getLz('term.disablePrivateSession')}}</span>
                 </button>
                 <button class="usermenu-item" @click="appRoute('remote-pair')">
                     <span class="usermenu-item-icon">