5:40 a.m.
Author: jarod
Update of /cvs/free/rpms/mythtv-themes/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26035
Modified Files:
mythtv-themes.spec
Added Files:
myththemes-0.22-svnfixes.patch
Log Message:
* Sat Nov 21 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-2
- Update to release-0-22-fixes branch, svn revision 22880
myththemes-0.22-svnfixes.patch:
--- NEW FILE myththemes-0.22-svnfixes.patch ---
Index: myththemes/metallurgy/htmls/notfound.html
===================================================================
--- myththemes/metallurgy/htmls/notfound.html (revision 0)
+++ myththemes/metallurgy/htmls/notfound.html (revision 22880)
@@ -0,0 +1,63 @@
+<html>
+<head>
+<title>%1</title>
+<style>
+body {
+ padding: 3em 0em;
+ background: #eeeeee;
+}
+hr {
+ color: lightgray;
+ width: 100%;
+}
+img {
+ float: left;
+ opacity: .8;
+}
+#box {
+ background: white;
+ border: 1px solid lightgray;
+ width: 600px;
+ padding: 60px;
+ margin: auto;
+}
+h1 {
+ font-size: 130%;
+ font-weight: bold;
+ border-bottom: 1px solid lightgray;
+ margin-left: 48px;
+}
+h2 {
+ font-size: 100%;
+ font-weight: normal;
+ border-bottom: 1px solid lightgray;
+ margin-left: 48px;
+}
+ul {
+ font-size: 80%;
+ padding-left: 48px;
+ margin: 0;
+}
+#reloadButton {
+ padding-left: 48px;
+}
+</style>
+</head>
+<body>
+ <div id="box">
+ <img src="data:image/png;base64,IMAGE_BINARY_DATA_HERE"
width="32" height="32"/>
+ <h1>%2</h1>
+ <h2>When connecting to: %3.</h2>
+ <ul>
+ <li>Check the address for errors such as <b>ww</b>.mythtv.org
+ instead of <b>www</b>.mythtv.org</li>
+ <li>If the address is correct, try to check the network
+ connection.</li>
+ <li>If your computer or network is protected by a firewall or
+ proxy, make sure that MythFrontend/MythBrowser is permitted to access
+ the network.</li>
+ </ul>
+ <br/><br/>
+ </div>
+</body>
+</html>
Property changes on: myththemes/metallurgy/htmls/notfound.html
___________________________________________________________________
Added: svn:executable
+ *
Index: myththemes/metallurgy/htmls/progdetails_page1.html
===================================================================
--- myththemes/metallurgy/htmls/progdetails_page1.html (revision 0)
+++ myththemes/metallurgy/htmls/progdetails_page1.html (revision 22880)
@@ -0,0 +1,34 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-GB">
+<head>
+ <meta http-equiv="content-type" content="text/html;
charset=iso-8859-1" />
+ <meta http-equiv="content-language" content="en-GB" />
+ <style type="text/css">
+ h1 {font-family:Arial;font-size:24pt;font-style: normal;color:#ffffff}
+ p {font-family:Arial;font-size:18pt;font-style: normal;color:#ffffff;margin-top:
-10pt}
+ hr {border:1px solid #686350;background-color:#97997d;height:3px;margin-top:
-10pt;margin-bottom: 15pt}
+ </style>
+</head>
+
+<body>
+ <h1>%TITLE_LABEL%</h1> <p>%TITLE%</p>
+ <h1>%TITLE_PRONOUNCE_LABEL%</h1> <p>%TITLE_PRONOUNCE%</p>
+ <h1>%DESCRIPTION_LABEL%</h1> <p>%DESCRIPTION%</p>
+ <h1>%EPISODE_LABEL%</h1> <p>%EPISODE%</p>
+ <h1>%ORIGINAL_AIRDATE_LABEL%</h1> <p>%ORIGINAL_AIRDATE%</p>
+ <h1>%ACTORS_LABEL%</h1> <p>%ACTORS%</p>
+ <h1>%DIRECTOR_LABEL%</h1> <p>%DIRECTOR%</p>
+ <h1>%PRODUCER_LABEL%</h1> <p>%PRODUCER%</p>
+ <h1>%EXECUTIVE_PRODUCER_LABEL%</h1>
<p>%EXECUTIVE_PRODUCER%</p>
+ <h1>%WRITER_LABEL%</h1> <p>%WRITER%</p>
+ <h1>%GUEST_STAR_LABEL%</h1> <p>%GUEST_STAR%</p>
+ <h1>%HOST_LABEL%</h1> <p>%HOST%</p>
+ <h1>%ADAPTER_LABEL%</h1> <p>%ADAPTER%</p>
+ <h1>%PRESENTER_LABEL%</h1> <p>%PRESENTER%</p>
+ <h1>%COMMENTATOR_LABEL%</h1> <p>%COMMENTATOR%</p>
+ <h1>%GUEST_LABEL%</h1> <p>%GUEST%</p>
+ <h1>%CATEGORY_LABEL%</h1> <p>%CATEGORY%</p>
+ <h1>%MYTHTV_STATUS_LABEL%</h1> <p>%MYTHTV_STATUS%</p>
+</body>
+
+</html>
Index: myththemes/metallurgy/htmls/progdetails_page2.html
===================================================================
--- myththemes/metallurgy/htmls/progdetails_page2.html (revision 0)
+++ myththemes/metallurgy/htmls/progdetails_page2.html (revision 22880)
@@ -0,0 +1,51 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-GB">
+<head>
+ <meta http-equiv="content-type" content="text/html;
charset=iso-8859-1" />
+ <meta http-equiv="content-language" content="en-GB" />
+ <style type="text/css">
+ h1 {font-family:Arial;font-size:24pt;font-style: normal;color:#ffffff}
+ p {font-family:Arial;font-size:18pt;font-style: normal;color:#ffffff;margin-top:
-10pt}
+ hr {border:1px solid #686350;background-color:#97997d;height:3px;margin-top:
-10pt;margin-bottom: 15pt}
+ </style>
+</head>
+
+<body>
+ <h1>%TITLE_LABEL%</h1> <p>%TITLE%</p>
+ <h1>%TITLE_PRONOUNCE_LABEL%</h1> <p>%TITLE_PRONOUNCE%</p>
+ <h1>%DESCRIPTION_LABEL%</h1> <p>%DESCRIPTION%</p>
+ <h1>%EPISODE_LABEL%</h1> <p>%EPISODE%</p>
+ <h1>%ACTORS_LABEL%</h1> <p>%ACTORS%</p>
+ <h1>%DIRECTOR_LABEL%</h1> <p>%DIRECTOR%</p>
+ <h1>%PRODUCER_LABEL%</h1> <p>%PRODUCER%</p>
+ <h1>%EXECUTIVE_PRODUCER_LABEL%</h1>
<p>%EXECUTIVE_PRODUCER%</p>
+ <h1>%WRITER_LABEL%</h1> <p>%WRITER%</p>
+ <h1>%GUEST_STAR_LABEL%</h1> <p>%GUEST_STAR%</p>
+ <h1>%HOST_LABEL%</h1> <p>%HOST%</p>
+ <h1>%ADAPTER_LABEL%</h1> <p>%ADAPTER%</p>
+ <h1>%PRESENTER_LABEL%</h1> <p>%PRESENTER%</p>
+ <h1>%COMMENTATOR_LABEL%</h1> <p>%COMMENTATOR%</p>
+ <h1>%GUEST_LABEL%</h1> <p>%GUEST%</p>
+ <h1>%CATEGORY_LABEL%</h1> <p>%CATEGORY%</p>
+ <h1>%CATEGORY_TYPE_LABEL%</h1> <p>%CATEGORY_TYPE%</p>
+ <h1>%ORIGINAL_AIRDATE_LABEL%</h1> <p>%ORIGINAL_AIRDATE%</p>
+ <h1>%PROGRAMID_LABEL%</h1> <p>%PROGRAMID%</p>
+ <h1>%MYTHTV_STATUS_LABEL%</h1> <p>%MYTHTV_STATUS%</p>
+ <h1>%RECORDING_RULE_LABEL%</h1> <p>%RECORDING_RULE%</p>
+ <h1>%LAST_RECORDED_LABEL%</h1> <p>%LAST_RECORDED%</p>
+ <h1>%NEXT_RECORDING_LABEL%</h1> <p>%NEXT_RECORDING%</p>
+ <h1>%AVERAGE_TIME_SHIFT_LABEL%</h1>
<p>%AVERAGE_TIME_SHIFT%</p>
+ <h1>%WATCH_LIST_SCORE_LABEL%</h1> <p>%WATCH_LIST_SCORE%</p>
+ <h1>%WATCH_LIST_STATUS_LABEL%</h1>
<p>%WATCH_LIST_STATUS%</p>
+ <h1>%SEARCH_PHRASE_LABEL%</h1> <p>%SEARCH_PHRASE%</p>
+ <h1>%FINDID_LABEL%</h1> <p>%FINDID%</p>
+ <h1>%RECORDING_HOST_LABEL%</h1> <p>%RECORDING_HOST%</p>
+ <h1>%RECORDED_FILE_NAME_LABEL%</h1>
<p>%RECORDED_FILE_NAME%</p>
+ <h1>%RECORDED_FILE_SIZE_LABEL%</h1>
<p>%RECORDED_FILE_SIZE%</p>
+ <h1>%RECORDING_PROFILE_LABEL%</h1>
<p>%RECORDING_PROFILE%</p>
+ <h1>%RECORDING_GROUP_LABEL%</h1> <p>%RECORDING_GROUP%</p>
+ <h1>%STORAGE_GROUP_LABEL%</h1> <p>%STORAGE_GROUP%</p>
+ <h1>%PLAYBACK_GROUP_LABEL%</h1> <p>%PLAYBACK_GROUP%</p>
+</body>
+
+</html>
Index: myththemes/metallurgy/schedule-ui.xml
===================================================================
--- myththemes/metallurgy/schedule-ui.xml (revision 22751)
+++ myththemes/metallurgy/schedule-ui.xml (working copy)
@@ -308,7 +308,6 @@
<buttonlist name="channellist">
<area>65,108,180,330</area>
<buttonarea>0,0,180,330</buttonarea>
- <align>allcenter</align>
<spacing>1</spacing>
<statetype name="buttonitem">
<state name="active">
@@ -318,7 +317,6 @@
</shape>
<imagetype name="channelicon">
<area>5,7,40,40</area>
- <align>allcenter</align>
</imagetype>
<textarea name="buttontext"
from="basetextarea">
<area>48,0,130,54</area>
@@ -357,7 +355,7 @@
<state name="inactive" from="active"/>
</statetype>
</buttonlist>
-
+
<guidegrid name="guidegrid">
<area>246,108,966,330</area>
<layout>horizontal</layout>
@@ -386,26 +384,26 @@
<area>85,493,760,35</area>
<font>extralargebold</font>
</textarea>
-
+
<textarea name="subtitle">
<area>85,529,760,25</area>
<font>mediumbold</font>
<template>%|"SUBTITLE|"%</template>
</textarea>
-
+
<textarea name="description">
<area>85,558,1115,90</area>
<font>medium</font>
<multiline>yes</multiline>
<template>%YEARSTARS% %DESCRIPTION% %LONGREPEAT%</template>
</textarea>
-
+
<textarea name="rectypestatus" from="basetextarea">
<area>860,503,325,60</area>
<multiline>yes</multiline>
<align>right</align>
</textarea>
-
+
</window>
<window name="programguide-video">
@@ -421,29 +419,56 @@
<align>allcenter</align>
</textarea>
- <container name="chanbar">
- <area>63,109,182,272</area>
- <bar name="chans" draworder="4">
- <area>0,0,180,272</area>
- <textoffset>46,0</textoffset>
- <iconoffset>5,-5</iconoffset>
- <iconsize>40,40</iconsize>
- <orientation>vertical</orientation>
- <align>allcenter</align>
- <font>small</font>
- <imagefile>guide/gg-chans.png</imagefile>
- </bar>
- </container>
+ <buttonlist name="channellist">
+ <area>65,108,180,330</area>
+ <buttonarea>0,0,180,330</buttonarea>
+ <spacing>1</spacing>
+ <statetype name="buttonitem">
+ <state name="active">
+ <shape name="background">
+ <area>0,0,180,54</area>
+ <fill color="#CCCCCC" alpha="28" />
+ </shape>
+ <imagetype name="channelicon">
+ <area>5,7,40,40</area>
+ </imagetype>
+ <textarea name="buttontext"
from="basetextarea">
+ <area>48,0,130,54</area>
+ <multiline>true</multiline>
+ <cutdown>yes</cutdown>
+ <font
state="favourite">basesmallyellow</font>
+ <font
state="unavailable">basesmallblue</font>
+ <font
state="favunavailable">basesmallpurple</font>
+ <align>allcenter</align>
+ </textarea>
+ </state>
+ <state name="selected" from="active"/>
+ <state name="inactive" from="active"/>
+ </statetype>
+ </buttonlist>
- <container name="timebar">
- <area>245,80,963,29</area>
- <bar name="times" draworder="4">
- <area>0,0,963,29</area>
- <align>center</align>
- <font>small</font>
- <imagefile>guide/gg-times.png</imagefile>
- </bar>
- </container>
+ <buttonlist name="timelist">
+ <area>246,79,966,30</area>
+ <layout>horizontal</layout>
+ <buttonarea>0,0,966,30</buttonarea>
+ <spacing>1</spacing>
+ <statetype name="buttonitem">
+ <area>0,0,240,30</area>
+ <state name="active">
+ <imagetype name="buttonbackground">
+ <area>0,0,240,30</area>
+ <filename>guide/gg-times.png</filename>
+ </imagetype>
+ <textarea name="buttontext"
from="basetextarea">
+ <area>10,3,220,28</area>
+ <font>small</font>
+ <align>allcenter</align>
+ </textarea>
+ </state>
+ <state name="selected" from="active"/>
+ <state name="inactive" from="active"/>
+ </statetype>
+ </buttonlist>
<guidegrid name="guidegrid">
<area>247,109,980,272</area>
@@ -465,16 +490,6 @@
<font>small</font>
</guidegrid>
- <container name="current_info">
- <area>1135,25,101,30</area>
- <textarea name="time" draworder="4"
align="center">
- <area>0,0,101,30</area>
- <cutdown>no</cutdown>
- <font>mediumlightgrey</font>
- <multiline>yes</multiline>
- </textarea>
- </container>
-
<textarea name="title">
<area>375,442,830,40</area>
<font>extralargebold</font>
@@ -493,9 +508,9 @@
<template>%YEARSTARS% %DESCRIPTION% %LONGREPEAT%</template>
</textarea>
- <container name="current_video">
+ <imagetype name="video">
<area>88,466,260,146</area>
- </container>
+ </imagetype>
</window>
@@ -589,7 +604,7 @@
<area>85,532,1115,110</area>
<font>medium</font>
<multiline>yes</multiline>
- <value>%YEARSTARS% %DESCRIPTION% %LONGREPEAT%</value>
+ <template>%YEARSTARS% %DESCRIPTION% %LONGREPEAT%</template>
</textarea>
<textarea name="rectype" from="basetextarea">
@@ -609,4 +624,23 @@
</window>
-</mythuitheme>
\ No newline at end of file
+ <window name="progdetails">
+
+ <textarea name="title" from="baseheading">
+ <value>Program Details</value>
+ </textarea>
+
+ <imagetype name="background">
+ <position>78,66</position>
+ <filename>backgrounds/menu_background.png</filename>
+ </imagetype>
+
+ <webbrowser name="browser">
+ <area>90,80,1090,560</area>
+ <zoom>1.0</zoom>
+ <background color="#000000" alpha="1"/>
+ </webbrowser>
+
+ </window>
+
+</mythuitheme>
Index: myththemes/metallurgy/recordings-ui.xml
===================================================================
--- myththemes/metallurgy/recordings-ui.xml (revision 22751)
+++ myththemes/metallurgy/recordings-ui.xml (working copy)
@@ -207,7 +207,7 @@
<font>medium</font>
<multiline>yes</multiline>
<cutdown>yes</cutdown>
- <value>%YEARSTARS% %DESCRIPTION% %LONGREPEAT%</value>
+ <template>%YEARSTARS% %DESCRIPTION% %LONGREPEAT%</template>
</textarea>
<imagetype name="video_background">
Index: myththemes/metallurgy/ui.xml
===================================================================
--- myththemes/metallurgy/ui.xml (revision 22751)
+++ myththemes/metallurgy/ui.xml (working copy)
@@ -753,4 +753,170 @@
</container>
</window>
+<window name="schdiff">
+
+ <font name="active_font" face="Frutiger LT Std">
+ <color>#ffffff</color>
+ <size>16</size>
+ <size:small>11</size:small>
+ </font>
+
+ <font name="inactive_font" face="Frutiger LT Std">
+ <color>#aaaaaa</color>
+ <size>16</size>
+ <size:small>11</size:small>
+ </font>
+
+ <font name="record_font" face="Frutiger LT Std">
+ <color>#F7862B</color>
+ <size>16</size>
+ <size:small>11</size:small>
+ </font>
+
+ <font name="recording_font" face="Frutiger LT Std">
+ <color>#FF33FF</color>
+ <size>16</size>
+ <size:small>11</size:small>
+ </font>
+
+ <font name="norecordfnt" face="Frutiger LT Std">
+ <color>#999999</color>
+ <size>16</size>
+ <size:small>11</size:small>
+ </font>
+
+ <font name="conflict_font" face="Frutiger LT Std">
+ <color>#ffff33</color>
+ <size>16</size>
+ <size:small>11</size:small>
+ </font>
+
+ <font name="currenttitle" face="Frutiger LT Std">
+ <color>#ffff33</color>
+ <size>18</size>
+ <size:small>12</size:small>
+ </font>
+
+ <font name="title" face="Frutiger LT Std">
+ <color>#ffffff</color>
+ <dropcolor>#000000</dropcolor>
+ <size>27</size>
+ <size:small>13</size:small>
+ <shadow>3,3</shadow>
+ </font>
+
+ <font name="info" face="Frutiger LT Std">
+ <color>#ffffff</color>
+ <size>17</size>
+ <size:small>8</size:small>
+ <shadow>1,1</shadow>
+ </font>
+
+ <font name="message" face="Frutiger LT Std">
+ <color>#ffffff</color>
+ <size>16</size>
+ <size:small>10</size:small>
+ <shadow>1,1</shadow>
+ </font>
+
+ <font name="messagegray" face="Frutiger LT Std">
+ <color>#999999</color>
+ <size>16</size>
+ <size:small>10</size:small>
+ <shadow>1,1</shadow>
+ </font>
+
+ <font name="messageyellow" face="Frutiger LT Std">
+ <color>#ffff33</color>
+ <size>16</size>
+ <size:small>10</size:small>
+ <shadow>1,1</shadow>
+ </font>
+
+ <container name="background">
+ <textarea name="sched" draworder="0">
+ <area>20,10,400,40</area>
+ <font>info</font>
+ <value>Preview Schedule Changes:</value>
+ </textarea>
+ <textarea name="view" align="right"
draworder="0">
+ <area>400,10,380,30</area>
+ <font>info</font>
+ </textarea>
+ <image name="filler" draworder="0"
fleximage="no">
+ <filename>conflicts/con-box.png</filename>
+ <position>0,39</position>
+ </image>
+ </container>
+
+ <container name="selector">
+ <area>0,39,800,290</area>
+ <listarea name="conflictlist" draworder="4">
+ <area>20,12,760,265</area>
+ <fcnfont name="conflict_font"
function="conflictingrecording"></fcnfont>
+ <fcnfont name="norecordfnt"
function="disabledrecording"></fcnfont>
+ <fcnfont name="active_font"
function="active"></fcnfont>
+ <fcnfont name="inactive_font"
function="inactive"></fcnfont>
+ <fcnfont name="record_font"
function="record"></fcnfont>
+ <fcnfont name="recording_font"
function="recording"></fcnfont>
+ <fcnfont name="active_font"
function="selected"></fcnfont>
+ <columnpadding>10</columnpadding>
+ <column number="1" width="160"
context="-1"></column>
+ <column number="2" width="120"
context="-1"></column>
+ <column number="3" width="370"
context="-1"></column>
+ <column number="4" width="20"
context="-1"></column>
+ <column number="5" width="20"
context="-1"></column>
+ <items>9</items>
+ <image function="selectionbar"
filename="shared/selectbar.png" location="-14,-5"></image>
+ <image function="uparrow" filename="shared/uparrow.png"
location="755,22"></image>
+ <image function="downarrow"
filename="shared/downarrow.png" location="755,230"></image>
+ </listarea>
+ <image name="showinglines" draworder="5"
fleximage="no">
+ <filename>cr-lines.png</filename>
+ <position>0,0</position>
+ </image>
+ </container>
+
+ <container name="program_info">
+ <area>0,360,800,210</area>
+ <textarea name="title" draworder="6">
+ <area>20,0,800,40</area>
+ <font>title</font>
+ </textarea>
+ <textarea name="channel" draworder="6">
+ <area>20,40,160,30</area>
+ <font>info</font>
+ </textarea>
+ <textarea name="timedate" draworder="6">
+ <area>200,40,420,30</area>
+ <font>info</font>
+ </textarea>
+ <textarea name="subdescr" draworder="6">
+ <area>20,70,720,140</area>
+ <font>info</font>
+ <multiline>yes</multiline>
+ <value>%SUBTITLE|"|"%%STARS%%DESCRIPTION%</value>
+ </textarea>
+ </container>
+
+ <container name="status_info">
+ <area>300,330,480,30</area>
+ <textarea name="recordingstatus" align="right"
draworder="6">
+ <area>0,0,480,30</area>
+ <font>message</font>
+ </textarea>
+ </container>
+
+
+ <container name="norecordings_list">
+ <textarea name="msg" align="center"
draworder="8">
+ <area>0,110,800,70</area>
+ <font>info</font>
+ <value>The recording schedule would not be affected.</value>
+ <multiline>yes</multiline>
+ </textarea>
+ </container>
+
+ </window>
+
</mythuitheme>
Index: myththemes/Mythbuntu/music-ui.xml
===================================================================
--- myththemes/Mythbuntu/music-ui.xml (revision 22751)
+++ myththemes/Mythbuntu/music-ui.xml (working copy)
@@ -1060,10 +1060,9 @@
<window name="miniplayer">
<area>-1,5,590,190</area>
- <imagetype name="track_info_background">
- <filename>miniplayer_background.png</filename>
+ <shape name="track_info_background" from="basebackground">
<area>10,10,569,170</area>
- </imagetype>
+ </shape>
<imagetype name="mm_blackhole_border">
<filename>mm_blackhole_border.png</filename>
Index: myththemes/Mythbuntu/schedule-ui.xml
===================================================================
--- myththemes/Mythbuntu/schedule-ui.xml (revision 22751)
+++ myththemes/Mythbuntu/schedule-ui.xml (working copy)
@@ -189,7 +189,7 @@
<textarea name="description" from="basetextarea">
<area>50,130,1200,90</area>
<multiline>yes</multiline>
- <value>%LONGREPEAT%%YEARSTARS%%DESCRIPTION%</value>
+ <template>%LONGREPEAT%%YEARSTARS%%DESCRIPTION%</template>
</textarea>
<textarea name="rectypestatus" from="basetextarea">
@@ -412,7 +412,7 @@
<textarea name="description" from="basetextarea">
<area>40,130,870,90</area>
<multiline>yes</multiline>
- <value>%LONGREPEAT%%YEARSTARS%%DESCRIPTION%</value>
+ <template>%LONGREPEAT%%YEARSTARS%%DESCRIPTION%</template>
</textarea>
<textarea name="rectypestatus" from="basetextarea">
@@ -585,7 +585,7 @@
<area>20,530,1240,160</area>
<multiline>yes</multiline>
<cutdown>yes</cutdown>
-
<value>%|"SUBTITLE|"%\n%YEARSTARS%%DESCRIPTION%</value>
+
<template>%|"SUBTITLE|"%\n%YEARSTARS%%DESCRIPTION%</template>
</textarea>
<textarea name="rectypestatus" from="basetextarea">
Index: myththemes/Mythbuntu/recordings-ui.xml
===================================================================
--- myththemes/Mythbuntu/recordings-ui.xml (revision 22751)
+++ myththemes/Mythbuntu/recordings-ui.xml (working copy)
@@ -263,7 +263,7 @@
<align>justify</align>
<multiline>yes</multiline>
<cutdown>yes</cutdown>
- <value>%|"SUBTITLE|"% %STARS% %DESCRIPTION%</value>
+ <template>%|"SUBTITLE|"% %STARS%
%DESCRIPTION%</template>
</textarea>
<imagetype name="preview">
@@ -271,10 +271,9 @@
<preserveaspect>true</preserveaspect>
</imagetype>
- <textarea name="norecordings">
- <area>20,75,760,300</area>
+ <textarea name="norecordings"from="description">
<font>basemedium</font>
- <value>No Recordings Available</value>
+ <value>No Recordings available, or screen loading...</value>
<multiline>yes</multiline>
<align>allcenter</align>
</textarea>
Index: myththemes/Mythbuntu/base.xml
===================================================================
--- myththemes/Mythbuntu/base.xml (revision 22751)
+++ myththemes/Mythbuntu/base.xml (working copy)
@@ -630,6 +630,7 @@
<buttonlist name="list" from="basebuttonlist">
<area>18,225,470,250</area>
+ <spacing>4</spacing>
<drawfrombottom>yes</drawfrombottom>
<showarrow>no</showarrow>
<wrapstyle>selection</wrapstyle>
Index: myththemes/Graphite/schedule-ui.xml
===================================================================
--- myththemes/Graphite/schedule-ui.xml (revision 22751)
+++ myththemes/Graphite/schedule-ui.xml (working copy)
@@ -162,7 +162,7 @@
<textarea name="description" from="basetextarea">
<area>40,150,1200,60</area>
<multiline>yes</multiline>
- <value>(%STARTTIME% - %ENDTIME%)
%LONGREPEAT%%YEARSTARS%%DESCRIPTION%</value>
+ <template>(%STARTTIME% - %ENDTIME%)
%LONGREPEAT%%YEARSTARS%%DESCRIPTION%</template>
</textarea>
<textarea name="rectypestatus" from="basetextarea">
@@ -371,13 +371,13 @@
<area>150,54,550,50</area>
<align>left,vcenter</align>
<font>basesmall</font>
- <value>%|"SUBTITLE|"%</value>
+ <template>%|"SUBTITLE|"%</template>
</textarea>
<textarea name="description" from="basetextarea">
<area>45,110,620,150</area>
<multiline>yes</multiline>
- <value>(%STARTTIME% - %ENDTIME%)
%LONGREPEAT%%YEARSTARS%%DESCRIPTION%</value>
+ <template>(%STARTTIME% - %ENDTIME%)
%LONGREPEAT%%YEARSTARS%%DESCRIPTION%</template>
</textarea>
<textarea name="channelgroup" from="basetextarea">
@@ -630,7 +630,7 @@
<font>basesmaller</font>
<multiline>yes</multiline>
<cutdown>yes</cutdown>
- <value>%|"SUBTITLE|"%</value>
+ <template>%|"SUBTITLE|"%</template>
</textarea>
<textarea name="rectypestatus" from="basetextarea">
Index: myththemes/Graphite/recordings-ui.xml
===================================================================
--- myththemes/Graphite/recordings-ui.xml (revision 22751)
+++ myththemes/Graphite/recordings-ui.xml (working copy)
@@ -84,7 +84,7 @@
<font>basesmaller</font>
<multiline>yes</multiline>
<cutdown>yes</cutdown>
- <value>%DESCRIPTION%</value>
+ <template>%DESCRIPTION%</template>
<align>justify</align>
</textarea>
Index: myththemes/Graphite/ui.xml
===================================================================
--- myththemes/Graphite/ui.xml (revision 22751)
+++ myththemes/Graphite/ui.xml (working copy)
@@ -81,5 +81,172 @@
</container>
</window>
+
+<window name="schdiff">
+
+ <font name="active_font" face="Frutiger LT Std">
+ <color>#ffffff</color>
+ <size>16</size>
+ <size:small>11</size:small>
+ </font>
+
+ <font name="inactive_font" face="Frutiger LT Std">
+ <color>#aaaaaa</color>
+ <size>16</size>
+ <size:small>11</size:small>
+ </font>
+
+ <font name="record_font" face="Frutiger LT Std">
+ <color>#F7862B</color>
+ <size>16</size>
+ <size:small>11</size:small>
+ </font>
+
+ <font name="recording_font" face="Frutiger LT Std">
+ <color>#FF33FF</color>
+ <size>16</size>
+ <size:small>11</size:small>
+ </font>
+
+ <font name="norecordfnt" face="Frutiger LT Std">
+ <color>#999999</color>
+ <size>16</size>
+ <size:small>11</size:small>
+ </font>
+
+ <font name="conflict_font" face="Frutiger LT Std">
+ <color>#ffff33</color>
+ <size>16</size>
+ <size:small>11</size:small>
+ </font>
+
+ <font name="currenttitle" face="Frutiger LT Std">
+ <color>#ffff33</color>
+ <size>18</size>
+ <size:small>12</size:small>
+ </font>
+
+ <font name="title" face="Frutiger LT Std">
+ <color>#ffffff</color>
+ <dropcolor>#000000</dropcolor>
+ <size>27</size>
+ <size:small>13</size:small>
+ <shadow>3,3</shadow>
+ </font>
+
+ <font name="info" face="Frutiger LT Std">
+ <color>#ffffff</color>
+ <size>17</size>
+ <size:small>8</size:small>
+ <shadow>1,1</shadow>
+ </font>
+
+ <font name="message" face="Frutiger LT Std">
+ <color>#ffffff</color>
+ <size>16</size>
+ <size:small>10</size:small>
+ <shadow>1,1</shadow>
+ </font>
+
+ <font name="messagegray" face="Frutiger LT Std">
+ <color>#999999</color>
+ <size>16</size>
+ <size:small>10</size:small>
+ <shadow>1,1</shadow>
+ </font>
+
+ <font name="messageyellow" face="Frutiger LT Std">
+ <color>#ffff33</color>
+ <size>16</size>
+ <size:small>10</size:small>
+ <shadow>1,1</shadow>
+ </font>
+
+ <container name="background">
+ <textarea name="sched" draworder="0">
+ <area>20,10,400,40</area>
+ <font>info</font>
+ <value>Preview Schedule Changes:</value>
+ </textarea>
+ <textarea name="view" align="right"
draworder="0">
+ <area>400,10,380,30</area>
+ <font>info</font>
+ </textarea>
+ <image name="filler" draworder="0"
fleximage="no">
+ <filename>conflicts/con-box.png</filename>
+ <position>0,39</position>
+ </image>
+ </container>
+
+ <container name="selector">
+ <area>0,39,800,290</area>
+ <listarea name="conflictlist" draworder="4">
+ <area>20,12,760,265</area>
+ <fcnfont name="conflict_font"
function="conflictingrecording"></fcnfont>
+ <fcnfont name="norecordfnt"
function="disabledrecording"></fcnfont>
+ <fcnfont name="active_font"
function="active"></fcnfont>
+ <fcnfont name="inactive_font"
function="inactive"></fcnfont>
+ <fcnfont name="record_font"
function="record"></fcnfont>
+ <fcnfont name="recording_font"
function="recording"></fcnfont>
+ <fcnfont name="active_font"
function="selected"></fcnfont>
+ <columnpadding>10</columnpadding>
+ <column number="1" width="160"
context="-1"></column>
+ <column number="2" width="120"
context="-1"></column>
+ <column number="3" width="370"
context="-1"></column>
+ <column number="4" width="20"
context="-1"></column>
+ <column number="5" width="20"
context="-1"></column>
+ <items>9</items>
+ <image function="selectionbar"
filename="shared/selectbar.png" location="-14,-5"></image>
+ <image function="uparrow" filename="shared/uparrow.png"
location="755,22"></image>
+ <image function="downarrow"
filename="shared/downarrow.png" location="755,230"></image>
+ </listarea>
+ <image name="showinglines" draworder="5"
fleximage="no">
+ <filename>cr-lines.png</filename>
+ <position>0,0</position>
+ </image>
+ </container>
+
+ <container name="program_info">
+ <area>0,360,800,210</area>
+ <textarea name="title" draworder="6">
+ <area>20,0,800,40</area>
+ <font>title</font>
+ </textarea>
+ <textarea name="channel" draworder="6">
+ <area>20,40,160,30</area>
+ <font>info</font>
+ </textarea>
+ <textarea name="timedate" draworder="6">
+ <area>200,40,420,30</area>
+ <font>info</font>
+ </textarea>
+ <textarea name="subdescr" draworder="6">
+ <area>20,70,720,140</area>
+ <font>info</font>
+ <multiline>yes</multiline>
+ <value>%SUBTITLE|"|"%%STARS%%DESCRIPTION%</value>
+ </textarea>
+ </container>
+
+ <container name="status_info">
+ <area>300,330,480,30</area>
+ <textarea name="recordingstatus" align="right"
draworder="6">
+ <area>0,0,480,30</area>
+ <font>message</font>
+ </textarea>
+ </container>
+
+
+ <container name="norecordings_list">
+ <textarea name="msg" align="center"
draworder="8">
+ <area>0,110,800,70</area>
+ <font>info</font>
+ <value>The recording schedule would not be affected.</value>
+ <multiline>yes</multiline>
+ </textarea>
+ </container>
+
+ </window>
+
</mythuitheme>
Index: mythtv-themes.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv-themes/F-11/mythtv-themes.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mythtv-themes.spec 9 Nov 2009 16:26:56 -0000 1.16
+++ mythtv-themes.spec 22 Nov 2009 05:40:13 -0000 1.17
@@ -17,7 +17,7 @@
%define desktop_vendor RPMFusion
# SVN Revision number and branch ID
-%define _svnrev r22752
+%define _svnrev r22880
%define branch release
#
@@ -35,7 +35,7 @@
Release: 0.1.rc2%{?dist}
#Release: 0.5.svn.%{_svnrev}%{?dist}
%else
-Release: 1%{?dist}
+Release: 2%{?dist}
%endif
################################################################################
@@ -103,6 +103,9 @@
%{_datadir}/mythtv/themes/*
%changelog
+* Sat Nov 21 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-2
+- Update to release-0-22-fixes branch, svn revision 22880
+
* Mon Nov 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-1
- Update to 0.22 release