This commit is contained in:
Chris Bevan 2017-02-28 19:45:10 +00:00
parent 19f675fd8d
commit ebda992cd5
12 changed files with 122 additions and 102 deletions

View File

@ -3,7 +3,7 @@
<defaultcontrol always="true">50</defaultcontrol>
<controls>
<include>globalBackground</include>
<control type="group">
<control type="group" id="9999">
<control type="group">
<posx>col-9-begin</posx>
<posy>row-9-begin</posy>
@ -37,7 +37,7 @@
<posy>73</posy>
<width>8-col</width>
<height>20-row</height>
<onleft>9000</onleft>
<onleft>activateWindow(1104)</onleft>
<ondown>50</ondown>
<onup>50</onup>
<itemgap>0</itemgap>
@ -180,7 +180,7 @@
<posy>73</posy>
<width>8-col</width>
<height>717</height>
<onleft>9000</onleft>
<onleft>activateWindow(1104)</onleft>
<onright>60</onright>
<ondown>50</ondown>
<onup>50</onup>
@ -336,71 +336,6 @@
</control>
</control>
</control>
<!-- Options menu-->
<control type="group">
<animation type="Conditional" condition="!controlgroup(9000).hasfocus">
<effect type="fade" start="100" end="0" time="300"/>
</animation>
<animation type="Conditional" condition="controlgroup(9000).hasfocus">
<effect type="fade" start="0" end="100" time="300"/>
</animation>
<control type="image">
<include>dimensionsFullscreen</include>
<texture>colors/black.png</texture>
<colordiffuse>ddFFFFFF</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
<control type="image">
<include>dimensionsFullscreen</include>
<texture>vignette.png</texture>
<colordiffuse>ffffffff</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
<!--options-->
<control type="grouplist" id="9000">
<posx>col-10-begin</posx>
<posy>8-row</posy>
<itemgap>0</itemgap>
<width>6-col</width>
<height>17-row</height>
<itemgap>0</itemgap>
<onleft>control.setfocus(50)</onleft>
<onright>control.setfocus(50)</onright>
<orientation>vertical</orientation>
<control type="radiobutton" id="7">
<width>6-col</width>
<texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
<focusedcolor>textActive</focusedcolor>
<textureradiofocus>-</textureradiofocus>
<textureradionofocus>-</textureradionofocus>
<radiowidth/>
<radioheight/>
<label>$LOCALIZE[25001]</label>
</control>
<control type="radiobutton" id="8">
<width>6-col</width>
<texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
<focusedcolor>textActive</focusedcolor>
<textureradiofocus>-</textureradiofocus>
<textureradionofocus>-</textureradionofocus>
<radiowidth/>
<radioheight/>
<label>$LOCALIZE[24999]</label>
</control>
<control type="button" id="5">
<texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
<focusedcolor>textActive</focusedcolor>
<width>6-col</width>
<label>10004</label>
</control>
<control type="button" id="9">
<texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
<focusedcolor>textActive</focusedcolor>
<width>6-col</width>
<label>24034</label>
</control>
</control>
</control>
<!--debugging-->
<include>DebugGrid</include>
<control type="label">

View File

@ -65,7 +65,7 @@
<align>center</align>
<font>regular</font>
<textcolor>textActive</textcolor>
<label>$INFO[weather.location] [B]$INFO[weather.temperature][/B] [LOWERCASE]$INFO[weather.conditions][/LOWERCASE]</label>
<label>$INFO[weather.location] [B]$INFO[weather.temperature][/B] [CAPITALIZE]$INFO[weather.conditions][/CAPITALIZE]</label>
</control>
</control>
<!--now playing music-->

View File

@ -182,4 +182,36 @@
<onclick>RunScript(script.skinshortcuts,type=manage&amp;group=picturessubmenu)</onclick>
</control>
</include>
<!--pictures submenu items-->
<include name="addonsSideMenu">
<control type="radiobutton" id="7">
<width>6-col</width>
<texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
<focusedcolor>textActive</focusedcolor>
<textureradiofocus>-</textureradiofocus>
<textureradionofocus>-</textureradionofocus>
<radiowidth/>
<radioheight/>
<label>$LOCALIZE[25001]</label>
<onclick>sendclick(addonbrowser,7)</onclick>
</control>
<control type="radiobutton" id="8">
<width>6-col</width>
<texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
<focusedcolor>textActive</focusedcolor>
<textureradiofocus>-</textureradiofocus>
<textureradionofocus>-</textureradionofocus>
<radiowidth/>
<radioheight/>
<label>$LOCALIZE[24999]</label>
<onclick>sendclick(addonbrowser,8)</onclick>
</control>
<control type="button" id="9">
<texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
<focusedcolor>textActive</focusedcolor>
<width>6-col</width>
<label>24034</label>
<onclick>sendclick(addonbrowser,9)</onclick>
</control>
</include>
</includes>

View File

