diff --git a/publish/changeLog.md b/publish/changeLog.md index 180c012b..ec9bc710 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -1,23 +1,3 @@ ### 新增 -- 新增设置-播放设置-显示歌词罗马音，默认关闭，注：目前只有网易源能获取到罗马音歌词（得益于 Binaryify/NeteaseCloudMusicApi/pull/1523），如果你知道其他源的歌词罗马音获取方式，欢迎PR或开issue交流！ - -### 优化 - -- 同时删除一首歌以上时将需要二次确认删除 -- 禁用透明窗口时右侧不再偏移5px距离（在win7、Ubuntu等系统上测试发现不偏移也不影响滚动条的拖动了） -- 删除未下载完成的任务时，只同时尝试删除已有下载进度的本地文件 -- 在全屏状态下使用`Esc`键可以退出全屏（#827） - -### 修复 - -- 修复某些情况下歌曲播放出错时不会自动切歌的问题 -- 修复关闭“显示切换动画”设置后，在应用启动时该设置没有被应用的问题 -- 修复原始歌词存在偏移时，歌词偏移设置的重置未按预期工作的问题 -- 修复长度大于一行的歌词在使用歌词调整播放进度时的时间不准问题 -- 修复潜在歌单更新失败的问题 - -### 文档 - -- 将歌曲添加“稍后播放”后，它们会被放在一个优先级最高的特殊队列中，点击“下一曲”时会消耗该队列中的歌曲，并且无法通过“上一曲”功能播放该队列的上一首歌曲 -- 在切歌时若不是通过“上一曲”、“下一曲”功能切歌（例如直接点击“排行榜列表”、“我的列表”中的歌曲切歌），“稍后播放”队列将会被清空 +- 新增设置-以全屏模式启动设置 diff --git a/src/common/defaultSetting.js b/src/common/defaultSetting.js index e2928c12..8904b1d9 100644 --- a/src/common/defaultSetting.js +++ b/src/common/defaultSetting.js @@ -2,7 +2,7 @@ const path = require('path') const os = require('os') const defaultSetting = { - version: '1.0.57', + version: '1.0.58', player: { togglePlayMethod: 'listLoop', highQuality: false, @@ -108,6 +108,7 @@ const defaultSetting = { port: '23332', }, windowSizeId: 2, + startInFullscreen: false, theme: { id: 0, lightId: 0, diff --git a/src/lang/en-us.json b/src/lang/en-us.json index 3da048dd..a44f3cc2 100644 --- a/src/lang/en-us.json +++ b/src/lang/en-us.json @@ -246,6 +246,7 @@ "setting__basic_sourcename_alias": "Aliases", "setting__basic_sourcename_real": "Original", "setting__basic_sourcename_title": "Select the name of music source", + "setting__basic_start_in_fullscreen": "Start in fullscreen mode", "setting__basic_theme": "Theme", "setting__basic_theme_auto_tip": "This is a dynamic theme, you can preset a light theme and a dark theme, and then it will automatically switch to the corresponding theme you preset according to the system's light and dark theme colors.\nNote: Right-click this theme item to open the light and dark theme setting window.", "setting__basic_to_tray": "Do not exit the software when closing the software and minimize it to the system tray", diff --git a/src/lang/zh-cn.json b/src/lang/zh-cn.json index 75a91179..a6eded57 100644 --- a/src/lang/zh-cn.json +++ b/src/lang/zh-cn.json @@ -246,6 +246,7 @@ "setting__basic_sourcename_alias": "别名", "setting__basic_sourcename_real": "原名", "setting__basic_sourcename_title": "选择音源名字类型", + "setting__basic_start_in_fullscreen": "以全屏模式启动", "setting__basic_theme": "主题颜色", "setting__basic_theme_auto_tip": "此乃动态主题，你可以预先设置一个亮色主题及暗色主题，此后将根据系统的亮、暗主题色自动切换为你预先设置的相应主题。\n注：鼠标 右击 此主题项即可打开亮、暗色主题设置窗口。", "setting__basic_to_tray": "关闭软件时不退出软件将其最小化到系统托盘", diff --git a/src/lang/zh-tw.json b/src/lang/zh-tw.json index b2c2a0f0..dff22825 100644 --- a/src/lang/zh-tw.json +++ b/src/lang/zh-tw.json @@ -246,6 +246,7 @@ "setting__basic_sourcename_alias": "別名", "setting__basic_sourcename_real": "原名", "setting__basic_sourcename_title": "選擇音源名字類型", + "setting__basic_start_in_fullscreen": "以全屏模式啟動", "setting__basic_theme": "主題顏色", "setting__basic_theme_auto_tip": "此乃動態主題，你可以預先設置一個亮色主題及暗色主題，此後將根據系統的亮、暗主題色自動切換為你預先設置的相應主題。\n注：鼠標 右擊 此主題項即可打開亮、暗色主題設置窗口。", "setting__basic_to_tray": "關閉軟件時不退出軟件將其最小化到系統托盤", diff --git a/src/main/index.js b/src/main/index.js index 2bc5bff5..3fb0de7d 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -160,7 +160,7 @@ function createWindow() { /** * Initial window options */ - global.modules.mainWindow = new BrowserWindow({ + const options = { height: windowSizeInfo.height, useContentSize: true, width: windowSizeInfo.width, @@ -178,7 +178,12 @@ function createWindow() { nodeIntegration: true, spellcheck: false, // 禁用拼写检查器 }, - }) + } + if (global.appSetting.startInFullscreen) { + options.fullscreen = true + if (isLinux) options.resizable = true + } + global.modules.mainWindow = new BrowserWindow(options) const shouldUseDarkColors = nativeTheme.shouldUseDarkColors const themeId = global.appSetting.theme.id == 'auto' diff --git a/src/renderer/core/useApp/index.js b/src/renderer/core/useApp/index.js index 01f055e3..194dfc0c 100644 --- a/src/renderer/core/useApp/index.js +++ b/src/renderer/core/useApp/index.js @@ -2,7 +2,7 @@ import { isLinux } from '@common/utils' import { getEnvParams, setIgnoreMouseEvents } from '@renderer/utils/tools' import { useRefGetter } from '@renderer/utils/vueTools' -import { sync, apiSource, proxy } from '@renderer/core/share' +import { sync, apiSource, proxy, isFullscreen } from '@renderer/core/share' import useSync from './useSync' import useUpdate from './useUpdate' @@ -22,6 +22,7 @@ export default () => { sync.enable = setting.value.sync.enable apiSource.value = setting.value.apiSource Object.assign(proxy, setting.value.network.proxy) + isFullscreen.value = setting.value.startInFullscreen const dieableIgnoreMouseEvents = () => { if (window.dt) return diff --git a/src/renderer/views/setting/components/SettingBasic.vue b/src/renderer/views/setting/components/SettingBasic.vue index 617dacad..8d9c8eba 100644 --- a/src/renderer/views/setting/components/SettingBasic.vue +++ b/src/renderer/views/setting/components/SettingBasic.vue @@ -20,6 +20,8 @@ dd base-checkbox(id="setting_show_animate" v-model="currentStting.isShowAnimation" :label="$t('setting__basic_show_animation')") .gap-top base-checkbox(id="setting_animate" v-model="currentStting.randomAnimate" :label="$t('setting__basic_animation')") + .gap-top + base-checkbox(id="setting_start_in_fullscreen" v-model="currentStting.startInFullscreen" :label="$t('setting__basic_start_in_fullscreen')") .gap-top base-checkbox(id="setting_to_tray" v-model="currentStting.tray.isShow" :label="$t('setting__basic_to_tray')") p.gap-top diff --git a/src/renderer/views/setting/setting.js b/src/renderer/views/setting/setting.js index a6ed1489..fe548a42 100644 --- a/src/renderer/views/setting/setting.js +++ b/src/renderer/views/setting/setting.js @@ -87,6 +87,7 @@ export const currentStting = ref({ port: '23332', }, windowSizeId: 1, + startInFullscreen: false, langId: 'cns', theme: { id: 0,