Testing Enigma 4pre2

Message ID 4359493B.3030400@syphir.sytes.net
State New
Headers

Commit Message

C.Y.M Oct. 21, 2005, 8:02 p.m. UTC
  > 
> I do like the idea you suggest about "scrolltext" instead of using "marquee".
> One directional might be better on the eyes.  What ever method you do decide on,
> it would be very helpful to just place strategic comments into the template so a
> person that wants to modify the code can easily find the code blocks.  Or, if we
> want to get really crazy, we could fix the template to use a variable which can
> be configured by UpdateEnigma.sh.  We could have a different variable for
> different areas of the skin (ie; Menu, Channel Info, Timers, etc..)
> 
> --SNIP--
> 
> # defines preferred display method in skin ("text" or "scrolltext" or "marquee")
> MENU_DISPLAY="scrolltext"
> CHAN_DISPLAY="marquee"
> TIMER_DISPLAY="scrolltext"
> 
> --SNIP--
> 

Here are some more changes required for the substitution method.

--SNIP--

# substitute display settings
cat $SKIN_TEMPLATE \
| sed -e "s/%MENU_DISPLAY%/"$MENU_DISPLAY"/" \
| sed -e "s/%CHAN_DISPLAY%/"$CHAN_DISPLAY"/" \
| sed -e "s/%TIMER_DISPLAY%/"$TIMER_DISPLAY"/" \
> $SKIN_TMP

--SNIP--

With attached changes to the template.  This code is untested, but I'm sure it
would work.

Best Regards,
  

Patch

@@ -388,8 +388,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">{ReplayTit
le}</text>
-               <text x1="5" x2="-4" y1="-160" y2="-125" color="TopTxtFG" align="left" font="FontBold.ttf:26,85">{ReplayTitle
}</text>
+               <%CHAN_DISPLAY% x1="8" x2="-1" y1="-159" y2="-124" color="TopTxtShad" align="left" font="FontBold.ttf:26,85">{Replay
Title}</%CHAN_DISPLAY%>
+               <%CHAN_DISPLAY% x1="5" x2="-4" y1="-160" y2="-125" color="TopTxtFG" align="left" font="FontBold.ttf:26,85">{ReplayTi
tle}</%CHAN_DISPLAY%>

                <!-- flicker-protection -->
                <rectangle x1="107" x2="107" y1="-107" y2="-107" color="RepBarMark"/>
@@ -561,7 +561,7 @@ 
 ifdef(`ext',   <rectangle x1="-184" x2="-1" y1="94" y2="-100" color="MenuHighlight"/>)
 ifdef(`ext',   <text x1="-180" x2="-1" y1="100" y2="125" color="MenuTxtFG" align="center" font="FontBold.ttf:20,85">TIMER:</
text>)
 ifdef(`ext',   <text x1="-180" x2="-1" y1="130" y2="155" color="MenuTxtFG" align="left" font="Font.ttf:20,85">{NextTimerStar
t}: {NextTimerChannel}</text>)
-ifdef(`ext',   <text x1="-180" x2="-1" y1="155" y2="180" color="MenuTxtFG" align="left" font="Font.ttf:20,85">{NextTimerName
}</text>)
+ifdef(`ext',   <%MENU_DISPLAY% x1="-180" x2="-1" y1="155" y2="180" color="MenuTxtFG" align="left" font="Font.ttf:20,85">{NextTimerN
ame}</%MENU_DISPLAY%>)
 ifdef(`ext',</block>)

                        <!-- Show running recordings (only in main-menu) -->
@@ -576,10 +576,10 @@ 
 ifdef(`ext',,  <text x1="-180" x2="-1" y1="100" y2="125" color="MenuTxtFG" align="center" font="FontBold.ttf:20,85">RECORDIN
GS:</text>)
                                </block>

-                               <text x1="-180" x2="-1" y1="130" y2="155" color="MenuTxtFG" align="left" font="Font.ttf:20,85
">{CurrentRecording:0}</text>
-                               <text x1="-180" x2="-1" y1="155" y2="180" color="MenuTxtFG" align="left" font="Font.ttf:20,85
">{CurrentRecording:1}</text>
-                               <text x1="-180" x2="-1" y1="180" y2="205" color="MenuTxtFG" align="left" font="Font.ttf:20,85
">{CurrentRecording:2}</text>
-                               <text x1="-180" x2="-1" y1="205" y2="230" color="MenuTxtFG" align="left" font="Font.ttf:20,85
">{CurrentRecording:3}</text>
+                               <%MENU_DISPLAY% x1="-180" x2="-1" y1="130" y2="155" color="MenuTxtFG" align="left" font="Font.ttf:20
,85">{CurrentRecording:0}</%MENU_DISPLAY%>
+                               <%MENU_DISPLAY% x1="-180" x2="-1" y1="155" y2="180" color="MenuTxtFG" align="left" font="Font.ttf:20
,85">{CurrentRecording:1}</%MENU_DISPLAY%>
+                               <%MENU_DISPLAY% x1="-180" x2="-1" y1="180" y2="205" color="MenuTxtFG" align="left" font="Font.ttf:20
,85">{CurrentRecording:2}</%MENU_DISPLAY%>
+                               <%MENU_DISPLAY% x1="-180" x2="-1" y1="205" y2="230" color="MenuTxtFG" align="left" font="Font.ttf:20
,85">{CurrentRecording:3}</%MENU_DISPLAY%>
                        </block>

                        <!-- Show warnings -->