Merge pull request #20509 from CastagnaIT/calib

[WindowScreenCalibration] Improvements to screen calibration window

10 files changed, 162 insertions, 47 deletions

diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index 72b0062f4b..0906b48e72 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -979,10 +979,12 @@ msgctxt "#213"
 msgid "Calibrate user interface..."
 msgstr ""
 
+#. To open window screen calibration and as window title
 #: system/settings/settings.xml
 #: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: skins/xml/SettingsScreenCalibration.xml
 msgctxt "#214"
-msgid "Video calibration..."
+msgid "Video calibration"
 msgstr ""
 
 msgctxt "#215"
@@ -1275,32 +1277,46 @@ msgctxt "#271"
 msgid "Top 100"
 msgstr ""
 
+#. Window screen calibration: calibration from the rectangle box
+#: xbmc/settings/windows/GUIWindowSettingsScreenCalibration.cpp
 msgctxt "#272"
-msgid "Top-Left overscan compensation"
+msgid "Pixel ratio adjustment"
 msgstr ""
 
+#. Window screen calibration: calibration by using the rectangle box
+#: xbmc/settings/windows/GUIWindowSettingsScreenCalibration.cpp
 msgctxt "#273"
-msgid "Bottom-Right overscan compensation"
+msgid "Adjust the rectangle so it is perfectly square"
 msgstr ""
 
+#. Window screen calibration: calibration from the top-left angle
+#: xbmc/settings/windows/GUIWindowSettingsScreenCalibration.cpp
 msgctxt "#274"
-msgid "Subtitle positioning"
+msgid "Top-Left overscan compensation"
 msgstr ""
 
+#. Window screen calibration: calibration from the bottom-right angle
+#: xbmc/settings/windows/GUIWindowSettingsScreenCalibration.cpp
 msgctxt "#275"
-msgid "Pixel ratio adjustment"
+msgid "Bottom-Right overscan compensation"
 msgstr ""
 
+#. Window screen calibration: calibration by using the top-left or bottom-right arrows
+#: xbmc/settings/windows/GUIWindowSettingsScreenCalibration.cpp
 msgctxt "#276"
 msgid "Adjust the arrow to change the amount of overscan"
 msgstr ""
 
+#. Window screen calibration: calibration of subtitle bar
+#: xbmc/settings/windows/GUIWindowSettingsScreenCalibration.cpp
 msgctxt "#277"
-msgid "Adjust the bar to change the subtitles position"
+msgid "Subtitle positioning"
 msgstr ""
 
+#. Window screen calibration: calibration by using the subtitle bar
+#: xbmc/settings/windows/GUIWindowSettingsScreenCalibration.cpp
 msgctxt "#278"
-msgid "Adjust the rectangle so it is perfectly square"
+msgid "Adjust the bar to change the subtitles position"
 msgstr ""
 
 msgctxt "#279"
@@ -6588,6 +6604,7 @@ msgid "Video encoder:"
 msgstr ""
 
 #: xbmc/windows/GUIWindowSystemInfo.cpp
+#: xbmc/settings/windows/GUIWindowSettingsScreenCalibration.cpp
 msgctxt "#13287"
 msgid "Screen resolution:"
 msgstr ""
@@ -13043,16 +13060,22 @@ msgctxt "#20324"
 msgid "Play part..."
 msgstr ""
 
+#. Window screen calibration: as title to reset calibration settings
+#: xbmc/settings/windows/GUIWindowSettingsScreenCalibration.cpp
 msgctxt "#20325"
 msgid "Calibration reset"
 msgstr ""
 
+#. Window screen calibration: ask to reset calibration settings
+#: xbmc/settings/windows/GUIWindowSettingsScreenCalibration.cpp
 msgctxt "#20326"
-msgid "This will reset the calibration values for {0:s}"
+msgid "Do you want reset the calibration to their defaults for \"{0:s}\" resolution?"
 msgstr ""
 
+#. Window screen calibration: the current calibration value
+#: xbmc/settings/windows/GUIWindowSettingsScreenCalibration.cpp
 msgctxt "#20327"
-msgid "to its default values."
+msgid "Current value: {}"
 msgstr ""
 
 msgctxt "#20328"
