diff --git a/publish/changeLog.md b/publish/changeLog.md index 41196e6d..6ec4da7a 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -21,6 +21,7 @@ - 桌面歌词新增在任务栏显示歌词进程设置(此设置用于在录屏软件无法捕获歌词窗口时的变通解决方法)(#1063) - 添加kg源罗马音歌词的支持 - 支持打开波点音乐歌单(需在酷我源打开) +- 新增设置-基本设置-播放栏进度条样式设置(此版本默认使用迷你进度条样式,对于某些不喜欢该样式的人可以将其换成其他样式) ### 优化(界面/交互/功能) diff --git a/src/common/defaultSetting.ts b/src/common/defaultSetting.ts index bec8c7a2..5c6542b4 100644 --- a/src/common/defaultSetting.ts +++ b/src/common/defaultSetting.ts @@ -15,6 +15,7 @@ const defaultSetting: LX.AppSetting = { 'common.randomAnimate': true, 'common.isAgreePact': false, 'common.controlBtnPosition': process.platform === 'darwin' ? 'left' : 'right', + 'common.playBarProgressStyle': 'mini', 'player.startupAutoPlay': false, 'player.togglePlayMethod': 'listLoop', diff --git a/src/common/types/app_setting.d.ts b/src/common/types/app_setting.d.ts index 14404fec..cea50340 100644 --- a/src/common/types/app_setting.d.ts +++ b/src/common/types/app_setting.d.ts @@ -63,6 +63,11 @@ declare global { */ 'common.controlBtnPosition': 'left' | 'right' + /** + * 播放栏进度条样式 + */ + 'common.playBarProgressStyle': 'mini' | 'full' | 'middle' + /** * 启动时自动播放歌曲 */ diff --git a/src/lang/en-us.json b/src/lang/en-us.json index f6754888..c2be004b 100644 --- a/src/lang/en-us.json +++ b/src/lang/en-us.json @@ -267,6 +267,10 @@ "setting__basic_font_size_19px": "Very big", "setting__basic_lang": "Language", "setting__basic_lang_title": "The language displayed in the software", + "setting__basic_playbar_progress_style": "Play bar progress bar style", + "setting__basic_playbar_progress_style_full": "Full width", + "setting__basic_playbar_progress_style_middle": "Medium", + "setting__basic_playbar_progress_style_mini": "Mini", "setting__basic_show_animation": "Show switching animation", "setting__basic_source": "Music source", "setting__basic_source_status_failed": "Initialization failed", diff --git a/src/lang/zh-cn.json b/src/lang/zh-cn.json index 224eb584..07582fdb 100644 --- a/src/lang/zh-cn.json +++ b/src/lang/zh-cn.json @@ -267,6 +267,10 @@ "setting__basic_font_size_19px": "非常大", "setting__basic_lang": "语言", "setting__basic_lang_title": "软件显示的语言", + "setting__basic_playbar_progress_style": "播放栏进度条样式", + "setting__basic_playbar_progress_style_full": "全宽", + "setting__basic_playbar_progress_style_middle": "中等", + "setting__basic_playbar_progress_style_mini": "迷你", "setting__basic_show_animation": "显示切换动画", "setting__basic_source": "音乐来源", "setting__basic_source_status_failed": "初始化失败", diff --git a/src/lang/zh-tw.json b/src/lang/zh-tw.json index a9539768..1b1e18a9 100644 --- a/src/lang/zh-tw.json +++ b/src/lang/zh-tw.json @@ -267,6 +267,10 @@ "setting__basic_font_size_19px": "非常大", "setting__basic_lang": "語言", "setting__basic_lang_title": "軟件顯示的語言", + "setting__basic_playbar_progress_style": "播放欄進度條樣式", + "setting__basic_playbar_progress_style_full": "全寬", + "setting__basic_playbar_progress_style_middle": "中等", + "setting__basic_playbar_progress_style_mini": "迷你", "setting__basic_show_animation": "顯示切換動畫", "setting__basic_source": "音樂來源", "setting__basic_source_status_failed": "初始化失敗", diff --git a/src/renderer/components/layout/PlayBar/FullWidthProgress.vue b/src/renderer/components/layout/PlayBar/FullWidthProgress.vue new file mode 100644 index 00000000..7b947f7a --- /dev/null +++ b/src/renderer/components/layout/PlayBar/FullWidthProgress.vue @@ -0,0 +1,308 @@ + + + + + + diff --git a/src/renderer/components/layout/PlayBar/MiddleWidthProgress.vue b/src/renderer/components/layout/PlayBar/MiddleWidthProgress.vue new file mode 100644 index 00000000..ce7e0f96 --- /dev/null +++ b/src/renderer/components/layout/PlayBar/MiddleWidthProgress.vue @@ -0,0 +1,323 @@ + + + + + + diff --git a/src/renderer/components/layout/PlayBar/MiniWidthProgress.vue b/src/renderer/components/layout/PlayBar/MiniWidthProgress.vue new file mode 100644 index 00000000..54c07cd0 --- /dev/null +++ b/src/renderer/components/layout/PlayBar/MiniWidthProgress.vue @@ -0,0 +1,338 @@ + + + + + + diff --git a/src/renderer/components/layout/PlayBar/index.vue b/src/renderer/components/layout/PlayBar/index.vue index 54c07cd0..51d23ef7 100644 --- a/src/renderer/components/layout/PlayBar/index.vue +++ b/src/renderer/components/layout/PlayBar/index.vue @@ -1,338 +1,13 @@ - - - - diff --git a/src/renderer/views/Setting/components/SettingBasic.vue b/src/renderer/views/Setting/components/SettingBasic.vue index b293571f..622f5dcd 100644 --- a/src/renderer/views/Setting/components/SettingBasic.vue +++ b/src/renderer/views/Setting/components/SettingBasic.vue @@ -79,6 +79,15 @@ dd div base-checkbox.gap-left(v-for="item in controlBtnPositionList" :key="item.id" :id="`setting_basic_control_btn_position_${item.id}`" name="setting_basic_control_btn_position" need :modelValue="appSetting['common.controlBtnPosition']" @update:modelValue="updateSetting({'common.controlBtnPosition': $event})" :value="item.id" :label="item.name") +dd + h3#basic_playbar_progress_style {{$t('setting__basic_playbar_progress_style')}} + div + base-checkbox.gap-left(id="setting_basic_playbar_progress_style_mini" name="setting_basic_playbar_progress_style" + need :modelValue="appSetting['common.playBarProgressStyle']" @update:modelValue="updateSetting({'common.playBarProgressStyle': $event})" value="mini" :label="$t('setting__basic_playbar_progress_style_mini')") + base-checkbox.gap-left(id="setting_basic_playbar_progress_style_middle" name="setting_basic_playbar_progress_style" + need :modelValue="appSetting['common.playBarProgressStyle']" @update:modelValue="updateSetting({'common.playBarProgressStyle': $event})" value="middle" :label="$t('setting__basic_playbar_progress_style_middle')") + base-checkbox.gap-left(id="setting_basic_playbar_progress_style_full" name="setting_basic_playbar_progress_style" + need :modelValue="appSetting['common.playBarProgressStyle']" @update:modelValue="updateSetting({'common.playBarProgressStyle': $event})" value="full" :label="$t('setting__basic_playbar_progress_style_full')") ThemeSelectorModal(v-model="isShowThemeSelectorModal") ThemeEditModal(v-model="isShowThemeEditModal" :theme-id="editThemeId" @submit="handleRefreshTheme")