Skip to content

Commit

Permalink
Basic adjustments following changes to skinning engine
Browse files Browse the repository at this point in the history 
- remove hyphen as none value
- remove <onclick>noop</onclick> (not needed anymore)

DialogAddonSettings.xml
- change grouplist id="9" to id="3"
- change button id="13" to id="10"
- change grouplist id="2" to id="5"
- change button id="3" to id="7"
- change radio button id="4" to id="8"
- change spincontrolex id="5" to id="9"
- change image id="6" to id="11"
- add edit id="12"
- change sliderex id="8" to id="13"
- change label id="7" to id="14"
- change button id="10" to id="28"
- change button id="11" to id="29"
- change button id="12" to id="30"

- rename DialogPVRGuideOSD.xml to DialogPVRChannelGuide.xml
- replace infolabel ListItem.ChannelNumber by ListItem.ChannelNumberLabel
- replace infolabel VideoPlayer.ChannelNumber by VideoPlayer.ChannelNumberLabel
- replace duration labels by new duration variable
- replace IsEmpty() by String.IsEmpty()
- replace StringCompare() by String.IsEqual()
- replace IntegerGreaterThan() by Integer.IsGreater()
- add all/watched/unwatched toggle button to PVR recordings
- replace localize values under the skin settings section with new values (Background label)
- replace Player.Recording infolabel by PVR.IsRecordingPlayingChannel
- replace PlayerControl(Record) command by PVR.ToggleRecordPlayingChannel
- replace Player.CanRecord infolabel by PVR.CanRecordPlayingChannel
- replace Movies, TV Show and Music home menu links

- bump skin version to 18.0.0 and GUI version to 5.13.0
  • Loading branch information
@Ch1llb0
Ch1llb0 committed Apr 18, 2018
1 parent 355d0a6 commit a15b76d
Show file tree
Hide file tree
Showing 51 changed files with 470 additions and 528 deletions.
5 changes: 2 additions & 3 deletions 16x9/AddonBrowser.xml
View file
Expand Up @@ -108,8 +108,8 @@
<texturesliderbackground border="9,1,6,1">common/ScrollBackground.png</texturesliderbackground>
<texturesliderbar border="8,1,6,1">common/ScrollbarGripNF.png</texturesliderbar>
<texturesliderbarfocus border="8,1,6,1" colordiffuse="DialogColor1">common/ScrollbarGripFO.png</texturesliderbarfocus>
<textureslidernib>-</textureslidernib>
<textureslidernibfocus>-</textureslidernibfocus>
<textureslidernib></textureslidernib>
<textureslidernibfocus></textureslidernibfocus>
<visible>!Skin.HasSetting(Scrollbars) + Control.IsVisible(500)</visible>
</control>

Expand All @@ -134,7 +134,6 @@
<top>0</top>
<width>460</width>
<height>1080</height>
<onclick>noop</onclick>
</control>

<control type="image">
Expand Down
34 changes: 17 additions & 17 deletions 16x9/Defaults.xml
View file
Expand Up @@ -29,14 +29,14 @@
<align>left</align>
<aligny>center</aligny>
<font>Font33</font>
<label>-</label>
<label></label>
<textoffsetx>0</textoffsetx>
<textcolor>DialogColor2</textcolor>
<focusedcolor>DialogColor1</focusedcolor>
<invalidcolor>$VAR[DisabledColor]</invalidcolor>
<disabledcolor>$VAR[DisabledColor]</disabledcolor>
<texturefocus>-</texturefocus>
<texturenofocus>-</texturenofocus>
<texturefocus></texturefocus>
<texturenofocus></texturenofocus>
<pulseonselect>false</pulseonselect>
</default>

Expand All @@ -45,16 +45,16 @@
<height>66</height>
<align>left</align>
<aligny>center</aligny>
<label>-</label>
<label></label>
<textoffsetx>0</textoffsetx>
<font>Font33</font>
<textcolor>DialogColor2</textcolor>
<focusedcolor>DialogColor1</focusedcolor>
<disabledcolor>$VAR[DisabledColor]</disabledcolor>
<texturenofocus>-</texturenofocus>
<texturefocus>-</texturefocus>
<alttexturenofocus>-</alttexturenofocus>
<alttexturefocus>-</alttexturefocus>
<texturenofocus></texturenofocus>
<texturefocus></texturefocus>
<alttexturenofocus></alttexturenofocus>
<alttexturefocus></alttexturefocus>
<pulseonselect>false</pulseonselect>
</default>

