Commit [74e723] Maximize Restore History

[pm3.hd] Update to 2.1.0. Upstream 7869b6d

theuni theuni 2011-12-21

added skin.pm3-hd/720p/DialogPeripheralSettings.xml
added skin.pm3-hd/media/flagging/audio/10.png
added skin.pm3-hd/media/flagging/audio/3.png
added skin.pm3-hd/media/flagging/audio/4.png
added skin.pm3-hd/media/flagging/audio/5.png
added skin.pm3-hd/media/flagging/audio/7.png
added skin.pm3-hd/media/flagging/audio/alac.png
added skin.pm3-hd/media/flagging/audio/pcm_bluray.png
added skin.pm3-hd/media/flagging/audio/wav.png
added skin.pm3-hd/media/flagging/video/vp8.png
changed skin.pm3-hd/720p/DialogButtonMenu.xml
changed skin.pm3-hd/720p/DialogSeekBar.xml
changed skin.pm3-hd/720p/Home.xml
changed skin.pm3-hd/720p/MyWeather.xml
changed skin.pm3-hd/720p/custom_SkinSetting_1111.xml
changed skin.pm3-hd/720p/includes.xml
changed skin.pm3-hd/720p/script-XBMC-Subtitles-main.xml
changed skin.pm3-hd/language/English/strings.xml
changed skin.pm3-hd/addon.xml
copied skin.pm3-hd/720p/script-XBMC_Lyrics-settings.xml -> skin.pm3-hd/720p/DialogPeripheralManager.xml
skin.pm3-hd/720p/DialogPeripheralSettings.xml Diff Switch to side-by-side view
Loading...
skin.pm3-hd/media/flagging/audio/10.png Diff Switch to side-by-side view
Loading...
skin.pm3-hd/media/flagging/audio/3.png Diff Switch to side-by-side view
Loading...
skin.pm3-hd/media/flagging/audio/4.png Diff Switch to side-by-side view
Loading...
skin.pm3-hd/media/flagging/audio/5.png Diff Switch to side-by-side view
Loading...
skin.pm3-hd/media/flagging/audio/7.png Diff Switch to side-by-side view
Loading...
skin.pm3-hd/media/flagging/audio/alac.png Diff Switch to side-by-side view
Loading...
skin.pm3-hd/media/flagging/audio/pcm_bluray.png Diff Switch to side-by-side view
Loading...
skin.pm3-hd/media/flagging/audio/wav.png Diff Switch to side-by-side view
Loading...
skin.pm3-hd/media/flagging/video/vp8.png Diff Switch to side-by-side view
Loading...
skin.pm3-hd/720p/DialogButtonMenu.xml Diff Switch to side-by-side view
Loading...
skin.pm3-hd/720p/DialogSeekBar.xml Diff Switch to side-by-side view
Loading...
skin.pm3-hd/720p/Home.xml Diff Switch to side-by-side view
Loading...
skin.pm3-hd/720p/MyWeather.xml Diff Switch to side-by-side view
Loading...
skin.pm3-hd/720p/custom_SkinSetting_1111.xml Diff Switch to side-by-side view
Loading...
skin.pm3-hd/720p/includes.xml Diff Switch to side-by-side view
Loading...
skin.pm3-hd/720p/script-XBMC-Subtitles-main.xml Diff Switch to side-by-side view
Loading...
skin.pm3-hd/language/English/strings.xml Diff Switch to side-by-side view
Loading...
skin.pm3-hd/addon.xml Diff Switch to side-by-side view
Loading...
skin.pm3-hd/720p/script-XBMC_Lyrics-settings.xml to skin.pm3-hd/720p/DialogPeripheralManager.xml
--- a/skin.pm3-hd/720p/script-XBMC_Lyrics-settings.xml
+++ b/skin.pm3-hd/720p/DialogPeripheralManager.xml
@@ -1,311 +1,220 @@
-<window>
-	<defaultcontrol>201</defaultcontrol>
+<window id="10140">
+	<defaultcontrol always="true">20</defaultcontrol>
 	<coordinates>
 		<system>1</system>
-		<posx>240</posx>
-		<posy>85</posy>
+		<posx>290</posx>
+		<posy>30</posy>
 	</coordinates>
 	<include>dialogeffect</include>
 	<controls>
