From 2e339d7e5737aadf50c07c50ae9791d5a07b63ea Mon Sep 17 00:00:00 2001
From: mashiros <490328928@qq.com>
Date: Fri, 29 Apr 2022 03:24:32 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E6=94=B9=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=20-=20=E4=BF=AE=E6=94=B9Line=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E9=A2=91=E8=B0=B1=E7=BA=BF=E4=B8=8A=E4=B8=8B=E7=9A=84?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=20-=20=E4=BC=98=E5=8C=96=E7=BF=BB=E8=AF=91?=
 =?UTF-8?q?=20-=20=E4=BF=AE=E6=94=B9=E7=BF=BB=E8=AF=91=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Locales/ja.qm                                   | Bin 0 -> 3164 bytes
 Locales/ja_JP.qm                                | Bin 3164 -> 0 bytes
 Locales/zh_CN.qm                                | Bin 3058 -> 0 bytes
 Locales/zh_TW.qm                                | Bin 0 -> 3058 bytes
 package.json                                    |  98 ++++++++++++------------
 qml/Main.qml                                    |   1 -
 qml/StylePreferences.qml                        |  31 ++------
 qml/api/AdvpPreference.qml                      |  17 +---
 readme.md                                       |   4 +-
 styles/Preset_Ordinal_Scale_UI_bottom/Style.qml |   1 -
 styles/Preset_circle/Style.qml                  |   1 -
 styles/Preset_gradient_line/Style.qml           |  61 +++++++++------
 styles/Preset_line/Style.qml                    |  68 +++++++++-------
 styles/Preset_solidcircle/Style.qml             |   1 -
 styles/Preset_waves/Style.qml                   |   1 -
 15 files changed, 137 insertions(+), 147 deletions(-)
 create mode 100644 Locales/ja.qm
 delete mode 100644 Locales/ja_JP.qm
 delete mode 100644 Locales/zh_CN.qm
 create mode 100644 Locales/zh_TW.qm

