supersonic/skin.tributary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[skin.confluence] v3.1.0

Browse Source 
- Fixed 'Paused' condition
- Restored view mode/sizing info
- More space for epg label
- Fixed recording icon size
This commit is contained in:
Kevin Goffe 2017-05-17 15:12:34 +01:00
parent ed71dbe0ff
commit 8646c4e33f
7 changed files with 75 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
720p/DialogPVRGuideOSD.xml
View File

@ -90,7 +90,7 @@
<control type="label"> <control type="label">
<left>10</left> <left>10</left>
<top>0</top> <top>0</top>
<width>100</width> <width>50</width>
<height>30</height> <height>30</height>
<font>font13</font> <font>font13</font>
<textcolor>grey2</textcolor> <textcolor>grey2</textcolor>
@ -100,21 +100,21 @@
<label>$INFO[ListItem.StartTime]</label> <label>$INFO[ListItem.StartTime]</label>
</control> </control>
<control type="image"> <control type="image">
<left>120</left> <left>70</left>
<top>7</top> <top>7</top>
<width>16</width> <width>16</width>
<height>16</height> <height>16</height>
<texture>$VAR[PVRTimerIcon]</texture> <texture>$VAR[PVRTimerIcon]</texture>
</control> </control>
<control type="label"> <control type="label">
<left>150</left> <left>86</left>
<top>0</top> <top>0</top>
<width>250</width> <width>314</width>
<height>30</height> <height>30</height>
<font>font12</font> <font>font12</font>
<textcolor>grey2</textcolor> <textcolor>grey2</textcolor>
<selectedcolor>selected</selectedcolor> <selectedcolor>selected</selectedcolor>
<align>right</align> <align>left</align>
<aligny>center</aligny> <aligny>center</aligny>
<label>$INFO[ListItem.Label]</label> <label>$INFO[ListItem.Label]</label>
</control> </control>
@ -141,7 +141,7 @@
<control type="label"> <control type="label">
<left>10</left> <left>10</left>
<top>0</top> <top>0</top>
<width>100</width> <width>50</width>
<height>30</height> <height>30</height>
<font>font13</font> <font>font13</font>
<textcolor>grey2</textcolor> <textcolor>grey2</textcolor>
@ -151,21 +151,21 @@
<label>$INFO[ListItem.StartTime]</label> <label>$INFO[ListItem.StartTime]</label>
</control> </control>
<control type="image"> <control type="image">
<left>120</left> <left>70</left>
<top>7</top> <top>7</top>
<width>16</width> <width>16</width>
<height>16</height> <height>16</height>
<texture>$VAR[PVRTimerIcon]</texture> <texture>$VAR[PVRTimerIcon]</texture>
</control> </control>
<control type="label"> <control type="label">
<left>150</left> <left>86</left>
<top>0</top> <top>0</top>
<width>250</width> <width>314</width>
<height>30</height> <height>30</height>
<font>font12</font> <font>font12</font>
<textcolor>grey2</textcolor> <textcolor>grey2</textcolor>
<selectedcolor>selected</selectedcolor> <selectedcolor>selected</selectedcolor>
<align>right</align> <align>left</align>
<aligny>center</aligny> <aligny>center</aligny>
<label>$INFO[ListItem.Label]</label> <label>$INFO[ListItem.Label]</label>
</control> </control>

6
720p/Home.xml
View File

