This commit is contained in:
Chris Bevan 2017-05-13 20:37:11 +01:00
parent be29e6a3f7
commit d68f2f79f4
17 changed files with 169 additions and 111 deletions

View File

@ -6,7 +6,7 @@
<control type="group" id="9999"> <control type="group" id="9999">
<control type="group"> <control type="group">
<posx>col-9-begin</posx> <posx>col-9-begin</posx>
<posy>row-9-begin</posy> <posy>row-7-begin</posy>
<visible>String.IsEqual(container.folderpath,addons://)</visible> <visible>String.IsEqual(container.folderpath,addons://)</visible>
<!--animations--> <!--animations-->
<include>modalDialogInOutVertical</include> <include>modalDialogInOutVertical</include>

View File

@ -121,7 +121,7 @@
<control type="label"> <control type="label">
<posx>2-col-indent</posx> <posx>2-col-indent</posx>
<posy>84</posy> <posy>84</posy>
<width>12-col-gutter</width> <width>9-col</width>
<font>buttonTitle</font> <font>buttonTitle</font>
<textcolor>highlight</textcolor> <textcolor>highlight</textcolor>
<label>$INFO[ListItem.AddonCreator,$LOCALIZE[31082]]</label> <label>$INFO[ListItem.AddonCreator,$LOCALIZE[31082]]</label>

View File

@ -191,8 +191,12 @@
</item> </item>
</content> </content>
</control> </control>
<control type="button" id="13"> <control type="togglebutton" id="13">
<description>Default Category Button</description> <description>Default Category Button</description>
<width>287</width>
<font>buttonTitle</font>
<texturefocus>colors/white.png</texturefocus>
<texturenofocus>-</texturenofocus>
</control> </control>
<control type="button" id="3"> <control type="button" id="3">
<description>Default Button</description> <description>Default Button</description>
@ -206,7 +210,8 @@
<control type="label" id="7"> <control type="label" id="7">
<label>-</label> <label>-</label>
<textoffsetx>24</textoffsetx> <textoffsetx>24</textoffsetx>
<font>itemTitle</font> <height>2-row</height>
<font>settingsCategoryTitle</font>
<textcolor>highlight</textcolor> <textcolor>highlight</textcolor>
</control> </control>
<control type="image" id="6"> <control type="image" id="6">

View File

@ -28,7 +28,6 @@
<textcolor>textActive</textcolor> <textcolor>textActive</textcolor>
<label>$LOCALIZE[1026]</label> <label>$LOCALIZE[1026]</label>
</control> </control>
<!--dialog controls 1--> <!--dialog controls 1-->
<control type="group"> <control type="group">
<posx>0</posx> <posx>0</posx>
@ -138,7 +137,7 @@
<width>11-col-gutter</width> <width>11-col-gutter</width>
<height>2-row</height> <height>2-row</height>
<aligny>center</aligny> <aligny>center</aligny>
<font>mediumStrong</font> <font>itemTitle</font>
<textcolor>textActive</textcolor> <textcolor>textActive</textcolor>
<selectedcolor>textActive</selectedcolor> <selectedcolor>textActive</selectedcolor>
<label>$LOCALIZE[31208]: $INFO[listitem.label]</label> <label>$LOCALIZE[31208]: $INFO[listitem.label]</label>
@ -162,7 +161,7 @@
<width>11-col-gutter</width> <width>11-col-gutter</width>
<height>2-row</height> <height>2-row</height>
<aligny>center</aligny> <aligny>center</aligny>
<font>mediumStrong</font> <font>itemTitle</font>
<textcolor>black</textcolor> <textcolor>black</textcolor>
<selectedcolor>black</selectedcolor> <selectedcolor>black</selectedcolor>
<label>$LOCALIZE[31208]: $INFO[listitem.label]</label> <label>$LOCALIZE[31208]: $INFO[listitem.label]</label>
@ -187,7 +186,8 @@
<posy>3-row</posy> <posy>3-row</posy>
<width>12-col-gutter</width> <width>12-col-gutter</width>
<hinttext>$LOCALIZE[31209]</hinttext> <hinttext>$LOCALIZE[31209]</hinttext>
<textoffsetx>166</textoffsetx> <textoffsetx>112</textoffsetx>
<font>itemTitle</font>
<align>left</align> <align>left</align>
<label>-</label> <label>-</label>
<onup>10</onup> <onup>10</onup>
@ -199,7 +199,7 @@
<width>3-col</width> <width>3-col</width>
<height>2-row</height> <height>2-row</height>
<aligny>center</aligny> <aligny>center</aligny>
<font>mediumStrong</font> <font>itemTitle</font>
<textcolor>textActive</textcolor> <textcolor>textActive</textcolor>
<label>$LOCALIZE[31210]:</label> <label>$LOCALIZE[31210]:</label>
<shadowcolor>-</shadowcolor> <shadowcolor>-</shadowcolor>

View File

@ -4,14 +4,13 @@
<onload condition="!IntegerGreaterThan(container(3).numitems,0) + !IntegerGreaterThan(container(6).numitems,0)">control.SetFocus(9999)</onload> <onload condition="!IntegerGreaterThan(container(3).numitems,0) + !IntegerGreaterThan(container(6).numitems,0)">control.SetFocus(9999)</onload>
<controls> <controls>
<!--background--> <!--background-->
<include>globalBackground</include> <include condition="!Player.HasVideo">globalBackground</include>
<control type="group"> <control type="group">
<control type="group"> <control type="group">
<posx>col-6-begin</posx> <posx>col-5-begin</posx>
<posy>row-5-begin</posy> <posy>row-4-begin</posy>
<!--animations--> <!--animations-->
<include>modalDialogInOut</include> <include condition="!Player.hasVideo">modalDialogInOutVertical</include>
<control type="image"> <control type="image">
<posx>0</posx> <posx>0</posx>
<posy>0</posy> <posy>0</posy>
@ -32,10 +31,20 @@
<shadowcolor>-</shadowcolor> <shadowcolor>-</shadowcolor>
</control> </control>
<control type="image"> <control type="image">
<visible>player.hasvideo</visible>
<posx>0</posx> <posx>0</posx>
<posy>2-row</posy> <posy>2-row</posy>
<width>16-col</width> <width>16-col</width>
<height>18-row</height> <height>19-row</height>
<texture>colors/black.png</texture>
<colordiffuse>99FFFFFF</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
<control type="image">
<posx>0</posx>
<posy>2-row</posy>
<width>16-col</width>
<height>19-row</height>
<texture>colors/black.png</texture> <texture>colors/black.png</texture>
<colordiffuse>overlay</colordiffuse> <colordiffuse>overlay</colordiffuse>
<aspectratio>stretch</aspectratio> <aspectratio>stretch</aspectratio>
@ -44,19 +53,18 @@
<posx>12-col</posx> <posx>12-col</posx>
<posy>2-row</posy> <posy>2-row</posy>
<width>4-col</width> <width>4-col</width>
<height>18-row</height> <height>19-row</height>
<texture>colors/black.png</texture> <texture>colors/black.png</texture>
<colordiffuse>overlay</colordiffuse> <colordiffuse>overlay</colordiffuse>
<aspectratio>stretch</aspectratio> <aspectratio>stretch</aspectratio>
</control> </control>
<control type="group" id="9000"> <control type="group" id="9000">
<!--Used in search from cast listing etc--> <!--Used in search from cast listing etc-->
<control type="panel" id="3"> <control type="panel" id="3">
<posx>0</posx> <posx>0</posx>
<posy>73</posy> <posy>73</posy>
<width>12-col</width> <width>12-col</width>
<height>18-row</height> <height>19-row</height>
<onright>9999</onright> <onright>9999</onright>
<itemlayout height="72" width="12-col"> <itemlayout height="72" width="12-col">
<control type="image"> <control type="image">

View File

@ -6,7 +6,9 @@
<!--background--> <!--background-->
<include condition="!Player.HasVideo">globalBackground</include> <include condition="!Player.HasVideo">globalBackground</include>
<control type="group"> <control type="group">
<visible>!Window.IsVisible(sliderdialog)</visible> <animation type="conditional" condition="Window.IsVisible(sliderdialog) | window.isvisible(selectdialog)" reversible="false">
<effect type="fade" start="100" end="0" time="200"/>
</animation>
<posx>col-5-begin</posx> <posx>col-5-begin</posx>
<posy>row-4-begin</posy> <posy>row-4-begin</posy>
<!--animations--> <!--animations-->

View File

@ -28,105 +28,110 @@
<aspectratio>stretch</aspectratio> <aspectratio>stretch</aspectratio>
</control> </control>
</control> </control>
<!--Date / time and weather-->
<control type="group"> <control type="group">
<posx>col-1-begin</posx> <animation type="conditional" condition="control.hasfocus(9001)">
<posy>row-22-begin</posy> <effect type="slide" center="auto" start="0,0" end="2-col,0" time="200"/>
<animation type="conditional" condition="player.hasaudio + !skin.hassetting(weatherdisplay)">
<effect type="slide" start="0,0" end="0,-72" tween="cubic" easing="out" time="0"/>
</animation> </animation>
<control type="label"> <!--Date / time and weather-->
<posx>0</posx> <control type="group">
<posy>-24</posy> <posx>col-1-begin</posx>
<width>24-col</width> <posy>row-22-begin</posy>
<height>4-row</height> <animation type="conditional" condition="player.hasaudio + !skin.hassetting(weatherdisplay)">
<align>center</align> <effect type="slide" start="0,0" end="0,-72" tween="cubic" easing="out" time="0"/>
<font>veryLarge</font> </animation>
<textcolor>textActive</textcolor> <control type="label">
<label>$INFO[System.Time]</label>
</control>
<control type="label">
<posx>0</posx>
<posy>2-row</posy>
<width>24-col</width>
<height>4-row</height>
<font>regular</font>
<align>center</align>
<textcolor>textActive</textcolor>
<label>$INFO[System.Date(DDD)] [B]$INFO[System.Date(dd)][/B] $INFO[System.Date(MMM)]</label>
</control>
<control type="label">
<visible>!isempty(Window(Weather).Property(WeatherProvider)) + !skin.hassetting(weatherdisplay) + !String.isempty(weather.location) + !String.isempty(weather.temperature) + !String.isempty(weather.conditions)</visible>
<posx>0</posx>
<posy>3-row</posy>
<width>24-col</width>
<height>5-row</height>
<align>center</align>
<font>regular</font>
<textcolor>textActive</textcolor>
<label>$INFO[weather.location] [B]$INFO[weather.temperature][/B] [CAPITALIZE]$INFO[weather.conditions][/CAPITALIZE]</label>
</control>
</control>
<!--now playing music-->
<control type="group">
<visible>player.hasaudio</visible>
<posx>col-1-begin</posx>
<posy>row-26-begin</posy>
<control type="grouplist">
<posx>0</posx>
<posy>18</posy>
<width>24-col</width>
<align>center</align>
<itemgap>18</itemgap>
<orientation>horizontal</orientation>
<control type="image">
<visible>!player.paused + !System.Platform.Linux.RaspberryPi</visible>
<posx>0</posx> <posx>0</posx>
<posy>0</posy> <posy>-24</posy>
<width>1-col-gutter</width> <width>24-col</width>
<height>1-col-gutter</height> <height>4-row</height>
<texture>equaliser.gif</texture> <align>center</align>
<font>veryLarge</font>
<textcolor>textActive</textcolor>
<label>$INFO[System.Time]</label>
</control> </control>
<control type="label"> <control type="label">
<visible>!player.paused + System.Platform.Linux.RaspberryPi</visible>
<posx>0</posx> <posx>0</posx>
<posy>0</posy> <posy>2-row</posy>
<width>1-col-gutter</width> <width>24-col</width>
<height>2-row</height> <height>4-row</height>
<font>regular</font>
<align>center</align> <align>center</align>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>textActive</textcolor> <textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor> <label>$INFO[System.Date(DDD)] [B]$INFO[System.Date(dd)][/B] $INFO[System.Date(MMM)]</label>
<label></label>
</control> </control>
<control type="label"> <control type="label">
<visible>player.paused</visible> <visible>!isempty(Window(Weather).Property(WeatherProvider)) + !skin.hassetting(weatherdisplay) + !String.isempty(weather.location) + !String.isempty(weather.temperature) + !String.isempty(weather.conditions)</visible>
<posx>0</posx> <posx>0</posx>
<posy>0</posy> <posy>3-row</posy>
<width>1-col-gutter</width> <width>24-col</width>
<height>2-row</height> <height>5-row</height>
<align>center</align> <align>center</align>
<aligny>center</aligny> <font>regular</font>
<font>symbolLarge</font>
<textcolor>textActive</textcolor> <textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor> <label>$INFO[weather.location] [B]$INFO[weather.temperature][/B] [CAPITALIZE]$INFO[weather.conditions][/CAPITALIZE]</label>
<label></label>
</control> </control>
<control type="label"> </control>
<description>Artist</description> <!--now playing music-->
<control type="group">
<visible>player.hasaudio</visible>
<posx>col-1-begin</posx>
<posy>row-26-begin</posy>
<control type="grouplist">
<posx>0</posx> <posx>0</posx>
<posy>0</posy> <posy>18</posy>
<font>small</font> <width>24-col</width>
<width>auto</width>
<height>2-row</height>
<align>center</align> <align>center</align>
<aligny>center</aligny> <itemgap>18</itemgap>
<height>2-row</height> <orientation>horizontal</orientation>
<label>$INFO[MusicPlayer.TimeRemaining,, ][B]$INFO[musicplayer.Artist,, ][/B]$INFO[MusicPlayer.Title]</label> <control type="image">
<scroll>true</scroll> <visible>!player.paused + !System.Platform.Linux.RaspberryPi</visible>
<textcolor>textActive</textcolor> <posx>0</posx>
<wrapmultiline>false</wrapmultiline> <posy>0</posy>
<width>1-col-gutter</width>
<height>1-col-gutter</height>
<texture>equaliser.gif</texture>
</control>
<control type="label">
<visible>!player.paused + System.Platform.Linux.RaspberryPi</visible>
<posx>0</posx>
<posy>0</posy>
<width>1-col-gutter</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
<label></label>
</control>
<control type="label">
<visible>player.paused</visible>
<posx>0</posx>
<posy>0</posy>
<width>1-col-gutter</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
<label></label>
</control>
<control type="label">
<description>Artist</description>
<posx>0</posx>
<posy>0</posy>
<font>small</font>
<width>auto</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<height>2-row</height>
<label>$INFO[MusicPlayer.TimeRemaining,, ][B]$INFO[musicplayer.Artist,, ][/B]$INFO[MusicPlayer.Title]</label>
<scroll>true</scroll>
<textcolor>textActive</textcolor>
<wrapmultiline>false</wrapmultiline>
</control>
</control> </control>
</control> </control>
</control> </control>

View File

@ -27,7 +27,7 @@
<posy>3</posy> <posy>3</posy>
<width>66</width> <width>66</width>
<height>66</height> <height>66</height>
<aspectratio scalediffuse="false">stretch</aspectratio> <aspectratio scalediffuse="false">scale</aspectratio>
<texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture> <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
</control> </control>
<control type="label"> <control type="label">
@ -102,7 +102,7 @@
<posy>3</posy> <posy>3</posy>
<width>66</width> <width>66</width>
<height>66</height> <height>66</height>
<aspectratio scalediffuse="false">stretch</aspectratio> <aspectratio scalediffuse="false">scale</aspectratio>
<texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture> <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
<animation type="focus" loop="false" reversible="false"> <animation type="focus" loop="false" reversible="false">
<effect type="fade" time="500"/> <effect type="fade" time="500"/>

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<window type="dialog" id="1101"> <window type="dialog" id="1101">
<onload>Dialog.Close(all,true)</onload> <onload>Dialog.Close(all)</onload>
<visible>Window.IsActive(1103) + !player.hasaudio</visible> <visible>Window.IsActive(1103) + !player.hasaudio</visible>
<controls> <controls>
<!--debugging--> <!--debugging-->

View File

@ -3,12 +3,26 @@
[V1.2.3] [V1.2.3]
- [FIXED] Fullscreen music activation crash - [FIXED] Fullscreen music activation crash
- [FIXED] Incorrect casing on some font calls (thanks BigNoid) - [FIXED] Incorrect casing on some font calls (thanks BigNoid)
- [FIXED] Audio offset blocked by dialog background (thanks PaulVT) - [FIXED] Audio offset blocked by dialog background (thanks PaulVT / iamgroot)
- [FIXED] Remove script-skinshortcuts-includes.xml from tree - [FIXED] Remove script-skinshortcuts-includes.xml from tree
- [FIXED] Vignette on artist slideshow adjusted to increase brightness - [FIXED] Vignette on artist slideshow adjusted to increase brightness
- [FIXED] PVR Channel icon aspect ratio adjusted for wider support
- [FIXED] change aspect ratio blocked by dialog background
- [FIXED] "Play DVD" changed to "Play Disc"
- [FIXED] Fullscreen music -> home transition when music is stopped by user
- [FIXED] Reduced font size on edit source dialog
- [DONE] - check addon author string -- too long.
- [DONE] - menu of video settings pop up from below rather than the right side?
- [DONE] - Addon config header label positioning awry
- [DONE] - clock and date to slide right in sync with the main menu appearing from the left
- in progress, watched etc?? - in progress, watched etc??
- add tvshow icon to resume episodes
- up / down volume support for fullscreenmusic
- addons like cine / series catoal / k911 don't work??

View File

@ -909,3 +909,7 @@ msgctxt "#31220"
msgid "Disable extended fanart" msgid "Disable extended fanart"
msgstr "" msgstr ""
msgctxt "#31221"
msgid "Play Disc"
msgstr ""

View File

@ -899,4 +899,8 @@ msgstr "Cacher résumé météo sur l'écran d'accueil"
msgctxt "#31218" msgctxt "#31218"
msgid "Enable this addon" msgid "Enable this addon"
msgstr "Activer cette extension" msgstr "Activer cette extension"
msgctxt "#31221"
msgid "Play Disc"
msgstr "Lecture de disque"

View File

@ -898,4 +898,8 @@ msgstr "Wetter auf dem Home-Screen ausblenden"
msgctxt "#31218" msgctxt "#31218"
msgid "Enable this addon" msgid "Enable this addon"
msgstr "Aktiviere dieses Addon" msgstr "Aktiviere dieses Addon"
msgctxt "#31221"
msgid "Play Disc"
msgstr "Disc wiedergeben"

View File

@ -898,4 +898,8 @@ msgstr "הסתר סיכום מזג האוויר על מסך הבית"
msgctxt "#31218" msgctxt "#31218"
msgid "Enable this addon" msgid "Enable this addon"
msgstr "הפעל את הרחבה" msgstr "הפעל את הרחבה"
msgctxt "#31221"
msgid "Play Disc"
msgstr "נגן תקליטור"

View File

@ -899,4 +899,8 @@ msgstr "Nascondi sommario meteo nel menu' principale"
msgctxt "#31218" msgctxt "#31218"
msgid "Enable this addon" msgid "Enable this addon"
msgstr "Abilita questo addon" msgstr "Abilita questo addon"
msgctxt "#31221"
msgid "Play Disc"
msgstr "Riprodurre il disco"

View File

@ -908,3 +908,7 @@ msgstr "Pobierz grafikę"
msgctxt "#31220" msgctxt "#31220"
msgid "Disable extended fanart" msgid "Disable extended fanart"
msgstr "Dezaktywuj dodatkowe fototapety" msgstr "Dezaktywuj dodatkowe fototapety"
msgctxt "#31221"
msgid "Play Disc"
msgstr "Odtwarzać płytę"

View File

@ -9,7 +9,7 @@
<action>action(FullScreen)</action> <action>action(FullScreen)</action>
</shortcut> </shortcut>
<shortcut> <shortcut>
<label>32032</label> <label>31221</label>
<label2>32034</label2> <label2>32034</label2>
<icon>DefaultAddon.png</icon> <icon>DefaultAddon.png</icon>
<thumb /> <thumb />