This commit is contained in:
Chris Bevan 2015-11-05 15:13:27 +00:00
parent d81c787039
commit 6cf95084e4
17 changed files with 467 additions and 699 deletions

View File

@ -52,7 +52,7 @@
<!--options-->
<control type="grouplist" id="9000">
<posx>0</posx>
<posy>2-row</posy>
<posy>13-row</posy>
<width>6-col</width>
<orientation>vertical</orientation>
<control type="radiobutton" id="6">

View File

@ -1,217 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<window>
<defaultcontrol always="true">9000</defaultcontrol>
<controls>
<!--background-->
<control type="group">
<include>fadeInOut</include>
<control type="image">
<include>dimensionsFullscreen</include>
<texture>colors/black.png</texture>
<colordiffuse>eeFFFFFF</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
</control>
<control type="group">
<posx>col-7-begin</posx>
<posy>row-5-begin</posy>
<include>modalDialogInOut</include>
<!--title-->
<control type="label">
<description>Programme title</description>
<posx>0</posx>
<posy>-56</posy>
<width>12-col</width>
<height>2-row</height>
<align>left</align>
<aligny>center</aligny>
<font>mediumStrong</font>
<textcolor>highlight</textcolor>
<label>$INFO[ListItem.Title]</label>
<wrapmultiline>true</wrapmultiline>
</control>
<control type="grouplist">
<posx>0</posx>
<posy>54</posy>
<width>12-col</width>
<orientation>horizontal</orientation>
<control type="label">
<width>1-col-gutter</width>
<height>2-row</height>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<label></label>
</control>
<control type="label">
<width>2-col</width>
<height>2-row</height>
<aligny>center</aligny>
<font>regularStrong</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.starttime]</label>
</control>
<control type="label">
<width>1-col-gutter</width>
<height>2-row</height>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<label></label>
</control>
<control type="label">
<width>2-col</width>
<height>2-row</height>
<aligny>center</aligny>
<font>regularStrong</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.endtime]</label>
</control>
<control type="label">
<width>1-col-gutter</width>
<height>2-row</height>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<label></label>
</control>
<control type="label">
<width>auto</width>
<height>2-row</height>
<aligny>center</aligny>
<font>regularStrong</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.duration]</label>
</control>
</control>
<!--synopsis-->
<control type="textbox">
<posx>0</posx>
<posy>4-row</posy>
<font>textbox</font>
<width>12-col</width>
<align>left</align>
<textcolor>textActive</textcolor>
<height>340</height>
<label>$INFO[ListItem.plot]</label>
<autoscroll delay="10000" time="1000" repeat="10000"/>
</control>
<!--View / record buttons-->
<control type="list" id="9000">
<posx>0</posx>
<posy>18-row</posy>
<width>12-col</width>
<height>2-row</height>
<itemgap>3</itemgap>
<orientation>horizontal</orientation>
<itemlayout width="6-col" height="2-row">
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>6-col</width>
<height>2-row</height>
<aspectratio>stretch</aspectratio>
<texture>colors/black.png</texture>
</control>
<control type="label">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<aligny>center</aligny>
<align>center</align>
<font>symbol</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label2]</label>
<shadowcolor>-</shadowcolor>
</control>
<control type="label">
<posx>1-col-indent</posx>
<posy>0</posy>
<width>6-col</width>
<height>2-row</height>
<aligny>center</aligny>
<font>buttonTitle</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label]</label>
<shadowcolor>-</shadowcolor>
</control>
</itemlayout>
<focusedlayout width="6-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>
<include>spinFocusIcon</include>
</control>
<control type="image">
<posx>1-col</posx>
<posy>0</posy>
<width>5-col</width>
<height>2-row</height>
<aspectratio>stretch</aspectratio>
<texture>colors/white.png</texture>
</control>
<control type="label">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<aligny>center</aligny>
<align>center</align>
<font>symbol</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label2]</label>
<shadowcolor>-</shadowcolor>
</control>
<control type="label">
<posx>1-col-indent</posx>
<posy>0</posy>
<width>6-col</width>
<height>2-row</height>
<aligny>center</aligny>
<font>buttonTitle</font>
<textcolor>black</textcolor>
<label>$INFO[ListItem.label]</label>
<shadowcolor>-</shadowcolor>
</control>
</focusedlayout>
<content>
<item id="1">
<label>31072</label>
<label2></label2>
<thumb>-</thumb>
<onclick>sendclick(5)</onclick>
</item>
<item id="2">
<label>264</label>
<label2></label2>
<thumb>-</thumb>
<onclick>SendClick(6)</onclick>
</item>
</content>
</control>
</control>
<!--buttons-->
<control type="group">
<visible>false</visible>
<control type="button" id="5">
<description>Switch to Channel</description>
</control>
<control type="button" id="6">
<description>Record</description>
</control>
</control>
<!--debugging-->
<include>DebugGrid</include>
<control type="label">
<include>WindowID</include>
<label>DialogPVRGuideInfo.xml</label>
</control>
</controls>
</window>

