This commit is contained in:
Chris Bevan 2015-12-10 20:55:39 +00:00
parent 3deb6ab654
commit 7043e5ce56
6 changed files with 3387 additions and 195 deletions

View File

@ -50,37 +50,17 @@
<textcolor>textActive</textcolor> <textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor> <shadowcolor>-</shadowcolor>
</control> </control>
<!--settings level button-->
<control type="grouplist">
<posx>9-col</posx>
<posy>0</posy>
<orientation>horizontal</orientation>
<control type="label">
<width>auto</width>
<height>2-row</height>
<font>smallStrong</font>
<aligny>center</aligny>
<label>$LOCALIZE[31126]:</label>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
</control>
<control type="button" id="20">
<align>left</align>
<height>2-row</height>
<width>2-col</width>
<font>smallStrong</font>
<label>$LOCALIZE[10037]</label>
<textcolor>textActive</textcolor>
<focusedcolor>textActive</focusedcolor>
<texturefocus colordiffuse="22FFFFFF">colors/black.png</texturefocus>
<texturenofocus>-</texturenofocus>
<textoffsetx>12</textoffsetx>
<textoffsety>0</textoffsety>
<onclick>SettingsLevelChange</onclick>
<ondown>5</ondown>
</control>
</control>
<!--Category submenu--> <!--Category submenu-->
<control type="button" id="1234">
<posx>0</posx>
<posy>18-row</posy>
<font>smallStrong</font>
<texturenofocus colordiffuse="11FFFFFF">colors/black.png</texturenofocus>
<label>[B][COLOR $INFO[skin.string(highlightColor)]]$LOCALIZE[31025]:[/COLOR][/B] $INFO[control.getlabel(20)]</label>
<onclick>SettingsLevelChange</onclick>
<onup>3</onup>
<onright>5</onright>
</control>
<control type="grouplist" id="3"> <control type="grouplist" id="3">
<posx>0</posx> <posx>0</posx>
<posy>2-row</posy> <posy>2-row</posy>
@ -89,7 +69,8 @@
<height>18-row</height> <height>18-row</height>
<onleft>9000</onleft> <onleft>9000</onleft>
<onright>5</onright> <onright>5</onright>
<onup>20</onup> <onup>1234</onup>
<ondown>1234</ondown>
<orientation>vertical</orientation> <orientation>vertical</orientation>
</control> </control>
<!--options--> <!--options-->
@ -144,6 +125,10 @@
<font>buttonTitle</font> <font>buttonTitle</font>
<texturenofocus>-</texturenofocus> <texturenofocus>-</texturenofocus>
</control> </control>
<control type="button" id="20">
<visible>false</visible>
<description>Change settings level</description>
</control>
</control> </control>
<!--debugging--> <!--debugging-->
<include>DebugGrid</include> <include>DebugGrid</include>

View File

@ -49,7 +49,7 @@
<height>24-row</height> <height>24-row</height>
<itemgap>0</itemgap> <itemgap>0</itemgap>
<ondown>5000</ondown> <ondown>5000</ondown>
<onright>dialog.close(1100)</onright> <onright>dialog.close(all,true)</onright>
<!--select a video addon--> <!--select a video addon-->
<control type="button" id="6001"> <control type="button" id="6001">
<visible>stringcompare(skin.string(menuItemTypeFilter),video)</visible> <visible>stringcompare(skin.string(menuItemTypeFilter),video)</visible>

View File

