diff --git a/wps/WPSLIST b/wps/WPSLIST index 8ada41afbf..c0ea1cc852 100644 --- a/wps/WPSLIST +++ b/wps/WPSLIST @@ -136,7 +136,7 @@ RWPS: iCatcher.rwps Author: Ioannis Koutoulakis Font.112x64x1: rockfont-8.fnt Font.138x110x1: nedore-8.fnt -Font.160x128x1: nedore-9.fnt +Font.160x128x2: nedore-9.fnt Font.160x128x16: nedore-9.fnt Font.176x132x16: nedore-9.fnt Font.220x176x16: nimbus-14.fnt @@ -147,6 +147,8 @@ Statusbar: on Name: iCatcher.rwps Author: Ioannis Koutoulakis +Font.160x128x2: nedore-9.fnt +Font.220x176x16: nimbus-14.fnt Statusbar: on diff --git a/wps/iCatcher.128x64x1.wps b/wps/iCatcher.128x64x1.160x128x2.wps similarity index 100% rename from wps/iCatcher.128x64x1.wps rename to wps/iCatcher.128x64x1.160x128x2.wps diff --git a/wps/iCatcher.128x64x1.220x176x16.wps b/wps/iCatcher.128x64x1.220x176x16.wps new file mode 100755 index 0000000000..f1e45245ae --- /dev/null +++ b/wps/iCatcher.128x64x1.220x176x16.wps @@ -0,0 +1,47 @@ +%wd + +%t1 %?mp<%al%pp/%pe%ar-:--/-:--|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt>;%t1 %?mp<%al%pp/%pe%ar-:--/-:--|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt> +%s%?d2<%?ia<%ac%ia|%ac%d2>|%?ia<%ac%ia|%acUnknown Artist>> +%s%?in<%?it<%ac%in - %it|%ac%in - %fm>|%?it<%ac%pp - %it|%ac%pp - %fm>> + +%xl|A|bat0-s.bmp|109|2| +%xl|B|bat1-s.bmp|109|2| +%xl|C|bat2-s.bmp|109|2| +%xl|D|bat3-s.bmp|109|2| +%xl|E|bat4-s.bmp|109|2| +%t0.5 %?bp<%?bc<%xdA|%xdE>|%?bl<%xdA|%xdB|%xdC|%xdD|%xdE>>;%t0.5 %?bp<%?bc<%xdB|%xdE>|%?bl<%xdA|%xdB|%xdC|%xdD|%xdE>>;%t0.5 %?bp<%?bc<%xdC|%xdE>|%?bl<%xdA|%xdB|%xdC|%xdD|%xdE>>;%t0.5 %?bp<%?bc<%xdD|%xdE>|%?bl<%xdA|%xdB|%xdC|%xdD|%xdE>>;%t0.5 %?bp<%?bc<%xdE|%xdE>|%?bl<%xdA|%xdB|%xdC|%xdD|%xdE>> +%xl|G|holdmain-s.bmp|86|1| +%xl|H|holdremote-s.bmp|86|1| +%xl|I|holdboth-s.bmp|86|1| +%xl|K|repeatall-s.bmp|66|1| +%xl|L|repeatone-s.bmp|66|1| +%xl|M|repeatshuffle-s.bmp|66|1| +%xl|N|repeata-b-s.bmp|66|1| +%xl|O|shuffle0-s.bmp|46|3| +%xl|P|shuffle1-s.bmp|46|3| +%xl|R|pb-play-s.bmp|3|2| +%xl|S|pb-pause-s.bmp|3|2| +%xl|T|pb-fforward-s.bmp|3|2| +%xl|U|pb-rewind-s.bmp|3|2| +%?mh<%?mr<%xdI|%xdG>|%?mr<%xdH|>>%?mm<|%xdK|%xdL|%xdM|%xdN>%?ps<%xdP|%xdO>%?mp<|%xdR|%xdS|%xdT|%xdU> +%xl|a|vol0-s.bmp|16|0| +%xl|b|vol1-s.bmp|16|0| +%xl|c|vol2-s.bmp|16|0| +%xl|d|vol3-s.bmp|16|0| +%xl|e|vol4-s.bmp|16|0| +%xl|f|vol5-s.bmp|16|0| +%xl|g|vol6-s.bmp|16|0| +%xl|h|vol7-s.bmp|16|0| +%xl|i|vol8-s.bmp|16|0| +%xl|j|ani1-s.bmp|16|0| +%xl|k|ani2-s.bmp|16|0| +%xl|l|ani3-s.bmp|16|0| +%xl|m|ani4-s.bmp|16|0| +%xl|n|ani5-s.bmp|16|0| +%xl|o|ani6-s.bmp|16|0| +%xl|p|ani7-s.bmp|16|0| +%xl|q|ani8-s.bmp|16|0| +%t0.1 %?mp<%xda|%?pv<%xda|%xda|%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdj|%xdj|%xdj>;%t0.1 %?mp<%xda|%?pv<%xda|%xda|%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdk|%xdk|%xdk>;%t0.1 %?mp<%xda|%?pv<%xda|%xda|%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdl|%xdl|%xdl>;%t0.1 %?mp<%xda|%?pv<%xda|%xda|%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdm|%xdm|%xdm>;%t0.1 %?mp<%xda|%?pv<%xda|%xda|%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdn|%xdn|%xdn>;%t0.1 %?mp<%xda|%?pv<%xda|%xda|%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdo|%xdo|%xdo>;%t0.1 %?mp<%xda|%?pv<%xda|%xda|%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdp|%xdp|%xdp>;%t0.1 %?mp<%xda|%?pv<%xda|%xda|%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdq|%xdq|%xdq> +%xl|X|line2-128.bmp|0|12| +%xl|Y|line1-128.bmp|0|57| +%xdX%xdY \ No newline at end of file diff --git a/wps/wpsbuild.pl b/wps/wpsbuild.pl index 0334133aa6..4f92b876ac 100755 --- a/wps/wpsbuild.pl +++ b/wps/wpsbuild.pl @@ -248,6 +248,13 @@ while() { $req_g_wps = $wps_prefix . "." . $req_g . ".wps"; last if (-e "$wpsdir/$req_g_wps"); + + if ($isrwps) { + $req_g = $req_g . "." . $main_width . "x" . $main_height . "x" . "$main_depth"; + + $req_g_wps = $wps_prefix . "." . $req_g . ".wps"; + last if (-e "$wpsdir/$req_g_wps"); + } } $req_t_wps = $wps_prefix . ".txt" . ".wps"; @@ -284,6 +291,9 @@ while() { elsif($l =~ /^RWPS: (.*)/i) { $rwps = $1; } + elsif($l =~ /^RWPS\.${main_width}x${main_height}x$main_depth: (.*)/i) { + $rwps = $1; + } elsif($l =~ /^Author: (.*)/i) { $author = $1; }