From 9f72a51458db09f2f86b4411bd4e6efdb09c85a6 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Wed, 1 Jul 2020 17:04:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BC=80=E5=85=B3=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E5=8A=9F=E8=83=BD=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/defaultSetting.js                     | 3 ++-
 src/renderer/components/core/Player.vue          | 2 +-
 src/renderer/components/core/PlayerDetail.vue    | 2 +-
 src/renderer/components/material/ListButtons.vue | 6 +++---
 src/renderer/components/material/Menu.vue        | 7 ++++++-
 src/renderer/components/material/Modal.vue       | 1 +
 src/renderer/lang/en-us/view/setting.json        | 1 +
 src/renderer/lang/zh-cn/view/setting.json        | 1 +
 src/renderer/lang/zh-tw/view/setting.json        | 1 +
 src/renderer/views/Setting.vue                   | 3 +++
 10 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/common/defaultSetting.js b/src/common/defaultSetting.js
index 64e8a07f..aa9195cd 100644
--- a/src/common/defaultSetting.js
+++ b/src/common/defaultSetting.js
@@ -3,7 +3,7 @@ const os = require('os')
 const { isMac } = require('./utils')
 
 const defaultSetting = {
-  version: '1.0.32',
+  version: '1.0.33',
   player: {
     togglePlayMethod: 'listLoop',
     highQuality: false,
@@ -35,6 +35,7 @@ const defaultSetting = {
     isSaveScrollLocation: true,
   },
   download: {
+    enable: false,
     savePath: path.join(os.homedir(), 'Desktop'),
     fileName: '歌名 - 歌手',
     maxDownloadNum: 3,
diff --git a/src/renderer/components/core/Player.vue b/src/renderer/components/core/Player.vue
index 80d73a2e..203e5f93 100644
--- a/src/renderer/components/core/Player.vue
+++ b/src/renderer/components/core/Player.vue
@@ -21,7 +21,7 @@ div(:class="$style.player")
       div(:class="$style.column2")
         div(:class="$style.progress" v-if="!isShowPlayerDetail")
           //- div(:class="[$style.progressBar, $style.progressBar1]" :style="{ transform: `scaleX(${progress || 0})` }")
-          div(:class="[$style.progressBar, $style.progressBar2, isActiveTransition ? $style.barTransition : '']" @transitionend="handleTransitionEnd" :style="{ transform: `scaleX(${progress || 0})` }")
+          div(:class="[$style.progressBar, $style.progressBar2, isActiveTransition ? $style.barTransition : '']" @transitionend="handleTransitionEnd" :style="{ transform: `scaleX(${progress || 0})`, willChange: isPlay || isActiveTransition ? 'transform' : 'auto' }")
         div(:class="$style.progressMask" @click='handleSetProgress' ref="dom_progress")
       div(:class="$style.column3")
         span(:class="$style.statusText") {{statusText}}
diff --git a/src/renderer/components/core/PlayerDetail.vue b/src/renderer/components/core/PlayerDetail.vue
index bfcaa513..91773087 100644
--- a/src/renderer/components/core/PlayerDetail.vue
+++ b/src/renderer/components/core/PlayerDetail.vue
@@ -39,7 +39,7 @@
           div(:class="$style.progressContent")
             div(:class="$style.progress")
               //- div(:class="[$style.progressBar, $style.progressBar1]" :style="{ transform: `scaleX(${progress || 0})` }")
-              div(:class="[$style.progressBar, $style.progressBar2, isActiveTransition ? $style.barTransition : '']" @transitionend="handleTransitionEnd" :style="{ transform: `scaleX(${playInfo.progress || 0})` }")
+              div(:class="[$style.progressBar, $style.progressBar2, isActiveTransition ? $style.barTransition : '']" @transitionend="handleTransitionEnd" :style="{ transform: `scaleX(${playInfo.progress || 0})`, willChange: isPlay || isActiveTransition ? 'transform' : 'auto' }")
             div(:class="$style.progressMask" @click='setProgress' ref="dom_progress")
         div(:class="$style.timeLabel")
           span(style="margin-left: 15px") {{playInfo.status}}
diff --git a/src/renderer/components/material/ListButtons.vue b/src/renderer/components/material/ListButtons.vue
index fd4a5842..4e5fd3e4 100644
--- a/src/renderer/components/material/ListButtons.vue
+++ b/src/renderer/components/material/ListButtons.vue
@@ -6,7 +6,7 @@ div(:class="$style.btns")
   button(type="button" v-if="listAddBtn" @contextmenu.capture.stop :title="$t('material.list_buttons.add_to')" @click.stop="handleClick('listAdd')")
     svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='100%' viewBox='0 0 42 42' space='preserve')
       use(xlink:href='#icon-addTo')
-  button(type="button" v-if="downloadBtn" @contextmenu.capture.stop :title="$t('material.list_buttons.download')" @click.stop="handleClick('download')")
+  button(type="button" v-if="downloadBtn && setting.download.enable" @contextmenu.capture.stop :title="$t('material.list_buttons.download')" @click.stop="handleClick('download')")
     svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='100%' viewBox='0 0 475.078 475.077' space='preserve')
       use(xlink:href='#icon-download')
   //- button(type="button" :title="$t('material.list_buttons.add')" v-if="userInfo" @click.stop="handleClick('add')")
@@ -31,7 +31,7 @@ div(:class="$style.btns")
 </template>
 
 <script>
-// import { mapGetters } from 'vuex'
+import { mapGetters } from 'vuex'
 
 export default {
   props: {
@@ -73,7 +73,7 @@ export default {
     },
   },
   computed: {
-    // ...mapGetters(['userInfo']),
+    ...mapGetters(['setting']),
   },
   methods: {
     handleClick(action) {
diff --git a/src/renderer/components/material/Menu.vue b/src/renderer/components/material/Menu.vue
index bd11d9c9..534cf82a 100644
--- a/src/renderer/components/material/Menu.vue
+++ b/src/renderer/components/material/Menu.vue
@@ -1,9 +1,10 @@
 <template lang="pug">
 ul(:class="$style.list" :style="listStyles" ref="dom_list")
-  li(v-for="item in menus" @click="handleClick(item)" v-if="!item.hide" :disabled="item.disabled") {{item[itemName]}}
+  li(v-for="item in menus" @click="handleClick(item)" v-if="!item.hide && (item.action == 'download' ? setting.download.enable : true)" :disabled="item.disabled") {{item[itemName]}}
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 
 export default {
   props: {
@@ -28,6 +29,9 @@ export default {
       },
     },
   },
+  computed: {
+    ...mapGetters(['setting']),
+  },
   watch: {
     isShow: {
       handler(n) {
@@ -131,6 +135,7 @@ export default {
   box-shadow: 0 1px 8px 0 rgba(0,0,0,.2);
   z-index: 10;
   overflow: hidden;
+  // will-change: transform;
   li {
     cursor: pointer;
     min-width: 80px;
diff --git a/src/renderer/components/material/Modal.vue b/src/renderer/components/material/Modal.vue
index 225f4bd1..83a4f4fa 100644
--- a/src/renderer/components/material/Modal.vue
+++ b/src/renderer/components/material/Modal.vue
@@ -132,6 +132,7 @@ export default {
   align-items: center;
   justify-items: center;
   z-index: 99;
+  // will-change: transform;
 }
 
 .content {
diff --git a/src/renderer/lang/en-us/view/setting.json b/src/renderer/lang/en-us/view/setting.json
index 19b58a25..c4d20294 100644
--- a/src/renderer/lang/en-us/view/setting.json
+++ b/src/renderer/lang/en-us/view/setting.json
@@ -64,6 +64,7 @@
   "list_scroll": "Remember playlist scrolling position (for Your library only)",
 
   "download": "Download",
+  "download_enable": "Whether to enable download function",
   "download_path_title": "Define the path to downloading",
   "download_path": "Download path",
   "download_path_label": "Current: ",
diff --git a/src/renderer/lang/zh-cn/view/setting.json b/src/renderer/lang/zh-cn/view/setting.json
index 22ca5200..2cffa0ac 100644
--- a/src/renderer/lang/zh-cn/view/setting.json
+++ b/src/renderer/lang/zh-cn/view/setting.json
@@ -64,6 +64,7 @@
   "list_scroll": "记住列表滚动位置（仅对我的音乐分类有效）",
 
   "download": "下载设置",
+  "download_enable": "是否启用下载功能",
   "download_path_title": "下载歌曲保存的路径",
   "download_path": "下载路径",
   "download_path_label": "当前下载路径：",
diff --git a/src/renderer/lang/zh-tw/view/setting.json b/src/renderer/lang/zh-tw/view/setting.json
index 94695c95..a8fccff4 100644
--- a/src/renderer/lang/zh-tw/view/setting.json
+++ b/src/renderer/lang/zh-tw/view/setting.json
@@ -59,6 +59,7 @@
   "list_scroll_title": "是否記住播放列表滾動條位置",
   "list_scroll": "記住列表滾動位置（僅對我的音樂分類有效）",
   "download": "下載設置",
+  "download_enable": "是否啟用下載功能",
   "download_path_title": "下載歌曲保存的路徑",
   "download_path": "下載路徑",
   "download_path_label": "當前下載路徑：",
diff --git a/src/renderer/views/Setting.vue b/src/renderer/views/Setting.vue
index 1dffef68..630952b5 100644
--- a/src/renderer/views/Setting.vue
+++ b/src/renderer/views/Setting.vue
@@ -110,6 +110,8 @@ div.scroll(:class="$style.setting")
       div
         material-checkbox(id="setting_list_showalbum" v-model="current_setting.list.isShowAlbumName" label="是否显示专辑栏")
     dt {{$t('view.setting.download')}}
+    dd
+      material-checkbox(id="setting_download_enable" v-model="current_setting.download.enable" :label="$t('view.setting.download_enable')")
     dd(:title="$t('view.setting.download_path_title')")
       h3 {{$t('view.setting.download_path')}}
       div
@@ -414,6 +416,7 @@ export default {
           isFocusSearchBox: false,
         },
         download: {
+          enable: false,
           savePath: '',
           fileName: '歌名 - 歌手',
           isDownloadLrc: false,