diff options
author | jmarshallnz <jcmarsha@gmail.com> | 2014-07-12 08:42:50 +1200 |
---|---|---|
committer | jmarshallnz <jcmarsha@gmail.com> | 2014-07-12 08:42:50 +1200 |
commit | dd9b215635a43a07c2cef35d08d6591d4eeb7ecf (patch) | |
tree | d83015c468fdfb01a8d26e51174ce471a484a404 /addons | |
parent | e4e1561d9d846522291242a3cb7d9afc9c27c499 (diff) | |
parent | 31e2567d34a00fcb29a7b8642733c043676dcf6c (diff) |
Merge pull request #3900 from vkosh/epg-recording
[pvr] add optional support for playing recordings from epg timeline or epg osd
Diffstat (limited to 'addons')
-rw-r--r-- | addons/skin.confluence/720p/DialogPVRGuideOSD.xml | 16 | ||||
-rw-r--r-- | addons/skin.confluence/720p/ViewsPVR.xml | 32 | ||||
-rw-r--r-- | addons/skin.confluence/media/PVR-HasRecording.png | bin | 0 -> 3629 bytes |
3 files changed, 48 insertions, 0 deletions
diff --git a/addons/skin.confluence/720p/DialogPVRGuideOSD.xml b/addons/skin.confluence/720p/DialogPVRGuideOSD.xml index c5d6c3197a..a0951d5d1b 100644 --- a/addons/skin.confluence/720p/DialogPVRGuideOSD.xml +++ b/addons/skin.confluence/720p/DialogPVRGuideOSD.xml @@ -116,6 +116,14 @@ <texture>PVR-HasTimer.png</texture> <visible>ListItem.HasTimer + !ListItem.IsRecording</visible> </control> + <control type="image"> + <left>60</left> + <top>7</top> + <width>16</width> + <height>16</height> + <texture>PVR-HasRecording.png</texture> + <visible>ListItem.HasRecording + !ListItem.IsRecording + !ListItem.HasTimer</visible> + </control> <control type="label"> <left>100</left> <top>0</top> @@ -190,6 +198,14 @@ <texture>PVR-HasTimer.png</texture> <visible>ListItem.HasTimer + !ListItem.IsRecording</visible> </control> + <control type="image"> + <left>60</left> + <top>7</top> + <width>16</width> + <height>16</height> + <texture>PVR-HasRecording.png</texture> + <visible>ListItem.HasRecording + !ListItem.IsRecording + !ListItem.HasTimer</visible> + </control> <control type="label"> <left>100</left> <top>0</top> diff --git a/addons/skin.confluence/720p/ViewsPVR.xml b/addons/skin.confluence/720p/ViewsPVR.xml index de75379ef5..2c5a0cbf3f 100644 --- a/addons/skin.confluence/720p/ViewsPVR.xml +++ b/addons/skin.confluence/720p/ViewsPVR.xml @@ -1017,6 +1017,14 @@ <texture>PVR-HasTimer.png</texture> <visible>ListItem.HasTimer + !ListItem.IsRecording</visible> </control> + <control type="image"> + <left>6</left> + <top>28</top> + <width>16</width> + <height>16</height> + <texture>PVR-HasRecording.png</texture> + <visible>ListItem.HasRecording + !ListItem.IsRecording + !ListItem.HasTimer</visible> + </control> </itemlayout> <focusedlayout height="48" width="40"> <control type="image" id="14"> @@ -1061,6 +1069,14 @@ <texture>PVR-HasTimer.png</texture> <visible>ListItem.HasTimer + !ListItem.IsRecording</visible> </control> + <control type="image"> + <left>6</left> + <top>28</top> + <width>16</width> + <height>16</height> + <texture>PVR-HasRecording.png</texture> + <visible>ListItem.HasRecording + !ListItem.IsRecording + !ListItem.HasTimer</visible> + </control> </focusedlayout> </control> <control type="group"> @@ -1579,6 +1595,14 @@ <label>31510</label> <visible>ListItem.HasTimer</visible> </control> + <control type="image"> + <left>980</left> + <top>10</top> + <width>20</width> + <height>20</height> + <texture>PVR-HasRecording.png</texture> + <visible>ListItem.HasRecording + !ListItem.IsRecording + !ListItem.HasTimer</visible> + </control> </control> </itemlayout> <focusedlayout height="40"> @@ -1694,6 +1718,14 @@ <label>31510</label> <visible>ListItem.HasTimer</visible> </control> + <control type="image"> + <left>980</left> + <top>10</top> + <width>20</width> + <height>20</height> + <texture>PVR-HasRecording.png</texture> + <visible>ListItem.HasRecording + !ListItem.IsRecording + !ListItem.HasTimer</visible> + </control> </control> </focusedlayout> </control> diff --git a/addons/skin.confluence/media/PVR-HasRecording.png b/addons/skin.confluence/media/PVR-HasRecording.png Binary files differnew file mode 100644 index 0000000000..1b048d69fc --- /dev/null +++ b/addons/skin.confluence/media/PVR-HasRecording.png |