View File

@ -29,9 +29,9 @@
<align>left</align>
<aligny>center</aligny>
<font>mediumStrong</font>
<textcolor>highlight</textcolor>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
<label>[COLOR textActive]$INFO[listitem.channelname][/COLOR] $INFO[ListItem.Label]</label>
<label>$INFO[ListItem.Label]</label>
<wrapmultiline>true</wrapmultiline>
</control>
@ -44,13 +44,25 @@
<font>itemTitle</font>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
<label>[COLOR highlight]$LOCALIZE[31192][/COLOR] $INFO[ListItem.startdate]</label>
<label>[COLOR highlight]$LOCALIZE[31214][/COLOR] $INFO[ListItem.channelname]</label>
</control>
<control type="label">
<posx>0</posx>
<posy>5-row</posy>
<width>6-col-gutter</width>
<width>12-col-gutter</width>
<align>left</align>
<aligny>center</aligny>
<font>itemTitle</font>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
<label>[COLOR highlight]$LOCALIZE[31192][/COLOR] $INFO[ListItem.startdate]</label>
</control>
<control type="label">
<posx>0</posx>
<posy>6-row</posy>
<width>12-col-gutter</width>
<align>left</align>
<aligny>center</aligny>
<font>itemTitle</font>
@ -62,7 +74,7 @@
<!--synopsis-->
<control type="textbox">
<posx>0</posx>
<posy>7-row</posy>
<posy>8-row</posy>
<font>textbox</font>
<width>12-col</width>
<align>left</align>
@ -76,7 +88,7 @@
<!--dialog controls-->
<control type="list" id="8000">
<posx>0</posx>
<posy>15-row</posy>
<posy>16-row</posy>
<width>12-col</width>
<height>2-row</height>
<orientation>horizontal</orientation>
@ -163,6 +175,13 @@
<thumb>-</thumb>
<onclick>sendclick(2003,10)</onclick>
</item>
<item id="2">
<label>264</label>
<label2></label2>
<thumb>-</thumb>
<onclick>SendClick(2003,6)</onclick>
</item>
</content>
</control>
</control>
@ -170,6 +189,25 @@
<!--buttons-->
<control type="group">
<visible>false</visible>
<control type="button" id="4">
<description>Find similar</description>
<label>19003</label>
</control>
<control type="button" id="5">
<description>Switch to Channel</description>
<label>19165</label>
</control>
<control type="button" id="6">
<description>Record</description>
</control>
<control type="button" id="8">
<description>Play recording</description>
<label>19687</label>
</control>
<control type="button" id="10">
<description>Play</description>
</control>
@ -178,7 +216,7 @@
<include>DebugGrid</include>
<control type="label">
<include>WindowID</include>
<label>DialogPVRRecordingInfo.xml</label>
<label>DialogPVRInfo.xml</label>
</control>
</controls>
</window>

View File

@ -30,7 +30,7 @@
<control type="label" id="1">
<posx>12</posx>
<posy>0</posy>
<width>8-col</width>
<width>16-col-gutter</width>
<height>2-row</height>
<aligny>center</aligny>
<font>dialogTitle</font>

View File

@ -43,6 +43,16 @@
<aspectratio>stretch</aspectratio>
</control>
<!--studio logos etc-->
<control type="image">
<posx>1-col</posx>
<posy>row-27-begin</posy>
<width>2-col</width>
<height>1-col</height>
<texture>resource://resource.images.studios.white/$INFO[ListItem.Studio,,.png]</texture>
<aspectratio>scale</aspectratio>
</control>
</control>
<!--content is movie or tvshow (from XBMC Library)-->
<control type="group">
@ -115,7 +125,7 @@
<content>
<item>
<label>$LOCALIZE[562]</label>
<label2>$INFO[ListItem.year] $INFO[ListItem.dbid]</label2>
<label2>$INFO[ListItem.year]</label2>
<thumb>-</thumb>
<onclick>noop</onclick>
</item>