@ -2,7 +2,6 @@
<window> <window>
<defaultcontrol always="true">3110</defaultcontrol> <defaultcontrol always="true">3110</defaultcontrol>
<controls> <controls>
<!-- background panel --> <!-- background panel -->
<control type="image"> <control type="image">
<include>dimensionsFullscreen</include> <include>dimensionsFullscreen</include>
@ -11,26 +10,23 @@
<animation effect="fade" reversible="false" end="95" time="0" condition="true">Conditional</animation> <animation effect="fade" reversible="false" end="95" time="0" condition="true">Conditional</animation>
<colordiffuse>FF1b1b1b</colordiffuse> <colordiffuse>FF1b1b1b</colordiffuse>
</control> </control>
<!--sample test screen--> <!--sample test screen-->
<control type="group"> <control type="group">
<posx>col-14-begin</posx> <posx>0</posx>
<posy>row-4-begin</posy> <posy>0</posy>
<control type="image"> <control type="image">
<posx>0</posx> <include>dimensionsFullscreen</include>
<posy>0</posy> <texture>colors/black.png</texture>
<width>10-col</width>
<height>405</height>
<texture>$INFO[Window(Home).Property(SkinHelper.AllMoviesBackground)]</texture>
<colordiffuse>FFffffff</colordiffuse> <colordiffuse>FFffffff</colordiffuse>
</control>
<control type="image">
<include>dimensionsFullscreen</include>
<texture>$INFO[Window(Home).Property(SkinHelper.AllMoviesBackground)]</texture>
<colordiffuse>22ffffff</colordiffuse>
<aspectratio>stretch</aspectratio> <aspectratio>stretch</aspectratio>
</control> </control>
<control type="image"> <control type="image">
<posx>0</posx> <include>dimensionsFullscreen</include>
<posy>0</posy>
<width>10-col</width>
<height>405</height>
<texture>vignette.png</texture> <texture>vignette.png</texture>
<colordiffuse>ffffffff</colordiffuse> <colordiffuse>ffffffff</colordiffuse>
<aspectratio>stretch</aspectratio> <aspectratio>stretch</aspectratio>
@ -38,70 +34,91 @@
<control type="image"> <control type="image">
<posx>0</posx> <posx>0</posx>
<posy>0</posy> <posy>0</posy>
<width>col-2-begin</width> <width>col-7-begin</width>
<height>405</height> <height>fullscreenHeight</height>
<texture>colors/white.png</texture> <texture>colors/white.png</texture>
<colordiffuse>$INFO[Window.Property(colorstring)]</colordiffuse> <colordiffuse>$INFO[Window.Property(colorstring)]</colordiffuse>
<aspectratio>stretch</aspectratio> <aspectratio>stretch</aspectratio>
</control> </control>
<include>dateTime</include>
<control type="label">
<posx>col-1-begin</posx>
<posy>row-1-begin</posy>
<width>1-col</width>
<height>1-col</height>
<font>symbolVeryLarge</font>
<aligny>center</aligny>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
<label></label>
</control>
<control type="list" id="9001">
<enabled>false</enabled>
<posx>0</posx>
<posy>row-6-begin</posy>
<width>8-col</width>
<height>24-row</height>
<orientation>vertical</orientation>
<onleft>9002</onleft>
<onright>9999</onright>
<onback>activateWindow(home)</onback>
<itemlayout width="col-7-begin" height="2-row">
<control type="label">
<posx>col-1-begin</posx>
<posy>0</posy>
<width>7-col</width>
<height>2-row</height>
<font>menuTitle</font>
<aligny>center</aligny>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
<label>$INFO[ListItem.label]</label>
</control>
</itemlayout>
<focusedlayout width="col-7-begin" height="2-row">
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>col-7-begin</width>
<height>2-row</height>
<texture>colors/white.png</texture>
<colordiffuse>textActive</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
<control type="label">
<posx>col-1-begin</posx>
<posy>0</posy>
<width>8-col</width>
<height>2-row</height>
<font>menuTitle</font>
<aligny>center</aligny>
<textcolor>$INFO[Window.Property(colorstring)]</textcolor>
<shadowcolor>-</shadowcolor>
<label>$INFO[ListItem.label]</label>
</control>
</focusedlayout>
<include>videoMenu</include>
</control>
</control> </control>
<!-- Color picker panel --> <!-- Color picker panel -->
<control type="panel" id="3110"> <control type="panel" id="3110">
<posx>col-1-begin</posx> <posx>col-10-begin</posx>
<posy>row-2-begin</posy> <posy>row-10-begin</posy>
<width>12-col</width> <width>12-col</width>
<height>25-row</height> <height>25-row</height>
<orientation>vertical</orientation> <orientation>vertical</orientation>
<onleft>3110</onleft> <onleft>3110</onleft>
<onright>3110</onright> <onright>3110</onright>
<onup>3030</onup> <onup>3012</onup>
<ondown>3010</ondown> <ondown>3012</ondown>
<itemlayout height="36" width="36">
<itemlayout height="36" width="36" condition="!StringCompare(Window.Property(palettename),basic) + !StringCompare(Window.Property(palettename),material-design)">
<control type="image"> <control type="image">
<width>92%</width> <width>92%</width>
<height>92%</height> <height>92%</height>
<texture border="5">$INFO[ListItem.Icon]</texture> <texture border="5">$INFO[ListItem.Icon]</texture>
</control> </control>
</itemlayout> </itemlayout>
<focusedlayout height="36" width="36" condition="!StringCompare(Window.Property(palettename),basic) + !StringCompare(Window.Property(palettename),material-design)"> <focusedlayout height="36" width="36">
<control type="group">
<animation effect="zoom" time="200" tween="sine" easing="inout" start="100" end="300" center="auto">Focus</animation>
<control type="image">
<width>92%</width>
<height>92%</height>
<texture border="5">$INFO[ListItem.Icon]</texture>
</control>
</control>
</focusedlayout>
<itemlayout height="36" width="36" condition="StringCompare(Window.Property(palettename),basic)">
<control type="image">
<width>92%</width>
<height>92%</height>
<texture border="5">$INFO[ListItem.Icon]</texture>
</control>
</itemlayout>
<focusedlayout height="36" width="36" condition="StringCompare(Window.Property(palettename),basic)">
<control type="group">
<animation effect="zoom" time="200" tween="sine" easing="inout" start="100" end="164" center="auto">Focus</animation>
<control type="image">
<width>92%</width>
<height>92%</height>
<texture border="5">$INFO[ListItem.Icon]</texture>
</control>
</control>
</focusedlayout>
<itemlayout height="36" width="36" condition="StringCompare(Window.Property(palettename),material-design)">
<control type="image">
<width>92%</width>
<height>92%</height>
<texture border="5">$INFO[ListItem.Icon]</texture>
</control>
</itemlayout>
<focusedlayout height="36" width="36" condition="StringCompare(Window.Property(palettename),material-design)">
<control type="group"> <control type="group">
<animation effect="zoom" time="200" tween="sine" easing="inout" start="100" end="164" center="auto">Focus</animation> <animation effect="zoom" time="200" tween="sine" easing="inout" start="100" end="164" center="auto">Focus</animation>
<control type="image"> <control type="image">
@ -112,123 +129,30 @@
</control> </control>
</focusedlayout> </focusedlayout>
</control> </control>
<!--current color name--> <!--current color name-->
<control type="label"> <control type="label">
<left>60</left> <posx>col-10-begin</posx>
<top>930</top> <posy>row-8-begin</posy>
<width>600</width> <width>5-col</width>
<height>40</height>
<label>$INFO[Window.Property(colorname)]</label> <label>$INFO[Window.Property(colorname)]</label>
<align>left</align>
<textcolor>white</textcolor> <textcolor>white</textcolor>
<shadowcolor>black</shadowcolor> <shadowcolor>black</shadowcolor>
</control> </control>
<control type="grouplist"> <control type="grouplist">
<orientation>horizontal</orientation> <orientation>horizontal</orientation>
<itemgap>20</itemgap> <posx>col-10-begin</posx>
<left>60</left> <posy>row-20-begin</posy>
<top>980</top> <width>6-col</width>
<width>1800</width>
<!-- choose color palette -->
<control type="button" id="3030">
<width>600</width>
<height>50</height>
<font>Reg32</font>
<align>right</align>
<ondown>3110</ondown>
<label>$ADDON[script.skin.helper.service 32141]: $INFO[Window.Property(palettename)]</label>
<textcolor>white</textcolor>
<textoffsetx>10</textoffsetx>
<texturenofocus></texturenofocus>
<visible>!IsEmpty(Window.Property(palettename))</visible>
</control>
<!-- color preview-->
<control type="image">
<width>100</width>
<height>60</height>
<aspectratio>stretch</aspectratio>
<texture border="5">panel.png</texture>
<colordiffuse>$INFO[Window.Property(colorstring)]</colordiffuse>
</control>
<!-- edit manual -->
<control type="button" id="3010">
<width>400</width>
<height>60</height>
<font>Reg32</font>
<onup>3110</onup>
<align>left</align>
<ondown>SetFocus(3110,1)</ondown>
<onright>3011</onright>
<label>$ADDON[script.skin.helper.service 32012]</label>
<label2>$INFO[Window.Property(colorstring)]</label2>
<textcolor>white</textcolor>
<texturenofocus colordiffuse="black" border="5">panel_trans.png</texturenofocus>
</control>
<!-- Save button --> <!-- Save button -->
<control type="button" id="3012"> <control type="button" id="3012">
<width>300</width> <onup>3010</onup>
<height>60</height>
<font>Reg32</font>
<onup>3110</onup>
<onleft>3010</onleft>
<label>190</label> <label>190</label>
<textcolor>white</textcolor>
<texturenofocus colordiffuse="black" border="5">panel_trans.png</texturenofocus>
</control> </control>
<!-- None --> <!-- None -->
<control type="button" id="3011"> <control type="button" id="3011">
<width>300</width> <onup>3010</onup>
<height>60</height>
<font>Reg32</font>
<onup>3110</onup>
<onleft>3010</onleft>
<label>$ADDON[script.skin.helper.service 32013]</label> <label>$ADDON[script.skin.helper.service 32013]</label>
<textcolor>white</textcolor>
<texturenofocus colordiffuse="black" border="5">panel_trans.png</texturenofocus>
</control>
<control type="group" id="3020">
<width>450</width>
<height>60</height>
<control type="label" id="3016">
<!-- label opacity-->
<width>150</width>
<left>0</left>
<align>left</align>
<onup>3110</onup>
<label>$ADDON[script.skin.helper.service 32049]:</label>
<textcolor>white</textcolor>
<texturenofocus colordiffuse="black" border="5">panel_trans.png</texturenofocus>
</control>
<control type="slider" id="3015">
<!-- opacity slider -->
<top>25</top>
<left>160</left>
<onup>3011</onup>
<ondown>3011</ondown>
<width>200</width>
</control>
<control type="label" id="3017">
<!-- opacity percentage -->
<width>80</width>
<height>60</height>
<right>0</right>
<align>right</align>
<onup>3110</onup>
<onleft>3010</onleft>
<label>$INFO[Control.Getlabel(3015)]</label>
<textcolor>white</textcolor>
<texturenofocus colordiffuse="black" border="5">panel_trans.png</texturenofocus>
</control>
</control> </control>
</control> </control>
</controls> </controls>
</window> </window>

File diff suppressed because it is too large Load Diff

View File

@ -33,9 +33,8 @@
***To do*** ***To do***
Complete submenu / filtering
Colour scheme selection window (use an image of the homescreen??) Finalize colour scheme selection window
scripted video info screen TEST PLAYMEDIA WORKS + close dialog when playing trailer scripted video info screen TEST PLAYMEDIA WORKS + close dialog when playing trailer

View File

@ -125,6 +125,10 @@ msgctxt "#31024"
msgid "Set skin highlight colour" msgid "Set skin highlight colour"
msgstr "" msgstr ""
msgctxt "#31025"
msgid "Settings"
msgstr ""
msgctxt "#31029" msgctxt "#31029"
msgid "Current playlist" msgid "Current playlist"
msgstr "" msgstr ""