From a3430cf5230fae67f7b6f82465badc6cdd67c293 Mon Sep 17 00:00:00 2001 From: jerrykuku Date: Tue, 9 Mar 2021 14:22:37 +0800 Subject: [PATCH] bump to v0.9 --- Makefile | 4 ++-- luasrc/model/cbi/argon-config/configuration.lua | 7 +++++++ po/zh-cn/argon-config.po | 9 +++++++++ root/etc/config/argon | 3 ++- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4b3dd0a..4e1d5ce 100644 --- a/Makefile +++ b/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-argon-config LUCI_PKGARCH:=all -PKG_VERSION:=0.8 -PKG_RELEASE:=beta +PKG_VERSION:=0.9 +PKG_RELEASE:=20210309 include $(INCLUDE_DIR)/package.mk diff --git a/luasrc/model/cbi/argon-config/configuration.lua b/luasrc/model/cbi/argon-config/configuration.lua index c85a46c..f1f0ec7 100644 --- a/luasrc/model/cbi/argon-config/configuration.lua +++ b/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(...) @@ -54,6 +55,12 @@ br.reset = false br.submit = false 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')) o:value('light', translate('Force Light')) diff --git a/po/zh-cn/argon-config.po b/po/zh-cn/argon-config.po index 6fa5e3b..1d25348 100644 --- a/po/zh-cn/argon-config.po +++ b/po/zh-cn/argon-config.po @@ -17,6 +17,15 @@ 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/root/etc/config/argon b/root/etc/config/argon index 11fb00f..c5d6313 100644 --- a/root/etc/config/argon +++ b/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' \ No newline at end of file