@ -802,7 +802,7 @@
<include>HomeSubMenuCommonValues</include> <include>HomeSubMenuCommonValues</include>
<onleft>9016</onleft> <onleft>9016</onleft>
<onright>9016</onright> <onright>9016</onright>
<visible>Container(9000).HasFocus(10)</visible> <visible>Container(9000).HasFocus(10) + !String.IsEmpty(Container(90160).ListItemNoWrap(0).Label)</visible>
<!-- Buttons for the grouplist --> <!-- Buttons for the grouplist -->
<include>HomeSubMenuMovies</include> <include>HomeSubMenuMovies</include>
</control> </control>
@ -810,7 +810,7 @@
<include>HomeSubMenuCommonValues</include> <include>HomeSubMenuCommonValues</include>
<onleft>9017</onleft> <onleft>9017</onleft>
<onright>9017</onright> <onright>9017</onright>
<visible>Container(9000).HasFocus(11)</visible> <visible>Container(9000).HasFocus(11) + !String.IsEmpty(Container(90170).ListItemNoWrap(0).Label)</visible>
<!-- Buttons for the grouplist --> <!-- Buttons for the grouplist -->
<include>HomeSubMenuTVShows</include> <include>HomeSubMenuTVShows</include>
</control> </control>
@ -818,7 +818,7 @@
<include>HomeSubMenuCommonValues</include> <include>HomeSubMenuCommonValues</include>
<onleft>9011</onleft> <onleft>9011</onleft>
<onright>9011</onright> <onright>9011</onright>
<visible>Container(9000).HasFocus(3)</visible> <visible>Container(9000).HasFocus(3) + !String.IsEmpty(Container(90110).ListItemNoWrap(0).Label)</visible>
<!-- Buttons for the grouplist --> <!-- Buttons for the grouplist -->
<include>HomeSubMenuMusic</include> <include>HomeSubMenuMusic</include>
</control> </control>

2
720p/Includes.xml
View File

@ -106,7 +106,7 @@
<value condition="Player.IsTempo + String.StartsWith(Player.PlaySpeed,0.)">$LOCALIZE[31045]</value> <value condition="Player.IsTempo + String.StartsWith(Player.PlaySpeed,0.)">$LOCALIZE[31045]</value>
<value condition="Player.IsTempo + String.StartsWith(Player.PlaySpeed,1.)">$LOCALIZE[31044]</value> <value condition="Player.IsTempo + String.StartsWith(Player.PlaySpeed,1.)">$LOCALIZE[31044]</value>
<value condition="Player.Playing + !Player.Seeking + !Player.DisplayAfterSeek">$LOCALIZE[31042]</value> <value condition="Player.Playing + !Player.Seeking + !Player.DisplayAfterSeek">$LOCALIZE[31042]</value>
<value condition="[Player.Paused + !Player.Caching] + !Player.Seeking + !Player.DisplayAfterSeek">$LOCALIZE[31043]</value> <value condition="[Player.Paused + !Player.Caching] + !Player.Seeking">$LOCALIZE[31043]</value>
<value condition="[Player.Paused + Player.Caching] + !Player.Seeking">$LOCALIZE[15107] $INFO[Player.CacheLevel]%</value> <value condition="[Player.Paused + Player.Caching] + !Player.Seeking">$LOCALIZE[15107] $INFO[Player.CacheLevel]%</value>
<value condition="!String.IsEmpty(Player.SeekStepSize) + ![player.forwarding | player.rewinding]">$LOCALIZE[31046][COLOR=grey] $INFO[Player.SeekStepSize][/COLOR]</value> <value condition="!String.IsEmpty(Player.SeekStepSize) + ![player.forwarding | player.rewinding]">$LOCALIZE[31046][COLOR=grey] $INFO[Player.SeekStepSize][/COLOR]</value>
<value condition="Player.DisplayAfterSeek + ![player.forwarding | player.rewinding]">$LOCALIZE[31046][COLOR=grey] $INFO[Player.SeekOffset][/COLOR]</value> <value condition="Player.DisplayAfterSeek + ![player.forwarding | player.rewinding]">$LOCALIZE[31046][COLOR=grey] $INFO[Player.SeekOffset][/COLOR]</value>

31
720p/MyPVRChannels.xml
View File