-		<control type="image">
-			<description>background image</description>
-			<posx>0</posx>
-			<posy>0</posy>
-			<width>810</width>
-			<height>550</height>
-			<texture border="40">DialogBack.png</texture>
-		</control>
-		<control type="image">
-			<description>background image</description>
-			<posx>0</posx>
-			<posy>0</posy>
-			<width>810</width>
-			<height>550</height>
-			<texture border="40">DialogFront.png</texture>
-		</control>
-		<!-- ** Required ** Do not change id or type -->
-		<control type="label">
-			<description>heading label</description>
-			<posx>40</posx>
-			<posy>40</posy>
-			<width>720</width>
-			<height>35</height>
-			<align>center</align>
-			<aligny>center</aligny>
-			<font>font18</font>
-			<label>[UPPERCASE]$LOCALIZE[SCRIPT0][/UPPERCASE] - ( $INFO[Control.GetLabel(30)] )</label>
-			<textcolor>white</textcolor>
-		</control>
-		<control type="label" id="30">
-			<description>Version label</description>
-			<label>-</label>
-			<visible>false</visible>
-		</control>
-		<control type="image">
-			<posx>40</posx>
-			<posy>78</posy>
-			<width>720</width>
-			<height>2</height>
-			<texture>separator.png</texture>
-		</control>
-		<!-- ** Required ** Do not change id's or type's -->
-		<control type="grouplist" id="9000">
-			<posx>40</posx>
-			<posy>90</posy>
-			<width>570</width>
-			<height>410</height>
-			<itemgap>5</itemgap>
-			<pagecontrol>-</pagecontrol>
-			<onleft>2000</onleft>
-			<onright>2000</onright>
-			<onup>9000</onup>
-			<ondown>9000</ondown>
-			<control type="button" id="201">
-				<description>Setting1 Button</description>
+		<control type="group">
+			<visible>!Window.IsVisible(PeripheralSettings)</visible>
+			<include>VisibleFadeEffect</include>
+			<control type="image">
+				<description>background image</description>
 				<posx>0</posx>
 				<posy>0</posy>
-				<width>570</width>
-				<height>35</height>
-				<font>font12</font>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-				<label>$LOCALIZE[SCRIPT201]</label>
-			</control>
-			<control type="image" id="1">
-				<description>separator image</description>
-				<width>570</width>
+				<width>700</width>
+				<height>660</height>
+				<texture border="40">DialogBack.png</texture>
+			</control>
+			<control type="image">
+				<description>background image</description>
+				<posx>0</posx>
+				<posy>0</posy>
+				<width>700</width>
+				<height>660</height>
+				<texture border="40">DialogFront.png</texture>
+			</control>
+			<control type="label" id="1">
+				<description>heading label</description>
+				<posx>40</posx>
+				<posy>40</posy>
+				<width>620</width>
+				<height>30</height>
+				<align>center</align>
+				<aligny>center</aligny>
+				<font>font18</font>
+				<label>$LOCALIZE[35000]</label>
+				<textcolor>dialogheader</textcolor>
+			</control>
+			<control type="button">
+				<description>Close Window button</description>
+				<posx>630</posx>
+				<posy>35</posy>
+				<include>WindowCloseButtonCommons</include>
+			</control>
+			<control type="image">
+				<posx>40</posx>
+				<posy>78</posy>
+				<width>620</width>
 				<height>2</height>
 				<texture>separator.png</texture>
 			</control>
