Aire-One
/
skin.pellucidPlus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

various

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
1080i/DialogPVRChannelManager.xml
View File

@ -11,8 +11,6 @@
<control type="group"> <control type="group">
<posx>col-2-begin</posx> <posx>col-2-begin</posx>
<posy>row-3-begin</posy> <posy>row-3-begin</posy>
<!--animations-->
<include>modalDialogInOutVertical</include>
<control type="image"> <control type="image">
<posx>0</posx> <posx>0</posx>
<posy>0</posy> <posy>0</posy>
@ -34,7 +32,7 @@
<control type="image"> <control type="image">
<posx>8-col</posx> <posx>8-col</posx>
<posy>2-row</posy> <posy>2-row</posy>
<width>14-col</width> <width>8-col</width>
<height>21-row</height> <height>21-row</height>
<texture>colors/black.png</texture> <texture>colors/black.png</texture>
<colordiffuse>overlay</colordiffuse> <colordiffuse>overlay</colordiffuse>
@ -66,11 +64,32 @@
</control> </control>
<!--channel list--> <!--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> <posx>0</posx>
<posy>2-row</posy> <posy>2-row</posy>
<width>8-col</width> <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> <onright>7</onright>
<itemlayout height="2-row" width="8-col"> <itemlayout height="2-row" width="8-col">
<control type="image"> <control type="image">
@ -132,9 +151,30 @@
</control> </control>
<!--channel management options--> <!--channel management options-->
<control type="group"> <control type="image">
<posx>8-col</posx> <posx>8-col</posx>
<posy>2-row</posy> <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"> <control type="radiobutton" id="7">
<description>Channel activated</description> <description>Channel activated</description>
<posx>0</posx> <posx>0</posx>
@ -263,9 +303,30 @@
</control> </control>
<!--OK / Cancel / apply--> <!--OK / Cancel / apply-->
<control type="panel" id="9000"> <control type="image">
<posx>16-col</posx> <posx>16-col</posx>
<posy>2-row</posy> <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> <width>8-col</width>
<height>6-row</height> <height>6-row</height>
<itemgap>3</itemgap> <itemgap>3</itemgap>

19
1080i/DialogPVRGroupManager.xml
View File

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

189
1080i/VideoOSD.xml
View File

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

27
1080i/custom_subtitleMenu.xml
View File

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

7
changelog.txt
View File

@ -30,15 +30,10 @@
on startup: add check for parent folder items: system.getbool(showparentdiritems) on startup: add check for parent folder items: system.getbool(showparentdiritems)
PVR channel manager
PVR Group manager
Pictures section update Pictures section update
DialogPVRinfo - button update DialogPVRinfo - button update
Add filename to subtitles listings
Radio RDS test Radio RDS test
Touchscreen controls - get Android tablet for testing 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) 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] [B]0.1.0[/B]
- Initial Commit - Initial Commit

12
language/English/strings.po
View File

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