merge from local dev branch

jeroenpardon · Jul 19, 2014 · 422a7cd · 422a7cd
1 parent e4f1cd8
commit 422a7cd
Show file tree

Hide file tree

Showing 262 changed files with 3,204 additions and 1,961 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,5 @@
 /720p/custom_RecordPrefs.xml
 
 /720p/script-skinshortcuts-includes.xml
+
+/Build.command
diff --git a/720p/Defaults.xml b/720p/Defaults.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <includes>
+	<default type="multiimage">
+		<include>screen_Dimensions</include>
+		<aspectratio align="center">scale</aspectratio>
+		<randomize>true</randomize>
+		<loop>yes</loop>
+		<!--<timeperimage>slideshow_Timer</timeperimage>-->
+		<fadetime>fadetime_Slideshow</fadetime>
+	</default>
+
 	<default type="scrollbar">
 		<width>8</width>
 		<showonepage>false</showonepage>
@@ -28,8 +37,8 @@
 	<default type="button">
 		<width>110</width>
 		<height>40</height>
-		<texturefocus border="2">list-focus.png</texturefocus>
-		<texturenofocus border="2">list-nofocus.png</texturenofocus>
+		<texturefocus>views/focus.png</texturefocus>
+		<texturenofocus>views/nofocus.png</texturenofocus>
 		<font>regular</font>
 		<textcolor>Color1</textcolor>
 		<focusedcolor>Focused</focusedcolor>
@@ -112,13 +121,13 @@
 
 	<default type="sliderex">
 		<height>40</height>
-		<texturefocus border="3">list-focus.png</texturefocus>
-		<texturenofocus border="3">list-nofocus.png</texturenofocus>
+		<texturefocus border="3">views/focus.png</texturefocus>
+		<texturenofocus border="3">views/nofocus.png</texturenofocus>
 		<sliderwidth>100</sliderwidth>
 		<sliderheight>20</sliderheight>
-		<texturesliderbar>sliderBackground.png</texturesliderbar>
-		<textureslidernib>-</textureslidernib>
-		<textureslidernibfocus>-</textureslidernibfocus>
+		<texturesliderbar>dialogs/slider/bar.png</texturesliderbar>
+		<textureslidernib>dialogs/slider/nib-nf.png</textureslidernib>
+		<textureslidernibfocus>dialogs/slider/nib-fo.png</textureslidernibfocus>
 		<pulseonselect>false</pulseonselect>
 	</default>
 
@@ -144,8 +153,8 @@
 	<default type="spincontrolex">
 		<font>regular</font>
 		<height>40</height>
-		<texturefocus border="2">list-focus.png</texturefocus>
-		<texturenofocus border="2">list-nofocus.png</texturenofocus>
+		<texturefocus border="2">views/focus.png</texturefocus>
+		<texturenofocus border="2">views/nofocus.png</texturenofocus>
 		<textureup colordiffuse="Color3">settings/spin/up-nf.png</textureup>
 		<textureupfocus colordiffuse="Color5">settings/spin/up-fo.png</textureupfocus>
 		<texturedown colordiffuse="Color3">settings/spin/down-nf.png</texturedown>

diff --git a/720p/DialogAlbumInfo.xml b/720p/DialogAlbumInfo.xml
@@ -162,7 +162,7 @@
 						<visible>![IsEmpty(ListItem.Property(Artist_Born)) + IsEmpty(ListItem.Property(Artist_Died)) + IsEmpty(ListItem.Property(Artist_Formed)) + IsEmpty(ListItem.Property(Artist_Disbanded))]</visible>
 						<control type="label">
 							<width>720</width>
-							<label>$VAR[artist_OriginPrefix] [COLOR=Color1]$VAR[artist_Origin][/COLOR]</label>
+							<label>$VAR[information:Origin.Prefix] [COLOR=Color1]$VAR[information:Origin][/COLOR]</label>
 							<include>detail_Sub</include>
 						</control>
 					</control>
@@ -277,7 +277,7 @@
 				<control type="textbox" id="400">
 					<width>720</width>
 					<height>325</height>