diff --git a/addons/skin.estouchy/media/calibrate_aspect.png b/addons/skin.estouchy/media/calibrate_aspect.png
index ad4d059aa0..4d4220fe7a 100644
--- a/addons/skin.estouchy/media/calibrate_aspect.png
+++ b/addons/skin.estouchy/media/calibrate_aspect.png
diff --git a/addons/skin.estouchy/media/calibrate_reset.png b/addons/skin.estouchy/media/calibrate_reset.png
new file mode 100644
index 0000000000..40b920a998
--- /dev/null
+++ b/addons/skin.estouchy/media/calibrate_reset.png
diff --git a/addons/skin.estouchy/media/calibrate_subtitles.png b/addons/skin.estouchy/media/calibrate_subtitles.png
index 85e549e66d..2f83a72965 100644
--- a/addons/skin.estouchy/media/calibrate_subtitles.png
+++ b/addons/skin.estouchy/media/calibrate_subtitles.png
diff --git a/addons/skin.estouchy/xml/Font.xml b/addons/skin.estouchy/xml/Font.xml
index 193a9bdded..8379936bd2 100644
--- a/addons/skin.estouchy/xml/Font.xml
+++ b/addons/skin.estouchy/xml/Font.xml
@@ -92,6 +92,12 @@
 			<style>bold</style>
 		</font>
 		<font>
+			<name>font38_title</name>
+			<filename>NotoSans-Regular.ttf</filename>
+			<size>38</size>
+			<style>bold</style>
+		</font>
+		<font>
 			<name>font70_title</name>
 			<filename>NotoSans-Regular.ttf</filename>
 			<size>70</size>
@@ -202,6 +208,12 @@
 			<style>bold</style>
 		</font>
 		<font>
+			<name>font38_title</name>
+			<filename>arial.ttf</filename>
+			<size>38</size>
+			<style>bold</style>
+		</font>
+		<font>
 			<name>font70_title</name>
 			<filename>Arial.ttf</filename>
 			<size>70</size>
diff --git a/addons/skin.estouchy/xml/SettingsScreenCalibration.xml b/addons/skin.estouchy/xml/SettingsScreenCalibration.xml
index 74c9ecf665..cae08c39d8 100644
--- a/addons/skin.estouchy/xml/SettingsScreenCalibration.xml
+++ b/addons/skin.estouchy/xml/SettingsScreenCalibration.xml
@@ -33,7 +33,7 @@
 			<font></font>
 			<onclick>Back</onclick>
 			<texturefocus>DialogCloseButton-focus.png</texturefocus>
-			<texturenofocus>DialogCloseButton.png</texturenofocus>
+			<texturenofocus colordiffuse="grey3">DialogCloseButton.png</texturenofocus>
 			<onleft>1</onleft>
 			<onright>1</onright>
 			<onup>1</onup>
@@ -46,7 +46,7 @@
 			<width>128</width>
 			<height>128</height>
 			<texturefocus>calibrate_top.png</texturefocus>
-			<texturenofocus></texturenofocus>
+			<texturenofocus colordiffuse="grey3">calibrate_top.png</texturenofocus>
 		</control>
 		<control type="mover" id="9">
 			<description>right bottom mover</description>
@@ -55,47 +55,74 @@
 			<width>128</width>
 			<height>128</height>
 			<texturefocus>calibrate_bottom.png</texturefocus>
-			<texturenofocus></texturenofocus>
+			<texturenofocus colordiffuse="grey3">calibrate_bottom.png</texturenofocus>
+		</control>
+		<control type="resize" id="11">
+			<description>pixel aspect ratio box</description>
+			<posx>0</posx>
+			<posy>232</posy>
+			<width>500</width>
+			<height>500</height>
+			<texturefocus>calibrate_aspect.png</texturefocus>
+			<texturenofocus colordiffuse="grey3">calibrate_aspect.png</texturenofocus>
 		</control>
 		<control type="mover" id="10">
 			<description>subtitle position mover</description>
 			<posx>200</posx>
 			<posy>500</posy>
