This commit is contained in:
Chris Bevan 2015-11-15 12:52:30 +00:00
parent 9ed52fe42a
commit 4df73904e9
6 changed files with 218 additions and 111 deletions

View File

@ -11,8 +11,6 @@
<control type="group">
<posx>col-2-begin</posx>
<posy>row-3-begin</posy>
<!--animations-->
<include>modalDialogInOutVertical</include>
<control type="image">
<posx>0</posx>
<posy>0</posy>
@ -34,7 +32,7 @@
<control type="image">
<posx>8-col</posx>
<posy>2-row</posy>
<width>14-col</width>
<width>8-col</width>
<height>21-row</height>
<texture>colors/black.png</texture>
<colordiffuse>overlay</colordiffuse>
@ -66,11 +64,32 @@
</control>
<!--channel list-->
<control type="list" id="20">
<control type="image">
<posx>0</posx>
<posy>2-row</posy>
<width>8-col-textbox</width>
<height>2-row</height>
<texture>colors/white.png</texture>
<aspectratio>stretch</aspectratio>
<colordiffuse>44FFFFFF</colordiffuse>
</control>
<control type="label">
<description>name label</description>
<posx>0</posx>
<posy>2-row</posy>
<width>8-col</width>
<height>21-row</height>
<height>2-row</height>
<aligny>center</aligny>
<align>center</align>
<font>itemSubTitle</font>
<textcolor>black</textcolor>
<label>$LOCALIZE[31214]</label>
</control>
<control type="list" id="20">
<posx>0</posx>
<posy>4-row</posy>
<width>8-col-textbox</width>
<height>19-row</height>
<onright>7</onright>
<itemlayout height="2-row" width="8-col">
<control type="image">
@ -132,9 +151,30 @@
</control>
<!--channel management options-->
<control type="group">
<control type="image">
<posx>8-col</posx>
<posy>2-row</posy>
<width>8-col-textbox</width>
<height>2-row</height>
<texture>colors/white.png</texture>
<aspectratio>stretch</aspectratio>
<colordiffuse>44FFFFFF</colordiffuse>
</control>
<control type="label">
<description>name label</description>
<posx>8-col</posx>
<posy>2-row</posy>
<width>8-col</width>
<height>2-row</height>
<aligny>center</aligny>
<align>center</align>
<font>itemSubTitle</font>
<textcolor>black</textcolor>
<label>$LOCALIZE[31179]</label>
</control>
<control type="group">
<posx>8-col</posx>
<posy>4-row</posy>
<control type="radiobutton" id="7">
<description>Channel activated</description>
<posx>0</posx>
@ -263,9 +303,30 @@
</control>
<!--OK / Cancel / apply-->
<control type="panel" id="9000">
<control type="image">
<posx>16-col</posx>
<posy>2-row</posy>
<width>6-col</width>
<height>2-row</height>
<texture>colors/white.png</texture>
<aspectratio>stretch</aspectratio>
<colordiffuse>44FFFFFF</colordiffuse>
</control>
<control type="label">
<description>name label</description>
<posx>16-col</posx>
<posy>2-row</posy>
<width>6-col</width>
<height>2-row</height>
<aligny>center</aligny>
<align>center</align>
<font>itemSubTitle</font>
<textcolor>black</textcolor>
<label>$LOCALIZE[31179]</label>
</control>
<control type="panel" id="9000">
<posx>16-col</posx>
<posy>4-row</posy>
<width>8-col</width>
<height>6-row</height>
<itemgap>3</itemgap>

View File