Expand All @@ -64,14 +64,14 @@
<align>left</align>
<aligny>center</aligny>
<font>Font33</font>
<label>-</label>
<label></label>
<textcolor>DialogColor2</textcolor>
<focusedcolor>DialogColor1</focusedcolor>
<disabledcolor>DisabledColor</disabledcolor>
<radiowidth>16</radiowidth>
<radioheight>16</radioheight>
<texturenofocus>-</texturenofocus>
<texturefocus>-</texturefocus>
<texturenofocus></texturenofocus>
<texturefocus></texturefocus>
<textureradioonfocus colordiffuse="DialogColor1">common/RadioOn.png</textureradioonfocus>
<textureradioonnofocus colordiffuse="DialogColor1">common/RadioOn.png</textureradioonnofocus>
<textureradioofffocus colordiffuse="DialogColor1">common/RadioOff.png</textureradioofffocus>
Expand All @@ -85,7 +85,7 @@
<height>66</height>
<align>left</align>
<aligny>center</aligny>
<label>-</label>
<label></label>
<font>Font33</font>
<spinwidth>35</spinwidth>
<spinheight>66</spinheight>
Expand Down Expand Up @@ -150,10 +150,10 @@

<default type="progress">
<height>44</height>
<texturebg>-</texturebg>
<lefttexture>-</lefttexture>
<righttexture>-</righttexture>
<overlaytexture>-</overlaytexture>
<texturebg></texturebg>
<lefttexture></lefttexture>
<righttexture></righttexture>
<overlaytexture></overlaytexture>
</default>

<default type="textbox">
Expand All @@ -173,7 +173,7 @@
<focusedcolor>TextColor1</focusedcolor>
<disabledcolor>$VAR[DisabledColor]</disabledcolor>
<invalidcolor>$VAR[DisabledColor]</invalidcolor>
<texturefocus>-</texturefocus>
<texturefocus></texturefocus>
<pulseonselect>no</pulseonselect>
</default>

Expand Down
41 changes: 24 additions & 17 deletions 16x9/DialogAddonSettings.xml
View file
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<window>
<!-- addonsettings -->
<defaultcontrol always="true">9</defaultcontrol>
<defaultcontrol always="true">3</defaultcontrol>

<controls>
<!-- Window Background -->
Expand All @@ -18,34 +18,34 @@
</include>

<!-- Left grouplist -->
<control type="grouplist" id="9">
<control type="grouplist" id="3">
<left>150</left>
<top>228</top>
<width>360</width>
<height>660</height>
<itemgap>0</itemgap>
<onleft>noop</onleft>
<onright>2</onright>
<onright>5</onright>
<onup>noop</onup>
<ondown>9001</ondown>
<orientation>vertical</orientation>
<scrolltime tween="sine" easing="out">240</scrolltime>
</control>

<!-- Default button -->
<control type="button" id="13">
<control type="button" id="10">
<width>360</width>
<height>66</height>
</control>

<!-- Right grouplist -->
<control type="grouplist" id="2">
<control type="grouplist" id="5">
<left>600</left>
<top>228</top>
<width>1200</width>
<height>660</height>
<itemgap>0</itemgap>
<onleft>9</onleft>
<onleft>3</onleft>
<onright>9001</onright>
<onup>noop</onup>
<ondown>9001</ondown>
Expand All @@ -54,41 +54,48 @@
</control>

<!-- Default button -->
<control type="button" id="3">
<control type="button" id="7">
<width>1200</width>
<height>66</height>
</control>

<!-- Default radiobutton -->
<control type="radiobutton" id="4">
<control type="radiobutton" id="8">
<width>1200</width>
<height>66</height>
<textwidth>1120</textwidth>
</control>

<!-- Default spincontrolex -->
<control type="spincontrolex" id="5">
<control type="spincontrolex" id="9">
<width>1200</width>
<height>66</height>
<textwidth>1120</textwidth>
</control>

<!-- Default label -->
<control type="label" id="7">
<control type="label" id="14">
<width>1200</width>
<height>66</height>
<label>-</label>
<label></label>
</control>

<!-- Default seperator -->
<control type="image" id="6">
<control type="image" id="11">
<width>1200</width>
<height>20</height>
<texture border="1,12,1,1" colordiffuse="DialogOverlayColorNF">common/ScrollBackgroundHorizontal.png</texture>
</control>

<!-- Default edit -->
<control type="label" id="12">
<width>1200</width>
<height>66</height>
<label></label>
</control>

<!-- Default slider -->
<control type="sliderex" id="8">
<control type="sliderex" id="13">
<width>1200</width>
<height>66</height>
</control>
Expand All @@ -107,23 +114,23 @@
<orientation>horizontal</orientation>
<align>center</align>
<itemgap>30</itemgap>
<onup>9</onup>
<onup>3</onup>
<defaultcontrol>10</defaultcontrol>

<!-- OK Button -->
<control type="button" id="10">
<control type="button" id="28">
<width>auto</width>
<label>186</label>
</control>

<!-- Cancel Button -->
<control type="button" id="11">
<control type="button" id="29">
<width>auto</width>
<label>222</label>
</control>

