diff --git a/i18n/default.properties b/i18n/default.properties index 13d860b..e2bddc8 100644 --- a/i18n/default.properties +++ b/i18n/default.properties @@ -29,7 +29,10 @@ header.search.open=Open search header.color_scheme.open=Choose color scheme header.color_scheme.list=Color schemes header.color_scheme.current=Current color scheme -header.theme.toggle=Toggle light or dark mode +header.appearance.current=Current appearance +header.appearance.light=Light +header.appearance.dark=Dark +header.appearance.system=System header.pixel_style.toggle=Toggle pixel style toc.show=Show table of contents toc.hide=Hide table of contents @@ -53,4 +56,4 @@ page.links.apply.field.feedUrls.placeholder=One URL per line page.links.apply.field.captcha=CAPTCHA page.links.apply.field.captcha.alt=CAPTCHA page.links.apply.field.captcha.title=Click to refresh CAPTCHA -page.links.apply.field.captcha.expired=CAPTCHA expired \ No newline at end of file +page.links.apply.field.captcha.expired=CAPTCHA expired diff --git a/i18n/en.properties b/i18n/en.properties index 13d860b..e2bddc8 100644 --- a/i18n/en.properties +++ b/i18n/en.properties @@ -29,7 +29,10 @@ header.search.open=Open search header.color_scheme.open=Choose color scheme header.color_scheme.list=Color schemes header.color_scheme.current=Current color scheme -header.theme.toggle=Toggle light or dark mode +header.appearance.current=Current appearance +header.appearance.light=Light +header.appearance.dark=Dark +header.appearance.system=System header.pixel_style.toggle=Toggle pixel style toc.show=Show table of contents toc.hide=Hide table of contents @@ -53,4 +56,4 @@ page.links.apply.field.feedUrls.placeholder=One URL per line page.links.apply.field.captcha=CAPTCHA page.links.apply.field.captcha.alt=CAPTCHA page.links.apply.field.captcha.title=Click to refresh CAPTCHA -page.links.apply.field.captcha.expired=CAPTCHA expired \ No newline at end of file +page.links.apply.field.captcha.expired=CAPTCHA expired diff --git a/i18n/es.properties b/i18n/es.properties index 193d303..1a4445c 100644 --- a/i18n/es.properties +++ b/i18n/es.properties @@ -29,7 +29,10 @@ header.search.open=Abrir búsqueda header.color_scheme.open=Elegir esquema de color header.color_scheme.list=Esquemas de color header.color_scheme.current=Esquema de color actual -header.theme.toggle=Cambiar entre modo claro y oscuro +header.appearance.current=Apariencia actual +header.appearance.light=Claro +header.appearance.dark=Oscuro +header.appearance.system=Sistema header.pixel_style.toggle=Activar o desactivar el estilo píxel toc.show=Mostrar tabla de contenido toc.hide=Ocultar tabla de contenido @@ -53,4 +56,4 @@ page.links.apply.field.feedUrls.placeholder=Una URL por línea page.links.apply.field.captcha=CAPTCHA page.links.apply.field.captcha.alt=CAPTCHA page.links.apply.field.captcha.title=Haz clic para actualizar el CAPTCHA -page.links.apply.field.captcha.expired=El CAPTCHA ha caducado \ No newline at end of file +page.links.apply.field.captcha.expired=El CAPTCHA ha caducado diff --git a/i18n/zh_CN.properties b/i18n/zh_CN.properties index db225d8..db056e2 100644 --- a/i18n/zh_CN.properties +++ b/i18n/zh_CN.properties @@ -29,7 +29,10 @@ header.search.open=打开搜索 header.color_scheme.open=选择配色 header.color_scheme.list=配色列表 header.color_scheme.current=当前配色 -header.theme.toggle=切换深色或浅色模式 +header.appearance.current=当前外观模式 +header.appearance.light=浅色 +header.appearance.dark=深色 +header.appearance.system=跟随系统 header.pixel_style.toggle=切换像素风格 toc.show=显示文章目录 toc.hide=隐藏文章目录 @@ -53,4 +56,4 @@ page.links.apply.field.feedUrls.placeholder=每行填写一个地址 page.links.apply.field.captcha=验证码 page.links.apply.field.captcha.alt=验证码 page.links.apply.field.captcha.title=点击刷新验证码 -page.links.apply.field.captcha.expired=验证码已过期 \ No newline at end of file +page.links.apply.field.captcha.expired=验证码已过期 diff --git a/i18n/zh_TW.properties b/i18n/zh_TW.properties index 0c7ae11..63becdb 100644 --- a/i18n/zh_TW.properties +++ b/i18n/zh_TW.properties @@ -29,7 +29,10 @@ header.search.open=開啟搜尋 header.color_scheme.open=選擇配色 header.color_scheme.list=配色清單 header.color_scheme.current=目前配色 -header.theme.toggle=切換深色或淺色模式 +header.appearance.current=目前外觀模式 +header.appearance.light=淺色 +header.appearance.dark=深色 +header.appearance.system=跟隨系統 header.pixel_style.toggle=切換像素風格 toc.show=顯示文章目錄 toc.hide=隱藏文章目錄 @@ -53,4 +56,4 @@ page.links.apply.field.feedUrls.placeholder=每行填寫一個地址 page.links.apply.field.captcha=驗證碼 page.links.apply.field.captcha.alt=驗證碼 page.links.apply.field.captcha.title=點擊重新整理驗證碼 -page.links.apply.field.captcha.expired=驗證碼已過期 \ No newline at end of file +page.links.apply.field.captcha.expired=驗證碼已過期 diff --git a/settings.yaml b/settings.yaml index 4f92c1b..5fe9ad3 100644 --- a/settings.yaml +++ b/settings.yaml @@ -48,6 +48,21 @@ spec: label: 默认像素化风格 value: false help: 开启后将默认使用像素风格字体及图标 + - $formkit: checkbox + name: search_button_enable + label: 展示搜索按钮 + value: true + help: 搜索组件插件可用时在页头展示搜索按钮 + - $formkit: checkbox + name: appearance_switcher_enable + label: 展示深浅切换按钮 + value: true + help: 在页头展示浅色, 深色和跟随系统三态切换按钮 + - $formkit: checkbox + name: pixel_style_switcher_enable + label: 展示像素化按钮 + value: true + help: 在页头展示像素风格切换按钮 - $formkit: checkbox name: custom_font_enable id: custom_font_enable diff --git a/src/module/header-actions.js b/src/module/header-actions.js index 3eaaac3..24be77d 100644 --- a/src/module/header-actions.js +++ b/src/module/header-actions.js @@ -1,5 +1,34 @@ import {syncColorSchemePicker} from "./color-scheme-picker.js"; import {getStoredPreference, PREFERENCE_KEYS, setStoredPreference} from "../utils/theme-preferences.js"; +import {getMessage} from "../utils/messages.js"; + +const APPEARANCE_MODES = ["light", "dark", "system"]; + +function getAppearanceMode() { + const mode = document.documentElement.dataset.themeMode + || getStoredPreference(PREFERENCE_KEYS.themeMode) + || window.TerminalThemeConfig?.defaultMode; + + return APPEARANCE_MODES.includes(mode) ? mode : "system"; +} + +function syncAppearanceToggle(toggle) { + const mode = getAppearanceMode(); + const fallbackLabels = { + light: "Light", + dark: "Dark", + system: "System" + }; + const currentLabel = getMessage("currentAppearance", "Current appearance"); + const modeLabel = getMessage( + `appearance${mode[0].toUpperCase()}${mode.slice(1)}`, + fallbackLabels[mode] + ); + const description = `${currentLabel}: ${modeLabel}`; + + toggle.setAttribute("aria-label", description); + toggle.title = description; +} function registerSearchButton() { const searchButton = document.querySelector('[data-header-action="open-search"]'); @@ -12,16 +41,21 @@ function registerSearchButton() { }); } -function registerThemeToggle() { - const toggle = document.getElementById("theme-toggle"); +function registerAppearanceToggle() { + const toggle = document.getElementById("appearance-toggle"); if (!toggle || typeof window.applyTheme !== "function") return; + syncAppearanceToggle(toggle); + toggle.addEventListener("click", function () { - const currentScheme = document.documentElement.dataset.colorScheme; - const nextMode = currentScheme === "dark" ? "light" : "dark"; + const currentMode = getAppearanceMode(); + const nextMode = APPEARANCE_MODES[ + (APPEARANCE_MODES.indexOf(currentMode) + 1) % APPEARANCE_MODES.length + ]; window.applyTheme(nextMode, {clearColorScheme: true}); setStoredPreference(PREFERENCE_KEYS.themeMode, nextMode); + syncAppearanceToggle(toggle); syncColorSchemePicker(); }); } @@ -44,6 +78,6 @@ function registerPixelToggle() { export function registerHeaderActions() { registerSearchButton(); - registerThemeToggle(); + registerAppearanceToggle(); registerPixelToggle(); } diff --git a/src/styles/header.scss b/src/styles/header.scss index 97cc2f0..c6f0547 100644 --- a/src/styles/header.scss +++ b/src/styles/header.scss @@ -72,7 +72,7 @@ } #color-scheme-trigger, - #theme-toggle, + #appearance-toggle, #search-button, #pixel-toggle { background-color: transparent; @@ -82,7 +82,7 @@ padding: 0; } - #theme-toggle, + #appearance-toggle, #search-button, #pixel-toggle { margin-left: calc(var(--size-theme-font) * 0.5); diff --git a/src/styles/icons.scss b/src/styles/icons.scss index 44b437f..e58eb00 100644 --- a/src/styles/icons.scss +++ b/src/styles/icons.scss @@ -13,4 +13,17 @@ html[data-pixel-style='false'] .icon-regular { html[data-pixel-style='true'] .icon-pixel { display: inline; -} \ No newline at end of file +} + +#appearance-toggle .appearance-icon { + display: none; +} + +html[data-pixel-style='false'][data-theme-mode='light'] #appearance-toggle .icon-regular[data-appearance-mode='light'], +html[data-pixel-style='false'][data-theme-mode='dark'] #appearance-toggle .icon-regular[data-appearance-mode='dark'], +html[data-pixel-style='false'][data-theme-mode='system'] #appearance-toggle .icon-regular[data-appearance-mode='system'], +html[data-pixel-style='true'][data-theme-mode='light'] #appearance-toggle .icon-pixel[data-appearance-mode='light'], +html[data-pixel-style='true'][data-theme-mode='dark'] #appearance-toggle .icon-pixel[data-appearance-mode='dark'], +html[data-pixel-style='true'][data-theme-mode='system'] #appearance-toggle .icon-pixel[data-appearance-mode='system'] { + display: inline; +} diff --git a/templates/modules/header.html b/templates/modules/header.html index ada4e60..eedba62 100644 --- a/templates/modules/header.html +++ b/templates/modules/header.html @@ -13,7 +13,7 @@ th:attr="aria-label=#{header.search.open}" type="button" data-header-action="open-search" - th:if="${pluginFinder.available('PluginSearchWidget')}"> + th:if="${theme.config.style.search_button_enable != false and pluginFinder.available('PluginSearchWidget')}">