View File

@ -198,7 +198,7 @@
<font>
<name>symbolWeather</name>
<filename>weather.ttf</filename>
<size>60</size>
<size>80</size>
</font>
<!-- Required for system -->
<font>

View File

@ -71,7 +71,7 @@
<width>12-col</width>
<align>right</align>
<font>pageSubTitle</font>
<label>$INFO[System.Date(mmm d)]</label>
<label>$INFO[System.Date(DDD)], $INFO[system.Date(mmm d)]</label>
<textcolor>textActive</textcolor>
</control>
</control>

View File

@ -67,9 +67,10 @@
<height>24-row</height>
<itemlayout width="8-col" height="4-row">
<control type="label">
<posx>32</posx>
<posy>6</posy>
<posx>4</posx>
<posy>-28</posy>
<width>2-col-gutter</width>
<height>4-row</height>
<font>symbolWeather</font>
<textcolor>textActive</textcolor>
<label>$VAR[weatherIcon]</label>

View File

@ -23,6 +23,11 @@
<colordiffuse>ffffffff</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
<control type="group">
<animation type="Conditional" condition="controlgroup(9000).hasfocus | controlgroup(9002).hasfocus | controlgroup(100).hasfocus">
<effect type="fade" start="100" end="0" time="200"/>
</animation>
<control type="image">
<posx>0</posx>
<posy>row-20-begin</posy>
@ -32,13 +37,20 @@
<texture border="0">colors/black.png</texture>
<colordiffuse>ccffffff</colordiffuse>
</control>
<control type="image">
<posx>0</posx>
<posy>row-20-begin</posy>
<width>fullscreenWidth</width>
<height>6</height>
<aspectratio scalediffuse="false">stretch</aspectratio>
<texture border="0">colors/white.png</texture>
<colordiffuse>highlight</colordiffuse>
</control>
<!--titles-->
<control type="group">
<visible>!controlgroup(9000).hasfocus</visible>
<posx>col-1-begin</posx>
<posy>row-6-begin</posy>
<control type="label">
<posx>24-col</posx>
<posy>0</posy>
@ -51,6 +63,14 @@
<wrapmultiline>true</wrapmultiline>
<label>$INFO[listitem.year][CR][B]$INFO[listitem.title][/B]</label>
</control>
<control type="label">
<posx>0</posx>
<posy>12-row</posy>
<width>24-col</width>
<height>2-row</height>
<font>largeStrong</font>
<textcolor>textActive</textcolor>
<label>[B]$INFO[container.foldername][/B]</label>
</control>
</control>
@ -154,5 +174,7 @@
</control>
</focusedlayout>
</control>
</control>
</control>
</include>
</includes>

View File

@ -10,7 +10,7 @@
<control type="image">
<include>dimensionsFullscreen</include>
<aspectratio scalediffuse="false">stretch</aspectratio>
<texture background="true" fallback="colors/black.png" border="0">$INFO[container.art(fanart)]</texture>
<texture background="true" fallback="colors/black.png" border="0">$INFO[lisitem.art(fanart)]</texture>
<colordiffuse>ffffffff</colordiffuse>
<animation type="conditional" condition="!controlgroup(9000).hasfocus" loop="true" reversible="false">
<effect type="fade" start="0" end="100" time="2000"/>
@ -18,6 +18,19 @@
<effect type="fade" start="100" end="0" time="1000" delay="14000"/>
</animation>
</control>
<!--display clearart if available-->
<control type="image">
<posx>966</posx>
<posy>row-6-begin</posy>
<width>4-col</width>
<height>4-col</height>
<aspectratio>stretch</aspectratio>
<texture>$INFO[listitem.art(clearart)]</texture>
<bordersize>0</bordersize>
</control>
<control type="image">
<include>dimensionsFullscreen</include>
<texture>vignette.png</texture>

View File

