From 0f3c85172153b75feffd5c72309869751912725b Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 11 Jan 2006 11:51:26 +0000 Subject: [PATCH] * Remove timeout clock graphics, which seem to break on some machines and were scary-looking anyway (closes: Ubuntu #21210). --- Makefile | 2 +- common.inc | 15 ------ debian/changelog | 7 +++ head.jpg | Bin 381 -> 0 bytes head_a.jpg | Bin 2163 -> 0 bytes timeout.inc | 134 ++++------------------------------------------- 6 files changed, 18 insertions(+), 140 deletions(-) delete mode 100644 head.jpg delete mode 100644 head_a.jpg diff --git a/Makefile b/Makefile index bce7ce1..555ecaa 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ TRANSLATIONS = $(addsuffix .tr,en $(notdir $(basename $(wildcard po/*.po)))) DEFAULT_LANG = -PIC_COMMON = back.jpg head{,_a}.jpg +PIC_COMMON = back.jpg FILES_CORE = init languages diff --git a/common.inc b/common.inc index 6e29b82..ea153fa 100644 --- a/common.inc +++ b/common.inc @@ -1024,21 +1024,6 @@ timeout.init - currentimage - - /head "head.jpg" readimage def - /head_a "head_a.jpg" readimage def - - small_layout { - 70 173 moveto head head_a showlogo - } { - 234 217 moveto head head_a showlogo - } ifelse - - head free head_a free - - setimage - % set default language "lang" findfile dup { /tmp over length 1 add 2 max string def diff --git a/debian/changelog b/debian/changelog index d6685d0..2e7e01c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gfxboot-theme-ubuntu (0.1.6) UNRELEASED; urgency=low + + * Remove timeout clock graphics, which seem to break on some machines and + were scary-looking anyway (closes: Ubuntu #21210). + + -- Colin Watson Wed, 11 Jan 2006 11:47:56 +0000 + gfxboot-theme-ubuntu (0.1.5) dapper; urgency=low * debian/rules: Stop trying to install *.dat. diff --git a/head.jpg b/head.jpg deleted file mode 100644 index 81746eea0b577d4516ee4343717f379944de7cf6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 381 zcmbtPOA5k341MEtoDoag^rNNd6pJe_;X)J@yoS&lcrH)i!bAAk=t;&@!G*5G7xD;? zqD2>`>%a97Nrr0023F)5|m+BcdJcDo&)!Z@ao zDCrIQNm^t?`6w@j!?G-sel@P_cwkH0mV2y8-FtyA1#gjrDfWlA_n(D!=Ld#ai~=GM5C>EuYD7>$Lkp<5fbb+J zP69+~cs8ntqe3i{goG+e3soTqdAMelYyQ4{_B}t&Id|`S{~U3@co^7*cXo3IKp+s{ zx)p$U1W>`9i;e_S!QQ$e$vht*dYtTwYRA9;u8_M*iOr zzW@-DKr|2y0igjf0t7*T#O;6v00O{}pWpZe7#swZ07E3Vy7t=u5CjSafuRsE9Px7k z1cpEX2^a#dWvXbeq>T2KJa$^!Y`co;0dg)?$HKus;7C$(T7DVpaV_Wl{Fa3Bzoq~7 z_*q5#%kZD-ARr6bdJF=B0BnID5%?qJS6m^lXiGjuaHNNK(cr@EIisNGS9M_6Q?A&I z8w)HkpzyU)*Y|1!4|k!{Z_Mk*lltInlgR9+Z5#SqfF(U|DxE8b-2Ft3+ zGbi;TrIx&kGiQefK%I%}k+?+!5l_}Ksld<<5vi+iKMkCO7R~^Q=!HG`$mpov{losu zb`CD%Ju%%Z@rb@VEu)_@Xs216?CF>?pqCUhbj+=RM-Qg!=sHDFUsuXVgQBetQnCqY z9#lG*5$vpb7z_-Sur8bJC~W`DIq= zP!=W6pZSN?jNEi&U2Ru`fSf=@aCX0J6fAap_bHmo6)0?aZmC-qT{Bx$?X2{*G6V$EIJL;D$RQ-VwXC4$7T3Kze3Y zbub@y>l$I5Su$~h~su!bI zJ;Z>uh3)q*VxZTrREBW0BsBL>rDzEq3p=sub|PYA@rXYFSImK|OHA2KpK;sfuu=O*7!yHHKNKHYUlD3X4rC?&dGHtEq=@{CO^mdSz@j@3OKryqlULaQL&i_zc$e+SuJZ=Bl#?Ba>61e%=fZEEmZAIGC*? zM^do*_HYlFVdzw18h?$*;FS#(zb(E)mil1gj_DCzdXQs3u)y>ug^_#VZ(x1}dN?=j z59YR3i_T9w0@+oeXD8M_Yg4$a|Kb{)j=l*RHI=C8PdYJu3fs2$O(^uPa&N6#g&p6g z`pm$fqP;heGJhJ1s5v{^$C|sc2fysgCx2i61PC%^eF}=b2#;ZJqTUOlR;oIGqlB8x z6u~Saq8s(z{efu>NzmFAeix&0S?a6y()8O$Ep>)j*|MRC)3^c4sYsnx->7fWC)QKz ztoiHw`cNBl;hAAdK(kX9D<+8_5~-PnHYyk8uE-Y-)(@|U%5(jxYhb_0@v@Bj^giXf zx*ksOfS~-MLt4Pr;-J#uA8%_!d}!i)8ssDw>=Sq@S5P z0Bw6sTo}q2QJXb-x3*(3f8CrPE)Y1B`Tu@VQw%((=xye@{I~@-o+gi*^WAJx^&gI| zEiqe{cMS)x{<$o2sh(Yt7LD)N&Q%-loVUsS(y%7Lv?)AMT~I%1{Y8s}w3C4`ZceYw zm9CWNZ5-}HEs%c<3&p^U?QBI_ddX-&$-aq(*xJdq?zn_v%5u8P5xSzfm9fS0Ly>3h z=X$n_c4y?G?;2bqSZA!^1G5pme@ZIYW2XXBZR70=t0DV>^_MHv81=LIOGICO>1paR aJD$PpD+vtx ( ) /Timeout { - % first time + /timeout.time exch def + /timeout.timeout exch def - dup /timeout.time exch def + timeout.time 10 mul 150 add 182 div /timeout.seconds exch def - over sub neg timeout.symbols mul exch div + timeout.seconds timeout.current eq { return } if + /timeout.current timeout.seconds def - dup timeout.current eq { pop return } if + white setcolor - /timeout.last timeout.current def - /timeout.current exch def + timeout.time.x timeout.time.y moveto -30 0 rmoveto + currentpoint 30 fontheight image - timeout.current timeout.symbols ge { - - timeout.time.x timeout.time.y moveto -30 0 rmoveto - currentpoint 30 fontheight image - - 0 1 timeout.symbols 1 sub { - timeout.clear { 2 } { 1 } ifelse drawtsymbol - } for - - % free memory - timeout.areas { - /to.tmp exch def - - to.tmp .to_back over over get free - to.tmp .to_back .undef put - - } forall - } { - - white setcolor - - timeout.time.x timeout.time.y moveto -30 0 rmoveto - currentpoint 30 fontheight image - - timeout.time 10 mul 150 add 182 div "%ds" timeout.buf sprintf + timeout.time 0 gt { + timeout.seconds "%ds" timeout.buf sprintf timeout.time.x timeout.time.y moveto timeout.buf showright - - timeout.last 1 timeout.current { - 1 sub dup 0 ge { - 1 drawtsymbol - } if - } for - } ifelse -} def - - -% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -% draw a timeout symbol -% ( index status ) ==> () -% -% status: 0: init, 1: clear, 2: set -% -/drawtsymbol { - /timeout.status exch def - - timeout.status 1 eq timeout.status 2 eq or { - timeout.areas exch get /to.tmp exch def - - timeout.x to.tmp .to_x get add - timeout.y to.tmp .to_y get add - moveto - - to.tmp .to_back get - restorescreen - } if } def @@ -83,77 +33,13 @@ % /timeout.init { /timeout.current -1 def - /timeout.symbols timeout.areas length def - /timeout.clear true def /timeout.buf 64 string def /timeout.time.x timeout.x 60 add def /timeout.time.y timeout.y 120 add def - - timeout.areas { - /to.tmp exch def - - timeout.x to.tmp .to_x get add - timeout.y to.tmp .to_y get add - moveto - - to.tmp .to_back - 6 6 savescreen - put - - } forall - } def /timeout.x { head.x } def /timeout.y { head.y } def -% timeout.areas entries -/.to_x 0 def -/.to_y 1 def -/.to_back 2 def - - -/timeout.areas [ - [ 54 0 .undef ] - [ 62 0 .undef ] - [ 70 3 .undef ] - [ 77 7 .undef ] - [ 84 12 .undef ] - [ 89 18 .undef ] - [ 94 25 .undef ] - [ 97 33 .undef ] - [ 99 41 .undef ] - [ 100 50 .undef ] - [ 99 58 .undef ] - [ 97 66 .undef ] - [ 94 74 .undef ] - [ 89 81 .undef ] - [ 83 87 .undef ] - [ 77 92 .undef ] - [ 69 96 .undef ] - [ 62 99 .undef ] - [ 54 100 .undef ] - [ 45 100 .undef ] - [ 37 99 .undef ] - [ 29 96 .undef ] - [ 21 92 .undef ] - [ 15 87 .undef ] - [ 9 81 .undef ] - [ 4 73 .undef ] - [ 1 66 .undef ] - [ 0 58 .undef ] - [ 0 49 .undef ] - [ 0 41 .undef ] - [ 1 33 .undef ] - [ 4 25 .undef ] - [ 9 18 .undef ] - [ 15 12 .undef ] - [ 21 7 .undef ] - [ 29 2 .undef ] - [ 37 0 .undef ] - [ 45 0 .undef ] -] def - -