-					<label>$VAR[global_Plot]</label>
+					<label>$VAR[media:Plot]</label>
 					<include>detail_Text</include>
 					<visible allowhiddenfocus="true">![Control.HasFocus(8002) | Control.HasFocus(50)]</visible>
 				</control>

diff --git a/720p/DialogButtonMenu.xml b/720p/DialogButtonMenu.xml
@@ -9,14 +9,14 @@
 	<controls>
 		<control type="image">
 			<include>screen_Dimensions</include>
-			<texture background="true">overlays/vignette.png</texture>
+			<texture background="true">overlays/vignette_full.png</texture>
 			<include>fadeinout</include>
 		</control>
 		<control type="grouplist" id="500">
 			<left>460</left>
 			<top>0</top>
 			<width>352</width>
-			<height>720</height>
+			<height>screen_Height</height>
 			<onup>500</onup>
 			<ondown>500</ondown>
 			<onright>402</onright>

diff --git a/720p/DialogContentSettings.xml b/720p/DialogContentSettings.xml
@@ -5,12 +5,12 @@
 	<coordinates>
 		<system>1</system>
 		<left>328</left>
-		<top>68</top>
+		<top>40</top>
 	</coordinates>
 	<controls>
 		<control type="image">
 			<width>625</width>
-			<height>585</height>
+			<height>640</height>
 			<include>dialog_Window</include>
 		</control>
 		<control type="label" id="1">
@@ -29,9 +29,9 @@
 					<include>dialog_ControlCommons</include>
 				</control>
 				<control type="image">
-					<top>38</top>
+					<top>39</top>
 					<width>617</width>
-					<include>dialog_SectionSeparator</include>
+					<include>dialog_Separator</include>
 				</control>
 				<control type="group">
 					<top>40</top>
@@ -65,7 +65,7 @@
 			</control>
 			<!--scrapers-->
 			<control type="group" id="9004">
-				<top>80</top>
+				<top>100</top>
 				<visible>!SubString(Control.GetLabel(3),$LOCALIZE[231])</visible>
 				<control type="label">
 					<width>613</width>
@@ -74,9 +74,9 @@
 					<include>dialog_ControlCommons</include>
 				</control>
 				<control type="image">
-					<top>38</top>
+					<top>39</top>
 					<width>617</width>
-					<include>dialog_SectionSeparator</include>
+					<include>dialog_Separator</include>
 				</control>
 				<control type="list" id="4">
 					<top>40</top>
@@ -126,8 +126,8 @@
 			</control>
 			<!--options-->
 			<control type="group" id="9005">
-				<top>240</top>
-				<animation effect="slide" start="0,0" end="0,-135"  time="0" condition="SubString(Control.GetLabel(3),$LOCALIZE[231])">Conditional</animation>
+				<top>280</top>
+				<animation effect="slide" start="0,0" end="0,-180"  time="0" condition="SubString(Control.GetLabel(3),$LOCALIZE[231])">Conditional</animation>
 				<control type="label">
 					<width>617</width>
 					<label>$LOCALIZE[33063]</label>
@@ -136,9 +136,9 @@
 					<include>dialog_ControlCommons</include>
 				</control>
 				<control type="image">
-					<top>38</top>
+					<top>39</top>
 					<width>617</width>
-					<include>dialog_SectionSeparator</include>
+					<include>dialog_Separator</include>
 				</control>
 				<!--controls area-->
 				<control type="grouplist" id="5">
@@ -165,7 +165,7 @@
 		<!--dialog buttons-->
 		<control type="group" id="9001">
 			<left>19</left>
-			<top>520</top>
+			<top>575</top>
 			<!--settings-->
 			<control type="button" id="6">
 				<label>$LOCALIZE[5]</label>

diff --git a/720p/DialogKeyboard.xml b/720p/DialogKeyboard.xml
@@ -165,7 +165,7 @@
 						<onup>101</onup>
 						<ondown>302</ondown>
 						<alttexturenofocus border="3">dialogs/button-ac.png</alttexturenofocus>
