Merge pull request #10785 from ronie/privacypolicy

add privacy policy

3 files changed, 77 insertions, 8 deletions

diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index 9847cbd292..969635f1d4 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -5495,7 +5495,12 @@ msgctxt "#12386"
 msgid "Month / Day"
 msgstr ""
 
-#empty strings from id 12387 to 12389
+#empty strings from id 12387 to 12388
+
+#: xbmc/windows/GUIWindowSystemInfo.cpp
+msgctxt "#12389"
+msgid "Privacy policy"
+msgstr ""
 
 #: xbmc/windows/GUIWindowSystemInfo.cpp
 msgctxt "#12390"
diff --git a/addons/skin.estouchy/xml/SettingsSystemInfo.xml b/addons/skin.estouchy/xml/SettingsSystemInfo.xml
index 05b9389437..4495490898 100644
--- a/addons/skin.estouchy/xml/SettingsSystemInfo.xml
+++ b/addons/skin.estouchy/xml/SettingsSystemInfo.xml
@@ -46,6 +46,7 @@
 				<height>598</height>
 				<itemgap>-1</itemgap>
 				<onleft>5</onleft>
+				<onright>60</onright>
 				<onup>9000</onup>
 				<ondown>9000</ondown>
 				<control type="button" id="95">
@@ -121,6 +122,18 @@
 					<label>31556</label>
 					<textoffsetx>20</textoffsetx>
 				</control>
+				<control type="button" id="100">
+					<width>290</width>
+					<height>80</height>
+					<aligny>center</aligny>
+					<font>font24_title</font>
+					<textcolor>white</textcolor>
+					<texturefocus>list_focus.png</texturefocus>
+					<texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus>
+					<pulseonselect>false</pulseonselect>
+					<label>12389</label>
+					<textoffsetx>20</textoffsetx>
+				</control>
 			</control>
 			<control type="image">
 				<posx>310</posx>
@@ -325,6 +338,31 @@
 					<font>font22</font>
 				</control>
 			</control>
+			<control type="textbox" id="30">
+				<posx>340</posx>
+				<posy>25</posy>
+				<width>800</width>
+				<height>550</height>
+				<pagecontrol>60</pagecontrol>
+				<autoscroll delay="5000" repeat="7500" time="5000">true</autoscroll>
+			</control>
+			<control type="scrollbar" id="60">
+				<posx>1200</posx>
+				<posy>0</posy>
+				<width>26</width>
+				<height>602</height>
+				<texturesliderbackground colordiffuse="30FFFFFF">white.png</texturesliderbackground>
+				<texturesliderbar colordiffuse="grey">white.png</texturesliderbar>
+				<texturesliderbarfocus colordiffuse="blue">white.png</texturesliderbarfocus>
+				<textureslidernib>blank.png</textureslidernib>
+				<textureslidernibfocus>blank.png</textureslidernibfocus>
+				<onleft>9000</onleft>
+				<showonepage>false</showonepage>
+				<orientation>vertical</orientation>
+				<animation effect="fade" time="150">Visible</animation>
+				<animation effect="fade" time="150">Hidden</animation>
+				<visible>Control.IsVisible(30)</visible>
+			</control>
 			<control type="group">
 				<posx>60</posx>
 				<posy>220r</posy>
diff --git a/addons/skin.estuary/1080i/SettingsSystemInfo.xml b/addons/skin.estuary/1080i/SettingsSystemInfo.xml
index 453055faa0..21dc1b40b4 100644
--- a/addons/skin.estuary/1080i/SettingsSystemInfo.xml
+++ b/addons/skin.estuary/1080i/SettingsSystemInfo.xml
@@ -21,10 +21,11 @@
 				<height>540</height>
 				<onup>9000</onup>
 				<ondown>9000</ondown>
+				<onright>60</onright>
 				<control type="button" id="95">
 					<description>Button Summary Values</description>
 					<include content="DefaultSettingButton">
-						<param name="height" value="88" />
+						<param name="height" value="75" />
 					</include>
 					<width>400</width>
 					<label>$LOCALIZE[20037]</label>
@@ -32,7 +33,7 @@
 				<control type="button" id="94">
 					<description>Button Storage</description>
 					<include content="DefaultSettingButton">
-						<param name="height" value="88" />
+						<param name="height" value="75" />
 					</include>
 					<width>400</width>
 					<label>$LOCALIZE[13277]</label>
@@ -40,7 +41,7 @@
 				<control type="button" id="96">
 					<description>Button Network</description>
 					<include content="DefaultSettingButton">
-						<param name="height" value="88" />
+						<param name="height" value="75" />
 					</include>
 					<width>400</width>
 					<label>$LOCALIZE[13279]</label>
@@ -48,7 +49,7 @@
 				<control type="button" id="97">
 					<description>Button Video</description>
 					<include content="DefaultSettingButton">
-						<param name="height" value="88" />
+						<param name="height" value="75" />
 					</include>
 					<width>400</width>
 					<label>$LOCALIZE[13280]</label>
@@ -56,7 +57,7 @@
 				<control type="button" id="98">
 					<description>Button Hardware</description>
 					<include content="DefaultSettingButton">
-						<param name="height" value="88" />
+						<param name="height" value="75" />
 					</include>
 					<width>400</width>
 					<label>$LOCALIZE[13281]</label>
@@ -64,11 +65,19 @@
 				<control type="button" id="99">
 					<description>Button PVR</description>
 					<include content="DefaultSettingButton">
-						<param name="height" value="88" />
+						<param name="height" value="75" />
 					</include>
 					<width>400</width>
 					<label>$LOCALIZE[19191]</label>
 				</control>
+				<control type="button" id="100">
+					<description>Button Policy</description>
+					<include content="DefaultSettingButton">
+						<param name="height" value="75" />
+					</include>
+					<width>400</width>
+					<label>$LOCALIZE[12389]</label>
+				</control>
 			</control>
 		</control>
 		<control type="group">
@@ -79,7 +88,7 @@
 				<left>420</left>
 				<top>70</top>
 				<width>1300</width>
-				<height>570</height>
+				<height>572</height>
 				<texture border="22">dialogs/dialog-bg.png</texture>
 			</control>
 			<control type="image">
@@ -150,6 +159,23 @@
 					<font>Mono28</font>
 				</control>
 			</control>
+			<control type="textbox" id="30">
+				<left>480</left>
+				<top>105</top>
+				<height>500</height>
+				<width>1200</width>
+				<pagecontrol>60</pagecontrol>
+				<autoscroll delay="5000" repeat="7500" time="5000">true</autoscroll>
+			</control>
+			<control type="scrollbar" id="60">
+				<left>1705</left>
+				<top>90</top>
+				<width>12</width>
+				<height>530</height>
+				<onleft>9000</onleft>
+				<orientation>vertical</orientation>
+				<visible>Control.IsVisible(30)</visible>
+			</control>
 			<control type="grouplist">
 				<left>60</left>
 				<top>630</top>