@ -6,7 +6,7 @@
<include>globalBackground</include>
<control type="group">
<posx>col-3-begin</posx>
<posy>row-2-begin</posy>
<posy>row-3-begin</posy>
<!--animations-->
<include>modalDialogInOutVertical</include>
<!--content provider title / info-->
@ -83,7 +83,7 @@
<width>6-col</width>
<height>2-row</height>
<aligny>center</aligny>
<font>itemTitle</font>
<font>itemSubTitle</font>
<textcolor>black</textcolor>
<label>$LOCALIZE[31194]</label>
</control>
@ -166,7 +166,7 @@
<height>2-row</height>
<aligny>center</aligny>
<align>center</align>
<font>itemTitle</font>
<font>itemSubTitle</font>
<textcolor>black</textcolor>
</control>
<control type="panel" id="12">
@ -257,7 +257,7 @@
<height>2-row</height>
<aligny>center</aligny>
<align>center</align>
<font>itemTitle</font>
<font>itemSubTitle</font>
<textcolor>black</textcolor>
</control>
<control type="panel" id="11">
@ -336,6 +336,17 @@
<aspectratio>stretch</aspectratio>
<colordiffuse>44FFFFFF</colordiffuse>
</control>
<control type="label">
<posx>16-col</posx>
<posy>2-row</posy>
<width>4-col</width>
<height>2-row</height>
<aligny>center</aligny>
<align>center</align>
<font>itemSubTitle</font>
<textcolor>black</textcolor>
<label>$LOCALIZE[31179]</label>
</control>
<control type="panel" id="9001">
<posx>16-col</posx>
<posy>4-row</posy>

View File

@ -29,7 +29,7 @@
<control type="label">
<posx>col-1-begin</posx>
<posy>23-row</posy>
<width>16-col</width>
<width>18-col</width>
<height>2-row</height>
<font>pageTitle</font>
<textcolor>textActive</textcolor>
@ -66,89 +66,112 @@
<autoscroll delay="10000" time="1000" repeat="10000"/>
</control>
<!--options-->
<control type="list" id="8001">
<posx>col-21-begin</posx>
<control type="group">
<posx>col-17-begin</posx>
<posy>0</posy>
<width>24-col</width>
<height>8-row</height>
<itemgap>0</itemgap>
<orientation>horizontal</orientation>
<itemlayout width="1-col" height="2-row">
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>1-col-textbox</width>
<height>2-row</height>
<aspectratio>stretch</aspectratio>
<texture>colors/black.png</texture>
<colordiffuse>textboxInactive</colordiffuse>
</control>
<control type="label">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label2]</label>
</control>
</itemlayout>
<focusedlayout width="1-col" height="2-row">
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>1-col-textbox</width>
<height>2-row</height>
<aspectratio>stretch</aspectratio>
<texture>colors/white.png</texture>
<colordiffuse>highlight</colordiffuse>
</control>
<control type="label">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label2]</label>
<shadowcolor>-</shadowcolor>
</control>
</focusedlayout>
<content>
<item>
<visible>System.GetBool(pvrmanager.enabled) + Player.CanRecord</visible>
<label>31201</label>
<label2></label2>
<thumb>-</thumb>
<onclick>PlayerControl(record)</onclick>
</item>
<item>
<description>Subtitles</description>
<label>24012</label>
<label2></label2>
<thumb>-</thumb>
<onclick>Close</onclick>
<onclick>activateWindow(1104)</onclick>
</item>
<item>
<description>Audio Settings</description>
<label>5</label>
<label2></label2>
<thumb>-</thumb>
<onclick>ActivateWindow(124)</onclick>
</item>
<item>
<description>Bookmarks</description>
<label>298</label>
<label2></label2>
<thumb>-</thumb>
<onclick>ActivateWindow(125)</onclick>
</item>
</content>
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>5-col-textbox</width>
<height>2-row</height>
<texture>colors/white.png</texture>
<colordiffuse>ffffffff</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
<control type="label">
<posx>24</posx>
<posy>0</posy>
<width>324</width>
<height>2-row</height>
<aligny>center</aligny>
<font>itemTitle</font>
<textcolor>black</textcolor>
<label>$LOCALIZE[31143]: $INFO[VideoPlayer.TimeRemaining]</label>
</control>
<control type="list" id="8001">
<posx>5-col</posx>
<posy>0</posy>
<width>12-col</width>
<height>2-row</height>
<itemgap>0</itemgap>
<orientation>horizontal</orientation>
<itemlayout width="1-col" height="2-row">
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>1-col-textbox</width>
<height>2-row</height>
<aspectratio>stretch</aspectratio>
<texture>colors/black.png</texture>
<colordiffuse>textboxInactive</colordiffuse>
</control>
<control type="label">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label2]</label>
</control>
</itemlayout>
<focusedlayout width="1-col" height="2-row">
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>1-col-textbox</width>
<height>2-row</height>
<aspectratio>stretch</aspectratio>
<texture>colors/white.png</texture>
<colordiffuse>highlight</colordiffuse>
</control>
<control type="label">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label2]</label>
<shadowcolor>-</shadowcolor>
</control>
</focusedlayout>
<content>
<item>
<visible>System.GetBool(pvrmanager.enabled) + Player.CanRecord</visible>
<label>31201</label>
<label2></label2>
<thumb>-</thumb>
<onclick>PlayerControl(record)</onclick>
</item>
<item>
<description>Subtitles</description>
<label>24012</label>
<label2></label2>
<thumb>-</thumb>
<onclick>Close</onclick>
<onclick>activateWindow(1104)</onclick>
</item>
<item>
<description>Audio Settings</description>
<label>5</label>
<label2></label2>
<thumb>-</thumb>
<onclick>ActivateWindow(124)</onclick>
</item>
<item>
<description>Bookmarks</description>
<label>298</label>
<label2></label2>
<thumb>-</thumb>
<onclick>ActivateWindow(125)</onclick>
</item>
</content>
</control>
</control>
</control>
<!--debugging-->

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<window type="dialog" id="1104">
<defaultcontrol always="true">5000</defaultcontrol>
<controls>
<include>fadeInOut</include>
<control type="group">
@ -33,21 +33,16 @@
<width>6-col</width>
<height>11-row</height>
<itemgap>0</itemgap>
<control type="button" id="4">
<description>Download Subtitle</description>
<width>8-col</width>
<label>31154</label>
<texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
<focusedcolor>textActive</focusedcolor>
<onclick>Dialog.Close(VideoOSD)</onclick>
<onclick>ActivateWindow(SubtitleSearch)</onclick>
</control>
<control type="radiobutton" id="1">
<description>Enable subtitles</description>
<enable>VideoPlayer.HasSubtitles</enable>
<texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
<focusedcolor>textActive</focusedcolor>
<label>449</label>
<label>31151</label>
<textureradiofocus>-</textureradiofocus>
<textureradionofocus>-</textureradionofocus>
<radiowidth/>
<radioheight/>
<onclick>ShowSubtitles</onclick>
<selected>VideoPlayer.SubtitlesEnabled</selected>
</control>
@ -60,7 +55,15 @@
<focusedcolor>textActive</focusedcolor>
<onclick>SubtitleDelay</onclick>
</control>
<control type="button" id="4">
<description>Download Subtitle</description>
<width>8-col</width>
<label>31154</label>
<texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
<focusedcolor>textActive</focusedcolor>
<onclick>Dialog.Close(VideoOSD)</onclick>
<onclick>ActivateWindow(SubtitleSearch)</onclick>
</control>
</control>
</control>
</control>