-			<control type="radiobutton" id="202">
-				<description>Setting2 Button</description>
-				<width>570</width>
+
+			<control type="list" id="20">
+				<posx>40</posx>
+				<posy>90</posy>
+				<width>600</width>
+				<height>470</height>
+				<onup>20</onup>
+				<ondown>20</ondown>
+				<onleft>10</onleft>
+				<onright>61</onright>
+				<pagecontrol>61</pagecontrol>
+				<scrolltime>200</scrolltime>
+				<animation effect="slide" start="0,0" end="10,0" time="0" condition="!Control.IsVisible(61)">Conditional</animation>
+				<itemlayout height="85" width="600">
+					<control type="image">
+						<posx>0</posx>
+						<posy>0</posy>
+						<width>600</width>
+						<height>80</height>
+						<texture border="5">button-nofocus.png</texture>
+					</control>
+					<control type="label">
+						<description>Name</description>
+						<posx>10</posx>
+						<posy>5</posy>
+						<width>580</width>
+						<height>20</height>
+						<label>$INFO[ListItem.Label]</label>
+						<align>left</align>
+						<aligny>center</aligny>
+						<font>font12</font>
+						<textcolor>white</textcolor>
+					</control>
+					<control type="label">
+						<description>Product ID Vendor ID</description>
+						<posx>10</posx>
+						<posy>30</posy>
+						<width>580</width>
+						<height>20</height>
+						<label>$LOCALIZE[35504]:  [COLOR=grey2]$INFO[ListItem.Property(Product)][/COLOR]    $LOCALIZE[35503]:  [COLOR=grey2]$INFO[ListItem.Property(Vendor)][/COLOR]</label>
+						<align>left</align>
+						<aligny>center</aligny>
+						<font>font11</font>
+						<textcolor>green</textcolor>
+					</control>
+					<control type="label">
+						<description>class</description>
+						<posx>10</posx>
+						<posy>50</posy>
+						<width>580</width>
+						<height>20</height>
+						<label>$LOCALIZE[35501]:  [COLOR=grey2]$INFO[ListItem.Property(Class)][/COLOR]</label>
+						<align>left</align>
+						<aligny>center</aligny>
+						<font>font11</font>
+						<textcolor>green</textcolor>
+					</control>
+				</itemlayout>
+				<focusedlayout height="85" width="600">
+					<control type="image">
+						<posx>0</posx>
+						<posy>0</posy>
+						<width>600</width>
+						<height>80</height>
+						<texture border="5">button-nofocus.png</texture>
+						<visible>!Control.HasFocus(20)</visible>
+						<include>VisibleFadeEffect</include>
+					</control>
+					<control type="image">
+						<posx>0</posx>
+						<posy>0</posy>
+						<width>600</width>
+						<height>80</height>
+						<texture border="5">button-focus.png</texture>
+						<visible>Control.HasFocus(20)</visible>
+						<include>VisibleFadeEffect</include>
+					</control>
+					<control type="label">
+						<description>Name</description>
+						<posx>10</posx>
+						<posy>5</posy>
+						<width>580</width>
+						<height>20</height>
+						<label>$INFO[ListItem.Label]</label>
+						<align>left</align>
+						<aligny>center</aligny>
+						<font>font12</font>
+						<textcolor>white</textcolor>
+					</control>
+					<control type="label">
+						<description>Product ID Vendor ID</description>
+						<posx>10</posx>
+						<posy>30</posy>
+						<width>580</width>
+						<height>20</height>
+						<label>$LOCALIZE[35504]:  [COLOR=grey2]$INFO[ListItem.Property(Product)][/COLOR]    $LOCALIZE[35503]:  [COLOR=grey2]$INFO[ListItem.Property(Vendor)][/COLOR]</label>
+						<align>left</align>
+						<aligny>center</aligny>
+						<font>font11</font>
+						<textcolor>green</textcolor>
+					</control>
+					<control type="label">
+						<description>class</description>
+						<posx>10</posx>
+						<posy>50</posy>
+						<width>580</width>
+						<height>20</height>
+						<label>$LOCALIZE[35501]:  [COLOR=grey2]$INFO[ListItem.Property(Class)][/COLOR]</label>
+						<align>left</align>
+						<aligny>center</aligny>
+						<font>font11</font>
+						<textcolor>green</textcolor>
+					</control>
+				</focusedlayout>
+			</control>
+
+			<control type="scrollbar" id="61">
+				<posx>641</posx>
+				<posy>90</posy>
+				<width>20</width>
+				<height>470</height>
+				<texturesliderbackground border="2,2,2,2">scrollbar_bar_back2.png</texturesliderbackground>
+				<texturesliderbar border="2,16,2,16">scrollbar_bar.png</texturesliderbar>
+				<texturesliderbarfocus border="2,16,2,16">scrollbar_bar_focus.png</texturesliderbarfocus>
+				<textureslidernib>scrollbar_nib.png</textureslidernib>
+				<textureslidernibfocus>scrollbar_nib.png</textureslidernibfocus>
+				<onleft>20</onleft>
+				<onright>10</onright>
+				<ondown>61</ondown>
+				<onup>61</onup>
+				<showonepage>false</showonepage>
+				<orientation>vertical</orientation>
+			</control>
+			<control type="label">
+				<description>number of files/pages in list text label</description>
+				<posx>640</posx>
+				<posy>575</posy>
+				<width>300</width>
 				<height>35</height>
