Merge pull request #595 from kyw504100/Patch7

Irregular update 22/03

src/i18n/en_US.json

@@ -302,6 +302,7 @@
   "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.aggressive": "Aggressive",
   "settings.option.audio.enableAdvancedFunctionality.audioNormalization": "Audio Normalization",
   "settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "Normalizes peak volume for individual tracks to create a more uniform listening experience.",
+  "settings.option.audio.enableAdvancedFunctionality.audioNormalization.disabled": "Managed by Audio Lab",
   "settings.option.audio.enableAdvancedFunctionality.audioSpatialization": "Audio Spatialization",
   "settings.option.audio.enableAdvancedFunctionality.audioSpatialization.description": "Spatialize audio and make audio more 3-dimensional (note: This is not Dolby Atmos)",
   "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization": "Cider Tuned Spatialization",

src/i18n/source/en_US.json

@@ -302,6 +302,7 @@
   "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.aggressive": "Aggressive",
   "settings.option.audio.enableAdvancedFunctionality.audioNormalization": "Audio Normalization",
   "settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "Normalizes peak volume for individual tracks to create a more uniform listening experience.",
+  "settings.option.audio.enableAdvancedFunctionality.audioNormalization.disabled": "Managed by Audio Lab",
   "settings.option.audio.enableAdvancedFunctionality.audioSpatialization": "Audio Spatialization",
   "settings.option.audio.enableAdvancedFunctionality.audioSpatialization.description": "Spatialize audio and make audio more 3-dimensional (note: This is not Dolby Atmos)",
   "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization": "Cider Tuned Spatialization",

src/main/plugins/menubar.ts

@@ -149,6 +149,12 @@ export default class Thumbar {
                     label: 'Volume Down',
                     accelerator: 'CommandOrControl+Down',
                     click: () => this._win.webContents.executeJavaScript(`app.volumeDown()`)
+                },
+                {type: 'separator'},
+                {
+                    label: 'Cast To Devices',
+                    accelerator: 'CommandOrControl+Shift+C',
+                    click: () => this._win.webContents.executeJavaScript(`app.modals.castMenu = true`)
                 }
             ]
         },

src/renderer/views/components/castmenu.ejs

@@ -1,5 +1,5 @@
 <script type="text/x-template" id="castmenu">
-<div class="spatialproperties-panel castmenu modal-fullscreen" >
+<div class="spatialproperties-panel castmenu modal-fullscreen" @click.self="close()" @contextmenu.self="close()">
     <div class="modal-window">
         <div class="modal-header">
             <div class="modal-title">Cast To Devices</div>

src/renderer/views/components/equalizer.ejs

@@ -1,5 +1,5 @@
 <script type="text/x-template" id="eq-view">
-    <div class="modal-fullscreen equalizer-panel">
+    <div class="modal-fullscreen equalizer-panel" @click.self="close()" @contextmenu.self="close()">
         <div class="modal-window" >
             <div class="modal-header">
                 <div class="modal-title">{{$root.getLz('term.equalizer')}}</div>

src/renderer/views/components/spatial-properties.ejs

@@ -1,5 +1,5 @@
 <script type="text/x-template" id="spatial-properties">
-    <div class="modal-fullscreen spatialproperties-panel">
+    <div class="modal-fullscreen spatialproperties-panel" @click.self="close()" @contextmenu.self="close()">
         <div class="modal-window" v-if="ready">
             <div class="modal-header">
                 <div class="modal-title">{{$root.getLz('spatial.spatialProperties')}}</div>

src/renderer/views/pages/about.ejs

@@ -16,9 +16,9 @@
                 <button onclick="window.open('https://ko-fi.com/cryptofyre')" class="md-btn sponsorBtn"><img src="./assets/ko_fi.svg"/>Ko-fi</button>
                 <button onclick="window.open('https://opencollective.com/ciderapp')" class="md-btn sponsorBtn"><img src="./assets/open_collective.svg"/>Open Collective</button>
                 <h3>{{$root.getLz('term.socials')}}</h3>
-                <button onclick="window.open('https://github.com/ciderapp/Cider')" class="md-btn sponsorBtn"><img style="width: 20.5px;" src="./assets/github.svg"/>{{$root.getLz('term.github')}}</button>
+                <button onclick="window.open('https://github.com/ciderapp/Cider')" class="md-btn sponsorBtn"><img src="./assets/github.svg"/>{{$root.getLz('term.github')}}</button>
-                <button onclick="window.open('https://discord.gg/applemusic')" class="md-btn sponsorBtn"><img src="./assets/discord.svg"/>{{$root.getLz('term.discord')}}</button>
+                <button onclick="window.open('https://discord.gg/applemusic')" class="md-btn sponsorBtn"><img style="height: 26px;" src="./assets/discord.svg"/>{{$root.getLz('term.discord')}}</button>
-                <button onclick="window.open('https://twitter.com/UseCider')" class="md-btn sponsorBtn"><img style="width: 20.5px;" src="./assets/twitter.svg"/>Twitter</button>
+                <button onclick="window.open('https://twitter.com/UseCider')" class="md-btn sponsorBtn"><img src="./assets/twitter.svg"/>Twitter</button>
 
             </div>
             <div class="col">