-			<width>512</width>
-			<height>128</height>
+			<width>380</width>
+			<height>90</height>
+			<!-- NOTE: The image must have 40px of trasparent on top and bottom the bar -->
 			<texturefocus>calibrate_subtitles.png</texturefocus>
-			<texturenofocus></texturenofocus>
+			<texturenofocus colordiffuse="grey3">calibrate_subtitles.png</texturenofocus>
 		</control>
-		<control type="resize" id="11">
-			<description>pixel aspect ratio box</description>
+		<control type="mover" id="12">
+			<description>reset calibration</description>
 			<posx>0</posx>
-			<posy>232</posy>
-			<width>256</width>
-			<height>256</height>
-			<texturefocus>calibrate_aspect.png</texturefocus>
-			<texturenofocus></texturenofocus>
+			<posy>900</posy>
+			<width>100</width>
+			<height>100</height>
+			<texturefocus>calibrate_reset.png</texturefocus>
+			<texturenofocus colordiffuse="grey3">calibrate_reset.png</texturenofocus>
 		</control>
 		<control type="group">
-			<posx>20</posx>
-			<posy>80</posy>
-			<include>16x9_xPos_Relocation</include>
+			<posx>0</posx>
+			<posy>10</posy>
+			<control type="label">
+				<description>window title</description>
+				<posx>0</posx>
+				<posy>0</posy>
+				<width>100%</width>
+				<label>$LOCALIZE[214]</label>
+				<align>center</align>
+				<font>font38_title</font>
+			</control>
 			<control type="label" id="2">
-				<description>coordinates label</description>
+				<description>resolution info</description>
 				<posx>0</posx>
-				<posy>10</posy>
-				<width>1280</width>
+				<posy>50</posy>
+				<width>100%</width>
 				<label></label>
 				<align>center</align>
-				<font>font24_title</font>
+				<font>font22</font>
 			</control>
 			<control type="label" id="3">
-				<description>help information</description>
+				<description>control description and help</description>
+				<posx>0</posx>
+				<posy>90</posy>
+				<width>100%</width>
+				<label></label>
+				<align>center</align>
+				<font>font30</font>
+			</control>
+			<control type="label" id="4">
+				<description>calibration value</description>
 				<posx>0</posx>
-				<posy>40</posy>
-				<width>1280</width>
+				<posy>180</posy>
+				<width>100%</width>
 				<label></label>
 				<align>center</align>
-				<font>font24_title</font>
+				<font>font25</font>
 			</control>
 		</control>
 	</controls>
diff --git a/addons/skin.estuary/media/calibrate/cal_sub.png b/addons/skin.estuary/media/calibrate/cal_sub.png
index fb08fc6916..89c3b1d91c 100644
--- a/addons/skin.estuary/media/calibrate/cal_sub.png
+++ b/addons/skin.estuary/media/calibrate/cal_sub.png
diff --git a/addons/skin.estuary/media/calibrate/reset.png b/addons/skin.estuary/media/calibrate/reset.png
new file mode 100644
index 0000000000..9f5ca01d21
--- /dev/null
+++ b/addons/skin.estuary/media/calibrate/reset.png
diff --git a/addons/skin.estuary/xml/Font.xml b/addons/skin.estuary/xml/Font.xml
index 8ff2aacc63..f34236eaed 100644
--- a/addons/skin.estuary/xml/Font.xml
+++ b/addons/skin.estuary/xml/Font.xml
@@ -54,6 +54,12 @@
 			<linespacing>0.8</linespacing>
 		</font>
 		<font>
+			<name>font32</name>
+			<filename>NotoSans-Regular.ttf</filename>
+			<size>32</size>
+			<style>lighten</style>
+		</font>
+		<font>
 			<name>font37</name>
 			<filename>NotoSans-Regular.ttf</filename>
 			<size>37</size>
@@ -114,6 +120,12 @@
 			<style>bold</style>
 		</font>
 		<font>
+			<name>font40_title</name>
+			<filename>NotoSans-Regular.ttf</filename>
+			<size>40</size>
+			<style>bold</style>
+		</font>
+		<font>
 			<name>font45_title</name>
 			<filename>NotoSans-Regular.ttf</filename>
 			<size>45</size>
