Skip to content

Commit

Permalink
Merge pull request #95 from AlwinEsch/fix-skin
Browse files Browse the repository at this point in the history
Fix skins
  • Loading branch information
AlwinEsch committed Dec 15, 2016
2 parents a98d1c0 + ba5a1b3 commit 3efe868
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 21 deletions.
16 changes: 7 additions & 9 deletions pvr.vdr.vnsi/resources/skins/skin.aeon.nox.5/1080i/Admin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<textoffsety>-4</textoffsety>
<label>Controlling OSD - press info to exit</label>
<label>$ADDON[pvr.vdr.vnsi 30103]</label>
<visible>StringCompare(Window.Property(menu),osd) +
<visible>String.IsEqual(Window.Property(menu),osd) +
ControlGroup(12).HasFocus()</visible>
</control>
<control type="group">
Expand All @@ -32,8 +32,8 @@
<width>356</width>
<height>720</height>
<onleft>61</onleft>
<onright condition="!StringCompare(Window.Property(menu),channels)">11</onright>
<onright condition="StringCompare(Window.Property(menu),channels)">38</onright>
<onright condition="!String.IsEqual(Window.Property(menu),channels)">11</onright>
<onright condition="String.IsEqual(Window.Property(menu),channels)">38</onright>
<onup>10</onup>
<ondown>10</ondown>
<pagecontrol>61</pagecontrol>
Expand All @@ -46,7 +46,6 @@
<texture border="1">separator2.png</texture>
</control>
<control type="label">
<posx>356</posx>
<posy>0</posy>
<width>356</width>
<height>90</height>
Expand Down Expand Up @@ -81,7 +80,6 @@
<include>VisibleFadeEffect</include>
</control>
<control type="label">
<posx>356</posx>
<posy>0</posy>
<width>356</width>
<height>90</height>
Expand Down Expand Up @@ -157,7 +155,7 @@
<onright>60</onright>
<onup>12</onup>
<ondown>12</ondown>
<visible>StringCompare(Window.Property(menu),osd)</visible>
<visible>String.IsEqual(Window.Property(menu),osd)</visible>
<control type="button" id="13">
<description>osd control label</description>
<width>1316</width>
Expand Down Expand Up @@ -192,7 +190,7 @@
<onright>60</onright>
<onup>20</onup>
<ondown>20</ondown>
<visible>StringCompare(Window.Property(menu),setup)</visible>
<visible>String.IsEqual(Window.Property(menu),setup)</visible>
<include>SettingsFadeEffect</include>
<control type="spincontrolex" id="21">
<description>Source Type</description>
Expand Down Expand Up @@ -254,7 +252,7 @@
</control>
<control type="group" id="30">
<include>SettingsFadeEffect</include>
<visible>StringCompare(Window.Property(menu),channels)</visible>
<visible>String.IsEqual(Window.Property(menu),channels)</visible>
<control type="radiobutton" id="31">
<description>Channels label</description>
<posx>522</posx>
Expand All @@ -270,7 +268,7 @@
<texturenofocus border="1">separator5.png
</texturenofocus>
<label>$ADDON[pvr.vdr.vnsi 30111]</label>
<selected>StringCompare(Window.Property(IsDirty),1)</selected>
<selected>String.IsEqual(Window.Property(IsDirty),1)</selected>
</control>
<control type="grouplist" id ="38">
<description>control area</description>
Expand Down
10 changes: 5 additions & 5 deletions pvr.vdr.vnsi/resources/skins/skin.aeon.nox/1080i/Admin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
<texture>GlassTitleBar.png</texture>
</control>
<control type="group" id="12">
<visible>StringCompare(Window.Property(menu),osd)</visible>
<visible>String.IsEqual(Window.Property(menu),osd)</visible>
<control type="button" id="13">
<description>osd control label</description>
<posx>25</posx>
Expand All @@ -134,7 +134,7 @@
</control>
</control>
<control type="group" id="20">
<visible>StringCompare(Window.Property(menu),setup)</visible>
<visible>String.IsEqual(Window.Property(menu),setup)</visible>
<defaultcontrol always="true">21</defaultcontrol>
<control type="spincontrolex" id="21">
<description>Source Type</description>
Expand Down Expand Up @@ -190,7 +190,7 @@
</control>
</control>
<control type="group" id="30">
<visible>StringCompare(Window.Property(menu),channels)</visible>
<visible>String.IsEqual(Window.Property(menu),channels)</visible>
<defaultcontrol always="true">33</defaultcontrol>
<control type="label" id="31">
<description>Channels label</description>
Expand All @@ -213,7 +213,7 @@
<aspectratio>stretch</aspectratio>
<colordiffuse>FFCC0000</colordiffuse>
<texture>views/scrollbarnub-focus.png</texture>
<visible>StringCompare(Window.Property(IsDirty),1)</visible>
<visible>String.IsEqual(Window.Property(IsDirty),1)</visible>
</control>
<control type="image">
<posx>1090</posx>
Expand All @@ -223,7 +223,7 @@
<aspectratio>stretch</aspectratio>
<colordiffuse>FF00FF00</colordiffuse>
<texture>views/scrollbarnub-focus.png</texture>
<visible>!StringCompare(Window.Property(IsDirty),1)</visible>
<visible>!String.IsEqual(Window.Property(IsDirty),1)</visible>
</control>
<control type="radiobutton" id="32">
<description>Is Radio</description>
Expand Down
10 changes: 5 additions & 5 deletions pvr.vdr.vnsi/resources/skins/skin.confluence/720p/Admin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
<texture>GlassTitleBar.png</texture>
</control>
<control type="group" id="12">
<visible>StringCompare(Window.Property(menu),osd)</visible>
<visible>String.IsEqual(Window.Property(menu),osd)</visible>
<control type="button" id="13">
<description>osd control label</description>
<left>25</left>
Expand All @@ -186,7 +186,7 @@
</control>
</control>
<control type="group" id="20">
<visible>StringCompare(Window.Property(menu),setup)</visible>
<visible>String.IsEqual(Window.Property(menu),setup)</visible>
<defaultcontrol always="true">21</defaultcontrol>
<control type="spincontrolex" id="21">
<description>Source Type</description>
Expand Down Expand Up @@ -239,7 +239,7 @@
</control>
</control>
<control type="group" id="30">
<visible>StringCompare(Window.Property(menu),channels)</visible>
<visible>String.IsEqual(Window.Property(menu),channels)</visible>
<defaultcontrol always="true">33</defaultcontrol>
<control type="label" id="31">
<description>Channels label</description>
Expand All @@ -262,7 +262,7 @@
<aspectratio>stretch</aspectratio>
<colordiffuse>FFCC0000</colordiffuse>
<texture>radiobutton-nofocus.png</texture>
<visible>StringCompare(Window.Property(IsDirty),1)</visible>
<visible>String.IsEqual(Window.Property(IsDirty),1)</visible>
</control>
<control type="image">
<left>730</left>
Expand All @@ -272,7 +272,7 @@
<aspectratio>stretch</aspectratio>
<colordiffuse>FF00FF00</colordiffuse>
<texture>radiobutton-nofocus.png</texture>
<visible>!StringCompare(Window.Property(IsDirty),1)</visible>
<visible>!String.IsEqual(Window.Property(IsDirty),1)</visible>
</control>
<control type="radiobutton" id="32">
<description>Is Radio</description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
<height>40</height>
<colordiffuse>FFCC0000</colordiffuse>
<texture>overlays/circle.png</texture>
<visible>StringCompare(Window.Property(IsDirty),1)</visible>
<visible>String.IsEqual(Window.Property(IsDirty),1)</visible>
</control>
<control type="image">
<left>1550</left>
Expand All @@ -135,7 +135,7 @@
<height>40</height>
<colordiffuse>FF00FF00</colordiffuse>
<texture>overlays/circle.png</texture>
<visible>!StringCompare(Window.Property(IsDirty),1)</visible>
<visible>!String.IsEqual(Window.Property(IsDirty),1)</visible>
</control>
<control type="grouplist" id="200">
<left>442</left>
Expand Down

0 comments on commit 3efe868

Please sign in to comment.