This commit is contained in:
Chris Bevan 2017-05-22 19:48:49 +01:00
parent f7894eec54
commit 2f84220c23
5 changed files with 81 additions and 146 deletions

View File

@ -121,7 +121,7 @@
<font>
<name>dialogTitle</name>
<filename>roboto/bold.ttf</filename>
<size>36</size>
<size>32</size>
<linespacing>1.0</linespacing>
<style>capitalize</style>
</font>

View File

@ -20,15 +20,13 @@
<textcolor>textActive</textcolor>
</control>
<control type="group">
<posx>1200</posx>
<posx>1176</posx>
<posy>0</posy>
<animation type="Windowopen">
<effect type="fade" start="0" end="100" time="300" delay="300"/>
<effect type="slide" start="800" end="0" tween="cubic" easing="out" time="400" delay="300"/>
</animation>
<animation type="windowClose">
<effect type="fade" start="100" end="0" time="350"/>
<effect type="slide" start="0" end="900" tween="cubic" easing="out" time="400"/>
<effect type="slide" start="0" end="900" tween="cubic" easing="in" time="400"/>
</animation>
<!--fade out if audio / video menu active-->
<animation type="Conditional" condition="Window.IsActive(seekbar) | Window.IsActive(osdvideosettings) | Window.IsActive(osdaudiosettings) | window.isactive(PVROSDChannels)">
@ -39,7 +37,7 @@
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>10-col</width>
<width>12-col</width>
<height>fullscreenHeight</height>
<texture>colors/black.png</texture>
<colordiffuse>cc111111</colordiffuse>
@ -55,66 +53,26 @@
<aspectratio>stretch</aspectratio>
</control>
<control type="group">
<posx>24</posx>
<posx>36</posx>
<posy>row-1-begin</posy>
<control type="group">
<posx>-6</posx>
<posy>0</posy>
<control type="image">
<visible>videoplayer.content(episodes)</visible>
<posx>0</posx>
<posy>-38</posy>
<width>3-col-gutter</width>
<height>256</height>
<aspectratio>scale</aspectratio>
<texture fallback="colors/offblack.png" border="6">$INFO[Player.Art(tvshow.poster)]</texture>
<bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture>
<bordersize>6</bordersize>
<colordiffuse>ffffffff</colordiffuse>
</control>
<control type="image">
<visible>videoplayer.content(movies)</visible>
<posx>0</posx>
<posy>-38</posy>
<width>3-col-gutter</width>
<height>256</height>
<aspectratio>scale</aspectratio>
<texture fallback="colors/offblack.png" border="6">$INFO[Player.Art(poster)]</texture>
<bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture>
<bordersize>6</bordersize>
<colordiffuse>ffffffff</colordiffuse>
</control>
<control type="image">
<visible>videoplayer.content(livetv)</visible>
<posx>0</posx>
<posy>0</posy>
<width>3-col-gutter</width>
<height>3-col-gutter</height>
<aspectratio>stretch</aspectratio>
<texture fallback="colors/offblack.png" border="6">$INFO[Player.Art(thumb)]</texture>
<bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture>
<bordersize>6</bordersize>
<colordiffuse>ffffffff</colordiffuse>
</control>
</control>
<control type="label">
<posx>204</posx>
<posy>24</posy>
<width>396</width>
<posx>0</posx>
<posy>0</posy>
<width>8-col</width>
<align>left</align>
<height>4-row</height>
<aligny>center</aligny>
<font>largeLight</font>
<textcolor>textActive</textcolor>
<label>[B]$INFO[videoplayer.TVShowTitle,,: ][/B]$INFO[videoplayer.title]</label>
<label>[B]$INFO[videoplayer.TVShowTitle,, [CR]][/B][B]$INFO[VideoPlayer.ChannelName,, [CR]][/B]$INFO[videoplayer.title]</label>
<wrapmultiline>true</wrapmultiline>
</control>
<!--player position-->
<control type="progress">
<description>Progress Bar</description>
<posx>150</posx>
<posy>247</posy>
<width>5-col</width>
<posy>212</posy>
<width>324</width>
<height>12</height>
<texturebg>colors/white.png</texturebg>
<midtexture colordiffuse="highlight">colors/white.png</midtexture>
@ -122,7 +80,7 @@
</control>
<control type="label">
<posx>0</posx>
<posy>6-row</posy>
<posy>5-row</posy>
<width>8-col</width>
<height>2-row</height>
<font>pageSubTitle</font>
@ -132,8 +90,8 @@
<scroll>false</scroll>
</control>
<control type="label">
<right>36</right>
<posy>6-row</posy>
<right>col-1-begin</right>
<posy>5-row</posy>
<width>8-col</width>
<height>2-row</height>
<font>pageSubTitle</font>
@ -148,26 +106,26 @@
<posx>0</posx>
<posy>8-row</posy>
<font>textbox</font>
<width>660</width>
<width>624</width>
<align>left</align>
<textcolor>textActive</textcolor>
<height>388</height>
<label fallback="31205">[B]$INFO[Player.FinishTime(HH:MM),$LOCALIZE[31160] ,. ][/B]$INFO[videoplayer.plot]</label>
<height>348</height>
<label fallback="31205">$INFO[Player.FinishTime(HH:MM),$LOCALIZE[31160] ,. ]$INFO[videoplayer.plot]</label>
<autoscroll>false</autoscroll>
<shadowcolor>-</shadowcolor>
<pagecontrol>61</pagecontrol>
</control>
<control type="scrollbar" id="61">
<posx>12r</posx>
<posx>60r</posx>
<posy>9-row</posy>
<height>8-row</height>
<height>7-row</height>
<ondown>8001</ondown>
</control>
</control>
<!--player controls-->
<control type="panel" id="8001">
<posx>60</posx>
<posy>766</posy>
<posx>24</posx>
<posy>row-20-begin</posy>
<width>10-col</width>
<height>2-row</height>
<itemgap>0</itemgap>
@ -265,13 +223,13 @@
</control>
<!--menu items-->
<control type="panel" id="8002">
<posx>0</posx>
<posy>24-row</posy>
<width>10-col</width>
<posx>24</posx>
<posy>row-23-begin</posy>
<width>9-col</width>
<height>12-row</height>
<itemgap>0</itemgap>
<onup>8001</onup>
<itemlayout width="5-col" height="2-row">
<itemlayout width="324" height="2-row">
<control type="label">
<posx>0</posx>
<posy>0</posy>
@ -286,7 +244,7 @@
<control type="label">
<posx>1-col-indent</posx>
<posy>0</posy>
<width>4-col-gutter</width>
<width>224</width>
<height>2-row</height>
<aligny>center</aligny>
<font>itemSubTitle</font>
@ -294,7 +252,7 @@
<label>$INFO[ListItem.label]</label>
</control>
</itemlayout>
<focusedlayout width="5-col" height="2-row">
<focusedlayout width="324" height="2-row">
<control type="image">
<posx>0</posx>
<posy>0</posy>
@ -307,7 +265,7 @@
<control type="image">
<posx>1-col</posx>
<posy>0</posy>
<width>4-col</width>
<width>252</width>
<height>2-row</height>
<aspectratio>stretch</aspectratio>
<texture>colors/white.png</texture>
@ -328,7 +286,7 @@
<control type="label">
<posx>1-col-indent</posx>
<posy>0</posy>
<width>4-col-gutter</width>
<width>224</width>
<height>2-row</height>
<aligny>center</aligny>
<font>itemSubTitle</font>