@@ -113,7 +113,7 @@
                         name: 'NoseySG',
                         link: 'https://twitter.com/noah_grose',
                         role: app.getLz('term.socialTeam'),
-                        avatar: 'https://pbs.twimg.com/profile_images/1422541289837535239/qg-aaoP9_400x400.jpg'
+                        avatar: 'https://pbs.twimg.com/profile_images/1496944907260420099/D5gl6H4J_400x400.jpg'
                     }
                 ]
             }

src/renderer/views/pages/library-recentlyadded.ejs

@@ -44,9 +44,11 @@
             </div>
         </div>
         <div class="well">
+            <div class="albums-square-container"> 
                 <mediaitem-square v-if="library.albums.viewAs == 'covers'" :item="item"
                                 v-for="item in library.albums.displayListing">
                 </mediaitem-square>
+            </div>
             <mediaitem-list-item v-if="library.albums.viewAs == 'list'" :show-duration="false" :show-meta-data="true"
                                  :show-library-status="false" :item="item"
                                  v-for="item in library.albums.displayListing">

src/renderer/views/pages/settings.ejs

@@ -24,6 +24,22 @@
                         <input type="checkbox" v-model="$root.cfg.general.privateEnabled" v-on:change="$root.mk.privateEnabled = $root.cfg.general.privateEnabled" switch/>
                     </div>
                 </div>
+                <div class="md-option-line">
+                    <div class="md-option-segment">
+                        {{$root.getLz('settings.option.window.openOnStartup')}}
+                    </div>
+                    <div class="md-option-segment md-option-segment_auto">
+                        <input type="checkbox" v-model="app.cfg.general.onStartup.enabled" switch/>
+                    </div>
+                </div>
+                <div class="md-option-line" v-show="app.cfg.general.onStartup.enabled">
+                    <div class="md-option-segment">
+                        {{$root.getLz('settings.option.window.openOnStartup.hidden')}}
+                    </div>
+                    <div class="md-option-segment md-option-segment_auto">
+                        <input type="checkbox" v-model="app.cfg.general.onStartup.hidden" switch/>
+                    </div>
+                </div>
                 <div class="md-option-line">
                     <div class="md-option-segment">
                         {{$root.getLz('settings.option.general.resumebehavior')}}<br>
@@ -121,6 +137,11 @@
                         <br>
                         <small>{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.audioNormalization.description')}}</small>
                     </div>
+                    <div>
+                        <span v-if="app.cfg.audio.equalizer.vibrantBass != 0 || app.cfg.audio.maikiwiAudio.spatial === true || app.cfg.audio.maikiwiAudio.ciderPPE === true">
+                            <small style="font-weight: bold;">{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.audioNormalization.disabled')}}</small>
+                        </span>
+                    </div>
                     <div class="md-option-segment md-option-segment_auto">
                         <input type="checkbox" v-model="app.cfg.audio.normalization" v-on:change="toggleNormalization" :disabled="app.cfg.audio.equalizer.vibrantBass != 0 || app.cfg.audio.maikiwiAudio.spatial === true || app.cfg.audio.maikiwiAudio.ciderPPE === true" switch/>
                     </div>
@@ -257,22 +278,6 @@
                 <span>{{$root.getLz('settings.header.window')}}</span>
             </div>
             <div class="settings-option-body">
-                <div class="md-option-line">
-                    <div class="md-option-segment">
-                        {{$root.getLz('settings.option.window.openOnStartup')}}
-                    </div>
-                    <div class="md-option-segment md-option-segment_auto">
-                        <input type="checkbox" v-model="app.cfg.general.onStartup.enabled" switch/>
-                    </div>
-                </div>
-                <div class="md-option-line" v-show="app.cfg.general.onStartup.enabled">
-                    <div class="md-option-segment">
-                        {{$root.getLz('settings.option.window.openOnStartup.hidden')}}
-                    </div>
-                    <div class="md-option-segment md-option-segment_auto">
-                        <input type="checkbox" v-model="app.cfg.general.onStartup.hidden" switch/>
-                    </div>
-                </div>
                 <div class="md-option-line" v-show="app.platform !== 'darwin'">
                     <div class="md-option-segment">
                         {{$root.getLz("settings.option.window.close_button_hide")}}