diff --git a/Locales/ja.qm b/Locales/ja.qm
new file mode 100644
index 0000000000000000000000000000000000000000..06df9546eb6dad5c7262b8abece1e22836a29c06
GIT binary patch
literal 3164
zcmaJ@e{2(V6#uTfyWVcsZj`ZLgm5H8NEG}UF&cu2+e!do-E7%#F>GAd@7j~@Zd|XM
zL(#B+GE8J~*}#Q}EchdY1fmfbY6fB)uwax(#2JWzsDq)RgJ2B)cz31OyKB2YmhRiW
z&wHQm`@YY6Z|Skf%(K7m={q-f*6{j$pIv$%Aw)kfHa%TiiBQ2|IGjMJXg;F)KS0P8
zL)4MW2o-Kb(~rN45PJgEe)SWaD^aX-4j}KKEjw9++)tvLe?JEJ1qHr?HxQzV3hw{>
zAVSQ8u0;oeVBhOHf2s_8j}-peK)^0c(|f@mwVp02-v)R$jaPNS`3U_Y`ys@+MISgl
z44=E{gRWBuadq?$xBL)qF@3rDW58cz@HdYFzi|eSPlq`D%!WJjz`x4u`w#r19_IKY
z*imE5=-%7#{UCFF{0hWTnH%E2aKGP}e_mby=Re#}%%1`H5qHx^8hqdC?wS|@|NB|$
z?MC1|%ATq3h40@g8eel4;tg{TJaq~D-R6e=f^*@0#VgJNZ`Tff-6|i%{el;J{{-F-
z@h@EugIy6naQ9QdFXulgNWkwKQlH#B{>(dGI3xbtAo!uS@^|X@gT3D~d(|NLd))J5
z9o&O$@y@(T!|#uH_Y^Jzo{ip%Cl>+lLnVFsJzcZ}$=O~AjyU`^zKf6HU+^S62$;g3
zyPl{CNs-;~zqcaN-d3xU7NQclnH1=lvR#wU-t6x09tf4=@9;Hz81J{Bxe9;1uvUsh
ziKaWCszpgQVAPI<&kdMC*bvb)NscD$Mm!$G6ZkZin;&jmW*U1d;+i5<w6?`1Eg2y?
zgbrz)@f05}jp<TNM2Ue|Ey+ZvQsRp0fUvsz4c{hSvjEcGg`lWOiUYt07B-#QJci}&
z^NsJBpt1@%8YhC%B2*DsBdVYWbRd0r2#?`IaHokZe7T7awUK5`O}6Ipz-_r6ywJTf
zwlq|3MlP*LLPi3L+A7ASO^`=NR945-Uw-3?i6}M@K}8caCq=F%uxrwp@=7t0$eVID
zg|H^vu+N)tDlnG}nOvw!MT<EYbLk9QoKCZ(HTOH>llUq=hbK(e?y8t5%Ovjfjz^%*
zhixV3@r#-$SnJSIR4f3F;_t1V{iIn6XL)9~$2ylZg_}xD3Ld|dXp4)Tf>ELlB2=Kb
zXWTTU{7Q$RGfQNCb7kPwn(9|%EL&3HTP8<@S|uStZOS=w;R7LFGp>15moph!GtG?S
zTds-`32IdEODa^_J#|~6Qt`!&3Dcfip{UX(Mb<=TBH7^V=p35}JS$}&CB_A#n4Q;s
zW}D@@%t|>SW$Bk+_p|YgleUNCSCbY^$o-ns=CP)*NtV&8PRx>c6gAAZbrDas_(I-_
z27&kWW@UXwwG@ef!lz6;L-yb;0nX&(tqI4ajY%TZwRMPU#F3Gdb+Kt(nzoKWDde!H
z8p<shbk`)c94TaVsrSsWv?d<97${wU#zLGF_#P(Hlrltuq#YW+0Wo@!gE$|W%<)W~
zpcIYedndDN+B%Uh)r6+#nZ|W&S}nPU$)i?BleL8_OGBq<v1y`j>SE4hBotFRrl84Z
zve?&QqDnHooXF9vK3AFn>GQxM@#z_0zPaVNr(UmS+;TfSU9yf>^jgDPMyw+^4Dc-G
zeBbL0qgfIu3u&UNO|1}iS3~<&n-)s}rAf_s<;VifFYyh0z`Pz4f&ojMbD0~sm^Hde
z*Qg{6qRqE2uqlis^V9AjrWjwGMTD-pHb+*ewO#GEOsXs_P;j~I-Wk6VykJu)w^nS=
zt<hPzmMpXc2{u`j!LqfmHlB=1@)Fx5gZ#pJlv&&osTE8b4VRiUJynX_B1My`zV8@Q
eC=bdO(zdwe2I!AB3`=2VD#POe9b?zahWrn4JrxT8

literal 0
HcmV?d00001

diff --git a/Locales/ja_JP.qm b/Locales/ja_JP.qm
deleted file mode 100644
index 06df9546eb6dad5c7262b8abece1e22836a29c06..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3164
zcmaJ@e{2(V6#uTfyWVcsZj`ZLgm5H8NEG}UF&cu2+e!do-E7%#F>GAd@7j~@Zd|XM
zL(#B+GE8J~*}#Q}EchdY1fmfbY6fB)uwax(#2JWzsDq)RgJ2B)cz31OyKB2YmhRiW
z&wHQm`@YY6Z|Skf%(K7m={q-f*6{j$pIv$%Aw)kfHa%TiiBQ2|IGjMJXg;F)KS0P8
zL)4MW2o-Kb(~rN45PJgEe)SWaD^aX-4j}KKEjw9++)tvLe?JEJ1qHr?HxQzV3hw{>
zAVSQ8u0;oeVBhOHf2s_8j}-peK)^0c(|f@mwVp02-v)R$jaPNS`3U_Y`ys@+MISgl
z44=E{gRWBuadq?$xBL)qF@3rDW58cz@HdYFzi|eSPlq`D%!WJjz`x4u`w#r19_IKY
z*imE5=-%7#{UCFF{0hWTnH%E2aKGP}e_mby=Re#}%%1`H5qHx^8hqdC?wS|@|NB|$
z?MC1|%ATq3h40@g8eel4;tg{TJaq~D-R6e=f^*@0#VgJNZ`Tff-6|i%{el;J{{-F-
z@h@EugIy6naQ9QdFXulgNWkwKQlH#B{>(dGI3xbtAo!uS@^|X@gT3D~d(|NLd))J5
z9o&O$@y@(T!|#uH_Y^Jzo{ip%Cl>+lLnVFsJzcZ}$=O~AjyU`^zKf6HU+^S62$;g3
zyPl{CNs-;~zqcaN-d3xU7NQclnH1=lvR#wU-t6x09tf4=@9;Hz81J{Bxe9;1uvUsh
ziKaWCszpgQVAPI<&kdMC*bvb)NscD$Mm!$G6ZkZin;&jmW*U1d;+i5<w6?`1Eg2y?
zgbrz)@f05}jp<TNM2Ue|Ey+ZvQsRp0fUvsz4c{hSvjEcGg`lWOiUYt07B-#QJci}&
z^NsJBpt1@%8YhC%B2*DsBdVYWbRd0r2#?`IaHokZe7T7awUK5`O}6Ipz-_r6ywJTf
zwlq|3MlP*LLPi3L+A7ASO^`=NR945-Uw-3?i6}M@K}8caCq=F%uxrwp@=7t0$eVID
zg|H^vu+N)tDlnG}nOvw!MT<EYbLk9QoKCZ(HTOH>llUq=hbK(e?y8t5%Ovjfjz^%*
zhixV3@r#-$SnJSIR4f3F;_t1V{iIn6XL)9~$2ylZg_}xD3Ld|dXp4)Tf>ELlB2=Kb
zXWTTU{7Q$RGfQNCb7kPwn(9|%EL&3HTP8<@S|uStZOS=w;R7LFGp>15moph!GtG?S
zTds-`32IdEODa^_J#|~6Qt`!&3Dcfip{UX(Mb<=TBH7^V=p35}JS$}&CB_A#n4Q;s
zW}D@@%t|>SW$Bk+_p|YgleUNCSCbY^$o-ns=CP)*NtV&8PRx>c6gAAZbrDas_(I-_
z27&kWW@UXwwG@ef!lz6;L-yb;0nX&(tqI4ajY%TZwRMPU#F3Gdb+Kt(nzoKWDde!H
z8p<shbk`)c94TaVsrSsWv?d<97${wU#zLGF_#P(Hlrltuq#YW+0Wo@!gE$|W%<)W~
zpcIYedndDN+B%Uh)r6+#nZ|W&S}nPU$)i?BleL8_OGBq<v1y`j>SE4hBotFRrl84Z
zve?&QqDnHooXF9vK3AFn>GQxM@#z_0zPaVNr(UmS+;TfSU9yf>^jgDPMyw+^4Dc-G
zeBbL0qgfIu3u&UNO|1}iS3~<&n-)s}rAf_s<;VifFYyh0z`Pz4f&ojMbD0~sm^Hde
z*Qg{6qRqE2uqlis^V9AjrWjwGMTD-pHb+*ewO#GEOsXs_P;j~I-Wk6VykJu)w^nS=
zt<hPzmMpXc2{u`j!LqfmHlB=1@)Fx5gZ#pJlv&&osTE8b4VRiUJynX_B1My`zV8@Q
eC=bdO(zdwe2I!AB3`=2VD#POe9b?zahWrn4JrxT8

diff --git a/Locales/zh_CN.qm b/Locales/zh_CN.qm
deleted file mode 100644
index 705aee3580666e96ef72a574265ec754f62dfb1d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3058
zcmaJ@eM}o=7=K&tu1C4H3|K>=lQUbk{UL-zjSJf!0ws<x3buR%-RKVbQqCQB^?Kz?
zaT`&Sfe9!wkWA+mzp~&*{EC|&Q;8oNnNc#61;b*ts5oaZGKbOm@!SE|yKBoI&Go%|
ze$VrJpYI*-h4arY92q@#>&>V49{X_aWrPsf+a9WGEJMil1{^*{h(3de!>=G@Z$QMm
z7ZJ*+N4ck7g!e6|_NyP@ycxCk6aexkba049h+0Cw{dFhc^KChkSK<3*+fAQNg03Zd
z(TM<@yX-Sld2k-f__YaxTpdXs1${&bndyBD@Ka=QRX>~u$cN}R!Oqj<i7!vXa|bzT
zpF${ef&A{859}3@7hB%}{O45hH@5@78LD_b7x4E{`<6C=ejj!0KhTdJrA{q^9Pt`8
zee@4_FH=|MFCpaEN?qmt1$~cG|2(o4&d)fuZCMZaK}YB<1>Soc{l9zx`k$hS=bC}{
z>-3q15qN)B=6u}^u=lES^WAfx?=$DgKjEBV%i4Jsc-y;~Jykhi_ict7`5p9r%{+Xi
z1?<l;6E{A9d;HA2Z;QeA(DF0$Bj(KWZa5?6+;PxDG&4&LFM!^B*M_R&pl_q=`+B$s
z?R4i~CgFRQ`$$Fw@Z99S@JSKq4|zt_d)gLxgq*izfFeTP8MzHY0YdO|G+;T#OQHk*
zyGz5J(OMa|VHu09*rrOm#}>!82Nw<<4tiVd{_8r<S?X(G8~JbqD=L(z=6F#95Cet#
zMO};zVnyM_NX#rm`wPbwn=6`M(goe6f+De{9Z`W-;$f_clR>3NSZ3i=<@;vGYx-p!
z;n5JgcoDPZk|4<z2(7B$cfMxO09e(|1~`S6EC9E^Ff`RSi>HSw56u{u<&}yN0kcvY
zTaHBq%dBeBiXGoRxH|>bt7C&v+^Wd&j#Oyp!7G7p_jUVG(5sWpE{%gf{F2<k34AYj
z&|;BRF)CLbk)<I5lENugdUTE7>h3Zw7EAALRo?1u4UyK}L><#srgI_6B&FTL7-FdU
z*A&Bb2A8IcB5^<-4(e(h<?Wm(V!@)B#@*prQ`)(FoWilj+%qH-5ul!UHlfppTltn`
zo#RqZ$pafh9$nDo<6}{Q>tVIDv``@YS;O<XDB+X3w2CrVW%_C(p_=ObqR9a{6=ImJ
zm0~>PqnOeIw6tw-0H3T|r)$r-N9Mvj<Ra_iWyq?P>NVIRggcsJy1a9zB=fzJsBlS+
z3v6hbHYK~OQUofTz-ozWz2v<S!zHOoF~%oVDz)cFQ^=TIxJ_YG$BpQl-MdAnNvXNT
zC6#dmHEl6<3RgAPoi=kBf8ppzl9$(4^WiYm@S2V$@DaaLXXCDE5%>q=n5~a?adOz|
z36RawWwTdh!w~jV(oJ52-yAh@C57W?wU~zs42_3@E(NvBLhHa*0`&gBhbq;klOPem
zozTiPajnx>C{w{jQ(#;HKGL2pGAp%e>MuFVt!0fas9nKShn^Kono4vg+NOSwyj93r
z4O1=7<#wXuvV-kX*IMLMTcceD|9TQV8H<tRezi=_RIa%RNV>VRawjzhb#7iWY&8un
z5n4gsf7QUzVh{#y5>IAyuxUCe<@16HCo5}bJUzCXt1{JAHlP%~HEnrOz0(ut4<u$V
z6@-C^t&^0VxL_GK*>y5*fdWiB-&KTlHmqRMj~u_#P*(Q(sKuW|V}Iv0Jq9!^I&ih5
z9!Ln6h6{8lXCv2{y5hWsMQFx<9hD%~l<Ik~5Ea%6@dz)Lm?jVS6xNu;S{2jQB<e|Z
n6p*@MSGgp%@sYT!ZYJ97NR3-#y-EWx4KWB9kkPiWWbyw2oc`hP

diff --git a/Locales/zh_TW.qm b/Locales/zh_TW.qm
new file mode 100644
index 0000000000000000000000000000000000000000..705aee3580666e96ef72a574265ec754f62dfb1d
GIT binary patch
literal 3058
zcmaJ@eM}o=7=K&tu1C4H3|K>=lQUbk{UL-zjSJf!0ws<x3buR%-RKVbQqCQB^?Kz?
zaT`&Sfe9!wkWA+mzp~&*{EC|&Q;8oNnNc#61;b*ts5oaZGKbOm@!SE|yKBoI&Go%|
ze$VrJpYI*-h4arY92q@#>&>V49{X_aWrPsf+a9WGEJMil1{^*{h(3de!>=G@Z$QMm
z7ZJ*+N4ck7g!e6|_NyP@ycxCk6aexkba049h+0Cw{dFhc^KChkSK<3*+fAQNg03Zd
z(TM<@yX-Sld2k-f__YaxTpdXs1${&bndyBD@Ka=QRX>~u$cN}R!Oqj<i7!vXa|bzT
zpF${ef&A{859}3@7hB%}{O45hH@5@78LD_b7x4E{`<6C=ejj!0KhTdJrA{q^9Pt`8
zee@4_FH=|MFCpaEN?qmt1$~cG|2(o4&d)fuZCMZaK}YB<1>Soc{l9zx`k$hS=bC}{
z>-3q15qN)B=6u}^u=lES^WAfx?=$DgKjEBV%i4Jsc-y;~Jykhi_ict7`5p9r%{+Xi
z1?<l;6E{A9d;HA2Z;QeA(DF0$Bj(KWZa5?6+;PxDG&4&LFM!^B*M_R&pl_q=`+B$s
z?R4i~CgFRQ`$$Fw@Z99S@JSKq4|zt_d)gLxgq*izfFeTP8MzHY0YdO|G+;T#OQHk*
zyGz5J(OMa|VHu09*rrOm#}>!82Nw<<4tiVd{_8r<S?X(G8~JbqD=L(z=6F#95Cet#
zMO};zVnyM_NX#rm`wPbwn=6`M(goe6f+De{9Z`W-;$f_clR>3NSZ3i=<@;vGYx-p!
z;n5JgcoDPZk|4<z2(7B$cfMxO09e(|1~`S6EC9E^Ff`RSi>HSw56u{u<&}yN0kcvY
zTaHBq%dBeBiXGoRxH|>bt7C&v+^Wd&j#Oyp!7G7p_jUVG(5sWpE{%gf{F2<k34AYj
z&|;BRF)CLbk)<I5lENugdUTE7>h3Zw7EAALRo?1u4UyK}L><#srgI_6B&FTL7-FdU
z*A&Bb2A8IcB5^<-4(e(h<?Wm(V!@)B#@*prQ`)(FoWilj+%qH-5ul!UHlfppTltn`
zo#RqZ$pafh9$nDo<6}{Q>tVIDv``@YS;O<XDB+X3w2CrVW%_C(p_=ObqR9a{6=ImJ
zm0~>PqnOeIw6tw-0H3T|r)$r-N9Mvj<Ra_iWyq?P>NVIRggcsJy1a9zB=fzJsBlS+
z3v6hbHYK~OQUofTz-ozWz2v<S!zHOoF~%oVDz)cFQ^=TIxJ_YG$BpQl-MdAnNvXNT
zC6#dmHEl6<3RgAPoi=kBf8ppzl9$(4^WiYm@S2V$@DaaLXXCDE5%>q=n5~a?adOz|
z36RawWwTdh!w~jV(oJ52-yAh@C57W?wU~zs42_3@E(NvBLhHa*0`&gBhbq;klOPem
zozTiPajnx>C{w{jQ(#;HKGL2pGAp%e>MuFVt!0fas9nKShn^Kono4vg+NOSwyj93r
z4O1=7<#wXuvV-kX*IMLMTcceD|9TQV8H<tRezi=_RIa%RNV>VRawjzhb#7iWY&8un
z5n4gsf7QUzVh{#y5>IAyuxUCe<@16HCo5}bJUzCXt1{JAHlP%~HEnrOz0(ut4<u$V
z6@-C^t&^0VxL_GK*>y5*fdWiB-&KTlHmqRMj~u_#P*(Q(sKuW|V}Iv0Jq9!^I&ih5
z9!Ln6h6{8lXCv2{y5hWsMQFx<9hD%~l<Ik~5Ea%6@dz)Lm?jVS6xNu;S{2jQB<e|Z
n6p*@MSGgp%@sYT!ZYJ97NR3-#y-EWx4KWB9kkPiWWbyw2oc`hP

literal 0
HcmV?d00001

diff --git a/package.json b/package.json
index d2f13f9..e15255b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "top.mashiros.widget.advp",
-    "version": "1.2.0",
+    "version": "1.2.1",
     
     "title": {
         "en": "ADV Plugin",
@@ -54,10 +54,10 @@
             "location": "/advp-style-preset/line",
             "catalog": "top.mashiros.advp-style",
             "title": {
-                "en": "Preset Line",
-                "zh": "预置 线",
-                "zh_TW": "預置 線",
-                "ja": "プリセット 線"
+                "en": "Line",
+                "zh": "线",
+                "zh_TW": "線",
+                "ja": "線"
             },
             "entry": "./styles/Preset_line/Style.qml"
         },
@@ -65,10 +65,10 @@
             "location": "/advp-style-preset/gradient_line",
             "catalog": "top.mashiros.advp-style",
             "title": {
-                "en": "Preset Gradient Line",
-                "zh": "预置 渐变线",
-                "zh_TW": "預置 漸變線",
-                "ja": "プリセット グラデーションライン"
+                "en": "Gradient Line",
+                "zh": "渐变线",
+                "zh_TW": "漸變線",
+                "ja": "グラデーションライン"
             },
             "entry": "./styles/Preset_gradient_line/Style.qml"
         },
@@ -76,10 +76,10 @@
             "location": "/advp-style-preset/waves",
             "catalog": "top.mashiros.advp-style",
             "title": {
-                "en": "Preset Waves",
-                "zh": "预置 波浪",
-                "zh_TW": "預置 波浪",
-                "ja": "プリセット 波浪"
+                "en": "Waves",
+                "zh": "波浪",
+                "zh_TW": "波浪",
+                "ja": "波浪"
             },
             "entry": "./styles/Preset_waves/Style.qml"
         },
@@ -87,10 +87,10 @@
             "location": "/advp-style-preset/circle",
             "catalog": "top.mashiros.advp-style",
             "title": {
-                "en": "Preset Circle",
-                "zh": "预置 圆",
-                "zh_TW": "預置 圓",
-                "ja": "プリセット 円"
+                "en": "Circle",
+                "zh": "圆",
+                "zh_TW": "圓",
+                "ja": "円"
             },
             "entry": "./styles/Preset_circle/Style.qml"
         },
@@ -98,10 +98,10 @@
             "location": "/advp-style-preset/solidcircle",
             "catalog": "top.mashiros.advp-style",
             "title": {
-                "en": "Preset Solid-circle",
-                "zh": "预置 实心圆",
-                "zh_TW": "預置 實心圓",
-                "ja": "プリセット 固形円"
+                "en": "Solid-circle",
+                "zh": "实心圆",
+                "zh_TW": "實心圓",
+                "ja": "固形円"
             },
             "entry": "./styles/Preset_solidcircle/Style.qml"
         },
@@ -109,10 +109,10 @@
             "location": "/advp-style-preset/ordinal_scale_ui_bottom",
             "catalog": "top.mashiros.advp-style",
             "title": {
-                "en": "Preset Ordinal Scale UI bottom",
-                "zh": "预置 序列之争底部UI",
-                "zh_TW": "預置 序列之爭底部UI",
-                "ja": "プリセット オーディナル・スケール- UI 下部"
+                "en": "Ordinal Scale UI bottom",
+                "zh": "序列之争底部UI",
+                "zh_TW": "序列之爭底部UI",
+                "ja": "オーディナル・スケール- UI 下部"
             },
             "entry": "./styles/Preset_Ordinal_Scale_UI_bottom/Style.qml"
         }, 
@@ -120,10 +120,10 @@
             "location": "/preset/advp-style-preset/line",
             "catalog": "preset/widget",
             "title": {
-                "en": "ADV Preset Line",
-                "zh": "ADV预置 线",
-                "zh_TW": "ADV預置 線",
-                "ja": "ADVプリセット 線"
+                "en": "Audio Visualization: Line",
+                "zh": "音频可视化: 线",
+                "zh_TW": "音頻可視化: 線",
+                "ja": "音声視覚化: 線"
             },
            "preview": "Presets/Line/preview.png",
            "entry": "Presets/Line/preset.json"
@@ -132,10 +132,10 @@
             "location": "/preset/advp-style-preset/gradient_line",
             "catalog": "preset/widget",
             "title": {
-                "en": "ADV Preset Gradient Line",
-                "zh": "ADV预置 渐变线",
-                "zh_TW": "ADV預置 漸變線",
-                "ja": "ADVプリセット グラデーションライン"
+                "en": "Audio Visualization: Gradient Line",
+                "zh": "音频可视化: 渐变线",
+                "zh_TW": "音頻可視化: 漸變線",
+                "ja": "音声視覚化: グラデーションライン"
             },
            "preview": "Presets/Gradient_Line/preview.png",
            "entry": "Presets/Gradient_Line/preset.json"
@@ -144,10 +144,10 @@
             "location": "/preset/advp-style-preset/waves",
             "catalog": "preset/widget",
             "title": {
-                "en": "ADV Preset Waves",
-                "zh": "ADV预置 波浪",
-                "zh_TW": "ADV預置 波浪",
-                "ja": "ADVプリセット 波浪"
+                "en": "Audio Visualization: Waves",
+                "zh": "音频可视化: 波浪",
+                "zh_TW": "音頻可視化: 波浪",
+                "ja": "音声視覚化: 波浪"
             },
            "preview": "Presets/Waves/preview.png",
            "entry": "Presets/Waves/preset.json"
@@ -156,10 +156,10 @@
             "location": "/preset/advp-style-preset/circle",
             "catalog": "preset/widget",
             "title": {
-                "en": "ADV Preset Circle",
-                "zh": "ADV预置 圆",
-                "zh_TW": "ADV預置 圓",
-                "ja": "ADVプリセット 円"
+                "en": "Audio Visualization: Circle",
+                "zh": "音频可视化: 圆",
+                "zh_TW": "音頻可視化: 圓",
+                "ja": "音声視覚化: 円"
             },
            "preview": "Presets/Circle/preview.png",
            "entry": "Presets/Circle/preset.json"
@@ -168,10 +168,10 @@
             "location": "/preset/advp-style-preset/solidcircle",
             "catalog": "preset/widget",
             "title": {
-                "en": "ADV Preset Solid-circle",
-                "zh": "ADV预置 实心圆",
-                "zh_TW": "ADV預置 實心圓",
-                "ja": "ADVプリセット 固形円"
+                "en": "Audio Visualization: Solid-circle",
+                "zh": "音频可视化: 实心圆",
+                "zh_TW": "音頻可視化: 實心圓",
+                "ja": "音声視覚化: 固形円"
             },
            "preview": "Presets/Solidcircle/preview.png",
            "entry": "Presets/Solidcircle/preset.json"
@@ -180,10 +180,10 @@
             "location": "/preset/advp-style-preset/ordinal_scale_ui_bottom",
             "catalog": "preset/widget",
             "title": {
-                "en": "ADV Preset Ordinal Scale UI bottom",
-                "zh": "ADV预置 序列之争底部UI",
-                "zh_TW": "ADV預置 序列之爭底部UI",
-                "ja": "ADVプリセット オーディナル・スケール- UI 下部"
+                "en": "Audio Visualization: Ordinal Scale UI bottom",
+                "zh": "音频可视化: 序列之争底部UI",
+                "zh_TW": "音頻可視化: 序列之爭底部UI",
+                "ja": "音声視覚化: オーディナル・スケール- UI 下部"
             },
            "preview": "Presets/Ordinal_Scale_UI_bottom/preview.png",
            "entry": "Presets/Ordinal_Scale_UI_bottom/preset.json"
diff --git a/qml/Main.qml b/qml/Main.qml
index f774523..50e4436 100644
--- a/qml/Main.qml
+++ b/qml/Main.qml
@@ -40,7 +40,6 @@ T.Widget {
             if (!widget.settings[widget.settings.current_style]) {
                 widget.settings[widget.settings.current_style] = defaultValues;
             }else if(widget.settings[widget.settings.current_style]["Version"] !== defaultValues["Version"]) {
-                delete widget.settings[widget.settings.current_style]["__cfg_height"];
                 delete widget.settings[widget.settings.current_style]["Version"];
                 widget.settings[widget.settings.current_style] = Object.assign(defaultValues, widget.settings[widget.settings.current_style]);
             }
diff --git a/qml/StylePreferences.qml b/qml/StylePreferences.qml
index 849bdef..fa3e885 100644
--- a/qml/StylePreferences.qml
+++ b/qml/StylePreferences.qml
@@ -14,17 +14,10 @@ NVG.Window {
     title: qsTr("ADV-Plugin: Settings")
     visible: true
     minimumWidth: 480
-    minimumHeight: 580
+    minimumHeight: 600
     width: minimumWidth
     height: minimumHeight
 
-    Behavior on minimumHeight {
-        PropertyAnimation {
-            duration: 500
-            easing.type: Easing.InOutBack
-        }
-    }
-
     property var old_style_cfg
     property int last_style_index
 
@@ -34,7 +27,6 @@ NVG.Window {
 
         header: TitleBar {
             text: qsTr("Settings")
-
             standardButtons: Dialog.Save | Dialog.Reset
 
             onAccepted: {
@@ -72,8 +64,6 @@ NVG.Window {
                         id: rootPreference
                         Layout.fillWidth: true
 
-                        label: qsTr("Configuration")
-
                         onPreferenceEdited: {
                             if (widget.settings.current_style !== Common.stylesURL[styleList.value]) {
                                 widget.settings[widget.settings.current_style] = old_style_cfg;
@@ -92,8 +82,11 @@ NVG.Window {
                             defaultValue: 0
                             model: Common.styles
                         }
-
-                        P.Separator {}
+                        
+                        Heading {
+                            id: heading
+                            text: Common.styles[styleList.value] + " " + qsTr("Configuration")
+                        }
 
                         P.PreferenceLoader {
                             id: stylePreferenceLoader
@@ -102,21 +95,9 @@ NVG.Window {
                             onLoaded: {
                                 let cfg = save();
                                 load(widget.settings[widget.settings.current_style]);
-                                window.minimumHeight = cfg["__cfg_height"];
-                            }
-
-                            onContentItemChanged: {
-                                if(contentItem) {
-                                    let index = Common.stylesURL.indexOf(widget.settings.current_style);
-                                    if (index === -1)
-                                        index = 0;
-                                    contentItem.label = Common.styles[index];
-                                }
                             }
                         }
 
-                        P.Separator {}
-
                         Component.onCompleted: {
                             last_style_index = Common.stylesURL.indexOf(widget.settings.current_style);
                             if (last_style_index === -1) {
diff --git a/qml/api/AdvpPreference.qml b/qml/api/AdvpPreference.qml
index 0888f60..3859786 100644
--- a/qml/api/AdvpPreference.qml
+++ b/qml/api/AdvpPreference.qml
@@ -2,11 +2,8 @@ import QtQuick 2.12
 import QtQuick.Controls 2.12
 import NERvGear.Preferences 1.0 as P
 
-P.DialogPreference {
-    icon.name: "solid:\uf085"
-    live: true
+P.PreferenceGroup {
     property string version: ""
-    property int cfg_height: 580
 
     P.TextFieldPreference {
         name: "Version"
@@ -14,17 +11,7 @@ P.DialogPreference {
         enabled: false
         defaultValue: version
     }
-
-    P.SpinPreference {
-        name: "__cfg_height"
-        enabled: false
-        visible: false
-        editable: false
-        from: cfg_height
-        to: cfg_height
-        defaultValue: cfg_height
-    }
-
+                
     ItemDelegate {
         text: qsTr("Version")
         visible: version
diff --git a/readme.md b/readme.md
index 16cd521..b1050b1 100644
--- a/readme.md
+++ b/readme.md
@@ -11,7 +11,7 @@
 
 ## 特色
 * 整合客户端与服务器端的功能，使用更简单
-* 预设4种频谱显示形式，其中每种都可以进一步自定义设置其样式
+* 预设6种频谱显示形式，其中每种都可以进一步自定义设置其样式
 * 提供了Style的开发接口，供开发者添加更多的可视化样式
 * 导入第三方Style类似其他插件，预计支持steam创意工坊下载
 * 服务端崩溃后自启动
@@ -20,7 +20,7 @@
 
 安装并启用插件后，默认加载第一种预设Style样式。右键挂件可调出菜单，在挂件菜单的挂件名选单中点击Settings选项，呼出Style设置窗口。点击其中的Styles选项可切换不同的Style风格，若此Style提供可配置项，则在Styles选项下方会出现配置界面的入口。
 
-<div align="center"><img src="https://s3.bmp.ovh/imgs/2022/04/15/b62270e9dd574622.png" style="zoom:80%;" /></div>
+<div align="center"><img src="https://s3.bmp.ovh/imgs/2022/04/29/c666df5a88a7ab9a.png" style="zoom:80%;" /></div>
 
 # 进阶设置
 
diff --git a/styles/Preset_Ordinal_Scale_UI_bottom/Style.qml b/styles/Preset_Ordinal_Scale_UI_bottom/Style.qml
index 062d5be..3e5a9e3 100644
--- a/styles/Preset_Ordinal_Scale_UI_bottom/Style.qml
+++ b/styles/Preset_Ordinal_Scale_UI_bottom/Style.qml
@@ -135,7 +135,6 @@ AdvpStyleTemplate {
 
     preference: AdvpPreference {
         version: defaultValues["Version"]
-        cfg_height: 680
 
         P.ColorPreference {
             name: "Bass Color"
diff --git a/styles/Preset_circle/Style.qml b/styles/Preset_circle/Style.qml
index 2cf2dcd..00ee6e1 100644
--- a/styles/Preset_circle/Style.qml
+++ b/styles/Preset_circle/Style.qml
@@ -125,7 +125,6 @@ AdvpStyleTemplate {
 
     preference: AdvpPreference {
         version: defaultValues["Version"]
-        cfg_height: 740
 
         P.ColorPreference {
             name: "Main Color"
diff --git a/styles/Preset_gradient_line/Style.qml b/styles/Preset_gradient_line/Style.qml
index 5c513e6..b2e325f 100644
--- a/styles/Preset_gradient_line/Style.qml
+++ b/styles/Preset_gradient_line/Style.qml
@@ -30,15 +30,13 @@ AdvpStyleTemplate {
                 readonly property int dataLength: 64/uDataLen
                 readonly property int channel: configs["Channel"]
                 readonly property bool centerRotateFlag: configs["Rotate Settings"]["Center Enable"]
-                readonly property real centerRotateAngle: configs["Rotate Settings"]["Center Angle"]
+                readonly property real centerRotateAngle: configs["Rotate Settings"]["Center Angle"]*Math.PI/180
                 readonly property bool lineRotateFlag: configs["Rotate Settings"]["Line Enable"]
-                readonly property real lineRotateAngle: configs["Rotate Settings"]["Line Angle"]
+                readonly property real lineRotateAngle: configs["Rotate Settings"]["Line Angle"]*Math.PI/180
                 readonly property bool autoNormalizing: configs["Data Settings"]["Auto Normalizing"]
                 readonly property real amplitude: 400.0/configs["Data Settings"]["Amplitude"]
                 readonly property int unitStyle: configs["Data Settings"]["Unit Style"]
 
-                property real degUnit: Math.PI / 180
-
                 property real halfWidth: width/2
                 property real halfHeight: height/2
 
@@ -46,7 +44,7 @@ AdvpStyleTemplate {
                 readonly property int r_stop: dataLength+dataLength*(channel!==0)
 
                 readonly property int total: r_stop-l_start
-                readonly property real _y_dy: centerRotateFlag*Math.tan(centerRotateAngle*degUnit)*halfWidth
+                readonly property real _y_dy: centerRotateFlag*Math.tan(centerRotateAngle)*halfWidth
                 readonly property real _ux: width/(r_stop-l_start)
                 readonly property real _dx: Math.round(_ux/2)
 
@@ -97,26 +95,40 @@ AdvpStyleTemplate {
 
                     context.clearRect(0, 0, width+32, height+32);
 
-                    let _y = halfHeight-_y_dy;
-                    if(lineRotateFlag || centerRotateFlag) {
-                        context.transform(1, centerRotateFlag*centerRotateAngle * degUnit, -lineRotateFlag*lineRotateAngle * degUnit, 1, lineRotateFlag*Math.sin(1.05*lineRotateAngle*degUnit)*_y, 0);
-                    }
-
-                    if (centerLineFlag) {
-                        context.fillRect(0, _y, width, 2);
-                    }
-
-                    //绘制频谱
+                    let _y;
                     let _dy;
-                    for (let i=l_start; i<r_stop; i++) {
-                        _y = halfHeight*(1-(linePosition!==2)*audioData[i])-_y_dy;
-                        _dy = (halfHeight + (!linePosition)*halfHeight)*audioData[i];
-                        context.fillRect(_ux * (i-l_start), _y, _dx, _dy);
-                    }
-
-
-                    if (centerRotateFlag || lineRotateFlag)
+                    //绘制频谱
+                    if(lineRotateFlag || centerRotateFlag) {
+                        context.transform(1, Math.sin(centerRotateFlag*centerRotateAngle), -Math.sin(lineRotateFlag*lineRotateAngle), 1, Math.sin(lineRotateFlag*lineRotateAngle)*(halfHeight-_y_dy), 0);
+                        for (let i=l_start; i<r_stop; i++) {
+                            _y = halfHeight*(1-(linePosition!==2)*audioData[i])-_y_dy;
+                            _dy = (halfHeight + (!linePosition)*halfHeight)*audioData[i];
+                            context.fillRect(_ux * (i-l_start), _y, _dx, _dy);
+                        }
+                        if (centerLineFlag) {
+                            context.fillRect(0, halfHeight-_y_dy, width, 2);
+                        }
                         context.resetTransform();
+                    } else if (linePosition) {
+                        let _flag = 1-2*(linePosition===1);
+                        _y = halfHeight + halfHeight*(3-2*linePosition)*Boolean(linePosition);
+                        for (let i=l_start; i<r_stop; i++) {
+                            _dy = height*audioData[i]*_flag;
+                            context.fillRect(_ux * (i-l_start), _y, _dx, _dy);
+                        }
+                        if (centerLineFlag) {
+                            context.fillRect(0, _y-(2-linePosition)*2, width, 2);
+                        }
+                    } else {
+                        for (let i=l_start; i<r_stop; i++) {
+                            _y = halfHeight*(1-(linePosition!==2)*audioData[i])-_y_dy;
+                            _dy = (halfHeight + (!linePosition)*halfHeight)*audioData[i];
+                            context.fillRect(_ux * (i-l_start), _y, _dx, _dy);
+                        }
+                        if (centerLineFlag) {
+                            context.fillRect(0, halfHeight-_y_dy, width, 2);
+                        }
+                    }
 
                     context.fill();
                     requestPaint();
@@ -132,7 +144,7 @@ AdvpStyleTemplate {
     }
 
     defaultValues: {
-        "Version": "1.1.0",
+        "Version": "1.2.0",
         "Gradient Direction": 0,
         "Start Position Color": "#f44336",
         "Middle Position Color": "#4caf50",
@@ -156,7 +168,6 @@ AdvpStyleTemplate {
 
     preference: AdvpPreference {
         version: defaultValues["Version"]
-        cfg_height: 670
 
         P.SelectPreference {
             name: "Gradient Direction"
diff --git a/styles/Preset_line/Style.qml b/styles/Preset_line/Style.qml
index acc0b1e..5180619 100644
--- a/styles/Preset_line/Style.qml
+++ b/styles/Preset_line/Style.qml
@@ -15,22 +15,20 @@ AdvpStyleTemplate {
         readonly property int dataLength: 64/uDataLen
         readonly property int channel: configs["Channel"]
         readonly property bool centerRotateFlag: configs["Rotate Settings"]["Center Enable"]
-        readonly property real centerRotateAngle: configs["Rotate Settings"]["Center Angle"]
+        readonly property real centerRotateAngle: configs["Rotate Settings"]["Center Angle"]*Math.PI/180
         readonly property bool lineRotateFlag: configs["Rotate Settings"]["Line Enable"]
-        readonly property real lineRotateAngle: configs["Rotate Settings"]["Line Angle"]
+        readonly property real lineRotateAngle: configs["Rotate Settings"]["Line Angle"]*Math.PI/180
         readonly property bool autoNormalizing: configs["Data Settings"]["Auto Normalizing"]
         readonly property real amplitude: 400.0/configs["Data Settings"]["Amplitude"]
         readonly property int unitStyle: configs["Data Settings"]["Unit Style"]
 
-        property real degUnit: Math.PI / 180
-
         property real halfWidth: width/2
         property real halfHeight: height/2
 
         readonly property int l_start: (channel===1)*dataLength
         readonly property int r_stop: dataLength+dataLength*(channel!==0)
         readonly property int total: r_stop-l_start
-        readonly property real _y_dy: centerRotateFlag*Math.tan(centerRotateAngle*degUnit)*halfWidth
+        readonly property real _y_dy: centerRotateFlag*Math.tan(centerRotateAngle)*halfWidth
         readonly property real _ux: width/(r_stop-l_start)
         readonly property real _dx: Math.round(_ux/2)
 
@@ -72,27 +70,46 @@ AdvpStyleTemplate {
 
             context.clearRect(0, 0, width+32, height+32);
 
-            let _y = halfHeight-_y_dy;
-            if(lineRotateFlag || centerRotateFlag) {
-                context.transform(1, centerRotateFlag*centerRotateAngle * degUnit, -lineRotateFlag*lineRotateAngle * degUnit, 1, lineRotateFlag*Math.sin(1.05*lineRotateAngle*degUnit)*_y, 0);
-            }
-
-            if (centerLineFlag) {
-                context.fillStyle = center_color;
-                context.fillRect(0, _y, width, 2);
-            }
-
-            context.fillStyle = line_color;
-            //绘制频谱
+            let _y;
             let _dy;
-            for (let i=l_start; i<r_stop; i++) {
-                _y = halfHeight*(1-(linePosition!==2)*audioData[i])-_y_dy;
-                _dy = (halfHeight + (!linePosition)*halfHeight)*audioData[i];
-                context.fillRect(_ux * (i-l_start), _y, _dx, _dy);
-            }
-
-            if (centerRotateFlag || lineRotateFlag)
+            //绘制频谱
+            if(lineRotateFlag || centerRotateFlag) {
+                context.transform(1, Math.sin(centerRotateFlag*centerRotateAngle), -Math.sin(lineRotateFlag*lineRotateAngle), 1, Math.sin(lineRotateFlag*lineRotateAngle)*(halfHeight-_y_dy), 0);
+                context.fillStyle = line_color;
+                for (let i=l_start; i<r_stop; i++) {
+                    _y = halfHeight*(1-(linePosition!==2)*audioData[i])-_y_dy;
+                    _dy = (halfHeight + (!linePosition)*halfHeight)*audioData[i];
+                    context.fillRect(_ux * (i-l_start), _y, _dx, _dy);
+                }
+                if (centerLineFlag) {
+                    context.fillStyle = center_color;
+                    context.fillRect(0, halfHeight-_y_dy, width, 2);
+                }
                 context.resetTransform();
+            } else if (linePosition) {
+                let _flag = 1-2*(linePosition===1);
+                _y = halfHeight + halfHeight*(3-2*linePosition)*Boolean(linePosition);
+                context.fillStyle = line_color;
+                for (let i=l_start; i<r_stop; i++) {
+                    _dy = height*audioData[i]*_flag;
+                    context.fillRect(_ux * (i-l_start), _y, _dx, _dy);
+                }
+                if (centerLineFlag) {
+                    context.fillStyle = center_color;
+                    context.fillRect(0, _y-(2-linePosition)*2, width, 2);
+                }
+            } else {
+                context.fillStyle = line_color;
+                for (let i=l_start; i<r_stop; i++) {
+                    _y = halfHeight*(1-(linePosition!==2)*audioData[i])-_y_dy;
+                    _dy = (halfHeight + (!linePosition)*halfHeight)*audioData[i];
+                    context.fillRect(_ux * (i-l_start), _y, _dx, _dy);
+                }
+                if (centerLineFlag) {
+                    context.fillStyle = center_color;
+                    context.fillRect(0, halfHeight-_y_dy, width, 2);
+                }
+            }
 
             context.fill();
             requestPaint();
@@ -106,7 +123,7 @@ AdvpStyleTemplate {
     }
 
     defaultValues: {
-        "Version": "1.1.0",
+        "Version": "1.2.0",
         "Center Line": true,
         "Center Color": "#ff4500",
         "Line Color": "#ff4500",
@@ -128,7 +145,6 @@ AdvpStyleTemplate {
 
     preference: AdvpPreference {
         version: defaultValues["Version"]
-        cfg_height: 580
 
         P.SwitchPreference {
             id: _cfg_preset_line_Center_Line
diff --git a/styles/Preset_solidcircle/Style.qml b/styles/Preset_solidcircle/Style.qml
index ff8aa00..2396004 100644
--- a/styles/Preset_solidcircle/Style.qml
+++ b/styles/Preset_solidcircle/Style.qml
@@ -141,7 +141,6 @@ AdvpStyleTemplate {
 
     preference: AdvpPreference {
         version: defaultValues["Version"]
-        cfg_height: 740
 
         P.ColorPreference {
             name: "Main Color"
diff --git a/styles/Preset_waves/Style.qml b/styles/Preset_waves/Style.qml
index 8170e50..10d37b7 100644
--- a/styles/Preset_waves/Style.qml
+++ b/styles/Preset_waves/Style.qml
@@ -98,7 +98,6 @@ AdvpStyleTemplate {
 
     preference: AdvpPreference {
         version: defaultValues["Version"]
-        cfg_height: 500
 
         P.SliderPreference {
             name: "Line Width"