-				<label>$LOCALIZE[SCRIPT202]</label>
-				<pulseonselect>no</pulseonselect>
+				<font>font12b</font>
+				<align>right</align>
+				<aligny>center</aligny>
+				<scroll>true</scroll>
+				<textcolor>white</textcolor>
+				<label>($INFO[Container(20).NumItems]) $LOCALIZE[31025] - $LOCALIZE[31024] ($INFO[Container(20).CurrentPage]/$INFO[Container(20).NumPages])</label>
+			</control>
+			<control type="button" id="10">
+				<description>OK button</description>
+				<posx>40</posx>
+				<posy>570</posy>
+				<width>200</width>
+				<height>40</height>
+				<label>186</label>
 				<font>font12</font>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			</control>
-			<control type="button" id="203">
-				<description>Setting2 Button</description>
-				<posx>0</posx>
-				<posy>0</posy>
-				<width>570</width>
-				<height>35</height>
-				<label>$LOCALIZE[SCRIPT203]</label>
-				<font>font12</font>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			</control>
-			<control type="radiobutton" id="210">
-				<description>Setting10 Button</description>
-				<width>570</width>
-				<height>35</height>
-				<label>$LOCALIZE[SCRIPT210]</label>
-				<pulseonselect>no</pulseonselect>
-				<font>font12</font>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			</control>
-			<control type="radiobutton" id="211">
-				<description>Setting11 Button</description>
-				<width>570</width>
-				<height>35</height>
-				<label>$LOCALIZE[SCRIPT211]</label>
-				<pulseonselect>no</pulseonselect>
-				<font>font12</font>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			</control>
-			<control type="image" id="2">
-				<description>separator image</description>
-				<width>570</width>
-				<height>2</height>
-				<texture>separator.png</texture>
-			</control>
-			<control type="radiobutton" id="280">
-				<description>Custom Button</description>
-				<width>570</width>
-				<height>35</height>
-				<label>31111</label>
-				<pulseonselect>no</pulseonselect>
-				<onclick>Skin.ToggleSetting(Music_Info_In_Lyrics)</onclick>
-				<selected>!Skin.HasSetting(Music_Info_In_Lyrics)</selected>
-				<font>font12</font>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			</control>
-			<control type="radiobutton" id="204">
-				<description>Setting4 Button</description>
-				<width>570</width>
-				<height>35</height>
-				<label>$LOCALIZE[SCRIPT204]</label>
-				<pulseonselect>no</pulseonselect>
-				<font>font12</font>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			</control>
-			<control type="radiobutton" id="205">
-				<description>Setting5 Button</description>
-				<width>570</width>
-				<height>35</height>
-				<label>$LOCALIZE[SCRIPT205]</label>
-				<pulseonselect>no</pulseonselect>
-				<font>font12</font>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			</control>
-			<control type="image" id="3">
-				<description>separator image</description>
-				<width>570</width>
-				<height>2</height>
-				<texture>separator.png</texture>
-			</control>
-			<control type="radiobutton" id="206">
-				<description>Setting6 Button</description>
-				<width>570</width>
-				<height>35</height>
-				<label>$LOCALIZE[SCRIPT206]</label>
-				<pulseonselect>no</pulseonselect>
-				<font>font12</font>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			</control>
-			<control type="button" id="207">
-				<description>Setting7 Button</description>
-				<posx>0</posx>
-				<posy>0</posy>
-				<width>570</width>
-				<height>35</height>
-				<label>$LOCALIZE[SCRIPT207]</label>
-				<font>font12</font>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			</control>
-			<control type="image" id="4">
-				<description>separator image</description>
-				<width>570</width>
-				<height>2</height>
-				<texture>separator.png</texture>
-			</control>
-			<control type="button" id="208">
-				<description>Setting8 Button</description>
-				<posx>0</posx>
-				<posy>0</posy>
-				<width>570</width>
-				<height>35</height>
-				<label>$LOCALIZE[SCRIPT208]</label>
-				<font>font12</font>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			</control>
-			<control type="radiobutton" id="209">
-				<description>Setting9 Button</description>
-				<width>570</width>
-				<height>35</height>
-				<label>$LOCALIZE[SCRIPT209]</label>
-				<pulseonselect>no</pulseonselect>
-				<font>font12</font>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			</control>
-		</control>
-		<!-- ** Required ** Do not change id's or type's -->
-		<control type="group" id="2000">
-			<posx>620</posx>
-			<posy>90</posy>
-			<control type="button" id="250">
-				<description>OK button</description>
-				<posx>0</posx>
-				<posy>0</posy>
-				<width>150</width>
-				<height>35</height>
+				<textcolor>grey2</textcolor>
+				<focusedcolor>white</focusedcolor>
+				<texturenofocus border="3">button-nofocus.png</texturenofocus>
+				<texturefocus border="3">button-focus2.png</texturefocus>
 				<align>center</align>