<!-- Defaults Button -->
<control type="button" id="12">
<control type="button" id="30">
<width>auto</width>
<label>409</label>
</control>
Expand Down
12 changes: 6 additions & 6 deletions 16x9/DialogFullScreenInfo.xml
View file
Expand Up @@ -245,10 +245,10 @@
<height>20</height>
<info>Player.Progress</info>
<texturebg border="2" colordiffuse="DialogColor2">osd/OSDProgressBack.png</texturebg>
<lefttexture>-</lefttexture>
<lefttexture></lefttexture>
<midtexture border="2" colordiffuse="DialogColor1">osd/OSDProgressBar.png</midtexture>
<righttexture>-</righttexture>
<overlaytexture>-</overlaytexture>
<righttexture></righttexture>
<overlaytexture></overlaytexture>
</control>

<!-- Cache bar -->
Expand All @@ -259,10 +259,10 @@
<height>20</height>
<info>Player.ProgressCache</info>
<texturebg colordiffuse="DialogColor2" border="2">osd/OSDProgressBack.png</texturebg>
<lefttexture>-</lefttexture>
<lefttexture></lefttexture>
<midtexture colordiffuse="OSDCache" border="2">osd/OSDProgressBar.png</midtexture>
<righttexture>-</righttexture>
<overlaytexture>-</overlaytexture>
<righttexture></righttexture>
<overlaytexture></overlaytexture>
</control>

<!-- Current Time/End Time -->
Expand Down
6 changes: 3 additions & 3 deletions 16x9/DialogGameControllers.xml
View file
Expand Up @@ -60,7 +60,7 @@
<height>66</height>
<font>Font33</font>
<align>center</align>
<label>-</label>
<label></label>
<textcolor>TextColor1</textcolor>
</control>

Expand All @@ -70,7 +70,7 @@
<height>42</height>
<font>Font33</font>
<align>center</align>
<label>-</label>
<label></label>
<textcolor>TextColor2</textcolor>
</control>

Expand Down Expand Up @@ -143,7 +143,7 @@
<height>72</height>
<font>Font72</font>
<textcolor>DialogColor1</textcolor>
<label>-</label>
<label></label>
</control>
</control>

Expand Down
0 16x9/DialogPVRGuideOSD.xml → 16x9/DialogPVRChannelGuide.xml 100755 → 100644
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions 16x9/DialogPVRChannelsOSD.xml
View file
Expand Up @@ -87,7 +87,7 @@
<width>746</width>
<height>90</height>
<font>Font36</font>
<label>$INFO[ListItem.ChannelNumber]</label>
<label>$INFO[ListItem.ChannelNumberLabel]</label>
<align>right</align>
<textcolor>TextColor2</textcolor>
</control>
Expand Down Expand Up @@ -139,7 +139,7 @@
<width>746</width>
<height>90</height>
<font>Font36</font>
<label>$INFO[ListItem.ChannelNumber]</label>
<label>$INFO[ListItem.ChannelNumberLabel]</label>
<align>right</align>
<textcolor>TextColor1</textcolor>
</control>
Expand Down
12 changes: 6 additions & 6 deletions 16x9/DialogPVRGroupManager.xml
View file
Expand Up @@ -9,10 +9,10 @@

<!-- Hidden labels -->
<control type="label" id="21">
<font>-</font>
<font></font>
</control>
<control type="label" id="22">
<font>-</font>
<font></font>
</control>

<control type="group">
Expand Down Expand Up @@ -100,7 +100,7 @@
<control type="label">
<width>526</width>
<textcolor>DialogColor2</textcolor>
<label>$INFO[ListItem.ChannelNumber,(,) ]$INFO[ListItem.ChannelName]</label>
<label>$INFO[ListItem.ChannelNumberLabel,(,) ]$INFO[ListItem.ChannelName]</label>
</control>

</itemlayout>
Expand All @@ -109,7 +109,7 @@

<control type="label">
<width>526</width>
<label>$INFO[ListItem.ChannelNumber,(,) ]$INFO[ListItem.ChannelName]</label>
<label>$INFO[ListItem.ChannelNumberLabel,(,) ]$INFO[ListItem.ChannelName]</label>
<animation effect="fade" start="100" end="75" condition="!Control.HasFocus(11)">Conditional</animation>
</control>

Expand Down Expand Up @@ -146,7 +146,7 @@
<control type="label">
<width>526</width>
<textcolor>DialogColor2</textcolor>
<label>$INFO[ListItem.ChannelNumber,(,) ]$INFO[ListItem.ChannelName]</label>
<label>$INFO[ListItem.ChannelNumberLabel,(,) ]$INFO[ListItem.ChannelName]</label>
</control>

</itemlayout>
Expand All @@ -155,7 +155,7 @@

<control type="label">
<width>526</width>
<label>$INFO[ListItem.ChannelNumber,(,) ]$INFO[ListItem.ChannelName]</label>
<label>$INFO[ListItem.ChannelNumberLabel,(,) ]$INFO[ListItem.ChannelName]</label>
<animation effect="fade" start="100" end="75" condition="!Control.HasFocus(12)">Conditional</animation>
</control>

Expand Down

0 comments on commit a15b76d

Please sign in to comment.