From fa1842370be003a246fe0d9f09fe6aa560714f3a Mon Sep 17 00:00:00 2001 From: Stephen 'Okra' Houston Date: Tue, 22 Aug 2017 20:44:14 -0500 Subject: [PATCH] Netstatus: Use arrows for up and down net traffic indicators. --- data/elementary/themes/edc/netstatus.edc | 44 ++++-------------- data/elementary/themes/img/netstatus_base.png | Bin 1339 -> 1975 bytes data/elementary/themes/img/netstatus_over.png | Bin 1101 -> 180 bytes data/elementary/themes/img/netstatus_rx.png | Bin 1196 -> 1116 bytes data/elementary/themes/img/netstatus_tx.png | Bin 1304 -> 1150 bytes 5 files changed, 10 insertions(+), 34 deletions(-) diff --git a/data/elementary/themes/edc/netstatus.edc b/data/elementary/themes/edc/netstatus.edc index 88d8040bc7..53eecc218d 100644 --- a/data/elementary/themes/edc/netstatus.edc +++ b/data/elementary/themes/edc/netstatus.edc @@ -14,15 +14,17 @@ group { name: "e/gadget/netstatus/main"; new txper = getarg(6); // new txmax = getarg(7); - new Float:val = rxper / 100.0; - custom_state(PART:"rx_clip", "default", 0.0); - set_state_val(PART:"rx_clip", STATE_REL1, 0.0, 1.0 - val); - set_state(PART:"rx_clip", "custom", 0.0); + new val = rxper + 155; + if (val == 155) val = 0; + custom_state(PART:"rx", "default", 0.0); + set_state_val(PART:"rx", STATE_COLOR, 255, 255, 255, val); + set_state(PART:"rx", "custom", 0.0); - val = txper / 100.0; - custom_state(PART:"tx_clip", "default", 0.0); - set_state_val(PART:"tx_clip", STATE_REL1, 0.0, 1.0 - val); - set_state(PART:"tx_clip", "custom", 0.0); + val = txper + 155; + if (val == 155) val = 0; + custom_state(PART:"tx", "default", 0.0); + set_state_val(PART:"tx", STATE_COLOR, 255, 255, 255, val); + set_state(PART:"tx", "custom", 0.0); } } } @@ -34,40 +36,14 @@ group { name: "e/gadget/netstatus/main"; image.normal: "netstatus_base.png"; } } - part { name: "rx_spacer"; type: SPACER; - description { state: "default" 0.0; - rel1.relative: 0.32 0.33; - rel2.relative: 0.98 0.78; - } - } - part { name: "rx_clip"; type: RECT; - description { state: "default" 0.0; - rel1.to: "rx_spacer"; - rel2.to: "rx_spacer"; - } - } part { name: "rx"; type: IMAGE; - clip_to: "rx_clip"; description { state: "default" 0.0; rel1.to: "base"; rel2.to: "base"; image.normal: "netstatus_rx.png"; } } - part { name: "tx_spacer"; type: SPACER; - description { state: "default" 0.0; - rel1.relative: 0.04 0.08; - rel2.relative: 0.68 0.50; - } - } - part { name: "tx_clip"; type: RECT; - description { state: "default" 0.0; - rel1.to: "tx_spacer"; - rel2.to: "tx_spacer"; - } - } part { name: "tx"; type: IMAGE; - clip_to: "tx_clip"; description { state: "default" 0.0; rel1.to: "base"; rel2.to: "base"; diff --git a/data/elementary/themes/img/netstatus_base.png b/data/elementary/themes/img/netstatus_base.png index 9c2c55f837972f45b6663f9c10f78ff5560f2985..cdc8e20137c3efdcaadee54586fc6e2fec0e0582 100644 GIT binary patch delta 1971 zcmV;k2Tb_83bzj-iBL{Q4GJ0x0000DNk~Le0000$0000$2nGNE0IF$m-jN|3e;cm= z02{9XUK)`c00007bV*G`2jK`80VF2QRY(i~00%@#L_t(|+U;6hY!lfPKKIU@ACF_3 zBtQrlBa$TwGHob7fhYkSEsCO4Y>|*kD^*=pyH)#ARYF>+Pc0YFm}#dK+t0|0^NdBPa`+&U3L3?XFdx=sOrI`xN2fAI3WBuQHZ zK?usSysN#v{o7ZsUj3#O1m@5#A%yrlIyx>yB9R~Ey*OI?1OT{k&JG+n@SVel z4|h5(kjff|=83{zAQA`N&dOV)p z+qZ8&eB{WHKDR3sMX~nm*|Wc{6e-|B)E5L{tKaW$IdS5|d!i^xrEuER)bzDer%rvf z5DV-cf^M?KMzuB~gm^?zYzT+LXLjt^v8R-gKY8-xM=xHyXaImzIVG@R06320JRXlX z91g#&X<7y$e}tHIQ?UX>3Kc@u4w-qiJ;NAFU0q%M0Pu}+N?@Y^Fiq3c*RNkc?C+278c6Pqo*x0zckdyxY{=QTywTuvA*=$y)lrCkn*;ka()p8d? zUl;&IQOsyGs%n}xuW8z=+<8F=5h$feS(bO1rkS$uh-Bu3jl_jw%Mkn zL2H2&05SlO27t6-7-_~>#xzZ8*9p(_YHmINr~sfVijuV<9ahdWAQuFdmmQdCn#{`U zcJn`T+8?achDgbgONrLgNs)x2(I_gmz#e=-07E?>TE>bh=N@-;VNA1U+36Hycc=g*)2Lt|rOc#ZB603e>{1v^H%yStU{ z?(U2E%t-+0M#@tvAVkY_qn;bv3vLKed5O0*x1;I)6>&;4Z}#=sWjal ze}bi80Rw5++viI1F6zhcs$ovbi6Huif}Rnu$7XquL~e|GKK z51mrqbpY1f+TM79w6wJJaCCI^kGT#JV~hn9_AU z5sSq>(RF>!ZmnOC%??{x*a{vI1Yunk>AG&hf7;(!H;ar$qZ|N8gb)z`vW8)(ilXSH zkQ#EaC{%=&OVK~X)_Pebd{3yNiYlt8qKYc2_@BqW0LZ$s$Pk}?XaE2J2>?k&PDHLk FV1gQ;rBVO@ delta 1330 zcmV-21iBL{Q4GJ0x0000DNk~Le0000m0000o2nGNE02<0zjFBN6e+v@; z01FcV0GgZ_00007bV*G`2jKw^4lyvE)j@Rt00hWML_t(&-tAaRPU}h(tp3;{VgOs< zZuE)?i(tZ(WgxK(n7|I=B<{a`2T#>HHV&T~OHX<)Em;o1Nlu+p=TvnA=XGBH@1^+S z@$vEZv4_TStoQkA`FGA4-h0Ftf8o8amvatX*VXr9j0hnhrG%%ar`uBi*w6mC6!<*& zaU4-f!7vO6A)u6kloE2zNGTzugcu_LOy18qV;F{$D`1ZWE`whRTxOj?#~6`PLMa8# zIqY^jIOh;TsFjE@BImpsh3r?^{)|F7=XyEkkWzy89stlZ4K6M&5JEr*e*w-pc<)h4 znE+o6z`UIE3dlPtLn<)CtO6;+?~O6mN|0v5FnmbV$rL(98~K_)&Ol>~D5XreO@5bB zP)ezlaLxfheSTF6u>wn38OIUBFw~%!X-*j#IH|-yLkNg5LTio9W&^EtrO~PsTH-x} z=8v%fz4wz~LkQ^m9y#Ypekrv9#=sbZoHL9ulO~tE*IKU!fFi@7bL|f0MCl4`{8?wrvei zDTQ$y>z#qgae04#e~W*4RRC?O@oxuQN8$%Ih^|{_J-6GX#(YV zo(~Hvxh<7gDTSOff2_5Yt4-6uTKl0deiHan@N*N`bzQ9jHHOc8IYwDdj!QNi-DdgYCU3%==;8!Ksi`G0C<0YN8k7L15$D4LiCetFJ*mhN0{9Z!bCsl zpXMe|#!&&hzP?W8Jb#E2h<9#GN2a-=EXB0=T)knFtfT z{dT*B_a1%U0{}t@-{${({~)vOoSTefX#xo{giuYOQfg7XD}bx3s|hzbm9*B_@At6Q zqU*ZJCgwXqkKv%l&VqWcx2#m zG_n$O!E$d-swt(`?E%TjV7HR06BfU_q7)od?^K5Ycx#*?|s!KiYO1yRs$eS zASaD9f%43h)FKVqwyo+rZ*J0Ozu%+pdmIjji7u=H;O*_LemT#GC{WDYlAY$pKIdHL zyA&%{f6y3%aU82#kG^zWQwyK(000002uVdwM6N<$g3uFb8~^|S diff --git a/data/elementary/themes/img/netstatus_over.png b/data/elementary/themes/img/netstatus_over.png index 62d5dcf10c9da01fb6700477121f357c4038b757..fdd2f9d900870e939d49338690c72f22f39e5dff 100644 GIT binary patch delta 140 zcmX@hv4v5wGr-TCmrII^fq{Y7)59eQNIQTq2OE%Fm05UiqM~6Ehd86EVE*SjPCzk7 zPZ!6Kid%25Z{%e#;9xem^}oJtX)(XTwj+lmQX8~@DuAG2@44B#UV3sk0NDrq59VJ# gIXxkp6(n=Oi239SCO+2C_A4N+r>mdKI;Vst0Gtjf`~Uy| delta 1069 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 diff --git a/data/elementary/themes/img/netstatus_tx.png b/data/elementary/themes/img/netstatus_tx.png index 1387226652971cc58ae962c3a14bd77c4d7e1142..ef23e11f35ee2ccb57158cc2a702d3a49eb5f281 100644 GIT binary patch delta 1139 zcmV-(1dRKb3jPQoiBL{Q4GJ0x0000DNk~Le0000$0000$2nGNE0IF$m-jN|3e;cm= z02{9XUK)`c00007bV*G`2jK`80Vfy>_a{POBRu`r7S?A$R7ap1C$MmmMoAE zDu_099n1A=X6|8uP1Og)aV&acf8U=pvPN@fj_?2e|97sg20)|HXfzs)M$?~QHy)DP z+C~7N=Bdo@?(k_5!01xvO(YRUBpX=5*_Ac9fA8+85P`bT`2Y!fh|FNd2oGPevNvu6 zfZ4p(+X4UpAsP`hooNh@T&&Do|Ked}>1K3#^;S3BrE~;xTiXNxj$wt9e-w-_H%6B> zi{Z@M008AsdTqG&%U9EHEtgb}0-eD6f`m1QRwyH*iAztT+11u{7p>s4^tEpRAfS2_ zsAKDs2%{NHqZ7{-hgWYf(hJXeY^Ih5<}ZJ$dK8QfN8dKgU;=~j#roLFX4y%cd0pF* zlX`!`fA~%M?D>MKQJ{{je;=^pXoluEnp!J{=gkB)L!J&o1 z$UCoC|78j^G9SyXf39j2jN@9Lggr%}!NuCdySFOVc(R>)i`LY833~K>GLwCzS`_G5 z))#h+oX8xtw0?rgVvBhfQ$|n_bc)XKhMH;=3cFI2_X6AoWB?|30Kp+KTUTdu-yTON zwoplZ_*qrNhPzR;e~9sOvoZd0GIeHu|K43?9e_x}0bz~dXf{_e$J5;`{Bz`k+e3-D zkjfE2B*PG<6FMBoUKO%l6S7fn{Ti~-K$fztZ6{_4%-lMVS-O&JKY4lYO$#9YYtE8h zz3P^q+>iXUcNG9EKqNpCDC{u^4P7XYUD_<$6GtwFCinL?f4o}x@NX&n2Ka7~**_@y z?lWZt$nWmR+}3tgdi6iSs~@!7f+S1~xFs@!QwY*;s|d>b_3Gi1maqWe1Av#`-H|Fs z0GfZ$1%Mg=Q~;pD(yIV-4OzNvs~iYaTlWJ%6#yFf-5nnkKpfTJI z6+u8&b*Gr1f6sZN0;sSWB-JCRxBz(45j6VU0o?BbczrE^3TpxV8a&w)i2W@<-#dVN zzyjIlm6+m<(fOJc;UVdOaxbyKSlKsk>n3(~%Nx`05VCgMG^o2002ovPDHLk FV1kt84fy~7 delta 1294 zcmV+p1@Zd+2$%{XiBL{Q4GJ0x0000DNk~Le0000m0000o2nGNE02<0zjFBN6e+v@; z01FcV0GgZ_00007bV*G`2jKw^4k`>7jP_^%00gB;L_t(&-tCvWt|P}0hQIFV;h}c5 zP#`EVV8{v_D^%`RF`%c>6ZjSU0!ke?bSfxuU_p?vI)HZ%Ik)bvi-MlRC0Dyn&L~)D zet=+2lbrdh>aPo7$By4O!lUt*e{bF2{_t|5?adsp^)qX>8{psyx`0jtRu*(VVfl+J-x)rgysP&6P5?OO#JkZzlEnbkluCp|A@a$-UYORSFmNkRk1qZTF{#DI%9Qi zzmo-*87~tq8FPDb2GaY8+oSy+;*Ah!1}l!&5i3h0FM`Y`^!yT8Ghxdaf0<8s88OM5 zN$BE$%e$j}A*;_ea`hL>a z*EfoL{@7_6@fnwb&JS44 zfa6lJJfLMF#E$gr6EsI$mFSA8Zs>sB2IQJ_vjxj*cbQMPmR6K?!j=JYXPm;W1*Q6x^CMpq6*y=t8yrVTT&f4sgWZMHhJ7Q;nqf?K_bVCWK|OL*vT&8}6|&5&kJsFaR4Q(j*hjwn`b%E?@ddIY z^$b4_eD}?FTMe>6Oa~t8DjtBtkDq>;h}E3L@9F0Exgw!$(t z`P3OL3)Lz=4?iQLa7;%I-GQRzl8qD-$8;oy$T1zcAMbgXA9yvqqDsBUZW9OQ|NIM? zU!&tIG@sivU52*$YF)R-+oD_Q!uKz~C-sRUg%~2be-0}(C5A|!nq&^?fSPiePV3fd zlv=iPVEFex-?T@qZ76BQ-0{n9lL2eHjtOeY{lh)sqtJ@fTG6^YW(M-sa`^bP2q~p) zC-L(yzQRoiF%e?IWI^XM_4HqCIiutMP{8tV_0I=H1f;b_Rc&Oix7zFLE5(S(&GnNV zNT2)xWL$Amyk=qy#B@jK5;EKqQV$O=*R6BGq~hk77_N?2|26S<*^gVUvE#|;Hrgnk zg7~|3z}-J=2h8llc3{Vj9XodH*s){BjvYI8?D&B33o-(E@c|rs%K!iX07*qoM6N<$ Ef|t5^wEzGB