From 62f2a2d5c8665cacd36b43905f71e0c6553cf090 Mon Sep 17 00:00:00 2001 From: Paul Tagliamonte Date: Wed, 22 Aug 2012 23:33:09 +0000 Subject: [PATCH] Thanks, jocarter! - Updating `Joy' password dots. --- debian/changelog | 5 ++++- plymouth/joy/joy.script | 14 ++++++++------ plymouth/joy/password_dot.png | Bin 0 -> 324 bytes plymouth/joy/password_dot16.png | Bin 0 -> 285 bytes plymouth/joy/password_field.png | Bin 1078 -> 1214 bytes plymouth/joy/password_field16.png | Bin 223 -> 230 bytes 6 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 plymouth/joy/password_dot.png create mode 100644 plymouth/joy/password_dot16.png diff --git a/debian/changelog b/debian/changelog index ea57813..d54c215 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,13 +6,16 @@ desktop-base (7.0.3) UNRELEASED; urgency=low - Don't cut off the last hostname letter. - Adjust font sizes and colors. * Ksplash: Do nut cut off blurred icons. - * Reduce opacity of debian swirl in gdm/kdm background to be + * Reduce opacity of debian swirl in gdm/kdm background to be less distracting. [ Paul Tagliamonte ] * debian/rules: Use xz compression for binary packages. (Closes: #683903) - Thanks to Ansgar Burchardt for the patch & bug. + [ Jonathan Carter ] + * Update joy theme to be more password-friendly. + -- Paul Tagliamonte Sun, 05 Aug 2012 08:55:10 -0400 desktop-base (7.0.2) unstable; urgency=low diff --git a/plymouth/joy/joy.script b/plymouth/joy/joy.script index 86f2745..f346d09 100644 --- a/plymouth/joy/joy.script +++ b/plymouth/joy/joy.script @@ -51,7 +51,7 @@ bg_sprite.SetPosition(Window.GetX() + Window.GetWidth() / 2 - scaled_bg_image.Ge # Set the text colour in (rgb / 256) text_colour.red = 0.0; -text_colour.green = 0.0; +text_colour.green = 0.0; text_colour.blue = 0.0; # Tinted text #988592 @@ -60,9 +60,9 @@ tinted_text_colour.green = 0.0; tinted_text_colour.blue = 0.0; # Action Text - #ffffff - RGB 255 255 255 -action_text_colour.red = 0.0; -action_text_colour.green = 0.0; -action_text_colour.blue = 0.0; +action_text_colour.red = 1.0; +action_text_colour.green = 1.0; +action_text_colour.blue = 1.0; # Orange - #ff4012 - RGB 255 64 18 debugsprite = Sprite(); @@ -197,11 +197,13 @@ if (bits_per_pixel == 4) { logo_filename = "debian_logo16.png"; progress_dot_off_filename = "progress_dot_off16.png"; progress_dot_on_filename = "progress_dot_on16.png"; + password_dot_filename = "password_dot.png"; password_field_filename = "password_field16.png"; } else { logo_filename = "debian_logo.png"; progress_dot_off_filename = "progress_dot_off.png"; progress_dot_on_filename = "progress_dot_on.png"; + password_dot_filename = "password_dot.png"; password_field_filename = "password_field.png"; } @@ -531,7 +533,7 @@ fun password_dialogue_setup (message_label) { local.entry; local.bullet_image; - bullet_image = Image (progress_dot_off_filename); + bullet_image = Image (password_dot_filename); entry.image = Image (password_field_filename); # Hide the normal labels @@ -721,7 +723,7 @@ fun update_progress_label (progress) { # See if we any other fsck check is complete # and, if so, hide the progress bars and the labels on_fsck_completed (); - + return 0; } } diff --git a/plymouth/joy/password_dot.png b/plymouth/joy/password_dot.png new file mode 100644 index 0000000000000000000000000000000000000000..7dd7413375dde415dda9292e8224a2f2a9c4f280 GIT binary patch literal 324 zcmeAS@N?(olHy`uVBq!ia0vp^q9Dw{1|(OCFP#RY*pj^6T^Rm@;DWu&Cj&(|3p^r= z85p>QL70(Y)*K0-AbW|YuPgf<4lyPX=V*urDv~DkUR0{QR40!I+Kn)StKYjH?RHS+u7gK(n_kU z((Z12DE+9vxvyQMRph>X{%WiGnVBAiO>FELr+$C-;XYurWy zEsk@ReQ5E%(=HNkKPhRC%dA+LMETh(KE!-7ej@*{?wInj8}qX3qdrxpUf8y(*kj{i z)_2c(owjFeaXZcDHM43G5dZ)H literal 0 HcmV?d00001 diff --git a/plymouth/joy/password_dot16.png b/plymouth/joy/password_dot16.png new file mode 100644 index 0000000000000000000000000000000000000000..991a5864923357d53acfc631f8f19b5bdc142faf GIT binary patch literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^q9Dw{0wkH`a%F)OQ#4gC<%p&S{dxCdIlkc`WwK|)PU%S*q>)my<-Muu1 zAv0>b*8B;Q3qP%%d~Xq#-pvhZPVwy~vQ#4gF&b2S$+!RLTbsT*& z>@5;JIwgfC2u@CtIxm#}_fg-oGxL}`Yo-LMZ#w%)vPgM)r8kRFIO{IGrdeBZR#f}{ bVE)A@yk4*VT#bV*(B%xCu6{1-oD!M<`MY8c literal 0 HcmV?d00001 diff --git a/plymouth/joy/password_field.png b/plymouth/joy/password_field.png index d40aaf24febc7c1f8d490783f82ba92d5b7c98e8..4c0b93e32a140d5649bb1ecfe6f0fcedb70e3385 100644 GIT binary patch delta 1194 zcmV;b1XcUC2)+rBB!32COGiWi{{a60|De66lK=n!32;bRa{vGf6951U69E94oEQKA z00(qQO+^RX2o?ef53bWkzyJUQOG!jQRCwC$-N9=dWgN!w=l8y|v$HeVY?21CNkEIC z3W|ckU}~t?-h1#E_3R%gD7B!Lf_l(`2gPU_a%k+PNs~;nn}401nRi|fc_)3l@#3kl z`+VR>b{2A(!BvTbf#BVR%X|4-dtO~@zI@DoXjZo;(tL15sjzCH0>YkA3sQ<#{JDl zTe7oTRC%8J=Nq=(o&*4zNf;*Yz5V9&#^)Q?mtMQ}X%r`KDWwA5N}|co?#!6=Tc6D4 zMIK9_zdBC)<q_5s}b4^WbneV?H9H z;y9jq^?&Ns_WnOlcJ{j6!;`bK%osDo`5~!M-u9%SwGQX6%m;yPydokEc9&@KXsuP$ zYR#UW_LrhCY_)>Ge}XFY%Uc>ipeo&HMokNzVGvC;V~ieTgDC_-!v;b9zLwO{fV>8PVy&%T_*8y0fakA_6A_(9LD|uBkAI6$Fcw5~NogC}NARC}NARC}NARGV>N5i@yB6>j}m;2zaG%Ch}h~LuKN=Q5B_b7X6A=M`C@}!6 zh<_LWre0Xo+Y96(vGH0oc1RsggzwwVw5cw_n6lQ?O=u7hAs zL^N+B(ZmG9?037}@9*CIVfXRQ&zsvjhkqx%-U)ynfFS@QIR7>127m;>%zURaySBPA z_u=}-H&)kf+)3hOMk&PuQlbfPlBWG{zxn#X*5>c`|M=_Clbzk&qddWAckHn3Os*$^1{lYUU6tQft&hT zxY8gR+i3XVFgSl&V!W|_C`KvouOsqSAq)o5_=lq&Gje_5UuI&PkTwhvng9R*07*qo IM6N<$f~?Fqng9R* delta 1057 zcmV++1m63;3APB3B!3xnMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o000Bn zNklp)v7i)%f)|fHc_|j!NF*h-En2XmrBss5c6Z&Kot=5Uw}1TJ`ns)xH=X@{;KvS= zKZket^5ze$?>)_z&p?iSIR;Q{%9&g~J?Ha@KzJj8DCsH7l;m9SjK2Z!{||-dgd&sa zJI8K7h5@j_Fp-$h6FC#g`G6e+KJKxuK(S?6=6$z) ztFpPh6JEWsm8WUCr%%`QG$kY^9J#%RF(JX2)-(V5@z<)8k|UI8%;;Uk?1%5YyMN*0 ziLeGU6Wq$HOp@!E^4y=Lo=4VDcUZ$JO? zV0~$E!GGMsh@=mL2O;(aE*p(-Ze}{m^L&aW1IAl7NoFc>Z2DlIo(>+IxG!wkcmTkF zQp$bdGjOBf?m7U#8`)6UV_pph@b_|+`y=7t4Nn074$%NWGyo6{07L@-(Eva+0Dx!! zAQ}LO1^}V~fM@_98UR2v01yoTL<0cP06;VV5PuB-AQ}LO27v!YG!#n#;Hg0Pfs#I` zXYDj{;sIcU8w@qN(=d~?3-ZdX?=a=oA~_4 z?|*+#E|(v&Y`}OrxG?wS+WHH3?*ID0bfF{B80+*foRFJ<=pV{#D0Ce8;%Kyhn-N)2SfuXB=@muDwiRNb4k+o z{(5@i`OY7@_clrrin6oA2%O&oP@G_lh9h%AF?>J6`-cG7bHPYR02DtU$_a=X2^!15 bp8^a3?aw@R=b4iF00000NkvXXu0mjfcfkqc diff --git a/plymouth/joy/password_field16.png b/plymouth/joy/password_field16.png index 1a0d19b49b78b7e6b86d996006c8ca45a358ba8b..962c5578d5f755452868116dab32fd08026b77e6 100644 GIT binary patch delta 161 zcmcc5_>6IagbE8Y0|Uc>;y`gA#UJ1k;+k5bt1Ky_A|VjET+`MRz#F z7>(r~_pl2A6$W^^IEF+VetW}E@PL5;v!gg;g2&81pN~H|C9$UBo4}hDS0pakSN+P^ zDqFil($M|8^rIC5$B!RG28E4_H`TRIkym>*ebS}qJ)IY3s-ADL2b#^`>FVdQ&MBb@ E08OMqp#T5? delta 154 zcmaFHc%N~Cgf