Skip to content

Commit

Permalink
Merge branch 'master' into fixes/0.25
Browse files Browse the repository at this point in the history 
Conflicts:
	recordings-ui.xml
	themeinfo.xml
  • Loading branch information
@tgm4883
tgm4883 committed Sep 21, 2012
2 parents 4368465 + a431bc9 commit bfd8c25
Show file tree
Hide file tree
Showing 43 changed files with 1,190 additions and 873 deletions.
103 changes: 86 additions & 17 deletions base.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,12 +266,12 @@
</state>
<state name="marked"></state>
</statetype>
<shape name="buttonbackground">
<area>30,0,1162,25</area>
<type>roundbox</type>
<fill color="#000000" alpha="150" />
<cornerradius>13</cornerradius>
</shape>
<!-- <shape name="buttonbackground"> -->
<!-- <area>30,0,1162,25</area> -->
<!-- <type>roundbox</type> -->
<!-- <fill color="#000000" alpha="150" /> -->
<!-- <cornerradius>13</cornerradius> -->
<!-- </shape> -->
<textarea name="buttontext">
<area>35,1,1155,24</area>
<font>basesmallgrey</font>
Expand Down Expand Up @@ -757,7 +757,7 @@
<area>0,0,10,10</area>
<font>basesmall</font>
<multiline>no</multiline>
<align>left</align>
<align>left,vcenter</align>
</textarea>

<!-- Base definition of a textedit -->
Expand All @@ -770,7 +770,7 @@
<area>0,0,355,30</area>
<type>roundbox</type>
<cornerradius>15</cornerradius>
<fill color="#666666" alpha="100" />
<fill color="#666666" alpha="175" />
</shape>
</state>
<state name="selected" from="active">
Expand Down Expand Up @@ -799,7 +799,7 @@
<area>0,0,80,30</area>
<type>roundbox</type>
<cornerradius>15</cornerradius>
<fill color="#666666" alpha="100" />
<fill color="#666666" alpha="175" />
</shape>
</state>
<state name="selected" from="active">
Expand Down Expand Up @@ -864,19 +864,25 @@
<statetype name="buttonitem">
<state name="active">
<textarea name="buttontext">
<area>0,0,100%,30</area>
<area>2%,0,96%,30</area>
<align>allcenter</align>
</textarea>
</state>
<state name="inactive">
<textarea name="buttontext">
<area>2%,0,96%,30</area>
<align>allcenter</align>
</textarea>
</state>
<state name="selectedinactive">
<textarea name="buttontext">
<area>0,0,100%,30</area>
<area>2%,0,96%,30</area>
<align>allcenter</align>
</textarea>
</state>
<state name="selectedactive">
<textarea name="buttontext">
<area>0,0,100%,30</area>
<area>2%,0,96%,30</area>
<align>allcenter</align>
</textarea>
</state>
Expand Down Expand Up @@ -1087,17 +1093,17 @@
<statetype name="buttonitem">
<state name="active">
<textarea name="buttontext">
<area>4,0,460,30</area>
<area>10,0,460,30</area>
</textarea>
</state>
<state name="selectedinactive">
<textarea name="buttontext">
<area>5,0,460,30</area>
<area>10,0,460,30</area>
</textarea>
</state>
<state name="selectedactive">
<textarea name="buttontext">
<area>5,0,460,30</area>
<area>10,0,460,30</area>
</textarea>
</state>
</statetype>
Expand Down Expand Up @@ -1287,7 +1293,7 @@
<window name="MythMetadataResults">

<animation trigger="AboutToShow">
<section duration="250">
<section duration="125">
<alpha start="0" end="255" easingcurve="OutQuart"/>
<zoom start="0" end="100" />
</section>
Expand Down Expand Up @@ -1359,7 +1365,7 @@
<window name="MythArtworkResults">

<animation trigger="AboutToShow">
<section duration="250">
<section duration="125">
<alpha start="0" end="255" easingcurve="OutQuart"/>
<zoom start="0" end="100" />
</section>
Expand Down Expand Up @@ -1411,4 +1417,67 @@
</statetype>
</buttonlist>
</window>

<group name="basekeybutton">

<group name="keybutton">
<area>0,0,100%,100%</area>
<minsize>50,100%</minsize>

<shape name="headingshape">
<area>0,0,100%,100%</area>
<minsize>50,100%</minsize>
<type>roundbox</type>
<cornerradius>8</cornerradius>
<fill color="#ffffff" alpha="255" />
</shape>

<textarea name="text">
<area>5,5,-5,-5</area>
<minsize>50,100%</minsize>
<align>center</align>
<font>basesmallblack</font>
<cutdown>no</cutdown>
</textarea>

</group>

</group>

<group name="detailsgroup">

<shape name="details_background" from="baseboxbackground">
<area>125,80,1030,190</area>
</shape>

<textarea name="title" from="basetextarea">
<area>150,90,810,45</area>
<font>baselarge</font>
</textarea>

<textarea name="category" from="basetextarea">
<area>970,85,160,50</area>
<font>baseextrasmall</font>
<align>vcenter,right</align>
<multiline>yes</multiline>
</textarea>

<textarea name="description" from="basetextarea">
<area>150,135,980,90</area>
<multiline>yes</multiline>
<template>%"|SUBTITLE|" %%00X00| %%(|ORIGINALAIRDATE|)\n%%YEARSTARS| %%DESCRIPTION%</template>
<align>justify</align>
</textarea>

<textarea name="timedate" from="basetextarea">
<area>150,235,440,27</area>
</textarea>

<textarea name="channel" from="basetextarea">
<area>890,235,240,35</area>
<align>right</align>
</textarea>

</group>

</mythuitheme>
4 changes: 2 additions & 2 deletions config-ui.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@
</button>

<textarea name="nochannumlabel" from="basetextarea">
<area>70,541,500,60</area>
<value>Hide Channels without channel number.</value>
<area>70,535,500,30</area>
<value>Hide Channels without channel number</value>
</textarea>

<checkbox name="nochannum" from="basecheckbox">
Expand Down

0 comments on commit bfd8c25

Please sign in to comment.