@ -6,9 +6,30 @@
<control type="group">
<visible>Substring(container.folderpath,videodb://) + !isempty(container.folderpath) + container.content(episodes) + !Substring(Container.folderpath,plugin)</visible>
<posy>0</posy>
<posx>-966</posx>
<posx>0</posx>
<control type="image">
<include>dimensionsFullscreen</include>
<visible>!isempty(container.art(season.poster))</visible>
<posx>0</posx>
<posy>0</posy>
<width>960</width>
<height>1440</height>
<aspectratio scalediffuse="false">stretch</aspectratio>
<texture background="true" fallback="" border="0">$INFO[container.art(season.poster)]</texture>
<colordiffuse>ffffffff</colordiffuse>
<animation type="conditional" condition="!controlgroup(9000).hasfocus + !Skin.HasSetting(lowPowerMode)" loop="true" reversible="false">
<effect type="fade" start="0" end="100" time="2000"/>
<effect type="slide" start="0,0" end="0,-360" time="15000"/>
<effect type="fade" start="100" end="0" time="1000" delay="14000"/>
</animation>
</control>
<control type="image">
<visible>isempty(container.art(season.poster))</visible>
<posx>-966</posx>
<posy>0</posy>
<width>1920</width>
<height>1080</height>
<aspectratio scalediffuse="false">stretch</aspectratio>
<texture background="true" fallback="colors/black.png" border="0">$INFO[container.art(fanart)]</texture>
<colordiffuse>ffffffff</colordiffuse>

View File

@ -28,12 +28,12 @@
<onback>9000</onback>
<pagecontrol>60</pagecontrol>
<scrolltime tween="cubic" easing="out">600</scrolltime>
<itemlayout width="252" height="388">
<itemlayout width="252" height="426">
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>228</width>
<height>304</height>
<height>342</height>
<aspectratio>stretch</aspectratio>
<texture border="6">DefaultPoster.png</texture>
<bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture>
@ -42,7 +42,7 @@
</control>
<control type="label">
<posx>12</posx>
<posy>300</posy>
<posy>338</posy>
<width>204</width>
<height>1-row</height>
<aligny>center</aligny>
@ -52,7 +52,7 @@
</control>
<control type="label">
<posx>12</posx>
<posy>324</posy>
<posy>362</posy>
<width>204</width>
<height>1-row</height>
<aligny>center</aligny>
@ -64,7 +64,7 @@
<posx>0</posx>
<posy>0</posy>
<width>228</width>
<height>304</height>
<height>342</height>
<aspectratio>stretch</aspectratio>
<texture border="0">$INFO[ListItem.Art(poster)]</texture>
<bordertexture border="6" colordiffuse="11FFFFFF">colors/black.png</bordertexture>
@ -72,14 +72,14 @@
<colordiffuse>ffffffff</colordiffuse>
</control>
</itemlayout>
<focusedlayout width="252" height="388">
<focusedlayout width="252" height="426">
<control type="group">
<include>focusThumb</include>
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>228</width>
<height>304</height>
<height>342</height>
<aspectratio>stretch</aspectratio>
<texture fallback="DefaultPoster.png" border="0">$INFO[ListItem.Art(poster)]</texture>
<bordertexture border="6" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
@ -87,7 +87,7 @@
</control>
<control type="label">
<posx>12</posx>
<posy>300</posy>
<posy>338</posy>
<width>204</width>
<height>1-row</height>
<aligny>center</aligny>
@ -97,7 +97,7 @@
</control>
<control type="label">
<posx>12</posx>
<posy>324</posy>
<posy>362</posy>
<width>204</width>
<height>1-row</height>
<aligny>center</aligny>

View File

@ -28,12 +28,12 @@
<onback>9000</onback>
<pagecontrol>60</pagecontrol>
<scrolltime tween="cubic" easing="out">600</scrolltime>
<itemlayout width="252" height="388">
<itemlayout width="252" height="426">
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>228</width>
<height>304</height>
<height>342</height>
<aspectratio>stretch</aspectratio>
<texture border="6">DefaultPoster.png</texture>
<bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture>
@ -42,7 +42,7 @@
</control>
<control type="label">
<posx>12</posx>
<posy>300</posy>
<posy>338</posy>
<width>204</width>
<height>1-row</height>
<aligny>center</aligny>
@ -53,7 +53,7 @@
<control type="label">
<visible>!System.Setting(hidewatched)</visible>
<posx>12</posx>
<posy>324</posy>
<posy>362</posy>
<width>204</width>
<height>1-row</height>
<aligny>center</aligny>
@ -64,7 +64,7 @@
<control type="label">
<visible>System.Setting(hidewatched)</visible>
<posx>12</posx>
<posy>324</posy>
<posy>362</posy>
<width>204</width>
<height>1-row</height>
<aligny>center</aligny>
@ -76,7 +76,7 @@
<posx>0</posx>
<posy>0</posy>
<width>228</width>
<height>304</height>
<height>342</height>
<aspectratio>stretch</aspectratio>
<texture border="0">$INFO[ListItem.Art(poster)]</texture>
<bordertexture border="6" colordiffuse="11FFFFFF">colors/black.png</bordertexture>
@ -84,14 +84,14 @@
<colordiffuse>ffffffff</colordiffuse>
</control>
</itemlayout>
<focusedlayout width="252" height="388">
<focusedlayout width="252" height="426">
<control type="group">
<include>focusThumb</include>
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>228</width>
<height>304</height>
<height>342</height>
<aspectratio>stretch</aspectratio>
<texture fallback="DefaultPoster.png" border="0">$INFO[ListItem.Art(poster)]</texture>
<bordertexture border="6" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
@ -99,7 +99,7 @@
</control>
<control type="label">
<posx>12</posx>
<posy>300</posy>
<posy>338</posy>
<width>204</width>
<height>1-row</height>
<aligny>center</aligny>
@ -110,7 +110,7 @@
<control type="label">
<visible>!System.Setting(hidewatched)</visible>
<posx>12</posx>
<posy>324</posy>
<posy>362</posy>
<width>204</width>
<height>1-row</height>
<aligny>center</aligny>
@ -121,7 +121,7 @@
<control type="label">
<visible>System.Setting(hidewatched)</visible>
<posx>12</posx>
<posy>324</posy>
<posy>362</posy>
<width>204</width>
<height>1-row</height>
<aligny>center</aligny>

View File

@ -30,6 +30,7 @@
<include condition="[String.IsEqual(skin.string(recentitems),music) + Window.isactive(1106)] | Window.isactive(Music) | window.isactive(musicplaylist) | window.isactive(radiochannels)">musicSideMenu</include>
<include condition="window.isactive(pictures)">picturesSideMenu</include>
<include condition="window.isactive(home)">homeSideMenu</include>
<include condition="window.isactive(addonbrowser)">addonsSideMenu</include>
</control>
</control>
</control>

View File

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

View File

@ -59,13 +59,13 @@
<description>Artist</description>
<posx>1-col</posx>
<posy>0</posy>
<font>itemSubTitleCondensed</font>
<font>itemSubTitle</font>
<width>7-col-gutter</width>
<height>54</height>
<align>left</align>
<aligny>center</aligny>
<height>1-row</height>
<label>[B]$INFO[musicplayer.Artist,, ][/B]$INFO[MusicPlayer.Title]</label>
<label>$INFO[MusicPlayer.TimeRemaining] [B]$INFO[musicplayer.Artist,, ][/B]$INFO[MusicPlayer.Title]</label>
<scroll>true</scroll>
<textcolor>textActive</textcolor>
</control>

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<window type="dialog" id="1103">
<defaultcontrol always="true">9876</defaultcontrol>
<onunload>activateWindow(music)</onunload>
<onunload>control.setfocus(50)</onunload>
<onload condition="System.HasAddon(script.artistslideshow)">RunScript(script.artistslideshow)</onload>
<onunload>control.setfocus(9999)</onunload>
<controls>
<include>globalBackground</include>
<control type="group">
@ -13,6 +13,7 @@
</animation>
<!--fanart-->
<control type="image">
<visible>isempty(Window(Visualisation).Property(ArtistSlideshow))</visible>
<posx>0</posx>
<posy>0</posy>
<include>dimensionsFullscreen</include>
@ -21,6 +22,19 @@
<include>kenBurnsey</include>
<colordiffuse>44ffffff</colordiffuse>
</control>
<!--artist slideshow (if active)-->
<control type="multiimage">
<visible>!isempty(Window(Visualisation).Property(ArtistSlideshow))</visible>
<include>dimensionsFullscreen</include>
<aspectratio>scale</aspectratio>
<timeperimage>15000</timeperimage>
<randomize>true</randomize>
<fadetime>1000</fadetime>
<loop>yes</loop>
<imagepath>$INFO[Window(Visualisation).Property(ArtistSlideshow)]</imagepath>
<include>kenBurnsey</include>
<colordiffuse>44ffffff</colordiffuse>
</control>
<!--visualisation-->
<control type="visualisation" id="2">
<visible>!SlideShow.IsActive</visible>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon id="skin.pellucid" version="1.1.0" name="Pellucid" provider-name="theDeadman">
<addon id="skin.pellucid" version="1.1.1" name="Pellucid" provider-name="theDeadman">
<requires>
<import addon="xbmc.gui" version="5.12.0"/>
<import addon="script.skinshortcuts" version="1.0.13"/>

View File

@ -1,5 +1,19 @@
**Changelog**
[V1.1.1]
- [FIXED] Aspect ratio incorrect in poster view (thanks wiiija)
- [NEW] Artist slideshow support
- [NEW] Polish translation (thanks Etharr)
- [FIXED] Context menu onback handling in addons (thanks Solbero)
- [FIXED] onback from music visualisation screen
[SKINNERS NOTES]
- CANT BE FIXED?? Check content is present before assigning view (DoggZipp bug)
- allow poster view for plugin / plex sourced movies
- expand image handling where possible
[V1.1.0]
- Various tweaks and GUI updates.
- [NEW] Additional user options for menu customisation added to skin settings
@ -32,7 +46,3 @@
- [REMOVED] Unused images
- Minor fixes and bug squashing (thanks Ronie!)
[SKINNERS NOTES]
- CANT BE FIXED: Check content is present before assigning view (DoggZipp bug)
- consider poster view for plugin / plex sourced movies
- expand image handling