-						<alttexturefocus border="3">dialogs/button-fo.png</alttexturefocus>
+						<alttexturefocus>dialogs/button-fo.png</alttexturefocus>
 						<include>dialog_KeyboardButton</include>
 					</control>
 					<control type="button" id="81">
@@ -235,7 +235,7 @@
 						<ondown>300</ondown>
 						<width>64</width>
 						<alttexturenofocus border="3">dialogs/button-ac.png</alttexturenofocus>
-						<alttexturefocus border="3">dialogs/button-fo.png</alttexturefocus>
+						<alttexturefocus>dialogs/button-fo.png</alttexturefocus>
 						<include>dialog_KeyboardButton</include>
 					</control>
 				</control>
@@ -254,7 +254,7 @@
 						<onup>303</onup>
 						<ondown>305</ondown>
 						<alttexturenofocus border="3">dialogs/button-ac.png</alttexturenofocus>
-						<alttexturefocus border="3">dialogs/button-fo.png</alttexturefocus>
+						<alttexturefocus>dialogs/button-fo.png</alttexturefocus>
 						<include>dialog_KeyboardButton</include>
 					</control>
 					<control type="button" id="65">

diff --git a/720p/DialogMediaSource.xml b/720p/DialogMediaSource.xml
@@ -28,9 +28,9 @@
 				<include>dialog_ControlCommons</include>
 			</control>
 			<control type="image">
-				<top>38</top>
+				<top>39</top>
 				<width>692</width>
-				<include>dialog_SectionSeparator</include>
+				<include>dialog_Separator</include>
 			</control>
 			<control type="image">
 				<top>80</top>
@@ -153,9 +153,9 @@
 			<left>4</left>
 			<top>330</top>
 			<control type="image">
-				<top>38</top>
+				<top>39</top>
 				<width>692</width>
-				<include>dialog_SectionSeparator</include>
+				<include>dialog_Separator</include>
 			</control>
 			<control type="label">
 				<width>692</width>

diff --git a/720p/DialogOK.xml b/720p/DialogOK.xml
@@ -27,7 +27,6 @@
 				<height>90</height>
 				<label>-</label>
 				<align>center</align>
-				<aligny>top</aligny>
 				<include>dialog_Text</include>
 			</control>
 			<control type="button" id="10">

diff --git a/720p/DialogPVRChannelsOSD.xml b/720p/DialogPVRChannelsOSD.xml
@@ -106,7 +106,7 @@
 					<control type="image">
 						<left>655</left>
 						<top>29</top>
-						<texture>$VAR[pvr_Status]</texture>
+						<texture>$VAR[pvr:Status]</texture>
 						<include>dialog_PVRstatus</include>
 					</control>
 				</itemlayout>
@@ -176,7 +176,7 @@
 					<control type="image">
 						<left>655</left>
 						<top>28</top>
-						<texture>$VAR[pvr_Status]</texture>
+						<texture>$VAR[pvr:Status]</texture>
 						<colordiffuse>Color1</colordiffuse>
 						<include>dialog_PVRstatus</include>
 					</control>

diff --git a/720p/DialogPVRGuideOSD.xml b/720p/DialogPVRGuideOSD.xml
@@ -80,17 +80,17 @@
 						<left>655</left>
 						<top>9</top>
 						<control type="image">
-							<texture>pvr/status_none.png</texture>
+							<texture>pvr/status/none-nf.png</texture>
 							<visible>![ListItem.HasTimer + ListItem.IsRecording]</visible>
 							<include>dialog_PVRstatus</include>
 						</control>
 						<control type="image">
-							<texture>pvr/status_timer.png</texture>
+							<texture>pvr/status/timer.png</texture>
 							<visible>ListItem.HasTimer</visible>
 							<include>dialog_PVRstatus</include>
 						</control>
 						<control type="image">
-							<texture>pvr/status_recording.png</texture>
+							<texture>pvr/status/recording.png</texture>
 							<visible>ListItem.IsRecording</visible>
 							<include>dialog_PVRstatus</include>
 						</control>
@@ -119,17 +119,17 @@
 						<left>655</left>
 						<top>9</top>
 						<control type="image">