@ -25,6 +25,10 @@
</control>
</control>
<control type="group">
<animation type="Conditional" condition="controlgroup(9000).hasfocus | controlgroup(9002).hasfocus | controlgroup(100).hasfocus">
<effect type="fade" start="100" end="0" time="200"/>
</animation>
<control type="image">
<posx>0</posx>
<posy>row-20-begin</posy>
@ -37,7 +41,6 @@
<!--titles-->
<control type="group">
<visible>!controlgroup(9000).hasfocus</visible>
<posx>col-1-begin</posx>
<posy>row-6-begin</posy>
@ -54,6 +57,7 @@
<label>$INFO[container(9998).listitem.artist][CR][B]$INFO[container(9998).listitem.title][/B]</label>
</control>
</control>
</control>
<!--content selector-->
<control type="list" id="9123">
@ -124,6 +128,9 @@
<!--content listing-->
<control type="panel" id="9998">
<animation type="Conditional" condition="controlgroup(9000).hasfocus | controlgroup(9002).hasfocus | controlgroup(100).hasfocus">
<effect type="fade" start="100" end="0" time="200"/>
</animation>
<posx>72</posx>
<posy>row-21-begin</posy>
<width>1800</width>

View File

@ -27,6 +27,10 @@
</control>
</control>
<control type="group">
<animation type="Conditional" condition="controlgroup(9000).hasfocus | controlgroup(9002).hasfocus | controlgroup(100).hasfocus">
<effect type="fade" start="100" end="0" time="200"/>
</animation>
<!--title-->
<control type="group">
<visible>!Substring(Container.folderpath,plugin)</visible>
@ -204,5 +208,6 @@
</focusedlayout>
</control>
</control>
</control>
</include>
</includes>

View File

@ -25,6 +25,10 @@
</control>
</control>
<control type="group">
<animation type="Conditional" condition="controlgroup(9000).hasfocus | controlgroup(9002).hasfocus | controlgroup(100).hasfocus">
<effect type="fade" start="100" end="0" time="200"/>
</animation>
<control type="image">
<posx>0</posx>
<posy>row-20-begin</posy>
@ -45,7 +49,6 @@
<effect type="fade" start="0" end="100" delay="600" time="200"/>
</animation>
<visible>!controlgroup(9000).hasfocus</visible>
<posx>col-1-begin</posx>
<posy>row-12-begin</posy>
@ -77,6 +80,7 @@
<label>[B]$INFO[container(9998).listitem.tvshowtitle][/B][CR]$INFO[container(9998).listitem.season,$LOCALIZE[31011] ,,]</label>
</control>
</control>
</control>
<!--content selector-->
<control type="list" id="9123">
@ -144,6 +148,9 @@
<!--content listing-->
<control type="panel" id="9998">
<animation type="Conditional" condition="controlgroup(9000).hasfocus | controlgroup(9002).hasfocus | controlgroup(100).hasfocus">
<effect type="fade" start="100" end="0" time="200"/>
</animation>
<posx>72</posx>
<posy>row-21-begin</posy>
<width>1800</width>

View File

