From 918c80e7b018d2cc984d9cf82dab2c61c938bae6 Mon Sep 17 00:00:00 2001 From: jerrykuku Date: Tue, 9 Mar 2021 14:22:37 +0800 Subject: [PATCH] luci-app-argon-config: bump to v0.9 --- package/ctcgfw/luci-app-argon-config/Makefile | 4 ++-- .../model/cbi/argon-config/configuration.lua | 19 +++++++++++++------ .../po/zh-cn/argon-config.po | 13 +++++++++++-- .../root/etc/config/argon | 3 ++- 4 files changed, 28 insertions(+), 11 deletions(-) diff --git a/package/ctcgfw/luci-app-argon-config/Makefile b/package/ctcgfw/luci-app-argon-config/Makefile index 1c94acc93c..3cf0201804 100644 --- a/package/ctcgfw/luci-app-argon-config/Makefile +++ b/package/ctcgfw/luci-app-argon-config/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-argon-config -PKG_VERSION:=0.7 -PKG_RELEASE:=beta +PKG_VERSION:=0.9 +PKG_RELEASE:=20210309 LUCI_TITLE:=LuCI page for Argon Config LUCI_DEPENDS:=+luci-theme-argonv3 diff --git a/package/ctcgfw/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua b/package/ctcgfw/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua index 5af5374521..f1f0ec7f62 100644 --- a/package/ctcgfw/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua +++ b/package/ctcgfw/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua @@ -23,6 +23,7 @@ if nxfs.access('/etc/config/argon') then blur_opacity = uci:get_first('argon', 'global', 'transparency') blur_opacity_dark = uci:get_first('argon', 'global', 'transparency_dark') mode = uci:get_first('argon', 'global', 'mode') + bing_background = uci:get_first('argon', 'global', 'bing_background') end function glob(...) @@ -49,10 +50,16 @@ local transparency_sets = { } -- [[ 模糊设置 ]]-- -br = SimpleForm('config', translate('Argon Config'), translate('Here you can set the blur and transparency of the login page of argon theme, and manage the background pictures and videos.')) +br = SimpleForm('config', translate('Argon Config'), translate('Here you can set the blur and transparency of the login page of argon theme, and manage the background pictures and videos.[Chrome is recommended]')) br.reset = false br.submit = false -s = br:section(SimpleSection) +s = br:section(SimpleSection) + +o = s:option(ListValue, 'bing_background', translate('Wallpaper Source')) +o:value('0', translate('Built-in')) +o:value('1', translate('Bing Wallpapers')) +o.default = bing_background +o.rmempty = false o = s:option(ListValue, 'mode', translate('Theme mode')) o:value('normal', translate('Follow System')) @@ -63,7 +70,7 @@ o.rmempty = false o.description = translate('You can choose Theme color mode here') o = s:option(Value, 'primary', translate('[Light mode] Primary Color'), translate('A HEX Color ; ( Default: #5e72e4 )')) -o.value = primary +o.default = primary o.datatype = ufloat o.rmempty = false @@ -78,12 +85,12 @@ o.datatype = ufloat o.rmempty = false o = s:option(Value, 'blur', translate('[Light mode] Frosted Glass Radius'), translate('Larger value will more blurred ; ( Suggest: clear: 1 or blur preset: 10 )')) -o.value = blur_radius +o.default = blur_radius o.datatype = ufloat o.rmempty = false o = s:option(Value, 'dark_primary', translate('[Dark mode] Primary Color'), translate('A HEX Color ; ( Default: #483d8b )')) -o.value = dark_primary +o.default = dark_primary o.datatype = ufloat o.rmempty = false @@ -96,7 +103,7 @@ o.datatype = ufloat o.rmempty = false o = s:option(Value, 'blur_dark', translate('[Dark mode] Frosted Glass Radius'), translate('Larger value will more blurred ; ( Suggest: clear: 1 or blur preset: 10 )')) -o.value = blur_radius_dark +o.default = blur_radius_dark o.datatype = ufloat o.rmempty = false diff --git a/package/ctcgfw/luci-app-argon-config/po/zh-cn/argon-config.po b/package/ctcgfw/luci-app-argon-config/po/zh-cn/argon-config.po index 1ba67fcff4..1d25348e5f 100644 --- a/package/ctcgfw/luci-app-argon-config/po/zh-cn/argon-config.po +++ b/package/ctcgfw/luci-app-argon-config/po/zh-cn/argon-config.po @@ -14,8 +14,17 @@ msgstr "" msgid "Argon Config" msgstr "Argon 主题设置" -msgid "Here you can set the blur and transparency of the login page of argon theme, and manage the background pictures and videos." -msgstr "在这里你可以设置 argon 主题的登录页面的模糊和透明度，并管理背景图片与视频。" +msgid "Here you can set the blur and transparency of the login page of argon theme, and manage the background pictures and videos.[Chrome is recommended]" +msgstr "在这里你可以设置argon 主题的登录页面的模糊和透明度，并管理背景图片与视频。[建议使用 Chrome]" + +msgid "Wallpaper Source" +msgstr "壁纸来源" + +msgid "Built-in" +msgstr "内建" + +msgid "Bing Wallpapers" +msgstr "Bing 壁纸" msgid "Theme mode" msgstr "主题模式" diff --git a/package/ctcgfw/luci-app-argon-config/root/etc/config/argon b/package/ctcgfw/luci-app-argon-config/root/etc/config/argon index 11fb00f5b9..fb7f35d9c7 100644 --- a/package/ctcgfw/luci-app-argon-config/root/etc/config/argon +++ b/package/ctcgfw/luci-app-argon-config/root/etc/config/argon @@ -5,4 +5,5 @@ config global option blur_dark '10' option transparency '0.5' option transparency_dark '0.5' - option mode 'normal' \ No newline at end of file + option mode 'normal' + option bing_background '0'