-							<texture>pvr/status_none.png</texture>
+							<texture>pvr/status/none-nf.png</texture>
 							<visible>![ListItem.HasTimer + ListItem.IsRecording]</visible>
 							<include>dialog_PVRstatus-focus</include>
 						</control>
 						<control type="image">
-							<texture>pvr/status_timer.png</texture>
+							<texture>pvr/status/timer.png</texture>
 							<visible>ListItem.HasTimer</visible>
 							<include>dialog_PVRstatus-focus</include>
 						</control>
 						<control type="image">
-							<texture>pvr/status_recording.png</texture>
+							<texture>pvr/status/recording.png</texture>
 							<visible>ListItem.IsRecording</visible>
 							<include>dialog_PVRstatus-focus</include>
 						</control>

diff --git a/720p/DialogPVRTimerSettings.xml b/720p/DialogPVRTimerSettings.xml
@@ -56,7 +56,6 @@
 		</control>
 		<!--default edit-->
 		<control type="edit" id="12">
-			<font>title</font>
 			<include>dialog_Edit</include>
 			<include>dialog_ControlCommons</include>
 		</control>

diff --git a/720p/DialogProgress.xml b/720p/DialogProgress.xml
@@ -19,13 +19,12 @@
 		</control>
 		<!--textbox-->
 		<control type="textbox" id="9">
-			<left>15</left>
-			<top>60</top>
-			<width>520</width>
-			<height max="90">auto</height>
+			<left>20</left>
+			<top>55</top>
+			<width>552</width>
+			<height>90</height>
 			<label>-</label>
 			<align>center</align>
-			<aligny>top</aligny>
 			<include>dialog_Text</include>
 		</control>
 		<control type="progress" id="20">

diff --git a/720p/DialogSeekBar.xml b/720p/DialogSeekBar.xml
@@ -15,7 +15,7 @@
 				<left>40</left>
 				<top>30</top>
 				<width>screen_Width</width>
-				<label>$VAR[player_Status]</label>
+				<label>$VAR[player:Status]</label>
 				<textcolor>Color1</textcolor>
 				<font>light_Header</font>
 				<visible>[Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding | Player.Caching] + !Window.IsActive(pvrosdchannels)</visible>

diff --git a/720p/DialogSelect.xml b/720p/DialogSelect.xml
@@ -87,8 +87,10 @@
 							<visible>!IsEmpty(ListItem.Art(thumb))</visible>
 						</control>
 						<control type="image">
-							<width>84</width>
-							<height>84</height>
+							<left>6</left>
+							<top>6</top>
+							<width>72</width>
+							<height>72</height>
 							<texture>$INFO[ListItem.Icon]</texture>
 							<colordiffuse>Color4</colordiffuse>
 							<aspectratio align="center">keep</aspectratio>
@@ -106,13 +108,15 @@
 								<top>25</top>
 								<width>470</width>
 								<label>$INFO[ListItem.Label2,, • ]$INFO[ListItem.Property(Addon.Creator),$LOCALIZE[31144] ]</label>
+								<textcolor>Color5</textcolor>
 								<include>dialog_CommonListItem</include>
 								<visible>!IsEmpty(ListItem.Property(Addon.Creator))</visible>
 							</control>
 							<control type="label">
 								<top>25</top>
 								<width>470</width>
 								<label>$INFO[ListItem.Label2]</label>
+								<textcolor>Color5</textcolor>
 								<include>dialog_CommonListItem</include>
 								<visible>IsEmpty(ListItem.Property(Addon.Creator))</visible>
 							</control>
@@ -132,8 +136,10 @@
 							<visible>!IsEmpty(ListItem.Art(thumb))</visible>
 						</control>
 						<control type="image">
-							<width>84</width>
-							<height>84</height>
+							<left>6</left>
+							<top>6</top>
+							<width>72</width>
+							<height>72</height>
 							<texture>$INFO[ListItem.Icon]</texture>
 							<colordiffuse>Color1</colordiffuse>
 							<aspectratio align="center">keep</aspectratio>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,3 +12,5 @@
		/720p/custom_RecordPrefs.xml

		/720p/script-skinshortcuts-includes.xml

		/Build.command