@@ -190,6 +202,11 @@
 			<linespacing>0.8</linespacing>
 		</font>
 		<font>
+			<name>font32</name>
+			<filename>arial.ttf</filename>
+			<size>32</size>
+		</font>
+		<font>
 			<name>font37</name>
 			<filename>arial.ttf</filename>
 			<size>37</size>
@@ -249,6 +266,12 @@
 			<style>bold</style>
 		</font>
 		<font>
+			<name>font40_title</name>
+			<filename>arial.ttf</filename>
+			<size>40</size>
+			<style>bold</style>
+		</font>
+		<font>
 			<name>font45_title</name>
 			<filename>arial.ttf</filename>
 			<size>45</size>
diff --git a/addons/skin.estuary/xml/SettingsScreenCalibration.xml b/addons/skin.estuary/xml/SettingsScreenCalibration.xml
index eece4ac4a5..f7f661b203 100644
--- a/addons/skin.estuary/xml/SettingsScreenCalibration.xml
+++ b/addons/skin.estuary/xml/SettingsScreenCalibration.xml
@@ -21,15 +21,6 @@
 			<texturefocus colordiffuse="button_focus">calibrate/cal_br.png</texturefocus>
 			<texturenofocus>calibrate/cal_br.png</texturenofocus>
 		</control>
-		<control type="mover" id="10">
-			<description>subtitle position mover</description>
-			<left>200</left>
-			<top>500</top>
-			<width>384</width>
-			<height>128</height>
-			<texturefocus colordiffuse="button_focus">calibrate/cal_sub.png</texturefocus>
-			<texturenofocus>calibrate/cal_sub.png</texturenofocus>
-		</control>
 		<control type="resize" id="11">
 			<description>pixel aspect ratio</description>
 			<left>0</left>
@@ -39,25 +30,64 @@
 			<texturefocus colordiffuse="button_focus">calibrate/cal_ratio.png</texturefocus>
 			<texturenofocus>calibrate/cal_ratio.png</texturenofocus>
 		</control>
+		<control type="mover" id="10">
+			<description>subtitle position mover</description>
+			<left>200</left>
+			<top>500</top>
+			<width>380</width>
+			<height>90</height>
+			<!-- NOTE: The image must have 40px of trasparent on top and bottom the bar -->
+			<texturefocus colordiffuse="button_focus">calibrate/cal_sub.png</texturefocus>
+			<texturenofocus>calibrate/cal_sub.png</texturenofocus>
+		</control>
+		<control type="mover" id="12">
+			<description>reset calibration</description>
+			<left>0</left>
+			<top>900</top>
+			<width>100</width>
+			<height>100</height>
+			<texturefocus colordiffuse="button_focus">calibrate/reset.png</texturefocus>
+			<texturenofocus>calibrate/reset.png</texturenofocus>
+		</control>
+		<control type="label">
+			<description>window title</description>
+			<left>0</left>
+			<top>10</top>
+			<width>100%</width>
+			<align>center</align>
+			<label>$LOCALIZE[214]</label>
+			<font>font40_title</font>
+			<shadowcolor>FF000000</shadowcolor>
+		</control>
 		<control type="label" id="2">
-			<description>coordinates label</description>
+			<description>resolution info</description>
 			<left>0</left>
-			<top>150</top>
+			<top>60</top>
 			<width>100%</width>
 			<align>center</align>
 			<label></label>
-			<font>font37</font>
+			<font>font27</font>
 			<shadowcolor>FF000000</shadowcolor>
 		</control>
 		<control type="label" id="3">
-			<description>help information</description>
+			<description>control description and help</description>
 			<left>0</left>
-			<top>210</top>
+			<top>110</top>
 			<width>100%</width>
 			<align>center</align>
 			<label></label>
 			<font>font37</font>
 			<shadowcolor>FF000000</shadowcolor>
 		</control>
+		<control type="label" id="4">
+			<description>calibration value</description>
+			<left>0</left>
+			<top>210</top>
+			<width>100%</width>
+			<align>center</align>
+			<label></label>
+			<font>font32</font>
+			<shadowcolor>FF000000</shadowcolor>
+		</control>
 	</controls>
 </window>