From b15f62dabd8e50689d229d6ba708bb08a9f38f76 Mon Sep 17 00:00:00 2001 From: qewer33 Date: Mon, 20 Dec 2021 19:23:27 +0300 Subject: [PATCH] Update package --- ClearClock.tar.gz | Bin 205905 -> 205950 bytes package/contents/config/main.xml | 6 +-- .../contents/ui/config/configAppearance.qml | 7 ++- package/contents/ui/lib/ConfigColor.qml | 51 ------------------ package/contents/ui/main.qml | 18 +++---- 5 files changed, 14 insertions(+), 68 deletions(-) delete mode 100644 package/contents/ui/lib/ConfigColor.qml diff --git a/ClearClock.tar.gz b/ClearClock.tar.gz index 0fd2bf7f342d3337f76555c6c173346dea6a41b2..a2a54f9714258fafe8db38b2c19667583d83ef50 100644 GIT binary patch delta 9247 zcmai$byU<}->wl+P(Y-lOS%;VM7mSDk&qY~q)YfJjYz}LLnAPRbc2F)4GlA-#0-tZ z(9G-e{LXvM`<_^5t!wXft^3|<|GD>PVu0XofB=^v1`q2&<&V#};kft0aj{cz?}Gth zn7f`Kgufxy#m1T>5+^D{eIkJ|bmpp2M)@JL^@s150&IJ)6Y5*lbk+=-P*sh*KX8=U znAAs_ok0sWwW0}vJs>vY{fGq>GNK+6nS+5^tMf)9P7+bU)4S!$ zor4{I6&GhYO8s0@Gc)g%K#cE7&^fSly`%3!`40jzmM4orR zf?&5B4Y)1hSV2z$5>|+0h~#o3JEc3jh=Pc(NN(b#`PY4$m5K^CBqD6}3n#K*kq$L@ zBpCWhh;(b0bZa&9l1$$Bp}yk^T_&}oIp0&}{k07rvEF)YoeI_7>9D~*xfcxIXfyDDB1(N*jd-a@7VI0sDZ zA#}3lasy6yysEF4uPFl{vg5ia|Hmq{vLulSznECu@&0O4GRlW!NuvP4=_M9^ruP0; zhXm+QU(q(d#kMmC(N@bYSud3=eW5^ew|}>A5P4q1#3BrY{fbDKe@a3lYbB@bj2BJ# zo|Qz|1+R>dse!3TIBYs10sd5nM%GbI`Ryn@PTA`(%({i!wA2LES|Y{UHQ*z9q~A___V~|7R{9f@0|!N9Lx^fs>}2>$5)yks-du@qIjoDxXBkjT)b)UGRj*FoYK z3eWe3>BDAV0j2lhSZ2`n_ox7S(o+@GLwkHL(iT_b^%N`zW(Kp%835{1>6e>oI8)JG49QF3hD$(h}G^#9Hy6 z0&u38^XTuL;hBivJ0?zu|MU?D*kER4xOa&+pd>Acee94BpVvz|aQ(La;%&VjHZMdv zh8_0%QN3SCW~^2nv7@l;sAA~?o)Aqwh=ihzl+TZJ#>I&KX5uHGY3ES~U%xjkh z(q*%+d~Iuokq6-ip$F_sp)fgE4-A>l?|w&&@>k5D$m_yFT9o?(PhTBeZ=CB~%_*ZW zj2XmMg|nw*Ng1*Ny2_x(gX&BfoGgOjHYEu|WI7qLT)N7(kIU4VQaOtR!u9@!I64^x zvzT}jP3>JyM+t?>Z>48s4UmFa-D#gMCK_7FoLZWn0;Np)SaR^1?+xJ&Rz9ttU@q=r+;3Jtucf>4sLyic;#g{!L^k zYM&XktBcwVMWGB`4kPSu0I_#~=&eh8R*K)$uzZi;tq7m{4o5b$fx_YBuxLi&c(~!v z$*Df=BAANEjfpdu@Z9tRlqzK14=Y}<@vx^l0MdCIa(XED7u1mCh4`M*>dk}oIZ2O? z5DyD2$z(KT;_f?g?t7TseBag_H#O@zoyAZv+;k~@6ECK?Vvs{U{YXY&nu%Ah%bp}#g|q`I%U#o85AUJDz%T9b$>;B7j$YYH=HAg9-)2?VnySX! z*qLlF!2ZPanga7`^zp@*FDYG&wjn8i(%pS{Or9vI#S57)ESyOTr601;3`ZR#7v_&X z@}E-kpT00hy>Ey0_~l3bktJFWr|-j;_(~B#$$yGxjv{V{G28b&{YU)rm5yZNSHtOl z;!A{31mOI0LN)lA#pUb7LHFm$>+)><(dxi-_5l$N27cNkeZqShOwy4nf5<*@t@8g> zuizx=nZomA)GbSZRP?fD!GG5q79jwfDWx`=t1!ntgUMbe_0M|%lSL8O6W3FkV3+Az z&y*K4Hh_R59_6612uZ9Utpi_ZL)dU4j6a$j?8NYSEPO0Ek?y-n`+W2?GlmA80O zz>hnT7K$2{*&8=LovN$%%uC(wvQrmRJ1K7>m7|bjh?Kl%hCL&lCetu57#aL(%E>h0 zkUHRxNkQ-5k>I;_r9C`Vi)Q*sWoT7MRm7|u9qb{>1oZ|5{Er_*x!t|9N$$TtGxsHogf3$g}a_^!^(T&Vi(WQOzW@`3Wfg(gkWgSC zfs@C7QegGTFrmG5<>;}=#lHZvY>rGyD#iQ@Ln|voB@aN}ehs5K$ z#zzYWbY=cNfv0+&`&|QL9}T0&{KT(kcJdw|dDDLYl0h$k2If{PfPG3T<#2uAb?&;z zLSf<9`7Z23K;|>pWOd@P-RkV*iZZ6@l%WXobi?EdAEw9W%f6%>y$OzaEtRl&VZlWw z94?TcBpD}?bLhaLSHHGm6Bo>T9oEACuIWWDBmYxNQkl?Co3SI8*=Ew+x6`z3Z%leH z*g!OQ<*UVZmzq>$N^Z|{hnuVZ(>Ycoa!ON`UbpJTgV%S&8{NDV;=!}|txL0PrFII@ zRcr>N8k~272g*)rK(0knUY)r^$~xSBI>0a1?E=pfw3`u}s4$nyx8a#v^aa}tTvgIe zkYvWP?c>0?xN*$+OXHg2VNU`ICz0b8y*4>~f#+r3LutdUbI^JT_S{WO;r5qYf$W!!!q{X%WNj@p=ZM;KUr5}wPd?0$QOI; zs7e`DFJvU`LT;H}lVA1bVUj9Lg2LAMPeha9;zKp%;|tTs$kWX(q;BQy{ahkPse*_Z z9XX-6OZiqi`<;dR@zXB%Y=ffKJ%J6^q5#q|Tq(^ok!UD&)#UWGI)8Ft0`$_aXlzCY z$*PfK+HiJ!_uXkgU&1)an5xXNlk&2>DW>cymvcNLn^VVVz8qJMfU|Q1RDgv9*O!qqlBdrdFlq{qp|(Nxp%p}C%)4@kV%Oaw1G>Kl3nwogScG*x40>=??s=mGW6*64 zNQ>Qxo-_1^3LDHwOO}!Yjy|2$5yFN`TwY2uW94mmj9wzsxJwpiXXTOkN_qWxK`=pm zK>O?)EFSt0+DRBh5%4JBfez9<+`Rhg?aYf;k6H7h%UArSO`9lWxW!!{CwcKQ6mn^@ zXE16M_4t{rNPsK^k+%{miSI3=Jx&T)g58HvMVp60+@Zb`HXAQxmt)nW_+YwS-vv`!IY!%pA6iwE_87O>Z0E_ z81kBXSASUM?sxH6WGjQS=w}@@sle6b<>+<9;c{OhZ`Eo=Y%v9JHA$I4c8+44%@OlK z&+3g9!{bG6f8c<8tfQM#Gt_X2&(4+N4iS#=S?e;paHD|mcGoHRH4bE)K<^axB`~_^ zNLx($o<;I)wGAc(j*n3a12SlHx%-i-a8K6#mL&8$mB6a$HwAw6QNP~Y35YIlpyYl&`Pn^+_MLqOORb2j~283}}Itt<&z zd(h%olWoD%QbymZeC61%YTl<*x!&2+ux#?DG*$d8Gayq=_mCL8E|eM2SgU$%SGH@u zfYC#b4@fdy&uudNmXwB2z?hxBhwiwJO2xc_5IgLVbKdF|oqkPf2W!pO&q-)HpdI%& z1)PAQ#_qFawT2PZgK#61LQ1_n1V!08#f7I zM1!Tp>t*N?oo;rJqj5*0;IqRRhjY`No1VRP=w>vI!9EnO`%6jF>AFE=a1C48Si9lLwU0lWwnUm$ckcRiCYqt4 z+Gz#Wxjp1IV$9zqKfA)8V*C}~Mt_u{yK?VxuEDJa6M^pE>ngidY3%fA)s*Hg0-mAY z+(tXcmTxQ(?0D)fw|L4|)04Jk)5sVMH<$N~D_Cl2qJnVaq>>N&6*7T?Y+c?zlq5zh zmAbs#KzaT3gUBU=m~bTt&+pRh5#8Jr&oib z+iW*!sT!1`nMb;jiO$-`eg)zG0%*h{Ck*_th`x6vy3h6aRSgA1G3)NMf1Q}?X~sll zYtMD^bj>8jyPXx8RfT=OVA$a-SHB~AeBQI?W+iWU3FW4MsR0ah?OD@VEd?LLc8^|l z8hKUWGgv0>W^Kf@!ic;5sMYQ^^FEe0niFGg+0V< zNdheXWsO+k7$yQ)g)*89tzaj9w+*W_qQf-<`7Wuqv$xL7%~iWNOkBDeA#@J!##{sB zJbN;)BKrCwgq%*VBEVNyY;WB}$t@o@`HdVaefEg28IBSbO5M!bZ`F<8J9is2n7>1( z9YU62gWUK1D;!+;R_=HK-pM;&rx`JyOug&s%4)ai)2n3M{2TOP`|U1Y| zUf1rjRqRfxZI#n-iN=Xd2+qxW8Cn^@=-X(b0e7bRgo=~DrqfvHzB4b>7op)Jn)91G zKcl)Um7;yo4)vgAYiZb7?kt_Kl_%uua|~5S$u>4%F3$YKpbLHN{bOa0TA%X+~F%`D}p;_0DyJ`nlW3d&CX8)`Yd2Hq3tAdxU z#%)bM4G(7~u9aZ~zDUDFe$ zh|oLx7Y5%bclCrdG!tJ{wpoMBTg~1kRS@f!wpkBvRelEO3+F7HBJ?Fs2h`!|3)IPK zS(Qr;i_=zHv*%f-lfhuqaR6d&FJWJG>aZT!aY+?TPA-L{=ALD zBIzgHjLHrXRcGTHu_<+8nZjWPBI8|Z_>MrN@Zy`FrcbUF_Y@XbRM;<;5)85pGYH&gkLpeNWjo<@DOdA&t+WL0xa?%}BfXaz(n}Jm zc^baX*rBYI@xEhx(Iw2vR$EATc05YOdz{clq-l(5H+nAw@gAZQk-PI!ntHUG)mEHr zT8z*esOPRouw(t`L7lFn0h)7qN$HTq#oJL3m*&!!yu3fqQlOEhAYhsXRUaH|?50OP z^w7D^nv(q1+$1zTUfg7?sIW9Dz;)mT)}CIo{Id7vGH6WT%@HYc$79f)pP9*}iz|&) z+R?7CwXw8J5PsJ3xB+pMuRHA+nMJ;4IDO5?~qLuC@wOECrF?&Id69!Dr?6MeOX)hF-61;$%4 z*M$oyS4dKeMT7ne3}SJ5QTAqK5jH64nl?tVPktP2aBTj%aI zF`GPEiohp7@wRcz@{0KCRJ$mgP`XB>*qtBT!B4#{SYXh#FZtlN#+Fe%5#`sr zD_p)JA9rBi*ev9(^oz%@1-4HOB%Jq>epG`}p}?MTY~m(P>l_$LqbH(qJE$)fH75~=b0`q9Vwr7bOjIFFXuE-7R&E3Nxx~CHCTHAzocg8?Dt=H?VcWXB| zbp|529nQ8=wm3bC>Z8J`72k)yfEvv}upNh)ri)5?i)z64?O+M|(cF&C^BVrjq2W3u za{)1@5@FNrcl%D43-Ex06J*5*FWANK4T0_F@{?wKT)JGFcUsr#rnst34RC=RPDWej z$97_R#NU?iENj_|QxIYBClXoGbpTLZQFY`Qe@{b4Vc$v0e5hW3z^$RjR$m$4%)J_)s!Zac88vR?ygc0k zt)9ProR-;w1T4bvA< zBILA%#Ax)RtHv?jd7mbfIoK#>D&V{ZThj!(;k?4%0MC*H_t0%3g;sLwKPkVTB=5Xj z)iO^W+IWcc1#6E6hK*>rO?-t&A(&m!zKCawkKW#w0C5c90Z`)ad-l3jppcRFVYEu1 zR{WaWg_rW$}rHZ(4%-?7rch)ye&AW2;5K@h9cH*U+iX4IV@VjgBT2=x>1d!L8Rv1G)8XLEBhf~R zo+PyjyllI>Y=`RV6soc+?(5Y&R z75C8P1^$><)2})^V_q;$QW#o?R)KlWhpcJuK78l1sz&a75SSdL3=bbQiYHFN$5zS# zVvRu@Mg2YU%%J&!xBTTF`UtAH@E%5Yoo43TmAdZi2i!W|x^~(~n$nZ!bFRPNRpo2k z_O&Rp@X0VvmrSnXe%thZCLQX0scf(J&Ji>m)r{(e|>{^xn3h zGPLNVeEFraRxql*^+&2>7YX`fgL%3>P!be_KU$|wPL`48+5pKNRqt(SGgR1YA+4Il z7vR$W4H5*kFuWqM{cw;rKa?PmlaqXOFWDNq<)e|KZU8D?QTx-rZ}~y~?BTlEX<71J za06<%OLwX67rB-uhf%;cDuZ~-ypumwRqYkZYr8T10gkHN5NC7St#)*w#%F4N;2`86 z>`3RnP<0y<>0~v8iDts<_)mbE;J&eUH>{nGshty<@d$S~J8uKTJY>a1((#I>JI#UW z+uB=ZgSv7Yb~Njh@h%di6}8l}WH9dBXTvw?uBLpv?7A!(s&~wiyv9Fn4tsZrR%mHj zvn1p&Ol^E+?29nmDuL`UGKppY68guI7U-P{(JetyQg^Ou&4suolfJC}><;gFEeo>* zHMVjNu|b#d#RW}Va4@*Pt(+s#sh}KB9o_2mrtJN`I_WWAO2%6Ih;usvnOnnFekdY5 zH)Jhq1@8z~)l!5vDf-wV3QNO8qw1bU)i$Ts-6c$z$i@YNc-AwUZP$R%6h4+fU!Gm) z!d~6;fN!$D|#Pfu7xFo8S&rY;%NYRK_{3kb8JX71?^oNe>S6~U&ao6a) z^Idl^$UglG%VN|I}s8jW*xk=z#wWVK2u0paL zSrF4zYYIIR8Cs(H!UC|q_WYHWMZCqO_IqZ%zV(Ve7iuqZe4k~~@hp)VJ$!K&<|??5OW z{uf6JhoVPtUq&Z@+_%z0dng?@yqjM{X_)J!r5;24;9EWRK#^A6=LI(ov8rJ<-^7Vu zE}Rpt2!?ooY__br-jTj84h%AUHHk18Yd1+G4_ugU#2Q7zH@a zDE|a<@Nr1UNm$1=Cdt!d2;LA`LZm-wr31Zk#p|!f-t-0oJIurlISHDkv$;W$eXyXe zRWAkM@NLs6hvVF}hhU)%I1K+>hKE3RHepNC_{e44@H;MTETu}h1$%1BQ)5>!8BZ_g@JHD( zm1sEGYWBoCXysQXu$^g6+64~tXFs>CwLSrm@y@QmXrF7{FoCbakdi1l&Em+`@rhf_ zuj-X&gl26Bfr9q{$Fv2hK#$ng0Sbu;pa{9sMbH7ky9L2>zw4$b&=eJZfk5x=CViZ{ z+hOjH6@A1M?IlI(M@Ko#LgpD+?_HG@>jgjf+#&8xt~6M>ExUl?=*9-2{Q^ay^fz+@lR}5wrbZT>l*GuLKYd^YeRp+-?2V zOL>XFbXAz`-eA<^bmeYM{4u7tnU@$qlox>}^l96jD{m@THV!HbkaKc%2o?%1$~>~S zsK%XEIr|ZJ@pj@n<^CK0#{LW@Xw~vB;M4TM-ARfOFd`7(L~hs+Fl=ybAgUdtv`_O9mIyy{kC85wICFXwe@+~DR{*nb|51lWZwP&ij{B;9icwsj~FBcsy6g+CA zr}yeS)J<h(U=wvhtKL@>WeZh0E1 zkFvn2{mviga*pU-o4=oG+sD!@_yI9g@a)ePm8P4DzZhC$v-%Fw@7*i*(q~7tZ&@^T z@Wv_bq*F>PcFyIKUV(t{faw54P=PCTnA(4(2S^a=8g)BC+@K|w?xc#8 DA04!_ delta 9206 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 - ClearClock Default + ccdefault @@ -42,7 +42,7 @@ - ClearClock Default + ccdefault @@ -71,7 +71,7 @@ - ClearClock Default + ccdefault diff --git a/package/contents/ui/config/configAppearance.qml b/package/contents/ui/config/configAppearance.qml index f8b0b8a..71ca4a5 100644 --- a/package/contents/ui/config/configAppearance.qml +++ b/package/contents/ui/config/configAppearance.qml @@ -10,6 +10,8 @@ import QtQuick.Dialogs 1.2 import org.kde.kirigami 2.3 as Kirigami +import "../lib" + Item { id: appearancePage width: childrenRect.width @@ -18,7 +20,7 @@ Item { signal configurationChanged property alias cfg_clockUse24hFormat: use24hFormat.checkState - property string cfg_clockFontColor: clockFontColorRect.color + property string cfg_clockFontColor: clockFontColor.value property string cfg_clockFontFamily property alias cfg_clockBoldText: clockBoldCheckBox.checked property alias cfg_clockItalicText: clockItalicCheckBox.checked @@ -39,6 +41,7 @@ Item { property alias cfg_dateItalicText: dateItalicCheckBox.checked property alias cfg_dateFontSize: dateFontSizeSpinBox.value + function fixFontFamilyChange(id, comboBox) { // HACK by the time we populate our model and/or the ComboBox is finished the value is still undefined if (id) { @@ -73,7 +76,7 @@ Item { }) arr.push({ "text": "ClearClock Default", - "value": "default" + "value": "ccdefault" }) var fonts = Qt.fontFamilies() diff --git a/package/contents/ui/lib/ConfigColor.qml b/package/contents/ui/lib/ConfigColor.qml deleted file mode 100644 index 2af46c8..0000000 --- a/package/contents/ui/lib/ConfigColor.qml +++ /dev/null @@ -1,51 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 1.0 -import QtQuick.Layouts 1.0 -import QtQuick.Dialogs 1.2 -import QtQuick.Window 2.2 - -import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents - -import ".." - -Button { - id: configColor - - property alias horizontalAlignment: label.horizontalAlignment - - property string configKey: '' - property string configValue: configKey ? plasmoid.configuration[configKey] : "" - property string defaultColor: '' - readonly property color value: configValue || defaultColor - - onConfigValueChanged: { - if (configKey) { - plasmoid.configuration[configKey] = configValue - } - } - - onClicked: dialog.open() - - Rectangle { - anchors.fill: parent - color: configColor.value - border.width: 2 - border.color: parent.containsMouse ? theme.highlightColor : "#BB000000" - } - - ColorDialog { - id: dialog - visible: false - modality: Qt.WindowModal - title: configColor.label - showAlphaChannel: true - color: configColor.value - - onCurrentColorChanged: { - if (visible && color != currentColor) { - configColor.configValue = currentColor - } - } - } -} diff --git a/package/contents/ui/main.qml b/package/contents/ui/main.qml index a5d08ec..6a0d62d 100644 --- a/package/contents/ui/main.qml +++ b/package/contents/ui/main.qml @@ -42,13 +42,6 @@ Item { source: "../fonts/Smooch-Regular.ttf" } - function max(a, b) { - if (a > b) - return a - else - return b - } - Plasmoid.fullRepresentation: ColumnLayout { anchors.fill: parent spacing: -20 @@ -65,12 +58,13 @@ Item { id: textMetricsDayLabel font.family: dayLabel.font.family font.pixelSize: dayLabel.font.pixelSize + font.bold: dayLabel.font.bold text: " Wednesday " } Item { - width: max(textMetricsClockLabel.width, textMetricsDayLabel.width) - height: max(textMetricsClockLabel.height, textMetricsDayLabel.height) + width: Math.max(textMetricsClockLabel.width, textMetricsDayLabel.width) + height: Math.max(textMetricsClockLabel.height, textMetricsDayLabel.height) Layout.alignment: Qt.AlignCenter PlasmaComponents.Label { @@ -80,7 +74,7 @@ Item { text: Qt.formatTime(currentDateTime).replace(":", ".") color: plasmoid.configuration.clockFontColor - font.family: if (plasmoid.configuration.clockFontFamily === "default") fontOutfitBold.name + font.family: if (plasmoid.configuration.clockFontFamily === "ccdefault") fontOutfitBold.name else plasmoid.configuration.clockFontFamily font.bold: plasmoid.configuration.clockBoldText font.italic: plasmoid.configuration.clockItalicText @@ -95,7 +89,7 @@ Item { text: Qt.formatDate(currentDateTime, "dddd") color: plasmoid.configuration.dayFontColor - font.family: if (plasmoid.configuration.dayFontFamily === "default") fontSmooch.name + font.family: if (plasmoid.configuration.dayFontFamily === "ccdefault") fontSmooch.name else plasmoid.configuration.dayFontFamily font.bold: plasmoid.configuration.daykBoldText font.italic: plasmoid.configuration.dayItalicText @@ -111,7 +105,7 @@ Item { text: Qt.formatDate(currentDateTime, plasmoid.configuration.dateCustomDateFormat) color: plasmoid.configuration.dateFontColor - font.family: if (plasmoid.configuration.dateFontFamily === "default") fontOutfitRegular.name + font.family: if (plasmoid.configuration.dateFontFamily === "ccdefault") fontOutfitRegular.name else plasmoid.configuration.dateFontFamily font.bold: plasmoid.configuration.dateBoldText font.italic: plasmoid.configuration.dateItalicText