@ -1,134 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<window>
<defaultcontrol>2</defaultcontrol>
<controls>
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>fullscreenWidth</width>
<height>fullscreenHeight</height>
<aspectratio>stretch</aspectratio>
<texture>colors/black.png</texture>
<colordiffuse>ddFFFFFF</colordiffuse>
<include>fadeInOut</include>
</control>
<control type="group">
<posx>col-7-begin</posx>
<posy>row-3-begin</posy>
<!--animations-->
<include>modalDialogInOutVertical</include>
<control type="image">
<posx>-528</posx>
<posy>44</posy>
<width>fullscreenWidth</width>
<height>1-row</height>
<texture>colors/white.png</texture>
<colordiffuse>ffffffff</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
<control type="image">
<posx>-3</posx>
<posy>44</posy>
<width>3</width>
<height>1-row</height>
<texture>colors/black.png</texture>
<colordiffuse>ffffffff</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
<control type="label" id="3">
<posx>12</posx>
<posy>44</posy>
<width>12-col</width>
<font>dialogTitle</font>
<textcolor>black</textcolor>
<shadowcolor>-</shadowcolor>
<label>$LOCALIZE[24010]</label>
</control>
<control type="label" id="4">
<posx>12</posx>
<posy>120</posy>
<width>12-col</width>
<font>dialogTitle</font>
<textcolor>black</textcolor>
<shadowcolor>-</shadowcolor>
<label>13389</label>
</control>
<!--visualisation list-->
<control type="list" id="2">
<posx>0</posx>
<posy>120</posy>
<width>12-col</width>
<height>11-row</height>
<onleft>5</onleft>
<onright>9001</onright>
<onup>6</onup>
<ondown>6</ondown>
<itemlayout height="1-row" width="6-col">
<control type="image">
<posx>0</posx>
<posy>2</posy>
<width>6-col-gutter</width>
<height>53</height>
<aspectratio>stretch</aspectratio>
<texture border="24,0,24,0">UIControls/listitemNF.png</texture>
<bordersize>0</bordersize>
<colordiffuse>99FFFFFF</colordiffuse>
</control>
<control type="image">
<posx>4</posx>
<posy>4</posy>
<width>48</width>
<height>48</height>
<aspectratio scalediffuse="false">scale</aspectratio>
<texture fallback="colors/offblack.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.icon]</texture>
</control>
<control type="label">
<posx>1-col</posx>
<posy>0</posy>
<width>312</width>
<font>itemTitle</font>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
<label>$INFO[ListItem.Label]</label>
</control>
</itemlayout>
<focusedlayout height="1-row" width="6-col">
<control type="image">
<posx>0</posx>
<posy>2</posy>
<width>6-col-gutter</width>
<height>53</height>
<aspectratio>stretch</aspectratio>
<texture border="24,0,24,0">UIControls/listitemFO.png</texture>
<bordersize>0</bordersize>
<colordiffuse>FFFFFFFF</colordiffuse>
</control>
<control type="image">
<posx>4</posx>
<posy>4</posy>
<width>48</width>
<height>48</height>
<aspectratio scalediffuse="false">scale</aspectratio>
<texture fallback="colors/offblack.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.icon]</texture>
</control>
<control type="label">
<posx>1-col</posx>
<posy>0</posy>
<width>312</width>
<font>itemTitle</font>
<textcolor>black</textcolor>
<selectedcolor>black</selectedcolor>
<shadowcolor>-</shadowcolor>
<label>$INFO[ListItem.Label]</label>
</control>
</focusedlayout>
</control>
</control>
<!--debugging-->
<include>DebugGrid</include>
<control type="label">
<include>WindowID</include>
<label>VisualisationPresetList.xml</label>
</control>
</controls>
</window>

View File

@ -4,6 +4,7 @@
<import addon="xbmc.gui" version="5.10.0"/>
<import addon="script.globalsearch" version="1.1.1"/>
<import addon="script.artistslideshow" version="1.5.0"/>
<import addon="resource.images.studios.white" version="0.0.1"/>
</requires>
<extension point="xbmc.gui.skin" debugging="false">
<res width="1920" height="1080" aspect="16:9" default="true" folder="1080i" />

View File

@ -1,6 +1,6 @@
[B]0.9.0[/B]
***Working towards Kodi Jarvis***
***Working towards Kodi Jarvis release***
- [REMOVED DEPENDENCY] script.thedeadman.functions (Nice one team Kodi!)
- [REMOVED] DialogPeripheralManager.xml
@ -13,11 +13,22 @@
- [REMOVED] musicoverlay.xml
- [NEW] custom_musicOverlay.xml
- [REMOVED] References to "zorder" tag
- [NEW] DialogPVRInfo.xml
- [REMOVED] DialogPVRGuideInfo.xml
- [REMOVED] DialogPVRRecordingInfo.xml
- [REMOVED] VisualisationPresetList.xml
[DONE] - DialogAddonInfo.xml - remove button id="11"
[DONE] - DialogKaiToast.xml - removed ID's 403-405
[DONE] - DialogVideoInfo.xml - add button ID 7, replace user rating value
[DONE] - MyMusicNav.xml - remove files node button
- [MODIFIED] DialogAddonInfo.xml - remove button id="11"
- [MODIFIED] DialogKaiToast.xml - remove ID's 403-405
- [MODIFIED] DialogVideoInfo.xml - add button ID 7, replace user rating value
- [MODIFIED] MyMusicNav.xml - remove files node button
***To do***
DialogPVRinfo - button and layout update
Touchscreen controls
revise the TVShow view
Fix clearart in TVShow views

View File

@ -506,7 +506,7 @@ msgid "All Episodes"
msgstr ""
msgctxt "#31192"
msgid "Recorded"
msgid "Date"
msgstr ""
msgctxt "#31193"
@ -584,3 +584,7 @@ msgstr ""
msgctxt "#31213"
msgid "(Showing unwatched items only)"
msgstr ""
msgctxt "#31214"
msgid "Channel"
msgstr ""