@ -71,7 +71,6 @@
<texturefocus border="3">VideoWindowFO.png</texturefocus> <texturefocus border="3">VideoWindowFO.png</texturefocus>
<texturenofocus>-</texturenofocus> <texturenofocus>-</texturenofocus>
<font>-</font> <font>-</font>
<pulseonselect>no</pulseonselect>
<onleft>70</onleft> <onleft>70</onleft>
<onclick>Fullscreen</onclick> <onclick>Fullscreen</onclick>
<visible>Player.HasVideo</visible> <visible>Player.HasVideo</visible>
@ -93,28 +92,6 @@
<visible>Player.HasVideo</visible> <visible>Player.HasVideo</visible>
<animation effect="slide" start="0,0" end="-2000,0" time="0">WindowClose</animation> <animation effect="slide" start="0,0" end="-2000,0" time="0">WindowClose</animation>
</control> </control>
<control type="image">
<left>1</left>
<top>1</top>
<width>688</width>
<height>35</height>
<texture>black-back.png</texture>
<colordiffuse>DDFFFFFF</colordiffuse>
<visible>Player.HasVideo</visible>
</control>
<control type="label">
<description>Current Video label</description>
<left>30</left>
<top>1</top>
<width>650</width>
<height>35</height>
<font>font12</font>
<textcolor>grey2</textcolor>
<align>center</align>
<aligny>center</aligny>
<label>$INFO[Player.Title]</label>
<visible>Player.HasVideo</visible>
</control>
</control> </control>
<control type="group"> <control type="group">
<include>Window_OpenClose_Animation</include> <include>Window_OpenClose_Animation</include>
@ -291,8 +268,8 @@
<control type="image"> <control type="image">
<left>5</left> <left>5</left>
<top>37</top> <top>37</top>
<width>30</width> <width>16</width>
<height>20</height> <height>16</height>
<texture>PVR-IsRecording.png</texture> <texture>PVR-IsRecording.png</texture>
<visible>ListItem.IsRecording</visible> <visible>ListItem.IsRecording</visible>
</control> </control>
@ -387,8 +364,8 @@
<control type="image"> <control type="image">
<left>5</left> <left>5</left>
<top>37</top> <top>37</top>
<width>30</width> <width>16</width>
<height>20</height> <height>16</height>
<texture>PVR-IsRecording.png</texture> <texture>PVR-IsRecording.png</texture>
<visible>ListItem.IsRecording</visible> <visible>ListItem.IsRecording</visible>
</control> </control>

48
720p/VideoFullScreen.xml
View File

@ -2,6 +2,54 @@
<window> <window>
<defaultcontrol>-</defaultcontrol> <defaultcontrol>-</defaultcontrol>
<controls> <controls>
<!-- view mode, sizing, screen resolution -->
<control type="group" id="0">
<depth>DepthOSD+</depth>
<left>0</left>
<top>20</top>
<animation effect="fade" time="150">VisibleChange</animation>
<control type="image">
<description>media info background image</description>
<left>0</left>
<top>0</top>
<width>1280</width>
<height>160</height>
<texture>black-back.png</texture>
</control>
<control type="label" id="10">
<description>row 1 label</description>
<left>50</left>
<top>10</top>
<width>1180</width>
<height>30</height>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<label>-</label>
</control>
<control type="label" id="11">
<description>row 2 label</description>
<left>50</left>
<top>55</top>
<width>1180</width>
<height>30</height>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<label>-</label>
</control>
<control type="label" id="12">
<description>row 3 label</description>
<left>50</left>
<top>100</top>
<width>1180</width>
<height>45</height>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<label>-</label>
</control>
</control>
<!-- media infos --> <!-- media infos -->
<control type="group" id="1"> <control type="group" id="1">
<depth>DepthOSD</depth> <depth>DepthOSD</depth>

2
addon.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<addon id="skin.confluence" version="3.0.39" name="Confluence" provider-name="Jezz_X, Team Kodi"> <addon id="skin.confluence" version="3.1.0" name="Confluence" provider-name="Jezz_X, Team Kodi">
<requires> <requires>
<import addon="xbmc.gui" version="5.12.0"/> <import addon="xbmc.gui" version="5.12.0"/>
</requires> </requires>

9
changelog.txt
View File

@ -1,3 +1,10 @@
[B]3.1.0[/B]
- Fixed 'Paused' condition
- Restored view mode/sizing info
- More space for epg label
- Fixed recording icon size
[B]3.0.39[/B] [B]3.0.39[/B]
- Fixed home Weather item - Fixed home Weather item
@ -6,7 +13,7 @@
[B]3.0.38[/B] [B]3.0.38[/B]
- Fix using DeafultUser.png added in v3.0.6 and remove unknown-user.png - Fix using DefaultUser.png added in v3.0.6 and remove unknown-user.png
[B]3.0.36[/B] [B]3.0.36[/B]