-				<label>$LOCALIZE[SCRIPT250]</label>
-				<texturefocus border="3">button-focus2.png</texturefocus>
-				<texturenofocus border="3">button-nofocus.png</texturenofocus>
-				<onleft>9000</onleft>
-				<onright>9000</onright>
-				<onup>254</onup>
-				<ondown>251</ondown>
-			</control>
-			<control type="button" id="251">
-				<description>Cancel button</description>
-				<posx>0</posx>
-				<posy>40</posy>
-				<width>150</width>
-				<height>35</height>
-				<align>center</align>
-				<label>$LOCALIZE[SCRIPT251]</label>
-				<texturefocus border="3">button-focus2.png</texturefocus>
-				<texturenofocus border="3">button-nofocus.png</texturenofocus>
-				<onleft>9000</onleft>
-				<onright>9000</onright>
-				<onup>250</onup>
-				<ondown>252</ondown>
-			</control>
-			<control type="button" id="252">
-				<description>Update button</description>
-				<posx>0</posx>
-				<posy>80</posy>
-				<width>150</width>
-				<height>35</height>
-				<align>center</align>
-				<label>$LOCALIZE[SCRIPT252]</label>
-				<texturefocus border="3">button-focus2.png</texturefocus>
-				<texturenofocus border="3">button-nofocus.png</texturenofocus>
-				<onleft>9000</onleft>
-				<onright>9000</onright>
-				<onup>251</onup>
-				<ondown>253</ondown>
-			</control>
-			<control type="button" id="253">
-				<description>Credits button</description>
-				<posx>0</posx>
-				<posy>120</posy>
-				<width>150</width>
-				<height>35</height>
-				<align>center</align>
-				<label>$LOCALIZE[SCRIPT253]</label>
-				<texturefocus border="3">button-focus2.png</texturefocus>
-				<texturenofocus border="3">button-nofocus.png</texturenofocus>
-				<onleft>9000</onleft>
-				<onright>9000</onright>
-				<onup>252</onup>
-				<ondown>255</ondown>
-			</control>
-			<control type="button" id="255">
-				<description>Defaults button</description>
-				<posx>0</posx>
-				<posy>160</posy>
-				<width>150</width>
-				<height>35</height>
-				<align>center</align>
-				<label>$LOCALIZE[SCRIPT255]</label>
-				<texturefocus border="3">button-focus2.png</texturefocus>
-				<texturenofocus border="3">button-nofocus.png</texturenofocus>
-				<onleft>9000</onleft>
-				<onright>9000</onright>
-				<onup>253</onup>
-				<ondown>254</ondown>
-			</control>
-			<control type="button" id="254">
-				<description>Play button</description>
-				<posx>0</posx>
-				<posy>200</posy>
-				<width>150</width>
-				<height>35</height>
-				<align>center</align>
-				<font>font12</font>
-				<label>$LOCALIZE[SCRIPT254]</label>
-				<texturefocus border="3">button-focus2.png</texturefocus>
-				<texturenofocus border="3">button-nofocus.png</texturenofocus>
-				<onleft>9000</onleft>
-				<onright>9000</onright>
-				<onup>255</onup>
-				<ondown>250</ondown>
+				<onleft>61</onleft>
+				<onright>20</onright>
+				<onup>20</onup>
+				<ondown>20</ondown>
 			</control>
 		</control>
 	</controls>
-</window>+</window>