View File

@ -30,15 +30,10 @@
on startup: add check for parent folder items: system.getbool(showparentdiritems)
PVR channel manager
PVR Group manager
Pictures section update
DialogPVRinfo - button update
Add filename to subtitles listings
Radio RDS test
Touchscreen controls - get Android tablet for testing
@ -47,6 +42,8 @@ Addons manager - clean up a bit.
Expand menu system to add options for sub menu etc (see xbox NXE for inspiration)
Android file view is not working properly.
[B]0.1.0[/B]
- Initial Commit

View File

@ -389,6 +389,10 @@ msgctxt "#31142"
msgid "Prioritise exit over shutdown in power menu"
msgstr ""
msgctxt "#31143"
msgid "Remaining"
msgstr ""
msgctxt "#31144"
msgid "FPS"
msgstr ""
@ -417,6 +421,10 @@ msgctxt "#31150"
msgid "Home: Hide Search"
msgstr ""
msgctxt "#31151"
msgid "Subtitles"
msgstr ""
msgctxt "#31152"
msgid "Press OK to cancel"
msgstr ""
@ -465,6 +473,10 @@ msgctxt "#31178"
msgid "Recent TV Shows"
msgstr ""
msgctxt "#31179"
msgid "Options"
msgstr ""
msgctxt "#31180"
msgid "Recent Albums"
msgstr ""