diff options
| author | Martijn Kaijser <machine.sanctum@gmail.com> | 2013-12-01 05:17:32 -0800 |
|---|---|---|
| committer | Martijn Kaijser <machine.sanctum@gmail.com> | 2013-12-01 05:17:32 -0800 |
| commit | ce07ae269e3441e3bfb1ceeae0338f5f92002408 (patch) | |
| tree | 3855ba50ccef6aaab3d656f6dfe88dfb7df373fc /addons | |
| parent | 9cebf4f7b79b1e7c27db913d0e1f2744590ce2cf (diff) | |
| parent | 56c06071ac8947bbfb0f7877b459754b280a5575 (diff) | |
Merge pull request #3735 from xhaggi/confluence-epg-timeline
[confluence] texture changes for epg timeline view
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/skin.confluence/720p/ViewsPVR.xml | 40 | ||||
| -rw-r--r-- | addons/skin.confluence/media/PVR-EpgProgressIndicator.png | bin | 579 -> 1075 bytes |
2 files changed, 26 insertions, 14 deletions
diff --git a/addons/skin.confluence/720p/ViewsPVR.xml b/addons/skin.confluence/720p/ViewsPVR.xml index 871b160c78..0ee80e86d3 100644 --- a/addons/skin.confluence/720p/ViewsPVR.xml +++ b/addons/skin.confluence/720p/ViewsPVR.xml @@ -845,6 +845,15 @@ <description>TV Guide Timeline</description> <visible>Control.IsVisible(10)</visible> <include>VisibleFadeEffect</include> + <control type="image"> + <description>separator image</description> + <left>80</left> + <top>111</top> + <width>1100</width> + <height>1</height> + <colordiffuse>88FFFFFF</colordiffuse> + <texture>separator2.png</texture> + </control> <control type="epggrid" id="10"> <description>EPG Grid</description> <left>80</left> @@ -855,19 +864,12 @@ <scrolltime>350</scrolltime> <timeblocks>40</timeblocks> <rulerunit>6</rulerunit> - <progresstexture border="5">PVR-EpgProgressIndicator.png</progresstexture> + <progresstexture border="0,48,18,14">PVR-EpgProgressIndicator.png</progresstexture> <onleft>31</onleft> <onright>31</onright> <onup>10</onup> <ondown>10</ondown> <rulerlayout height="35" width="40"> - <control type="image" id="1"> - <width>40</width> - <height>29</height> - <left>0</left> - <top>0</top> - <texture border="5">button-nofocus.png</texture> - </control> <control type="label" id="2"> <left>10</left> <top>0</top> @@ -881,13 +883,13 @@ </control> </rulerlayout> <channellayout height="52" width="280"> - <animation effect="fade" start="110" time="200">UnFocus</animation> - <control type="image" id="1"> + <control type="image"> <left>0</left> <top>0</top> <width>270</width> <height>52</height> - <texture border="5">button-nofocus.png</texture> + <texture border="2">MenuItemNF.png</texture> + <include>VisibleFadeEffect</include> </control> <control type="label"> <left>5</left> @@ -921,13 +923,23 @@ </control> </channellayout> <focusedchannellayout height="52" width="280"> - <animation effect="fade" start="110" time="200">OnFocus</animation> - <control type="image" id="1"> + <control type="image"> <left>0</left> <top>0</top> <width>270</width> <height>52</height> - <texture border="5">button-focus.png</texture> + <texture border="2">MenuItemNF.png</texture> + <visible>!Control.HasFocus(10)</visible> + <include>VisibleFadeEffect</include> + </control> + <control type="image"> + <left>0</left> + <top>0</top> + <width>270</width> + <height>52</height> + <texture border="2">MenuItemFO.png</texture> + <visible>Control.HasFocus(10)</visible> + <include>VisibleFadeEffect</include> </control> <control type="label"> <left>5</left> diff --git a/addons/skin.confluence/media/PVR-EpgProgressIndicator.png b/addons/skin.confluence/media/PVR-EpgProgressIndicator.png Binary files differindex 698182434f..83b465d0d6 100644 --- a/addons/skin.confluence/media/PVR-EpgProgressIndicator.png +++ b/addons/skin.confluence/media/PVR-EpgProgressIndicator.png |