View File

@ -48,7 +48,7 @@
<control type="group">
<posx>col-1-begin</posx>
<posy>row-23-begin</posy>
<animation type="Conditional" condition="control.hasfocus(6789) | window.isactive(1105)">
<animation type="Conditional" condition="window.isactive(1105)">
<effect type="slide" start="0,0" end="0,500" tween="sine" time="400"/>
</animation>
<animation type="conditional" condition="!StringCompare(MusicPlayer.Time,00:00)">
@ -213,19 +213,8 @@
<posy>-100</posy>
<height>1-col</height>
<width>1-col</width>
<onup>noop</onup>
<ondown>6789</ondown>
<onleft>playercontrol(previous)</onleft>
<onright>playercontrol(next)</onright>
<onclick>activatewindow(1105)</onclick>
</control>
<control type="button" id="6789">
<posx>-100</posx>
<posy>-100</posy>
<height>1-col</height>
<width>1-col</width>
<onup>9876</onup>
<ondown>noop</ondown>
<onup>VolumeUp</onup>
<ondown>VolumeDown</ondown>
<onleft>playercontrol(previous)</onleft>
<onright>playercontrol(next)</onright>
<onclick>activatewindow(1105)</onclick>

View File

@ -327,28 +327,6 @@
<bordersize>6</bordersize>
<colordiffuse>overlay</colordiffuse>
</control>
<control type="label">
<posx>12</posx>
<posy>2-row</posy>
<width>360</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>regularStrong</font>
<textcolor>textDisabled</textcolor>
<label>$INFO[ListItem.tvshowtitle]</label>
</control>
<control type="label">
<posx>12</posx>
<posy>3-row</posy>
<width>360</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>buttonTitle</font>
<textcolor>textDisabled</textcolor>
<label>$INFO[ListItem.Season,$LOCALIZE[31011] , ]$INFO[ListItem.Episode,$LOCALIZE[31204] ,]</label>
</control>
<control type="image">
<posx>0</posx>
<posy>0</posy>
@ -360,6 +338,28 @@
<bordersize>6</bordersize>
<colordiffuse>ffffffff</colordiffuse>
</control>
<control type="label">
<posx>24</posx>
<posy>5-row</posy>
<width>336</width>
<height>2-row</height>
<aligny>center</aligny>
<font>buttonTitle</font>
<textcolor>textActive</textcolor>
<label>[B]$INFO[ListItem.tvshowtitle][/B]</label>
<shadowcolor>11FFFFFF</shadowcolor>
</control>
<control type="label">
<posx>24</posx>
<posy>6-row</posy>
<width>336</width>
<height>2-row</height>
<aligny>center</aligny>
<font>buttonTitle</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.Season,$LOCALIZE[31011] , ]$INFO[ListItem.Episode,$LOCALIZE[31204] ,]</label>
<shadowcolor>11FFFFFF</shadowcolor>
</control>
</itemlayout>
<focusedlayout width="420" height="312">
<control type="group">
@ -375,28 +375,6 @@
<bordersize>6</bordersize>
<colordiffuse>ffffffff</colordiffuse>
</control>
<control type="label">
<posx>12</posx>
<posy>2-row</posy>
<width>360</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>regularStrong</font>
<textcolor>textDisabled</textcolor>
<label>$INFO[ListItem.tvshowtitle]</label>
</control>
<control type="label">
<posx>12</posx>
<posy>3-row</posy>
<width>360</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>buttonTitle</font>
<textcolor>textDisabled</textcolor>
<label>$INFO[ListItem.Season,$LOCALIZE[31011] , ]$INFO[ListItem.Episode,$LOCALIZE[31204] ,]</label>
</control>
<control type="image">
<posx>0</posx>
<posy>0</posy>
@ -408,6 +386,28 @@
<bordersize>6</bordersize>
<colordiffuse>ffffffff</colordiffuse>
</control>
<control type="label">
<posx>24</posx>
<posy>5-row</posy>
<width>336</width>
<height>2-row</height>
<aligny>center</aligny>
<font>buttonTitle</font>
<textcolor>textActive</textcolor>
<label>[B]$INFO[ListItem.tvshowtitle][/B]</label>
<shadowcolor>11FFFFFF</shadowcolor>
</control>
<control type="label">
<posx>24</posx>
<posy>6-row</posy>
<width>336</width>
<height>2-row</height>
<aligny>center</aligny>
<font>buttonTitle</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.Season,$LOCALIZE[31011] , ]$INFO[ListItem.Episode,$LOCALIZE[31204] ,]</label>
<shadowcolor>11FFFFFF</shadowcolor>
</control>
</control>
</focusedlayout>
</control>

View File

@ -1,30 +1,18 @@
**Changelog**
[V1.2.3]
- [FIXED] Fullscreen music activation crash
- [FIXED] Fullscreen music activation could hang kodi in some cases
- [FIXED] Incorrect casing on some font calls (thanks BigNoid)
- [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 github tree
- [FIXED] Vignette on artist slideshow adjusted to increase brightness
- [FIXED] PVR Channel icon aspect ratio adjusted for wider support
- [FIXED] PVR Channel icon aspect ratio adjusted for wider icon 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??
- add tvshow icon to resume episodes
- up / down volume support for fullscreenmusic
- addons like cine / series catoal / k911 don't work??
- [NEW] up / down now controls volume in fullscreen musicview
- Various minor tweaks and fixes
[V1.2.2]
- [NEW] Hebrew Translation (thanks Eric P)