rpms/vdr-skins/devel Aluminium-1.0-demo-fonts.patch, NONE, 1.1 enigma-0.3a-fonts.patch, NONE, 1.1 izegrey16-1.0-20050304-fonts.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 vdr-skins-prepare-tarballs.sh, 1.2, 1.3 vdr-skins.spec, 1.13, 1.14
Ville Skyttä
scop at fedoraproject.org
Tue Sep 1 21:14:25 UTC 2009
- Previous message: rpms/kernel/devel drm-god-shut-up-about-edid-already.patch, NONE, 1.1 kernel.spec, 1.1758, 1.1759
- Next message: rpms/papyrus/devel .cvsignore, 1.19, 1.20 papyrus.spec, 1.28, 1.29 sources, 1.19, 1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: scop
Update of /cvs/pkgs/rpms/vdr-skins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19085
Modified Files:
.cvsignore sources vdr-skins-prepare-tarballs.sh
vdr-skins.spec
Added Files:
Aluminium-1.0-demo-fonts.patch enigma-0.3a-fonts.patch
izegrey16-1.0-20050304-fonts.patch
Log Message:
* Tue Sep 1 2009 Ville Skyttä <ville.skytta at iki.fi> - 20090901-1
- Adapt to recent 1.2+ text2skin versions; patch Aluminium, enigma and izegrey
font handling (no longer filename based font paths, phew).
- Add EgalsTry 1.1.0.
- Apply Thomas Günther's locale patches for DeepBlue, enElchi, and Enigma.
- Drop unused SilverGreen themes, install default properly.
- Recompress cleaned up tarballs with xz.
- Hardlink identical files.
Aluminium-1.0-demo-fonts.patch:
Aluminium.skin | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE Aluminium-1.0-demo-fonts.patch ---
diff -up Aluminium/Aluminium.skin~ Aluminium/Aluminium.skin
--- Aluminium/Aluminium.skin~ 2004-12-08 20:45:13.000000000 +0200
+++ Aluminium/Aluminium.skin 2009-07-13 00:04:06.000000000 +0300
@@ -155,7 +155,7 @@
<text x1="24" x2="593" y1="102" y2="129" color="#AF80ff00">{PresentTitle}</text>
<text x1="24" x2="419" y1="62" y2="91" color="#AFFFFF00" font="Osd">{PresentStartDateTime:%d.%m. %H\:%M} - {PresentEndDateTime:%H\:%M}</text>
<text x1="420" x2="539" y1="62" y2="91" color="#AFFFFF00" font="Osd" condition="{PresentVPSDateTime}">VPS: {PresentVPSDateTime:%H\:%M}</text>
- <scrolltext x1="24" y1="138" y2="-72" x2="583" font="helmetr.ttf:20" color="#AFFFFF00">
+ <scrolltext x1="24" y1="138" y2="-72" x2="583" font="Sans Serif at 20" color="#AFFFFF00">
{PresentShortText}
{PresentDescription}
</scrolltext> <!-- Notice how whitespace is handled: The newline between the two tokens is recognized
@@ -171,7 +171,7 @@
</block>
<block condition="{MenuText}">
- <scrolltext x1="24" y1="62" y2="-72" x2="583" font="helmetr.ttf:20" color="#AFFFFF00">{MenuText}</scrolltext>
+ <scrolltext x1="24" y1="62" y2="-72" x2="583" font="Sans Serif at 20" color="#AFFFFF00">{MenuText}</scrolltext>
<image x="585" y="138" condition="{CanScrollUp}" path="symbols/arrowup.xpm" color="#AFFFFF00" bgColor="#8F2B1B9E"/>
<image x="585" y="-96" condition="{CanScrollDown}" path="symbols/arrowdown.xpm" color="#AFFFFF00" bgColor="#8F2B1B9E"/>
<scrollbar x1="585" x2="608" y1="162" y2="-110" color="#AFFFFF00" bgColor="#8F2B1B9E"/>
enigma-0.3a-fonts.patch:
Enigma.skin | 262 ++++++++++++++++++++++++++++++------------------------------
1 file changed, 131 insertions(+), 131 deletions(-)
--- NEW FILE enigma-0.3a-fonts.patch ---
diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin
--- Enigma/Enigma.skin~ 2009-07-13 00:07:10.000000000 +0300
+++ Enigma/Enigma.skin 2009-07-13 00:08:26.000000000 +0300
@@ -55,16 +55,16 @@
<rectangle x1="107" x2="-1" y1="-128" y2="-125" color="TopBG"/>
<!-- channel-info -->
- <text x1="110" x2="182" y1="-159" y2="-124" color="TopTxtShad" align="center" font="FontBold.ttf:26,85">{ChannelNumber}</text>
- <text x1="107" x2="179" y1="-160" y2="-125" color="TopTxtFG" align="center" font="FontBold.ttf:26,85">{ChannelNumber}</text>
- <text x1="186" x2="-5" y1="-159" y2="-124" color="TopTxtShad" align="left" font="FontBold.ttf:26,85">{ChannelName}</text>
- <text x1="183" x2="-8" y1="-160" y2="-125" color="TopTxtFG" align="left" font="FontBold.ttf:26,85">{ChannelName}</text>
+ <text x1="110" x2="182" y1="-159" y2="-124" color="TopTxtShad" align="center" font="Sans Serif:Bold at 26,85">{ChannelNumber}</text>
+ <text x1="107" x2="179" y1="-160" y2="-125" color="TopTxtFG" align="center" font="Sans Serif:Bold at 26,85">{ChannelNumber}</text>
+ <text x1="186" x2="-5" y1="-159" y2="-124" color="TopTxtShad" align="left" font="Sans Serif:Bold at 26,85">{ChannelName}</text>
+ <text x1="183" x2="-8" y1="-160" y2="-125" color="TopTxtFG" align="left" font="Sans Serif:Bold at 26,85">{ChannelName}</text>
<!-- EPG-date "now" -->
<rectangle x1="107" x2="-1" y1="-120" y2="-78" color="ChEpgNowBG"/>
<block condition="or({PresentHasTimer},{PresentHasVPS})">
- <text x1="107" x2="182" y1="-122" y2="-78" color="ChEpgTxtTimeFG" align="center" font="FontBold.ttf:20,85">{PresentStartDateTime:%H\:%M}</text>
+ <text x1="107" x2="182" y1="-122" y2="-78" color="ChEpgTxtTimeFG" align="center" font="Sans Serif:Bold at 20,85">{PresentStartDateTime:%H\:%M}</text>
<image condition="and({PresentHasTimer},{PresentHasVPS})" x="115" y="-98" color="SymRecActive" bgColor="ChEpgNowBG" path="symbols/recording.xpm"/>
<image condition="and({PresentHasTimer},{PresentHasVPS})" x="144" y="-98" color="ChEpgTxtTimeFG" bgColor="SymActive" path="symbols/vps.xpm"/>
@@ -72,25 +72,25 @@
<image condition="and(not({PresentHasTimer}),{PresentHasVPS})" x="129" y="-98" color="ChEpgTxtTimeFG" bgColor="SymActive" path="symbols/vps.xpm"/>
</block>
<block condition="not(or({PresentHasTimer},{PresentHasVPS}))">
- <text x1="107" x2="182" y1="-112" y2="-78" color="ChEpgTxtTimeFG" align="center" font="FontBold.ttf:20,85">{PresentStartDateTime:%H\:%M}</text>
+ <text x1="107" x2="182" y1="-112" y2="-78" color="ChEpgTxtTimeFG" align="center" font="Sans Serif:Bold at 20,85">{PresentStartDateTime:%H\:%M}</text>
</block>
<block condition="not({PresentShortText})">
- <text x1="183" x2="-65" y1="-112" y2="-78" color="ChEpgTxtTitleFG" align="left" font="FontBold.ttf:20,85">{PresentTitle}</text>
+ <text x1="183" x2="-65" y1="-112" y2="-78" color="ChEpgTxtTitleFG" align="left" font="Sans Serif:Bold at 20,85">{PresentTitle}</text>
</block>
<block condition="{PresentShortText}">
- <text x1="183" x2="-65" y1="-122" y2="-102" color="ChEpgTxtTitleFG" align="left" font="FontBold.ttf:20,85">{PresentTitle}</text>
- <text x1="183" x2="-65" y1="-101" y2="-78" color="ChEpgTxtShortInfoFG" align="left" font="Font.ttf:20,85">{PresentShortText}</text>
+ <text x1="183" x2="-65" y1="-122" y2="-102" color="ChEpgTxtTitleFG" align="left" font="Sans Serif:Bold at 20,85">{PresentTitle}</text>
+ <text x1="183" x2="-65" y1="-101" y2="-78" color="ChEpgTxtShortInfoFG" align="left" font="Sans Serif at 20,85">{PresentShortText}</text>
</block>
- <text x1="-60" x2="-5" y1="-122" y2="-102" color="ChEpgTxtTitleFG" align="right" font="Font.ttf:20,85">{PresentDuration:%m}'</text>
- <text x1="-60" x2="-5" y1="-101" y2="-78" color="ChEpgTxtShortInfoFG" align="right" font="Font.ttf:20,85">+{PresentRemaining:%m}'</text>
+ <text x1="-60" x2="-5" y1="-122" y2="-102" color="ChEpgTxtTitleFG" align="right" font="Sans Serif at 20,85">{PresentDuration:%m}'</text>
+ <text x1="-60" x2="-5" y1="-101" y2="-78" color="ChEpgTxtShortInfoFG" align="right" font="Sans Serif at 20,85">+{PresentRemaining:%m}'</text>
<!-- EPG-date "next" -->
<rectangle x1="107" x2="-1" y1="-73" y2="-31" color="ChEpgNxtBG"/>
<block condition="or({FollowingHasTimer},{FollowingHasVPS})">
- <text x1="107" x2="182" y1="-75" y2="-31" color="ChEpgTxtTimeFG" align="center" font="FontBold.ttf:20,85">{FollowingStartDateTime:%H\:%M}</text>
+ <text x1="107" x2="182" y1="-75" y2="-31" color="ChEpgTxtTimeFG" align="center" font="Sans Serif:Bold at 20,85">{FollowingStartDateTime:%H\:%M}</text>
<image condition="and({FollowingHasTimer},{FollowingHasVPS})" x="115" y="-51" color="SymTimActive" bgColor="ChEpgNxtBG" path="symbols/timer.xpm"/>
<image condition="and({FollowingHasTimer},{FollowingHasVPS})" x="144" y="-51" color="ChEpgTxtTimeFG" bgColor="SymActive" path="symbols/vps.xpm"/>
@@ -98,18 +98,18 @@
<image condition="and(not({FollowingHasTimer}),{FollowingHasVPS})" x="129" y="-51" color="ChEpgTxtTimeFG" bgColor="SymActive" path="symbols/vps.xpm"/>
</block>
<block condition="not(or({FollowingHasTimer},{FollowingHasVPS}))">
- <text x1="107" x2="182" y1="-65" y2="-31" color="ChEpgTxtTimeFG" align="center" font="FontBold.ttf:20,85">{FollowingStartDateTime:%H\:%M}</text>
+ <text x1="107" x2="182" y1="-65" y2="-31" color="ChEpgTxtTimeFG" align="center" font="Sans Serif:Bold at 20,85">{FollowingStartDateTime:%H\:%M}</text>
</block>
<block condition="not({FollowingShortText})">
- <text x1="183" x2="-65" y1="-65" y2="-31" color="ChEpgTxtTitleFG" align="left" font="FontBold.ttf:20,85">{FollowingTitle}</text>
+ <text x1="183" x2="-65" y1="-65" y2="-31" color="ChEpgTxtTitleFG" align="left" font="Sans Serif:Bold at 20,85">{FollowingTitle}</text>
</block>
<block condition="{FollowingShortText}">
- <text x1="183" x2="-65" y1="-75" y2="-55" color="ChEpgTxtTitleFG" align="left" font="FontBold.ttf:20,85">{FollowingTitle}</text>
- <text x1="183" x2="-65" y1="-54" y2="-31" color="ChEpgTxtShortInfoFG" align="left" font="Font.ttf:20,85">{FollowingShortText}</text>
+ <text x1="183" x2="-65" y1="-75" y2="-55" color="ChEpgTxtTitleFG" align="left" font="Sans Serif:Bold at 20,85">{FollowingTitle}</text>
+ <text x1="183" x2="-65" y1="-54" y2="-31" color="ChEpgTxtShortInfoFG" align="left" font="Sans Serif at 20,85">{FollowingShortText}</text>
</block>
- <text x1="-60" x2="-5" y1="-65" y2="-31" color="ChEpgTxtTitleFG" align="right" font="Font.ttf:20,85">{FollowingDuration:%m}'</text>
+ <text x1="-60" x2="-5" y1="-65" y2="-31" color="ChEpgTxtTitleFG" align="right" font="Sans Serif at 20,85">{FollowingDuration:%m}'</text>
<!-- bottom info-line -->
<ellipse x1="107" x2="116" y1="-10" y2="-1" arc="3" color="BotBG"/>
@@ -117,8 +117,8 @@
<rectangle x1="107" x2="-1" y1="-26" y2="-11" color="BotBG"/> <rectangle x1="117" x2="-11" y1="-10" y2="-1" color="BotBG"/>
<!-- date / time -->
- <text x1="112" x2="229" y1="-26" y2="-1" color="BotTxtFG" align="left" font="Font.ttf:20,85">{DateTime:%d.%m.}</text>
- <text x1="112" x2="229" y1="-26" y2="-1" color="BotTxtFG" align="right" font="Font.ttf:20,85">{DateTime:%H\:%M}</text>
+ <text x1="112" x2="229" y1="-26" y2="-1" color="BotTxtFG" align="left" font="Sans Serif at 20,85">{DateTime:%d.%m.}</text>
+ <text x1="112" x2="229" y1="-26" y2="-1" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{DateTime:%H\:%M}</text>
<!-- progress-bar (if there are further audio-infos) -->
<block condition="and({PresentProgress},or(ne({AudioTrack},''),equal({AudioChannel},'left'),equal({AudioChannel},'right')))">
@@ -156,9 +156,9 @@
<image condition="not({ChannelHasMultilang})" x="-177" y="-22" color="BotBG" bgColor="SymInactive" path="symbols/multilingual.xpm"/>
<!-- selected Language -->
- <marquee condition="and(ne({AudioTrack},''),or(equal({AudioChannel},'left'),equal({AudioChannel},'right')))" x1="-242" x2="-181" y1="-26" y2="-1" color="BotTxtFG" align="right" font="Font.ttf:20,85">{AudioTrack} ({AudioChannel} channel)</marquee>
- <marquee condition="and(ne({AudioTrack},''),not(or(equal({AudioChannel},'left'),equal({AudioChannel},'right'))))" x1="-242" x2="-181" y1="-26" y2="-1" color="BotTxtFG" align="right" font="Font.ttf:20,85">{AudioTrack}</marquee>
- <marquee condition="and(equal({AudioTrack},''),or(equal({AudioChannel},'left'),equal({AudioChannel},'right')))" x1="-242" x2="-181" y1="-26" y2="-1" color="BotTxtFG" align="right" font="Font.ttf:20,85">{AudioChannel} channel</marquee>
+ <marquee condition="and(ne({AudioTrack},''),or(equal({AudioChannel},'left'),equal({AudioChannel},'right')))" x1="-242" x2="-181" y1="-26" y2="-1" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{AudioTrack} ({AudioChannel} channel)</marquee>
+ <marquee condition="and(ne({AudioTrack},''),not(or(equal({AudioChannel},'left'),equal({AudioChannel},'right'))))" x1="-242" x2="-181" y1="-26" y2="-1" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{AudioTrack}</marquee>
+ <marquee condition="and(equal({AudioTrack},''),or(equal({AudioChannel},'left'),equal({AudioChannel},'right')))" x1="-242" x2="-181" y1="-26" y2="-1" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{AudioChannel} channel</marquee>
</block>
@@ -179,16 +179,16 @@
<rectangle x1="107" x2="-1" y1="-56" y2="-41" color="BotBG"/> <rectangle x1="107" x2="-11" y1="-40" y2="-31" color="BotBG"/>
<!-- date / time -->
- <text x1="112" x2="229" y1="-56" y2="-31" color="BotTxtFG" align="left" font="Font.ttf:20,85">{DateTime:%d.%m.}</text>
- <text x1="112" x2="229" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Font.ttf:20,85">{DateTime:%H\:%M}</text>
+ <text x1="112" x2="229" y1="-56" y2="-31" color="BotTxtFG" align="left" font="Sans Serif at 20,85">{DateTime:%d.%m.}</text>
+ <text x1="112" x2="229" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{DateTime:%H\:%M}</text>
<!-- no EPG-data-view -->
<block condition="{ChannelNumber}">
<!-- channel-info -->
- <text x1="110" x2="182" y1="-129" y2="-94" color="TopTxtShad" align="center" font="FontBold.ttf:26,85">{ChannelNumber}</text>
- <text x1="107" x2="179" y1="-130" y2="-95" color="TopTxtFG" align="center" font="FontBold.ttf:26,85">{ChannelNumber}</text>
- <text x1="186" x2="-5" y1="-129" y2="-94" color="TopTxtShad" align="left" font="FontBold.ttf:26,85">{ChannelName}</text>
- <text x1="183" x2="-8" y1="-130" y2="-95" color="TopTxtFG" align="left" font="FontBold.ttf:26,85">{ChannelName}</text>
+ <text x1="110" x2="182" y1="-129" y2="-94" color="TopTxtShad" align="center" font="Sans Serif:Bold at 26,85">{ChannelNumber}</text>
+ <text x1="107" x2="179" y1="-130" y2="-95" color="TopTxtFG" align="center" font="Sans Serif:Bold at 26,85">{ChannelNumber}</text>
+ <text x1="186" x2="-5" y1="-129" y2="-94" color="TopTxtShad" align="left" font="Sans Serif:Bold at 26,85">{ChannelName}</text>
+ <text x1="183" x2="-8" y1="-130" y2="-95" color="TopTxtFG" align="left" font="Sans Serif:Bold at 26,85">{ChannelName}</text>
<!-- icons -->
<image condition="{IsRecording}" x="-32" y="-52" color="SymRecActive" bgColor="BotTxtFG" path="symbols/recording.xpm"/>
@@ -210,15 +210,15 @@
<image condition="not({ChannelHasMultilang})" x="-177" y="-52" color="BotBG" bgColor="SymInactive" path="symbols/multilingual.xpm"/>
<!-- selected Language -->
- <marquee condition="and(ne({AudioTrack},''),or(equal({AudioChannel},'left'),equal({AudioChannel},'right')))" x1="233" x2="-181" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Font.ttf:20,85">{AudioTrack} ({AudioChannel} channel)</marquee>
- <marquee condition="and(ne({AudioTrack},''),not(or(equal({AudioChannel},'left'),equal({AudioChannel},'right'))))" x1="233" x2="-181" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Font.ttf:20,85">{AudioTrack}</marquee>
- <marquee condition="and(equal({AudioTrack},''),or(equal({AudioChannel},'left'),equal({AudioChannel},'right')))" x1="233" x2="-181" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Font.ttf:20,85">{AudioChannel} channel</marquee>
+ <marquee condition="and(ne({AudioTrack},''),or(equal({AudioChannel},'left'),equal({AudioChannel},'right')))" x1="233" x2="-181" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{AudioTrack} ({AudioChannel} channel)</marquee>
+ <marquee condition="and(ne({AudioTrack},''),not(or(equal({AudioChannel},'left'),equal({AudioChannel},'right'))))" x1="233" x2="-181" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{AudioTrack}</marquee>
+ <marquee condition="and(equal({AudioTrack},''),or(equal({AudioChannel},'left'),equal({AudioChannel},'right')))" x1="233" x2="-181" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{AudioChannel} channel</marquee>
</block>
<!-- bouquets-view -->
<block condition="not({ChannelNumber})">
- <text x1="110" x2="-1" y1="-129" y2="-94" color="TopTxtShad" align="center" font="FontBold.ttf:26,85">{ChannelName}</text>
- <text x1="107" x2="-4" y1="-130" y2="-95" color="TopTxtFG" align="center" font="FontBold.ttf:26,85">{ChannelName}</text>
+ <text x1="110" x2="-1" y1="-129" y2="-94" color="TopTxtShad" align="center" font="Sans Serif:Bold at 26,85">{ChannelName}</text>
+ <text x1="107" x2="-4" y1="-130" y2="-95" color="TopTxtFG" align="center" font="Sans Serif:Bold at 26,85">{ChannelName}</text>
</block>
</block>
@@ -232,8 +232,8 @@
<rectangle condition="{MessageWarning}" x1="111" x2="-5" y1="-86" y2="-65" color="MsgWarningBG"/>
<rectangle condition="{MessageError}" x1="111" x2="-5" y1="-86" y2="-65" color="MsgErrorBG"/>
- <text x1="115" x2="-10" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Font.ttf:20,85">{Message}</text>
- <text x1="116" x2="-9" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Font.ttf:20,85">{Message}</text>
+ <text x1="115" x2="-10" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Sans Serif at 20,85">{Message}</text>
+ <text x1="116" x2="-9" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Sans Serif at 20,85">{Message}</text>
</block>
</display>
@@ -269,10 +269,10 @@
<!-- no EPG-data-view -->
<block condition="{ChannelNumber}">
<!-- channel-info -->
- <text x1="110" x2="182" y1="-129" y2="-94" color="TopTxtShad" align="center" font="FontBold.ttf:26,85">{ChannelNumber}</text>
- <text x1="107" x2="179" y1="-130" y2="-95" color="TopTxtFG" align="center" font="FontBold.ttf:26,85">{ChannelNumber}</text>
- <text x1="186" x2="-5" y1="-129" y2="-94" color="TopTxtShad" align="left" font="FontBold.ttf:26,85">{ChannelName}</text>
- <text x1="183" x2="-8" y1="-130" y2="-95" color="TopTxtFG" align="left" font="FontBold.ttf:26,85">{ChannelName}</text>
+ <text x1="110" x2="182" y1="-129" y2="-94" color="TopTxtShad" align="center" font="Sans Serif:Bold at 26,85">{ChannelNumber}</text>
+ <text x1="107" x2="179" y1="-130" y2="-95" color="TopTxtFG" align="center" font="Sans Serif:Bold at 26,85">{ChannelNumber}</text>
+ <text x1="186" x2="-5" y1="-129" y2="-94" color="TopTxtShad" align="left" font="Sans Serif:Bold at 26,85">{ChannelName}</text>
+ <text x1="183" x2="-8" y1="-130" y2="-95" color="TopTxtFG" align="left" font="Sans Serif:Bold at 26,85">{ChannelName}</text>
<!-- icons -->
<image condition="{IsRecording}" x="-32" y="-52" color="SymRecActive" bgColor="BotTxtFG" path="symbols/recording.xpm"/>
@@ -294,15 +294,15 @@
<image condition="not({ChannelHasMultilang})" x="-177" y="-52" color="BotBG" bgColor="SymInactive" path="symbols/multilingual.xpm"/>
<!-- selected Language -->
- <marquee condition="and(ne({AudioTrack},''),or(equal({AudioChannel},'left'),equal({AudioChannel},'right')))" x1="223" x2="-181" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Font.ttf:20,85">{AudioTrack} ({AudioChannel} channel)</marquee>
- <marquee condition="and(ne({AudioTrack},''),not(or(equal({AudioChannel},'left'),equal({AudioChannel},'right'))))" x1="223" x2="-181" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Font.ttf:20,85">{AudioTrack}</marquee>
- <marquee condition="and(equal({AudioTrack},''),or(equal({AudioChannel},'left'),equal({AudioChannel},'right')))" x1="223" x2="-181" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Font.ttf:20,85">{AudioChannel} channel</marquee>
+ <marquee condition="and(ne({AudioTrack},''),or(equal({AudioChannel},'left'),equal({AudioChannel},'right')))" x1="223" x2="-181" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{AudioTrack} ({AudioChannel} channel)</marquee>
+ <marquee condition="and(ne({AudioTrack},''),not(or(equal({AudioChannel},'left'),equal({AudioChannel},'right'))))" x1="223" x2="-181" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{AudioTrack}</marquee>
+ <marquee condition="and(equal({AudioTrack},''),or(equal({AudioChannel},'left'),equal({AudioChannel},'right')))" x1="223" x2="-181" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{AudioChannel} channel</marquee>
</block>
<!-- bouquets-view -->
<block condition="not({ChannelNumber})">
- <text x1="110" x2="-1" y1="-129" y2="-94" color="TopTxtShad" align="center" font="FontBold.ttf:26,85">{ChannelName}</text>
- <text x1="107" x2="-4" y1="-130" y2="-95" color="TopTxtFG" align="center" font="FontBold.ttf:26,85">{ChannelName}</text>
+ <text x1="110" x2="-1" y1="-129" y2="-94" color="TopTxtShad" align="center" font="Sans Serif:Bold at 26,85">{ChannelName}</text>
+ <text x1="107" x2="-4" y1="-130" y2="-95" color="TopTxtFG" align="center" font="Sans Serif:Bold at 26,85">{ChannelName}</text>
</block>
<!-- dummy-area -->
@@ -313,8 +313,8 @@
<rectangle x1="107" x2="-1" y1="-56" y2="-41" color="BotBG"/> <rectangle x1="107" x2="-11" y1="-40" y2="-31" color="BotBG"/>
<!-- date / time -->
- <text x1="112" x2="229" y1="-56" y2="-31" color="BotTxtFG" align="left" font="Font.ttf:20,85">{DateTime:%d.%m.}</text>
- <text x1="112" x2="229" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Font.ttf:20,85">{DateTime:%H\:%M}</text>
+ <text x1="112" x2="229" y1="-56" y2="-31" color="BotTxtFG" align="left" font="Sans Serif at 20,85">{DateTime:%d.%m.}</text>
+ <text x1="112" x2="229" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{DateTime:%H\:%M}</text>
<!-- overlay messages -->
<block condition="{Message}">
@@ -326,8 +326,8 @@
<rectangle condition="{MessageWarning}" x1="111" x2="-5" y1="-86" y2="-65" color="MsgWarningBG"/>
<rectangle condition="{MessageError}" x1="111" x2="-5" y1="-86" y2="-65" color="MsgErrorBG"/>
- <text x1="115" x2="-10" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Font.ttf:20,85">{Message}</text>
- <text x1="116" x2="-9" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Font.ttf:20,85">{Message}</text>
+ <text x1="115" x2="-10" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Sans Serif at 20,85">{Message}</text>
+ <text x1="116" x2="-9" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Sans Serif at 20,85">{Message}</text>
</block>
</display>
@@ -385,8 +385,8 @@
<rectangle x1="0" x2="-1" y1="-140" y2="-133" color="TopBG"/>
<rectangle x1="0" x2="-1" y1="-128" y2="-125" color="TopBG"/>
- <text x1="8" x2="-1" y1="-159" y2="-124" color="TopTxtShad" align="left" font="FontBold.ttf:26,85">{ReplayTitle}</text>
- <text x1="5" x2="-4" y1="-160" y2="-125" color="TopTxtFG" align="left" font="FontBold.ttf:26,85">{ReplayTitle}</text>
+ <text x1="8" x2="-1" y1="-159" y2="-124" color="TopTxtShad" align="left" font="Sans Serif:Bold at 26,85">{ReplayTitle}</text>
+ <text x1="5" x2="-4" y1="-160" y2="-125" color="TopTxtFG" align="left" font="Sans Serif:Bold at 26,85">{ReplayTitle}</text>
<!-- flicker-protection -->
<rectangle x1="107" x2="107" y1="-107" y2="-107" color="RepBarMark"/>
@@ -409,9 +409,9 @@
<!-- replay-position and replay-prompt -->
<rectangle x1="94" x2="-1" y1="-64" y2="-31" color="ChEpgNxtBG"/>
- <text x1="98" x2="228" y1="-61" y2="-31" color="RepTxtFG" align="left" font="FontBold.ttf:20,85">{ReplayPosition}</text>
- <text x1="-135" x2="-5" y1="-61" y2="-31" color="RepTxtFG" align="right" font="FontBold.ttf:20,85">{ReplayDuration}</text>
- <text x1="229" x2="-136" y1="-61" y2="-31" color="RepTxtFG" align="center" font="Font.ttf:20,85">{ReplayPrompt}</text>
+ <text x1="98" x2="228" y1="-61" y2="-31" color="RepTxtFG" align="left" font="Sans Serif:Bold at 20,85">{ReplayPosition}</text>
+ <text x1="-135" x2="-5" y1="-61" y2="-31" color="RepTxtFG" align="right" font="Sans Serif:Bold at 20,85">{ReplayDuration}</text>
+ <text x1="229" x2="-136" y1="-61" y2="-31" color="RepTxtFG" align="center" font="Sans Serif at 20,85">{ReplayPrompt}</text>
<!-- bottom info-line -->
<ellipse x1="0" x2="9" y1="-10" y2="-1" arc="3" color="BotBG"/>
@@ -419,8 +419,8 @@
<rectangle x1="0" x2="-1" y1="-26" y2="-11" color="BotBG"/> <rectangle x1="10" x2="-11" y1="-10" y2="-1" color="BotBG"/>
<!-- date / time -->
- <text x1="5" x2="122" y1="-26" y2="-1" color="BotTxtFG" align="left" font="Font.ttf:20,85">{DateTime:%d.%m.}</text>
- <text x1="5" x2="122" y1="-26" y2="-1" color="BotTxtFG" align="right" font="Font.ttf:20,85">{DateTime:%H\:%M}</text>
+ <text x1="5" x2="122" y1="-26" y2="-1" color="BotTxtFG" align="left" font="Sans Serif at 20,85">{DateTime:%d.%m.}</text>
+ <text x1="5" x2="122" y1="-26" y2="-1" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{DateTime:%H\:%M}</text>
<!-- overlay messages -->
<block condition="{Message}">
@@ -432,8 +432,8 @@
<rectangle condition="{MessageWarning}" x1="111" x2="-5" y1="-86" y2="-65" color="MsgWarningBG"/>
<rectangle condition="{MessageError}" x1="111" x2="-5" y1="-86" y2="-65" color="MsgErrorBG"/>
- <text x1="115" x2="-10" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Font.ttf:20,85">{Message}</text>
- <text x1="116" x2="-9" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Font.ttf:20,85">{Message}</text>
+ <text x1="115" x2="-10" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Sans Serif at 20,85">{Message}</text>
+ <text x1="116" x2="-9" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Sans Serif at 20,85">{Message}</text>
</block>
</display>
@@ -490,8 +490,8 @@
<rectangle condition="{MessageWarning}" x1="111" x2="-5" y1="-86" y2="-65" color="MsgWarningBG"/>
<rectangle condition="{MessageError}" x1="111" x2="-5" y1="-86" y2="-65" color="MsgErrorBG"/>
- <text x1="115" x2="-10" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Font.ttf:20,85">{Message}</text>
- <text x1="116" x2="-9" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Font.ttf:20,85">{Message}</text>
+ <text x1="115" x2="-10" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Sans Serif at 20,85">{Message}</text>
+ <text x1="116" x2="-9" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Sans Serif at 20,85">{Message}</text>
</block>
</display>
@@ -518,12 +518,12 @@
<!-- blink if there is less than 5h recording-time left and we are in the 'Main-Menu' -->
<block condition="or(gt({FreeDiskSpace},7725),{PresentTitle},{MenuText})">
- <text x1="8" x2="-100" y1="1" y2="29" color="TopTxtShad" align="left" font="FontBold.ttf:24,85">{MenuTitle:rest}</text>
- <text x1="5" x2="-103" y1="0" y2="28" color="TopTxtFG" align="left" font="FontBold.ttf:24,85">{MenuTitle:rest}</text>
+ <text x1="8" x2="-100" y1="1" y2="29" color="TopTxtShad" align="left" font="Sans Serif:Bold at 24,85">{MenuTitle:rest}</text>
+ <text x1="5" x2="-103" y1="0" y2="28" color="TopTxtFG" align="left" font="Sans Serif:Bold at 24,85">{MenuTitle:rest}</text>
</block>
<block condition="not(or(gt({FreeDiskSpace},7725),{PresentTitle},{MenuText}))">
- <blink x1="8" x2="-100" y1="1" y2="29" color="TopTxtShad" delay="500" align="left" font="FontBold.ttf:24,85">{MenuTitle:rest}</blink>
- <blink x1="5" x2="-103" y1="0" y2="28" color="TopTxtFG" delay="500" align="left" font="FontBold.ttf:24,85">{MenuTitle:rest}</blink>
+ <blink x1="8" x2="-100" y1="1" y2="29" color="TopTxtShad" delay="500" align="left" font="Sans Serif:Bold at 24,85">{MenuTitle:rest}</blink>
+ <blink x1="5" x2="-103" y1="0" y2="28" color="TopTxtFG" delay="500" align="left" font="Sans Serif:Bold at 24,85">{MenuTitle:rest}</blink>
</block>
<!-- menu-area -->
@@ -620,11 +620,11 @@
<!-- icons -->
<rectangle x1="-90" x2="-1" y1="0" y2="25" color="LogoBG"/>
- <text x1="-87" x2="-1" y1="1" y2="31" color="TopTxtShad" align="center" font="FontBold.ttf:20,150">VDR</text>
- <text x1="-90" x2="-4" y1="0" y2="30" color="TopTxtFG" align="center" font="FontBold.ttf:20,150">VDR</text>
+ <text x1="-87" x2="-1" y1="1" y2="31" color="TopTxtShad" align="center" font="Sans Serif:Bold at 20,150">VDR</text>
+ <text x1="-90" x2="-4" y1="0" y2="30" color="TopTxtFG" align="center" font="Sans Serif:Bold at 20,150">VDR</text>
- <text x1="8" x2="-100" y1="1" y2="31" color="TopTxtShad" align="left" font="FontBold.ttf:24,85">{MenuTitle}</text>
- <text x1="5" x2="-103" y1="0" y2="30" color="TopTxtFG" align="left" font="FontBold.ttf:24,85">{MenuTitle}</text>
+ <text x1="8" x2="-100" y1="1" y2="31" color="TopTxtShad" align="left" font="Sans Serif:Bold at 24,85">{MenuTitle}</text>
+ <text x1="5" x2="-103" y1="0" y2="30" color="TopTxtFG" align="left" font="Sans Serif:Bold at 24,85">{MenuTitle}</text>
<!-- menu-area -->
<rectangle x1="0" x2="-1" y1="30" y2="-31" color="MenuBG"/>
@@ -640,10 +640,10 @@
<!-- menu -->
<rectangle condition="{IsMenuCurrent}" x1="5" x2="-100" y1="2" y2="25" color="MenuHighlight"/>
<image condition="{IsMenuCurrent}" x="15" y="5" color="MenuTxtCurFG" bgColor="MenuHighlight" path="symbols/right.xpm"/>
- <text x1="30" x2="-106" y1="0" y2="25" color="MenuTxtGrpFG" font="FontBold.ttf:22,85">{MenuGroup}</text>
- <text x1="30" x2="-106" y1="0" y2="25" color="MenuTxtFG" font="Font.ttf:22,85">{MenuItem}</text>
- <marquee x1="30" x2="-106" y1="0" y2="25" color="MenuTxtCurFG" font="Font.ttf:22,85">{MenuCurrent}</marquee>
- <marquee x1="31" x2="-105" y1="0" y2="25" color="MenuTxtCurFG" font="Font.ttf:22,85">{MenuCurrent}</marquee>
+ <text x1="30" x2="-106" y1="0" y2="25" color="MenuTxtGrpFG" font="Sans Serif:Bold at 22,85">{MenuGroup}</text>
+ <text x1="30" x2="-106" y1="0" y2="25" color="MenuTxtFG" font="Sans Serif at 22,85">{MenuItem}</text>
+ <marquee x1="30" x2="-106" y1="0" y2="25" color="MenuTxtCurFG" font="Sans Serif at 22,85">{MenuCurrent}</marquee>
+ <marquee x1="31" x2="-105" y1="0" y2="25" color="MenuTxtCurFG" font="Sans Serif at 22,85">{MenuCurrent}</marquee>
</list>
<!-- spared info-line -->
@@ -655,10 +655,10 @@
<!-- menu -->
<rectangle condition="{IsMenuCurrent}" x1="5" x2="-100" y1="2" y2="25" color="MenuHighlight"/>
<image condition="{IsMenuCurrent}" x="15" y="5" color="MenuTxtCurFG" bgColor="MenuHighlight" path="symbols/right.xpm"/>
- <text x1="30" x2="-106" y1="0" y2="25" color="MenuTxtGrpFG" font="FontBold.ttf:22,85">{MenuGroup}</text>
- <text x1="30" x2="-106" y1="0" y2="25" color="MenuTxtFG" font="Font.ttf:22,85">{MenuItem}</text>
- <marquee x1="30" x2="-106" y1="0" y2="25" color="MenuTxtCurFG" font="Font.ttf:22,85">{MenuCurrent}</marquee>
- <marquee x1="31" x2="-105" y1="0" y2="25" color="MenuTxtCurFG" font="Font.ttf:22,85">{MenuCurrent}</marquee>
+ <text x1="30" x2="-106" y1="0" y2="25" color="MenuTxtGrpFG" font="Sans Serif:Bold at 22,85">{MenuGroup}</text>
+ <text x1="30" x2="-106" y1="0" y2="25" color="MenuTxtFG" font="Sans Serif at 22,85">{MenuItem}</text>
+ <marquee x1="30" x2="-106" y1="0" y2="25" color="MenuTxtCurFG" font="Sans Serif at 22,85">{MenuCurrent}</marquee>
+ <marquee x1="31" x2="-105" y1="0" y2="25" color="MenuTxtCurFG" font="Sans Serif at 22,85">{MenuCurrent}</marquee>
</list>
<!-- other menus -->
@@ -673,10 +673,10 @@
<!-- menu -->
<rectangle condition="{IsMenuCurrent}" x1="5" x2="-6" y1="2" y2="25" color="MenuHighlight"/>
<image condition="{IsMenuCurrent}" x="15" y="5" color="MenuTxtCurFG" bgColor="MenuHighlight" path="symbols/right.xpm"/>
- <text x1="35" x2="-11" y1="0" y2="25" color="MenuTxtGrpFG" font="FontBold.ttf:22,85">{MenuGroup}</text>
- <text x1="35" x2="-11" y1="0" y2="25" color="MenuTxtFG" font="Font.ttf:22,85">{MenuItem}</text>
- <marquee x1="35" x2="-11" y1="0" y2="25" color="MenuTxtCurFG" font="Font.ttf:22,85">{MenuCurrent}</marquee>
- <marquee x1="36" x2="-10" y1="0" y2="25" color="MenuTxtCurFG" font="Font.ttf:22,85">{MenuCurrent}</marquee>
+ <text x1="35" x2="-11" y1="0" y2="25" color="MenuTxtGrpFG" font="Sans Serif:Bold at 22,85">{MenuGroup}</text>
+ <text x1="35" x2="-11" y1="0" y2="25" color="MenuTxtFG" font="Sans Serif at 22,85">{MenuItem}</text>
+ <marquee x1="35" x2="-11" y1="0" y2="25" color="MenuTxtCurFG" font="Sans Serif at 22,85">{MenuCurrent}</marquee>
+ <marquee x1="36" x2="-10" y1="0" y2="25" color="MenuTxtCurFG" font="Sans Serif at 22,85">{MenuCurrent}</marquee>
</list>
<!-- spared info-line -->
@@ -690,10 +690,10 @@
<!-- menu -->
<rectangle condition="{IsMenuCurrent}" x1="5" x2="-6" y1="2" y2="25" color="MenuHighlight"/>
<image condition="{IsMenuCurrent}" x="15" y="5" color="MenuTxtCurFG" bgColor="MenuHighlight" path="symbols/right.xpm"/>
- <text x1="35" x2="-11" y1="0" y2="25" color="MenuTxtGrpFG" font="FontBold.ttf:22,85">{MenuGroup}</text>
- <text x1="35" x2="-11" y1="0" y2="25" color="MenuTxtFG" font="Font.ttf:22,85">{MenuItem}</text>
- <marquee x1="35" x2="-11" y1="0" y2="25" color="MenuTxtCurFG" font="Font.ttf:22,85">{MenuCurrent}</marquee>
- <marquee x1="36" x2="-10" y1="0" y2="25" color="MenuTxtCurFG" font="Font.ttf:22,85">{MenuCurrent}</marquee>
+ <text x1="35" x2="-11" y1="0" y2="25" color="MenuTxtGrpFG" font="Sans Serif:Bold at 22,85">{MenuGroup}</text>
+ <text x1="35" x2="-11" y1="0" y2="25" color="MenuTxtFG" font="Sans Serif at 22,85">{MenuItem}</text>
+ <marquee x1="35" x2="-11" y1="0" y2="25" color="MenuTxtCurFG" font="Sans Serif at 22,85">{MenuCurrent}</marquee>
+ <marquee x1="36" x2="-10" y1="0" y2="25" color="MenuTxtCurFG" font="Sans Serif at 22,85">{MenuCurrent}</marquee>
</list>
<!-- menu-area for extended EPG-info -->
@@ -703,11 +703,11 @@
<!-- Title -->
<block condition="{PresentShortText}">
- <marquee x1="10" x2="-98" y1="33" y2="63" font="FontBold.ttf:24,85" color="MenuTxtFG">{PresentTitle}</marquee>
- <marquee x1="10" x2="-98" y1="63" y2="93" font="FontBold.ttf:22,85" color="MenuTxtFG">{PresentShortText}</marquee>
+ <marquee x1="10" x2="-98" y1="33" y2="63" font="Sans Serif:Bold at 24,85" color="MenuTxtFG">{PresentTitle}</marquee>
+ <marquee x1="10" x2="-98" y1="63" y2="93" font="Sans Serif:Bold at 22,85" color="MenuTxtFG">{PresentShortText}</marquee>
</block>
<block condition="not({PresentShortText})">
- <marquee x1="10" x2="-98" y1="48" y2="78" font="FontBold.ttf:24,85" color="MenuTxtFG">{PresentTitle}</marquee>
+ <marquee x1="10" x2="-98" y1="48" y2="78" font="Sans Serif:Bold at 24,85" color="MenuTxtFG">{PresentTitle}</marquee>
</block>
<!-- icon -->
@@ -718,13 +718,13 @@
<image condition="not({PresentIsRunning})" x="-33" y="100" color="MenuInfFG" bgColor="SymInactive" path="symbols/run.xpm"/>
<block condition="{PresentIsRunning}">
- <text x1="10" x2="-200" y1="95" y2="123" color="MenuInfFG" align="left" font="FontBold.ttf:20,85">{PresentStartDateTime:%d.%m.} {PresentStartDateTime:%H\:%M}-{PresentEndDateTime:%H\:%M} ({PresentRemaining:%m}/{PresentDuration:%m}')</text>
+ <text x1="10" x2="-200" y1="95" y2="123" color="MenuInfFG" align="left" font="Sans Serif:Bold at 20,85">{PresentStartDateTime:%d.%m.} {PresentStartDateTime:%H\:%M}-{PresentEndDateTime:%H\:%M} ({PresentRemaining:%m}/{PresentDuration:%m}')</text>
<image condition="{PresentHasTimer}" x="-64" y="100" color="SymRecActive" bgColor="MenuBG" path="symbols/recording.xpm"/>
<image condition="not({PresentHasTimer})" x="-64" y="100" color="MenuInfFG" bgColor="SymInactive" path="symbols/recording.xpm"/>
</block>
<block condition="not({PresentIsRunning})">
- <text x1="10" x2="-200" y1="95" y2="123" color="MenuInfFG" align="left" font="FontBold.ttf:20,85">{PresentStartDateTime:%d.%m.} {PresentStartDateTime:%H\:%M}-{PresentEndDateTime:%H\:%M} ({PresentDuration:%m}')</text>
+ <text x1="10" x2="-200" y1="95" y2="123" color="MenuInfFG" align="left" font="Sans Serif:Bold at 20,85">{PresentStartDateTime:%d.%m.} {PresentStartDateTime:%H\:%M}-{PresentEndDateTime:%H\:%M} ({PresentDuration:%m}')</text>
<image condition="{PresentHasTimer}" x="-64" y="100" color="SymTimActive" bgColor="MenuBG" path="symbols/timer.xpm"/>
<image condition="not({PresentHasTimer})" x="-64" y="100" color="MenuInfFG" bgColor="SymInactive" path="symbols/timer.xpm"/>
@@ -734,10 +734,10 @@
<image condition="not({PresentHasVPS})" x="-93" y="100"
color="MenuInfFG" bgColor="SymInactive" path="symbols/vps.xpm"/>
- <text condition="{PresentHasVPS}" x1="-160" x2="-98" y1="94" y2="123" color="SymActive" align="right" font="FontBold.ttf:20,85">{PresentVPSDateTime:%H\:%M}</text>
+ <text condition="{PresentHasVPS}" x1="-160" x2="-98" y1="94" y2="123" color="SymActive" align="right" font="Sans Serif:Bold at 20,85">{PresentVPSDateTime:%H\:%M}</text>
<!-- Description -->
- <scrolltext x1="10" x2="-106" y1="135" y2="-36" font="Font.ttf:22,85" color="MenuTxtFG">{PresentDescription}</scrolltext>
+ <scrolltext x1="10" x2="-106" y1="135" y2="-36" font="Sans Serif at 22,85" color="MenuTxtFG">{PresentDescription}</scrolltext>
</block>
<!-- menu-area for Recording-info -->
@@ -747,25 +747,25 @@
<!-- Title -->
<block condition="{RecordingShortText}">
- <marquee x1="10" x2="-98" y1="33" y2="63" font="FontBold.ttf:24,85" color="MenuTxtFG">{RecordingTitle}</marquee>
- <marquee x1="10" x2="-98" y1="63" y2="93" font="FontBold.ttf:22,85" color="MenuTxtFG">{RecordingShortText}</marquee>
+ <marquee x1="10" x2="-98" y1="33" y2="63" font="Sans Serif:Bold at 24,85" color="MenuTxtFG">{RecordingTitle}</marquee>
+ <marquee x1="10" x2="-98" y1="63" y2="93" font="Sans Serif:Bold at 22,85" color="MenuTxtFG">{RecordingShortText}</marquee>
</block>
<block condition="not({RecordingShortText})">
- <marquee x1="10" x2="-98" y1="48" y2="78" font="FontBold.ttf:24,85" color="MenuTxtFG">{RecordingTitle}</marquee>
+ <marquee x1="10" x2="-98" y1="48" y2="78" font="Sans Serif:Bold at 24,85" color="MenuTxtFG">{RecordingTitle}</marquee>
</block>
<!-- icon -->
<image x="-85" y="5" bgColor="LogoBG" path="icons/Summary.png"/>
<!-- Timing-info -->
- <text x1="10" x2="150" y1="95" y2="123" color="MenuInfFG" align="left" font="FontBold.ttf:20,85">{RecordingDateTime:%d.%m. %H\:%M}</text>
+ <text x1="10" x2="150" y1="95" y2="123" color="MenuInfFG" align="left" font="Sans Serif:Bold at 20,85">{RecordingDateTime:%d.%m. %H\:%M}</text>
<!--
- <text condition="and({RecordingLanguageCode:0},not({RecordingLanguageCode:1}),not({RecordingLanguageCode:2}))" x1="151" x2="-98" y1="95" y2="123" color="MenuInfFG" align="right" font="FontBold.ttf:20,85">{RecordingLanguageCode:0} ({RecordingLanguageDescription:0})</text>
+ <text condition="and({RecordingLanguageCode:0},not({RecordingLanguageCode:1}),not({RecordingLanguageCode:2}))" x1="151" x2="-98" y1="95" y2="123" color="MenuInfFG" align="right" font="Sans Serif:Bold at 20,85">{RecordingLanguageCode:0} ({RecordingLanguageDescription:0})</text>
-->
<!-- Description -->
- <scrolltext x1="10" x2="-106" y1="135" y2="-36" font="Font.ttf:22,85" color="MenuTxtFG">{RecordingDescription}</scrolltext>
+ <scrolltext x1="10" x2="-106" y1="135" y2="-36" font="Sans Serif at 22,85" color="MenuTxtFG">{RecordingDescription}</scrolltext>
</block>
<!-- Menu-text -->
@@ -774,17 +774,17 @@
<rectangle x1="0" x2="-95" y1="30" y2="93" color="MenuAltBG"/>
<rectangle x1="0" x2="-1" y1="94" y2="-31" color="MenuAltBG"/>
- <scrolltext condition="or(equal({MenuTitle:clean},trans('Summary')),equal({MenuTitle:clean},trans('Info')))" x1="10" x2="-106" y1="35" y2="-36" font="Font.ttf:22,85" color="MenuTxtFG">{MenuText}</scrolltext>
- <scrolltext condition="not(or(equal({MenuTitle:clean},trans('Summary')),equal({MenuTitle:clean},trans('Info'))))" x1="10" x2="-106" y1="35" y2="-36" font="FontMonoSpaced.ttf:22,85" color="MenuTxtFG">{MenuText}</scrolltext>
+ <scrolltext condition="or(equal({MenuTitle:clean},trans('Summary')),equal({MenuTitle:clean},trans('Info')))" x1="10" x2="-106" y1="35" y2="-36" font="Sans Serif at 22,85" color="MenuTxtFG">{MenuText}</scrolltext>
+ <scrolltext condition="not(or(equal({MenuTitle:clean},trans('Summary')),equal({MenuTitle:clean},trans('Info'))))" x1="10" x2="-106" y1="35" y2="-36" font="Monospaced at 22,85" color="MenuTxtFG">{MenuText}</scrolltext>
</block>
<!-- Show recordings (in all menus except 'Extended EPG-info' and 'MenuText') -->
<block condition="and(not({PresentTitle}),not({MenuText}),{CurrentRecording})">
<rectangle x1="0" x2="-1" y1="-60" y2="-27" color="Transparent"/>
<rectangle x1="0" x2="-1" y1="-56" y2="-31" color="MenuHighlight"/>
- <text condition="not({CurrentRecording:1})" x1="8" x2="-9" y1="-56" y2="-31" color="MenuTxtFG" align="left" font="Font.ttf:20,85">RECORDING: {CurrentRecording}</text>
+ <text condition="not({CurrentRecording:1})" x1="8" x2="-9" y1="-56" y2="-31" color="MenuTxtFG" align="left" font="Sans Serif at 20,85">RECORDING: {CurrentRecording}</text>
<!-- trans('RECORDING: {CurrentRecording}') -->
- <text condition="{CurrentRecording:1}" x1="8" x2="-9" y1="-56" y2="-31" color="MenuTxtFG" align="left" font="Font.ttf:20,85">RECORDINGS: {CurrentRecording}</text>
+ <text condition="{CurrentRecording:1}" x1="8" x2="-9" y1="-56" y2="-31" color="MenuTxtFG" align="left" font="Sans Serif at 20,85">RECORDINGS: {CurrentRecording}</text>
<!-- trans('RECORDINGS: {CurrentRecording}') -->
</block>
@@ -798,8 +798,8 @@
<rectangle condition="{MessageWarning}" x1="4" x2="-5" y1="-56" y2="-35" color="MsgWarningBG"/>
<rectangle condition="{MessageError}" x1="4" x2="-5" y1="-56" y2="-35" color="MsgErrorBG"/>
- <text x1="8" x2="-10" y1="-59" y2="-31" color="MsgTxtFG" align="center" font="Font.ttf:20,85">{Message}</text>
- <text x1="9" x2="-9" y1="-59" y2="-31" color="MsgTxtFG" align="center" font="Font.ttf:20,85">{Message}</text>
+ <text x1="8" x2="-10" y1="-59" y2="-31" color="MsgTxtFG" align="center" font="Sans Serif at 20,85">{Message}</text>
+ <text x1="9" x2="-9" y1="-59" y2="-31" color="MsgTxtFG" align="center" font="Sans Serif at 20,85">{Message}</text>
</block>
<!-- bottom info-line -->
@@ -809,33 +809,33 @@
<rectangle x1="10" x2="-11" y1="-10" y2="-1" color="BotBG"/>
<!-- date / time -->
- <text x1="5" x2="122" y1="-26" y2="-1" color="BotTxtFG" align="left" font="Font.ttf:20,85">{DateTime:%d.%m.}</text>
- <text x1="5" x2="122" y1="-26" y2="-1" color="BotTxtFG" align="right" font="Font.ttf:20,85">{DateTime:%H\:%M}</text>
+ <text x1="5" x2="122" y1="-26" y2="-1" color="BotTxtFG" align="left" font="Sans Serif at 20,85">{DateTime:%d.%m.}</text>
+ <text x1="5" x2="122" y1="-26" y2="-1" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{DateTime:%H\:%M}</text>
<!-- Buttons -->
<block condition="{ButtonRed}">
<rectangle x1="-460" x2="-342" y1="-26" y2="-1" color="Transparent"/>
<rectangle x1="-456" x2="-346" y1="-26" y2="-1" color="MenuRed"/>
- <marquee x1="-456" x2="-347" y1="-26" y2="-1" color="BotTxtFG" align="center" font="Font.ttf:20,85">{ButtonRed}</marquee>
- <marquee x1="-455" x2="-346" y1="-26" y2="-1" color="BotTxtFG" align="center" font="Font.ttf:20,85">{ButtonRed}</marquee>
+ <marquee x1="-456" x2="-347" y1="-26" y2="-1" color="BotTxtFG" align="center" font="Sans Serif at 20,85">{ButtonRed}</marquee>
+ <marquee x1="-455" x2="-346" y1="-26" y2="-1" color="BotTxtFG" align="center" font="Sans Serif at 20,85">{ButtonRed}</marquee>
</block>
<block condition="{ButtonGreen}">
<rectangle x1="-345" x2="-227" y1="-26" y2="-1" color="Transparent"/>
<rectangle x1="-341" x2="-231" y1="-26" y2="-1" color="MenuGreen"/>
- <marquee x1="-341" x2="-232" y1="-26" y2="-1" color="BotTxtFG" align="center" font="Font.ttf:20,85">{ButtonGreen}</marquee>
- <marquee x1="-340" x2="-231" y1="-26" y2="-1" color="BotTxtFG" align="center" font="Font.ttf:20,85">{ButtonGreen}</marquee>
+ <marquee x1="-341" x2="-232" y1="-26" y2="-1" color="BotTxtFG" align="center" font="Sans Serif at 20,85">{ButtonGreen}</marquee>
+ <marquee x1="-340" x2="-231" y1="-26" y2="-1" color="BotTxtFG" align="center" font="Sans Serif at 20,85">{ButtonGreen}</marquee>
</block>
<block condition="{ButtonYellow}">
<rectangle x1="-230" x2="-112" y1="-26" y2="-1" color="Transparent"/>
<rectangle x1="-226" x2="-116" y1="-26" y2="-1" color="MenuYellow"/>
- <marquee x1="-226" x2="-117" y1="-26" y2="-1" color="BotTxtFG" align="center" font="Font.ttf:20,85">{ButtonYellow}</marquee>
- <marquee x1="-225" x2="-116" y1="-26" y2="-1" color="BotTxtFG" align="center" font="Font.ttf:20,85">{ButtonYellow}</marquee>
+ <marquee x1="-226" x2="-117" y1="-26" y2="-1" color="BotTxtFG" align="center" font="Sans Serif at 20,85">{ButtonYellow}</marquee>
+ <marquee x1="-225" x2="-116" y1="-26" y2="-1" color="BotTxtFG" align="center" font="Sans Serif at 20,85">{ButtonYellow}</marquee>
</block>
<block condition="{ButtonBlue}">
<rectangle x1="-115" x2="-1" y1="-26" y2="-1" color="Transparent"/>
<rectangle x1="-111" x2="-1" y1="-26" y2="-1" color="MenuBlue"/>
- <marquee x1="-111" x2="-2" y1="-26" y2="-1" color="BotTxtFG" align="center" font="Font.ttf:20,85">{ButtonBlue}</marquee>
- <marquee x1="-110" x2="-1" y1="-26" y2="-1" color="BotTxtFG" align="center" font="Font.ttf:20,85">{ButtonBlue}</marquee>
+ <marquee x1="-111" x2="-2" y1="-26" y2="-1" color="BotTxtFG" align="center" font="Sans Serif at 20,85">{ButtonBlue}</marquee>
+ <marquee x1="-110" x2="-1" y1="-26" y2="-1" color="BotTxtFG" align="center" font="Sans Serif at 20,85">{ButtonBlue}</marquee>
</block>
<!-- Scroll-bar -->
@@ -868,8 +868,8 @@
<rectangle x1="107" x2="-1" y1="-110" y2="-103" color="TopBG"/>
<rectangle x1="107" x2="-1" y1="-98" y2="-95" color="TopBG"/>
- <text x1="110" x2="-1" y1="-129" y2="-94" color="TopTxtShad" align="center" font="FontBold.ttf:26,85">Volume</text>
- <text x1="107" x2="-4" y1="-130" y2="-95" color="TopTxtFG" align="center" font="FontBold.ttf:26,85">Volume</text>
+ <text x1="110" x2="-1" y1="-129" y2="-94" color="TopTxtShad" align="center" font="Sans Serif:Bold at 26,85">Volume</text>
+ <text x1="107" x2="-4" y1="-130" y2="-95" color="TopTxtFG" align="center" font="Sans Serif:Bold at 26,85">Volume</text>
<!-- trans('Volume') -->
<!-- Volume-bar -->
@@ -882,8 +882,8 @@
<rectangle x1="107" x2="-1" y1="-56" y2="-41" color="BotBG"/> <rectangle x1="107" x2="-11" y1="-40" y2="-31" color="BotBG"/>
<!-- date / time -->
- <text x1="112" x2="229" y1="-56" y2="-31" color="BotTxtFG" align="left" font="Font.ttf:20,85">{DateTime:%d.%m.}</text>
- <text x1="112" x2="229" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Font.ttf:20,85">{DateTime:%H\:%M}</text>
+ <text x1="112" x2="229" y1="-56" y2="-31" color="BotTxtFG" align="left" font="Sans Serif at 20,85">{DateTime:%d.%m.}</text>
+ <text x1="112" x2="229" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{DateTime:%H\:%M}</text>
<!-- overlay messages -->
<block condition="{Message}">
@@ -895,8 +895,8 @@
<rectangle condition="{MessageWarning}" x1="111" x2="-5" y1="-86" y2="-65" color="MsgWarningBG"/>
<rectangle condition="{MessageError}" x1="111" x2="-5" y1="-86" y2="-65" color="MsgErrorBG"/>
- <text x1="115" x2="-10" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Font.ttf:20,85">{Message}</text>
- <text x1="116" x2="-9" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Font.ttf:20,85">{Message}</text>
+ <text x1="115" x2="-10" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Sans Serif at 20,85">{Message}</text>
+ <text x1="116" x2="-9" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Sans Serif at 20,85">{Message}</text>
</block>
</display>
@@ -918,8 +918,8 @@
<rectangle x1="107" x2="-1" y1="-110" y2="-103" color="TopBG"/>
<rectangle x1="107" x2="-1" y1="-98" y2="-95" color="TopBG"/>
- <text x1="110" x2="-1" y1="-129" y2="-94" color="TopTxtShad" align="center" font="FontBold.ttf:26,85">Message</text>
- <text x1="107" x2="-4" y1="-130" y2="-95" color="TopTxtFG" align="center" font="FontBold.ttf:26,85">Message</text>
+ <text x1="110" x2="-1" y1="-129" y2="-94" color="TopTxtShad" align="center" font="Sans Serif:Bold at 26,85">Message</text>
+ <text x1="107" x2="-4" y1="-130" y2="-95" color="TopTxtFG" align="center" font="Sans Serif:Bold at 26,85">Message</text>
<!-- trans('Message') -->
<rectangle x1="107" x2="-1" y1="-90" y2="-61" color="MsgInfoBG"/>
@@ -932,16 +932,16 @@
<rectangle condition="{MessageWarning}" x1="111" x2="-5" y1="-86" y2="-65" color="MsgWarningBG"/>
<rectangle condition="{MessageError}" x1="111" x2="-5" y1="-86" y2="-65" color="MsgErrorBG"/>
- <text x1="115" x2="-10" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Font.ttf:20,85">{Message}</text>
- <text x1="116" x2="-9" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Font.ttf:20,85">{Message}</text>
+ <text x1="115" x2="-10" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Sans Serif at 20,85">{Message}</text>
+ <text x1="116" x2="-9" y1="-89" y2="-61" color="MsgTxtFG" align="center" font="Sans Serif at 20,85">{Message}</text>
<!-- bottom info-line -->
<ellipse x1="-10" x2="-1" y1="-40" y2="-31" arc="4" color="BotBG"/>
<rectangle x1="107" x2="-1" y1="-56" y2="-41" color="BotBG"/> <rectangle x1="107" x2="-11" y1="-40" y2="-31" color="BotBG"/>
<!-- date / time -->
- <text x1="112" x2="229" y1="-56" y2="-31" color="BotTxtFG" align="left" font="Font.ttf:20,85">{DateTime:%d.%m.}</text>
- <text x1="112" x2="229" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Font.ttf:20,85">{DateTime:%H\:%M}</text>
+ <text x1="112" x2="229" y1="-56" y2="-31" color="BotTxtFG" align="left" font="Sans Serif at 20,85">{DateTime:%d.%m.}</text>
+ <text x1="112" x2="229" y1="-56" y2="-31" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{DateTime:%H\:%M}</text>
</display>
@@ -969,18 +969,18 @@
<rectangle x1="0" x2="339" y1="-140" y2="-133" color="TopBG"/>
<rectangle x1="0" x2="339" y1="-128" y2="-125" color="TopBG"/>
- <text x1="3" x2="339" y1="-159" y2="-124" color="TopTxtShad" align="center" font="FontBold.ttf:26,85">Audio</text>
- <text x1="0" x2="336" y1="-160" y2="-125" color="TopTxtFG" align="center" font="FontBold.ttf:26,85">Audio</text>
+ <text x1="3" x2="339" y1="-159" y2="-124" color="TopTxtShad" align="center" font="Sans Serif:Bold at 26,85">Audio</text>
+ <text x1="0" x2="336" y1="-160" y2="-125" color="TopTxtFG" align="center" font="Sans Serif:Bold at 26,85">Audio</text>
<!-- trans('Audio') -->
<!-- audio-area -->
<rectangle x1="94" x2="339" y1="-120" y2="-31" color="AudioBG"/>
<list x1="94" x2="339" y1="-114" y2="-31">
<item height="26"/>
- <text x1="10" x2="235" y1="0" y2="26" color="AudioTxtFG" font="Font.ttf:22,85">{MenuItem}</text>
+ <text x1="10" x2="235" y1="0" y2="26" color="AudioTxtFG" font="Sans Serif at 22,85">{MenuItem}</text>
<rectangle condition="{MenuCurrent}" x1="5" x2="240" y1="1" y2="26" color="AudioHighlight"/>
- <marquee x1="10" x2="235" y1="0" y2="26" color="AudioTxtCurFG" font="Font.ttf:22,85">{MenuCurrent}</marquee>
- <marquee x1="11" x2="235" y1="0" y2="26" color="AudioTxtCurFG" font="Font.ttf:22,85">{MenuCurrent}</marquee>
+ <marquee x1="10" x2="235" y1="0" y2="26" color="AudioTxtCurFG" font="Sans Serif at 22,85">{MenuCurrent}</marquee>
+ <marquee x1="11" x2="235" y1="0" y2="26" color="AudioTxtCurFG" font="Sans Serif at 22,85">{MenuCurrent}</marquee>
</list>
<!-- bottom info-line -->
@@ -990,7 +990,7 @@
<rectangle x1="10" x2="329" y1="-10" y2="-1" color="BotBG"/>
<!-- date / time -->
- <text x1="5" x2="122" y1="-26" y2="-1" color="BotTxtFG" align="left" font="Font.ttf:20,85">{DateTime:%d.%m.}</text>
- <text x1="5" x2="122" y1="-26" y2="-1" color="BotTxtFG" align="right" font="Font.ttf:20,85">{DateTime:%H\:%M}</text>
+ <text x1="5" x2="122" y1="-26" y2="-1" color="BotTxtFG" align="left" font="Sans Serif at 20,85">{DateTime:%d.%m.}</text>
+ <text x1="5" x2="122" y1="-26" y2="-1" color="BotTxtFG" align="right" font="Sans Serif at 20,85">{DateTime:%H\:%M}</text>
</display>
</skin>
izegrey16-1.0-20050304-fonts.patch:
izegrey16.skin | 76 ++++++++++++++++++++++++++++-----------------------------
1 file changed, 38 insertions(+), 38 deletions(-)
--- NEW FILE izegrey16-1.0-20050304-fonts.patch ---
Index: izegrey16.skin
===================================================================
RCS file: /var/cvsroot/skins/izegrey16/izegrey16.skin,v
retrieving revision 1.1
diff -u -r1.1 izegrey16.skin
--- izegrey16.skin 4 Mar 2005 18:41:46 -0000 1.1
+++ izegrey16.skin 12 Jul 2009 20:11:18 -0000
@@ -7,7 +7,7 @@
<ellipse x1="0" x2="11" y1="423" y2="450" color="darkgrey" arc="7"/>
<rectangle x1="12" x2="599" y1="423" y2="450" color="darkgrey"/>
<ellipse x1="600" x2="611" y1="423" y2="450" color="darkgrey" arc="5"/>
- <text x1="15" x2="105" y1="423" y2="450" color="lightgrey" font="Vera.ttf:22" align="left">Volume</text>
+ <text x1="15" x2="105" y1="423" y2="450" color="lightgrey" font="Sans Serif at 22" align="left">Volume</text>
<progress x1="110" x2="597" y1="427" y2="446" color="green" current="{VolumeCurrent}" total="{VolumeTotal}"/>
</block>
</display>
@@ -16,10 +16,10 @@
<ellipse x1="0" x2="11" y1="423" y2="450" color="darkgrey" arc="7"/>
<rectangle x1="12" x2="599" y1="423" y2="450" color="darkgrey"/>
<ellipse x1="600" x2="611" y1="423" y2="450" color="darkgrey" arc="5"/>
- <text x1="12" x2="599" y1="423" y2="450" color="lightgrey" font="Vera.ttf:22" align="center">{MessageInfo} </text>
- <text x1="12" x2="599" y1="423" y2="450" color="lightgrey" font="Vera.ttf:22" align="center">{MessageStatus} </text>
- <text x1="12" x2="599" y1="423" y2="450" color="lightgrey" font="Vera.ttf:22" align="center">{MessageWarning}</text>
- <text x1="12" x2="599" y1="423" y2="450" color="lightgrey" font="Vera.ttf:22" align="center">{MessageError} </text>
+ <text x1="12" x2="599" y1="423" y2="450" color="lightgrey" font="Sans Serif at 22" align="center">{MessageInfo} </text>
+ <text x1="12" x2="599" y1="423" y2="450" color="lightgrey" font="Sans Serif at 22" align="center">{MessageStatus} </text>
+ <text x1="12" x2="599" y1="423" y2="450" color="lightgrey" font="Sans Serif at 22" align="center">{MessageWarning}</text>
+ <text x1="12" x2="599" y1="423" y2="450" color="lightgrey" font="Sans Serif at 22" align="center">{MessageError} </text>
</display>
<display id="replayInfo">
@@ -30,8 +30,8 @@
<!-- time bar -->
<progress x1="4" x2="500" y1="433" y2="452" color="green" bgColor="lightgrey" current="{ReplayPositionIndex}" total="{ReplayDurationIndex}" mark="darkgrey" active="red" keep="darkgrey"/>
<!-- replay title -->
- <text x1="4" x2="354" y1="405" y2="429" color="darkwhite" font="Vera.ttf:22">{ReplayTitle}</text>
- <text x1="410" x2="600" y1="405" y2="429" color="darkwhite" align="right" font="Vera.ttf:22">{ReplayPosition} / {ReplayDuration}</text>
+ <text x1="4" x2="354" y1="405" y2="429" color="darkwhite" font="Sans Serif at 22">{ReplayTitle}</text>
+ <text x1="410" x2="600" y1="405" y2="429" color="darkwhite" align="right" font="Sans Serif at 22">{ReplayPosition} / {ReplayDuration}</text>
<!-- symbols -->
<image x="550" y="435" alpha="200" condition="{ReplayIsPlaying}" color="green" bgColor="darkgrey" path="symbols/play.xpm"/>
<image x="550" y="435" alpha="200" condition="{ReplayIsPausing}" color="red" bgColor="darkgrey" path="symbols/pause.xpm"/>
@@ -85,21 +85,21 @@
<rectangle x1="10" x2="-1" y1="306" y2="367" color="darkgrey"/>
<rectangle x1="10" x2="95" y1="306" y2="360" color="grey"/>
<ellipse x1="10" x2="25" y1="306" y2="321" color="00000000" arc="-2"/>
- <text x1="10" x2="95" y1="306" y2="360" color="lightgrey" font="Vera.ttf:40" align="center" >{ChannelNumber}</text>
+ <text x1="10" x2="95" y1="306" y2="360" color="lightgrey" font="Sans Serif at 40" align="center" >{ChannelNumber}</text>
<rectangle x1="95" x2="318" y1="306" y2="333" color="darkgrey"/>
<ellipse x1="319" x2="332" y1="306" y2="333" color="darkgrey" arc="5"/>
- <text x1="97" x2="248" y1="306" y2="333" color="lightgrey" font="Vera.ttf:22" align="left">{DateTime:%a %d.%m.}</text>
- <text x1="350" x2="510" y1="306" y2="360" color="lightgrey" font="Vera.ttf:40" align="right">{DateTime:%H\:%M} </text>
+ <text x1="97" x2="248" y1="306" y2="333" color="lightgrey" font="Sans Serif at 22" align="left">{DateTime:%a %d.%m.}</text>
+ <text x1="350" x2="510" y1="306" y2="360" color="lightgrey" font="Sans Serif at 40" align="right">{DateTime:%H\:%M} </text>
<!-- channel name -->
<rectangle x1="95" x2="349" y1="333" y2="360" color="grey"/>
<ellipse x1="350" x2="363" y1="333" y2="360" color="grey" arc="5"/>
- <text x1="97" x2="361" y1="333" y2="360" color="lightgrey" font="Vera.ttf:22">{ChannelName}</text>
+ <text x1="97" x2="361" y1="333" y2="360" color="lightgrey" font="Sans Serif at 22">{ChannelName}</text>
<!-- program start times -->
<rectangle x1="10" x2="77" y1="367" y2="454" color="darkgrey"/>
<ellipse x1="10" x2="25" y1="455" y2="470" color="darkgrey" arc="3"/>
<rectangle x1="26" x2="77" y1="455" y2="470" color="darkgrey"/>
- <text x1="10" x2="74" y1="367" y2="394" color="lightgrey" font="Vera.ttf:20" align="right">{PresentStartDateTime:%H\:%M}</text>
- <text x1="10" x2="74" y1="421" y2="448" color="lightgrey" font="Vera.ttf:20" align="right">{FollowingStartDateTime:%H\:%M}</text>
+ <text x1="10" x2="74" y1="367" y2="394" color="lightgrey" font="Sans Serif at 20" align="right">{PresentStartDateTime:%H\:%M}</text>
+ <text x1="10" x2="74" y1="421" y2="448" color="lightgrey" font="Sans Serif at 20" align="right">{FollowingStartDateTime:%H\:%M}</text>
<!-- time bar -->
<rectangle x1="78" x2="89" y1="367" y2="470" color="grey"/>
<progress x1="80" x2="87" y1="367" y2="470" color="yellow" current="{PresentProgress}" total="{PresentDuration}"/>
@@ -107,10 +107,10 @@
<rectangle x1="90" x2="591" y1="367" y2="470" color="darkgrey"/>
<rectangle x1="592" x2="607" y1="367" y2="454" color="darkgrey"/>
<ellipse x1="592" x2="607" y1="455" y2="470" color="darkgrey" arc="4"/>
- <text x1="98" x2="565" y1="367" y2="394" color="lightgrey" font="Vera.ttf:22">{PresentTitle}</text>
- <text x1="98" x2="565" y1="395" y2="418" color="grey" font="Vera.ttf:18">{PresentShortText}</text>
- <text x1="98" x2="565" y1="421" y2="448" color="lightgrey" font="Vera.ttf:22">{FollowingTitle}</text>
- <text x1="98" x2="565" y1="449" y2="472" color="grey" font="Vera.ttf:18">{FollowingShortText}</text>
+ <text x1="98" x2="565" y1="367" y2="394" color="lightgrey" font="Sans Serif at 22">{PresentTitle}</text>
+ <text x1="98" x2="565" y1="395" y2="418" color="grey" font="Sans Serif at 18">{PresentShortText}</text>
+ <text x1="98" x2="565" y1="421" y2="448" color="lightgrey" font="Sans Serif at 22">{FollowingTitle}</text>
+ <text x1="98" x2="565" y1="449" y2="472" color="grey" font="Sans Serif at 18">{FollowingShortText}</text>
<!-- symbols -->
<image x="568" y="365" alpha="200" condition="{IsRecording}" color="lightgrey" bgColor="darkgrey" path="symbols/recording.xpm"/>
<image x="568" y="385" alpha="200" condition="{IsEncrypted}" color="lightgrey" bgColor="darkgrey" path="symbols/encrypted.xpm"/>
@@ -132,8 +132,8 @@
<rectangle x1="0" x2="607" y1="16" y2="27" color="darkgrey"/>
<ellipse x1="0" x2="15" y1="0" y2="15" color="darkgrey" arc="2"/>
<ellipse x1="592" x2="607" y1="0" y2="15" color="darkgrey" arc="1"/>
- <text x1="361" x2="592" y1="1" y2="31" color="lightgrey" align="right" font="Vera.ttf:22">{DateTime:%a %d.%m. %H\:%M}</text>
- <text x1="15" x2="360" y1="1" y2="31" color="lightgrey" font="Vera.ttf:22">{MenuTitle}</text>
+ <text x1="361" x2="592" y1="1" y2="31" color="lightgrey" align="right" font="Sans Serif at 22">{DateTime:%a %d.%m. %H\:%M}</text>
+ <text x1="15" x2="360" y1="1" y2="31" color="lightgrey" font="Sans Serif at 22">{MenuTitle}</text>
<!-- menu list -->
<rectangle x1="0" x2="607" y1="28" y2="455" color="grey"/>
<list x1="0" x2="607" y1="32" y2="455">
@@ -141,41 +141,41 @@
<ellipse x1="0" x2="11" y1="0" y2="27" color="lightgrey" condition="{IsMenuCurrent}" arc="7"/>
<rectangle x1="12" x2="595" y1="0" y2="27" color="lightgrey" condition="{IsMenuCurrent}"/>
<ellipse x1="596" x2="607" y1="0" y2="27" color="lightgrey" condition="{IsMenuCurrent}" arc="5"/>
- <text x1="12" x2="595" y1="0" y2="27" color="lightgrey" font="Vera.ttf:22">{MenuGroup}</text>
- <text x1="12" x2="595" y1="0" y2="27" color="grey" font="Vera.ttf:20">{MenuCurrent}</text>
- <text x1="12" x2="595" y1="0" y2="27" color="darkwhite" font="Vera.ttf:20">{MenuItem}</text>
+ <text x1="12" x2="595" y1="0" y2="27" color="lightgrey" font="Sans Serif at 22">{MenuGroup}</text>
+ <text x1="12" x2="595" y1="0" y2="27" color="grey" font="Sans Serif at 20">{MenuCurrent}</text>
+ <text x1="12" x2="595" y1="0" y2="27" color="darkwhite" font="Sans Serif at 20">{MenuItem}</text>
</list>
<!-- red button -->
<block>
<ellipse x1="0" x2="15" y1="468" y2="483" color="red" arc="3"/>
<rectangle x1="0" x2="15" y1="456" y2="467" color="red"/>
<rectangle x1="16" x2="151" y1="456" y2="483" color="red"/>
- <text x1="0" x2="155" y1="456" y2="483" color="darkwhite" font="VeraBd.ttf:22" align="center">{ButtonRed}</text>
+ <text x1="0" x2="155" y1="456" y2="483" color="darkwhite" font="Sans Serif:Bold at 22" align="center">{ButtonRed}</text>
</block>
<!-- green button -->
<block>
<rectangle x1="152" x2="303" y1="456" y2="483" color="green"/>
- <text x1="156" x2="305" y1="456" y2="483" color="darkgrey" font="VeraBd.ttf:22" align="center">{ButtonGreen}</text>
+ <text x1="156" x2="305" y1="456" y2="483" color="darkgrey" font="Sans Serif:Bold at 22" align="center">{ButtonGreen}</text>
</block>
<!-- yellow button -->
<block>
<rectangle x1="304" x2="455" y1="456" y2="483" color="yellow"/>
- <text x1="306" x2="455" y1="456" y2="483" color="darkgrey" font="VeraBd.ttf:22" align="center">{ButtonYellow}</text>
+ <text x1="306" x2="455" y1="456" y2="483" color="darkgrey" font="Sans Serif:Bold at 22" align="center">{ButtonYellow}</text>
</block>
<!-- blue button -->
<block>
<rectangle x1="456" x2="591" y1="456" y2="483" color="blue"/>
<rectangle x1="592" x2="607" y1="456" y2="467" color="blue"/>
<ellipse x1="592" x2="607" y1="468" y2="483" color="blue" arc="4"/>
- <text x1="456" x2="607" y1="456" y2="483" color="darkwhite" font="VeraBd.ttf:22" align="center">{ButtonBlue}</text>
+ <text x1="456" x2="607" y1="456" y2="483" color="darkwhite" font="Sans Serif:Bold at 22" align="center">{ButtonBlue}</text>
</block>
<!-- detailed epg info -->
<block condition="{PresentTitle}">
- <text x1="24" x2="419" y1="62" y2="91" color="darkgrey" font="Vera.ttf:22">{PresentStartDateTime:%d.%m. %H\:%M} - {PresentEndDateTime:%H\:%M}</text>
- <text x1="420" x2="539" y1="62" y2="91" color="darkgrey" font="Vera.ttf:22" condition="{PresentVPSDateTime}">VPS: {PresentVPSDateTime:%H\:%M}</text>
- <text x1="24" x2="593" y1="102" y2="129" color="darkwhite" font="Vera.ttf:22">{PresentTitle}</text>
- <scrolltext x1="24" x2="583" y1="138" y2="450" color="lightgrey" font="Vera.ttf:22">{PresentShortText}{PresentDescription}</scrolltext>
+ <text x1="24" x2="419" y1="62" y2="91" color="darkgrey" font="Sans Serif at 22">{PresentStartDateTime:%d.%m. %H\:%M} - {PresentEndDateTime:%H\:%M}</text>
+ <text x1="420" x2="539" y1="62" y2="91" color="darkgrey" font="Sans Serif at 22" condition="{PresentVPSDateTime}">VPS: {PresentVPSDateTime:%H\:%M}</text>
+ <text x1="24" x2="593" y1="102" y2="129" color="darkwhite" font="Sans Serif at 22">{PresentTitle}</text>
+ <scrolltext x1="24" x2="583" y1="138" y2="450" color="lightgrey" font="Sans Serif at 22">{PresentShortText}{PresentDescription}</scrolltext>
<scrollbar x1="585" x2="597" y1="138" y2="450" condition="or({CanScrollUp},{CanScrollDown})" color="darkgrey" bgColor="grey"/>
<image x="72" y="35" path="symbols/vps.xpm" condition="{HasVPS}"/>
<image x="48" y="35" path="symbols/timer.xpm" condition="{HasTimer}"/>
@@ -183,7 +183,7 @@
</block>
<!-- menu text -->
<block condition="{MenuText}">
- <scrolltext x1="24" x2="583" y1="62" y2="426" font="Vera.ttf:22" color="lightgrey">{MenuText}</scrolltext>
+ <scrolltext x1="24" x2="583" y1="62" y2="426" font="Sans Serif at 22" color="lightgrey">{MenuText}</scrolltext>
<scrollbar x1="585" x2="597" y1="62" y2="426" condition="or({CanScrollUp},{CanScrollDown})" color="lightgrey" bgColor="darkgrey"/>
</block>
<!-- message -->
@@ -192,28 +192,28 @@
<rectangle x1="0" x2="607" y1="456" y2="468" color="lightgrey"/>
<rectangle x1="15" x2="592" y1="468" y2="483" color="lightgrey"/>
<ellipse x1="592" x2="607" y1="468" y2="483" color="lightgrey" arc="4"/>
- <text x1="0" x2="592" y1="456" y2="483" color="darkgrey" align="center" font="Vera.ttf:22">{MessageInfo}</text>
+ <text x1="0" x2="592" y1="456" y2="483" color="darkgrey" align="center" font="Sans Serif at 22">{MessageInfo}</text>
</block>
<block condition="{MessageStatus}">
<ellipse x1="0" x2="15" y1="468" y2="483" color="lightgrey" arc="3"/>
<rectangle x1="0" x2="607" y1="456" y2="468" color="lightgrey"/>
<rectangle x1="15" x2="592" y1="468" y2="483" color="lightgrey"/>
<ellipse x1="592" x2="607" y1="468" y2="483" color="lightgrey" arc="4"/>
- <text x1="0" x2="592" y1="456" y2="483" color="darkgrey" align="center" font="Vera.ttf:22">{MessageStatus}</text>
+ <text x1="0" x2="592" y1="456" y2="483" color="darkgrey" align="center" font="Sans Serif at 22">{MessageStatus}</text>
</block>
<block condition="{MessageWarning}">
<ellipse x1="0" x2="15" y1="468" y2="483" color="lightgrey" arc="3"/>
<rectangle x1="0" x2="607" y1="456" y2="468" color="lightgrey"/>
<rectangle x1="15" x2="592" y1="468" y2="483" color="lightgrey"/>
<ellipse x1="592" x2="607" y1="468" y2="483" color="lightgrey" arc="4"/>
- <text x1="0" x2="592" y1="456" y2="483" color="darkgrey" align="center" font="Vera.ttf:22">{MessageWarning}</text>
+ <text x1="0" x2="592" y1="456" y2="483" color="darkgrey" align="center" font="Sans Serif at 22">{MessageWarning}</text>
</block>
<block condition="{MessageError}">
<ellipse x1="0" x2="15" y1="468" y2="483" color="lightgrey" arc="3"/>
<rectangle x1="0" x2="607" y1="456" y2="468" color="lightgrey"/>
<rectangle x1="15" x2="592" y1="468" y2="483" color="lightgrey"/>
<ellipse x1="592" x2="607" y1="468" y2="483" color="lightgrey" arc="4"/>
- <text x1="0" x2="592" y1="456" y2="483" color="darkgrey" align="center" font="Vera.ttf:22">{MessageError}</text>
+ <text x1="0" x2="592" y1="456" y2="483" color="darkgrey" align="center" font="Sans Serif at 22">{MessageError}</text>
</block>
</display>
@@ -225,7 +225,7 @@
<rectangle x1="0" x2="15" y1="325" y2="339" color="darkgrey"/>
<rectangle x1="233" x2="249" y1="325" y2="339" color="darkgrey"/>
<rectangle x1="16" x2="232" y1="310" y2="339" color="darkgrey"/>
- <text x1="16" x2="232" y1="314" y2="337" color="lightgrey" font="Vera.ttf:22">{MenuTitle}</text>
+ <text x1="16" x2="232" y1="314" y2="337" color="lightgrey" font="Sans Serif at 22">{MenuTitle}</text>
<!-- background -->
<rectangle x1="0" x2="249" y1="340" y2="463" color="grey"/>
<rectangle x1="16" x2="232" y1="464" y2="479" color="grey"/>
@@ -234,11 +234,11 @@
<!-- audio list -->
<list x1="0" x2="249" y1="342" y2="479">
<item height="27"/>
- <text x1="12" x2="238" y1="0" y2="27" color="darkwhite" font="Vera.ttf:22" >{MenuItem}</text>
+ <text x1="12" x2="238" y1="0" y2="27" color="darkwhite" font="Sans Serif at 22" >{MenuItem}</text>
<ellipse x1="0" x2="11" y1="0" y2="27" color="darkgrey" arc="7" condition="{IsMenuCurrent}"/>
<rectangle x1="12" x2="238" y1="0" y2="27" color="darkgrey" condition="{IsMenuCurrent}"/>
<ellipse x1="238" x2="249" y1="0" y2="27" color="darkgrey" arc="5" condition="{IsMenuCurrent}"/>
- <text x1="12" x2="249" y1="0" y2="27" color="yellow" font="Vera.ttf:22" >{MenuCurrent}</text>
+ <text x1="12" x2="249" y1="0" y2="27" color="yellow" font="Sans Serif at 22" >{MenuCurrent}</text>
</list>
</display>
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-skins/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 24 Nov 2008 19:11:51 -0000 1.3
+++ .cvsignore 1 Sep 2009 21:14:25 -0000 1.4
@@ -1,7 +1,11 @@
-Aluminium-1.0-demo-nologos.tar.bz2
-DeepBlue-0.1.4-nologos.tar.bz2
+Aluminium-1.0-demo-nologos.tar.xz
+deepblue-0.1.4-locale.diff
+DeepBlue-0.1.4-nologos.tar.xz
EgalSimple-1.0-demo.tar.bz2
+enelchi-0.7.2-locale.diff
+enigma-0.3a-locale.diff
+izegrey16-1.0-20050304-nologos.tar.xz
SilverGreen-0.1.7.tar.bz2
-izegrey16-1.0-20050304-nologos.tar.bz2
-vdrskin-enigma-0.3a-nologos.tar.bz2
+Skin-EgalsTry-1.1.0-nologos.tar.xz
vdrskin-enElchi-0.7.2.tgz
+vdrskin-enigma-0.3a-nologos.tar.xz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-skins/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 24 Nov 2008 19:11:51 -0000 1.3
+++ sources 1 Sep 2009 21:14:25 -0000 1.4
@@ -1,7 +1,11 @@
-f7aca33ccc3f17f257a6919d1f2d5bc0 Aluminium-1.0-demo-nologos.tar.bz2
-8527b1fc6f7a5bacd622ee828de3f203 DeepBlue-0.1.4-nologos.tar.bz2
+00a37ab75fcadeb46385d585938bfe56 Aluminium-1.0-demo-nologos.tar.xz
+b4982b8a9900897f215eadab0acef6db deepblue-0.1.4-locale.diff
+46bf3259b319df37a0d532020a9d9f74 DeepBlue-0.1.4-nologos.tar.xz
8676ae6f7596d7c09fbdec7468709bbc EgalSimple-1.0-demo.tar.bz2
+6d25e2376a348596ffc4c35ad4480606 enelchi-0.7.2-locale.diff
+9a305465f90e9ce1e52b4238df8489b0 enigma-0.3a-locale.diff
+edd0fc660e55168a14223b3150e10f1f izegrey16-1.0-20050304-nologos.tar.xz
89dd82fa698d139a15c4d24601188a0c SilverGreen-0.1.7.tar.bz2
-8a238e3d1a3f2d62a37415e912e780e4 izegrey16-1.0-20050304-nologos.tar.bz2
-acdb6c15e86aee821401cc2697a4e225 vdrskin-enigma-0.3a-nologos.tar.bz2
+9ded71faf87400a031a18b8315909cb4 Skin-EgalsTry-1.1.0-nologos.tar.xz
f1913e012a68f8ca7a1feb3da82b8709 vdrskin-enElchi-0.7.2.tgz
+c4a4a3078cffa557639130af829aeb55 vdrskin-enigma-0.3a-nologos.tar.xz
Index: vdr-skins-prepare-tarballs.sh
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-skins/devel/vdr-skins-prepare-tarballs.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- vdr-skins-prepare-tarballs.sh 24 Nov 2008 19:11:51 -0000 1.2
+++ vdr-skins-prepare-tarballs.sh 1 Sep 2009 21:14:25 -0000 1.3
@@ -7,7 +7,7 @@ curl -O http://skins.vdr-developer.org/t
rm -rf izegrey16
tar zxf izegrey16-1.0-20050304.tar.gz
rm -f izegrey16/{*.tar,*.ttf,logos/{*.mng,*.png,*.xpm}}
-tar jcf izegrey16-1.0-20050304-nologos.tar.bz2 izegrey16
+tar c izegrey16 | xz --best > izegrey16-1.0-20050304-nologos.tar.xz
rm -rf izegrey16
[ ! -e vdrskin-enigma-0.3a.tar.bz2 ] && \
@@ -20,7 +20,7 @@ find Enigma -type d -exec chmod +x {} ';
mv Enigma/icons Enigma/icons-normal
tar zx -C Enigma -f $PWD/icons-low-low-col.tar.gz
rm -rf Enigma/{hqlogos/*,fonts/ttf-bitstream-vera*,patches}
-tar jcf vdrskin-enigma-0.3a-nologos.tar.bz2 Enigma
+tar c Enigma | xz --best > vdrskin-enigma-0.3a-nologos.tar.xz
rm -rf Enigma
[ ! -e DeepBlue-0.1.4.tar.gz ] && \
@@ -34,7 +34,7 @@ find DeepBlueDXR3 -type d -exec chmod +x
rm -rf DeepBlue/logos/*
mv DeepBlueDXR3/HISTORY DeepBlue
mv DeepBlueDXR3/images DeepBlue/images-dxr3
-tar jcf DeepBlue-0.1.4-nologos.tar.bz2 DeepBlue
+tar c DeepBlue | xz --best > DeepBlue-0.1.4-nologos.tar.xz
rm -rf DeepBlue DeepBlueDXR3
[ ! -e Aluminium-1.0-demo.tar.bz2 ] && \
@@ -42,5 +42,13 @@ curl -O http://linux.kompiliert.net/cont
rm -rf Aluminium
tar jxf Aluminium-1.0-demo.tar.bz2
rm -f Aluminium/logos/*
-tar jcf Aluminium-1.0-demo-nologos.tar.bz2 Aluminium
+tar c Aluminium | xz --best > Aluminium-1.0-demo-nologos.tar.xz
rm -rf Aluminium
+
+[ ! -e Skin-EgalsTry-1.1.0.tgz ] && \
+curl -O http://www.egal-vdr.de/skins/Skin-EgalsTry-1.1.0.tgz
+rm -rf EgalsTry
+tar zxf Skin-EgalsTry-1.1.0.tgz
+rm -r EgalsTry/logos/*
+tar c EgalsTry | xz --best > Skin-EgalsTry-1.1.0-nologos.tar.xz
+rm -rf EgalsTry
Index: vdr-skins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-skins/devel/vdr-skins.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- vdr-skins.spec 27 Jul 2009 06:46:41 -0000 1.13
+++ vdr-skins.spec 1 Sep 2009 21:14:25 -0000 1.14
@@ -8,13 +8,9 @@
%global vdr_group %(vdr-config --group 2>/dev/null || echo ERROR)
%global vdr_user %(vdr-config --user 2>/dev/null || echo ERROR)
-%global sansfont %{_datadir}/fonts/dejavu/DejaVuSans.ttf
-%global boldfont %{_datadir}/fonts/dejavu/DejaVuSans-Bold.ttf
-%global monofont %{_datadir}/fonts/dejavu/DejaVuSansMono.ttf
-
Name: vdr-skins
-Version: 20081124
-Release: 6%{?dist}
+Version: 20090901
+Release: 1%{?dist}
Summary: Collection of OSD skins for VDR
Group: Applications/Multimedia
@@ -25,20 +21,22 @@ License: GPL+
# http://home.arcor.de/bjoern.sturzrehm/vdr/
Source0: http://home.arcor.de/bjoern.sturzrehm/vdr/SilverGreen-0.1.7.tar.bz2
# http://skins.vdr-developer.org/
-Source1: izegrey16-1.0-20050304-nologos.tar.bz2
+Source1: izegrey16-1.0-20050304-nologos.tar.xz
# http://home.pages.at/brougs78/
# http://ventoso.org/luca/vdr/
-Source2: vdrskin-enigma-0.3a-nologos.tar.bz2
+Source2: vdrskin-enigma-0.3a-nologos.tar.xz
# http://vdr.pfroen.de/
# http://www.netholic.com/viewtopic.php?t=1464
-Source3: DeepBlue-0.1.4-nologos.tar.bz2
+Source3: DeepBlue-0.1.4-nologos.tar.xz
# http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka/
Source4: http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka/files/vdrskin-enElchi-0.7.2.tgz
# http://www.fdm-ware.de/vdrskin/
# http://linux.kompiliert.net/contrib/
-Source5: Aluminium-1.0-demo-nologos.tar.bz2
+Source5: Aluminium-1.0-demo-nologos.tar.xz
# http://linux.kompiliert.net/contrib/
Source6: http://linux.kompiliert.net/contrib/EgalSimple-1.0-demo.tar.bz2
+# http://www.egal-vdr.de/skins/
+Source7: Skin-EgalsTry-1.1.0-nologos.tar.xz
# http://www.vdrskins.org/vdrskins/thumbnails.php?album=58
Source8: http://web.archive.org/web/20060322201106/http://www.magoa.net/sttng-blue.theme
Source99: %{name}-prepare-tarballs.sh
@@ -46,15 +44,21 @@ Source99: %{name}-prepare-tarballs
Patch0: %{name}-aluminium-i18n.patch
Patch1: %{name}-egalsimple-i18n.patch
Patch2: %{name}-izegrey16-i18n.patch
+Patch3: http://toms-cafe.de/vdr/download/deepblue-0.1.4-locale.diff
+Patch4: http://toms-cafe.de/vdr/download/enigma-0.3a-locale.diff
+Patch5: http://toms-cafe.de/vdr/download/enelchi-0.7.2-locale.diff
+Patch6: izegrey16-1.0-20050304-fonts.patch
+Patch7: enigma-0.3a-fonts.patch
+Patch8: Aluminium-1.0-demo-fonts.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: vdr-devel
-# Font build deps for checking filenames during build
-BuildRequires: dejavu-sans-fonts
-BuildRequires: dejavu-sans-mono-fonts
-Requires: vdr-text2skin >= 1.1
-Requires: vdr >= 1.4.6-2
+BuildRequires: gettext
+BuildRequires: hardlink
+Requires: vdr-text2skin >= 1.2-3
+Requires: vdr >= 1.6.0
+# Actually any sans+monospace set would do
Requires: dejavu-sans-fonts
Requires: dejavu-sans-mono-fonts
@@ -63,7 +67,7 @@ This package contains a collection of sk
%prep
-%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6
+%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7
find . -type d -exec chmod 755 {} ';'
find . -type f -exec chmod 644 {} ';'
find . -type d -name CVS* | xargs rm -r
@@ -75,6 +79,20 @@ done
%patch0
%patch1
%patch2
+cd DeepBlue
+%patch3 -p2
+cd ..
+cd Enigma
+%patch4 -p2
+%patch7 -p1
+cd ..
+cd enElchi
+%patch5 -p2
+cd ..
+cd izegrey16
+%patch6 -p0
+cd ..
+%patch8 -p0
SKINS=$(find * -maxdepth 0 -type d)
@@ -86,12 +104,13 @@ for s in $SKINS ; do
done
find . -type f -name "*.theme" -exec mv {} . ';'
+mv SilverGreen-Default.theme SilverGreen-default.theme
+rm SilverGreen-ThemeName.theme
for s in $SKINS ; do
[ -f $s-default.theme ] || touch $s-default.theme
done
ln -sf mp3.png Aluminium/replay/mp3oss.png
-sed -i -e 's|\bhelmetr\.ttf\b|%{sansfont}|g' Aluminium/Aluminium.skin
rm -r Aluminium/{Aluminium.skin.*,MERKEN,fonts}
cd DeepBlue
@@ -103,11 +122,9 @@ cd ..
rm -r EgalSimple/{EgalSimple.skin.*,themes}
+rm -r EgalsTry/{theme,tools}
+
cd Enigma
-sed -i -e 's|\bFont\.ttf\b|%{sansfont}|g' \
- -e 's|\bFontBold\.ttf\b|%{boldfont}|g' \
- -e 's|\bFontMonoSpaced\.ttf\b|%{monofont}|g' \
- Enigma.skin
rm -r fonts themes *.ttf
find . -type f -iname thumbs.db | xargs rm
mv icons icons-dxr3
@@ -116,16 +133,14 @@ cd ..
rm -rf enElchi/themes
-sed -i -e 's|Vera\.ttf|%{sansfont}|g' -e 's|VeraBd\.ttf|%{boldfont}|g' \
- izegrey16/izegrey16.skin
-
-# Remove translations if built for VDR 1.6.x for now, text2skin crash issues.
-if pkg-config --atleast-version 1.6.0 vdr ; then
- find . -name "*.trans" -delete
-fi
+# *.trans not needed with text2skin >= 1.2 and vdr >= 1.6.0
+find . -name "*.trans" -delete
%build
+for skin in DeepBlue enElchi Enigma ; do
+ make -C $skin %{?_smp_mflags}
+done
%install
@@ -142,15 +157,17 @@ find $RPM_BUILD_ROOT%{vardir}/themes -na
install -dm 755 $RPM_BUILD_ROOT%{datadir}/text2skin
cp -pR $(find * -maxdepth 0 -type d) $RPM_BUILD_ROOT%{datadir}/text2skin/
+rm -r $RPM_BUILD_ROOT%{datadir}/text2skin/*/{Makefile,locale,po}
-
-%check
-for font in %{sansfont} %{boldfont} %{monofont} ; do
- if [ ! -r "$font" ] ; then
- "Font file $font does not exist, specfile probably needs updating"
- exit 1
- fi
+for skin in DeepBlue enElchi Enigma ; do
+ make -C $skin install-i18n DESTDIR=$RPM_BUILD_ROOT LOCDIR=%{_datadir}/locale
done
+%find_lang %{name} --all-name
+# Note: .lang before .themes due to defattr in .themes
+cat %{name}.lang %{name}.themes > %{name}.files
+
+# Save a bit of space
+%{_sbindir}/hardlink -cv $RPM_BUILD_ROOT%{_datadir}
%clean
@@ -180,7 +197,7 @@ if [ $2 -eq 0 ] ; then
fi
-%files -f %{name}.themes
+%files -f %{name}.files
%defattr(-,root,root,-)
%doc COPYING* HISTORY.* README.*
@@ -195,6 +212,8 @@ fi
%{datadir}/text2skin/EgalSimple/
+%{datadir}/text2skin/EgalsTry/
+
%{datadir}/text2skin/enElchi/
%dir %{datadir}/text2skin/Enigma/
@@ -211,51 +230,60 @@ fi
%changelog
+* Tue Sep 1 2009 Ville Skyttä <ville.skytta at iki.fi> - 20090901-1
+- Adapt to recent 1.2+ text2skin versions; patch Aluminium, enigma and izegrey
+ font handling (no longer filename based font paths, phew).
+- Add EgalsTry 1.1.0.
+- Apply Thomas Günther's locale patches for DeepBlue, enElchi, and Enigma.
+- Drop unused SilverGreen themes, install default properly.
+- Recompress cleaned up tarballs with xz.
+- Hardlink identical files.
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20081124-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-* Fri Feb 27 2009 Ville Skyttä <ville.skytta at iki.fi> - 20081124-5
+* Fri Feb 27 2009 Ville Skyttä <ville.skytta at iki.fi> - 20081124-5
- More deja vu with dejavu-fonts changes (#480477).
- Use %%global instead of %%define.
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20081124-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-* Sat Jan 10 2009 Ville Skyttä <ville.skytta at iki.fi> - 20081124-3
+* Sat Jan 10 2009 Ville Skyttä <ville.skytta at iki.fi> - 20081124-3
- Use full DejaVu fonts instead of LGC (#477478).
-* Thu Dec 25 2008 Ville Skyttä <ville.skytta at iki.fi> - 20081124-2
+* Thu Dec 25 2008 Ville Skyttä <ville.skytta at iki.fi> - 20081124-2
- Use DejaVu fonts for Aluminium and Enigma (#477478).
-* Mon Nov 24 2008 Ville Skyttä <ville.skytta at iki.fi> - 20081124-1
+* Mon Nov 24 2008 Ville Skyttä <ville.skytta at iki.fi> - 20081124-1
- Update enElchi to 0.7.2.
- Catch up again with latest dejavu-fonts changes.
-* Mon Apr 7 2008 Ville Skyttä <ville.skytta at iki.fi> - 20061119-6
+* Mon Apr 7 2008 Ville Skyttä <ville.skytta at iki.fi> - 20061119-6
- Don't install translations if built for VDR 1.6.0 due to text2skin issues.
- Re-add disttag.
-* Mon Dec 10 2007 Ville Skyttä <ville.skytta at iki.fi> - 20061119-5
+* Mon Dec 10 2007 Ville Skyttä <ville.skytta at iki.fi> - 20061119-5
- Adjust font paths for dejavu-lgc-fonts 2.22+ (#388891). Deja vu, indeed.
-* Sun Nov 18 2007 Ville Skyttä <ville.skytta at iki.fi> - 20061119-4
+* Sun Nov 18 2007 Ville Skyttä <ville.skytta at iki.fi> - 20061119-4
- Adjust font paths for dejavu-lgc-fonts 2.21+ (#388891).
-* Fri Aug 10 2007 Ville Skyttä <ville.skytta at iki.fi> - 20061119-3
+* Fri Aug 10 2007 Ville Skyttä <ville.skytta at iki.fi> - 20061119-3
- Use DejaVu LGC fonts instead of Bitstream Vera.
- License: GPL+
-* Mon Apr 23 2007 Ville Skyttä <ville.skytta at iki.fi> - 20061119-2
+* Mon Apr 23 2007 Ville Skyttä <ville.skytta at iki.fi> - 20061119-2
- Relocate themes to /var/lib/vdr/themes, drop disttag (#216355).
- Drop file based dependency on /usr/share/vdr/text2skin.
- Fix sttng-blue source URL.
-* Sun Nov 19 2006 Ville Skyttä <ville.skytta at iki.fi> - 20061119-1
+* Sun Nov 19 2006 Ville Skyttä <ville.skytta at iki.fi> - 20061119-1
- Install skins to /usr/share/vdr/text2skin.
- Don't ship channel logos.
-* Sun Sep 24 2006 Ville Skyttä <ville.skytta at iki.fi> - 20060924-1
+* Sun Sep 24 2006 Ville Skyttä <ville.skytta at iki.fi> - 20060924-1
- Add DXR3 compatible image set for DeepBlue from cccache.
-* Sun May 21 2006 Ville Skyttä <ville.skytta at iki.fi> - 20060311-2
+* Sun May 21 2006 Ville Skyttä <ville.skytta at iki.fi> - 20060311-2
- Fix some enElchi logos.
- Previous message: rpms/kernel/devel drm-god-shut-up-about-edid-already.patch, NONE, 1.1 kernel.spec, 1.1758, 1.1759
- Next message: rpms/papyrus/devel .cvsignore, 1.19, 1.20 papyrus.spec, 1.28, 1.29 sources, 1.19, 1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list