[skin.confluence] v4.4.7

Updated GameOSD
2018-08-12 18:46:48 +01:00 · 2018-08-12 18:46:48 +01:00 · 8728b7b42d
parent 45f97e8923
commit 8728b7b42d
6 changed files with 60 additions and 18 deletions
--- a/720p/DialogSelect.xml
+++ b/720p/DialogSelect.xml
@ -4,7 +4,7 @@
 	<include>dialogeffect</include>
 	<depth>DepthDialog+</depth>
 	<controls>
-		<include condition="Window.IsActive(gameviewmode) | Window.IsActive(gamevideofilter)">GameDialogSelectLayout</include>
-		<include condition="![Window.IsActive(gameviewmode) | Window.IsActive(gamevideofilter)]">DefaultDialogSelectLayout</include>
+		<include condition="Window.IsActive(gameviewmode) | Window.IsActive(gamevideofilter) | Window.IsActive(gamevideorotation)">GameDialogSelectLayout</include>
+		<include condition="![Window.IsActive(gameviewmode) | Window.IsActive(gamevideofilter) | Window.IsActive(gamevideorotation)]">DefaultDialogSelectLayout</include>
 	</controls>
 </window>
--- a/720p/GameOSD.xml
+++ b/720p/GameOSD.xml
@ -4,17 +4,17 @@
 	<include>dialogeffect</include>
 	<coordinates>
 		<left>470</left>
-		<top>208</top>
+		<top>147</top>
 	</coordinates>
 	<controls>
 		<control type="group">
-			<visible>!Window.IsActive(GameVideoFilter) + !Window.IsActive(GameViewMode) + !Window.IsActive(GameControllers)</visible>
+			<visible>!Window.IsActive(GameVideoFilter) + !Window.IsActive(GameViewMode) + !Window.IsActive(GameVideoRotation) + !Window.IsActive(GameControllers)</visible>
 			<control type="image">
 				<description>background image</description>
 				<left>0</left>
 				<top>0</top>
 				<width>340</width>
-				<height>344</height>
+				<height>470</height>
 				<texture border="20">DialogBack.png</texture>
 			</control>
 			<control type="image">
@ -43,7 +43,7 @@
 				<left>20</left>
 				<top>70</top>
 				<width>300</width>
-				<height>254</height>
+				<height>380</height>
 				<itemgap>4</itemgap>
 				<control type="button" id="1001">
 					<description>Resume button</description>
@ -65,8 +65,7 @@
 					<textcolor>grey2</textcolor>
 					<focusedcolor>white</focusedcolor>
 					<texturefocus border="5">button-focus.png</texturefocus>
-					<label>$LOCALIZE[10035]</label>
-					<label2>Select + B</label2>
+					<label>$LOCALIZE[13007]</label>
 					<onclick>PlayerControl(Reset)</onclick>
 				</control>
 				<control type="button" id="1003">
@ -81,12 +80,24 @@
 					<label2>Select + Start</label2>
 					<onclick>Stop</onclick>
 				</control>
-				<control type="image" id="1004">
+				<control type="button" id="1004">
+					<description>Volume button</description>
+					<width>300</width>
+					<height>38</height>
+					<font>fontContextMenu</font>
+					<textcolor>grey2</textcolor>
+					<focusedcolor>white</focusedcolor>
+					<texturefocus border="5">button-focus.png</texturefocus>
+					<label>13376</label>
+					<label2>Select + Right Stick</label2>
+					<onclick>ActivateWindow(GameVolume)</onclick>
+				</control>
+				<control type="image" id="1005">
 					<description>separator image</description>
 					<height>2</height>
 					<texture>separator2.png</texture>
 				</control>
-				<control type="button" id="1005">
+				<control type="button" id="1006">
 					<description>Video filter button</description>
 					<width>300</width>
 					<height>38</height>
@ -98,8 +109,8 @@
 					<label>$LOCALIZE[230]</label>
 					<onclick>ActivateWindow(GameVideoFilter)</onclick>
 				</control>
-				<control type="button" id="1006">
-					<description>View mode button</description>
+				<control type="button" id="1007">
+					<description>Stretch mode button</description>
 					<width>300</width>
 					<height>38</height>
 					<font>fontContextMenu</font>
@ -107,11 +118,11 @@
 					<textcolor>grey2</textcolor>
 					<focusedcolor>white</focusedcolor>
 					<texturefocus border="5">button-focus.png</texturefocus>
-					<label>$LOCALIZE[629]</label>
+					<label>35233</label>
 					<onclick>ActivateWindow(GameViewMode)</onclick>
 				</control>
-				<control type="button" id="1007">
-					<description>Input settings button</description>
+				<control type="button" id="1008">
+					<description>Rotation button</description>
 					<width>300</width>
 					<height>38</height>
 					<font>fontContextMenu</font>
@ -119,9 +130,33 @@
 					<textcolor>grey2</textcolor>
 					<focusedcolor>white</focusedcolor>
 					<texturefocus border="5">button-focus.png</texturefocus>
-					<label>$LOCALIZE[35223]</label>
+					<label>35227</label>
+					<onclick>ActivateWindow(GameVideoRotation)</onclick>
+				</control>
+				<control type="button" id="1009">
+					<description>Controller button</description>
+					<width>300</width>
+					<height>38</height>
+					<font>fontContextMenu</font>
+					<align>center</align>
+					<textcolor>grey2</textcolor>
+					<focusedcolor>white</focusedcolor>
+					<texturefocus border="5">button-focus.png</texturefocus>
+					<label>$LOCALIZE[35234]</label>
 					<onclick>ActivateWindow(gamecontrollers)</onclick>
 				</control>
+				<control type="button" id="1010">
+					<description>Advanced settings button</description>
+					<width>300</width>
+					<height>38</height>
+					<font>fontContextMenu</font>
+					<align>center</align>
+					<textcolor>grey2</textcolor>
+					<focusedcolor>white</focusedcolor>
+					<texturefocus border="5">button-focus.png</texturefocus>
+					<label>$LOCALIZE[35226]</label>
+					<onclick>ActivateWindow(GameAdvancedSettings)</onclick>
+				</control>
 			</control>
 			<control type="button">
 				<description>Close Window button</description>
--- a/720p/Includes.xml
+++ b/720p/Includes.xml
@ -41,7 +41,8 @@
 	<!-- VARIABLES -->
 	<variable name="GameSelectHeader">
 		<value condition="Window.IsActive(gamevideofilter)">$LOCALIZE[230]</value>
-		<value condition="Window.IsActive(gameviewmode)">$LOCALIZE[629]</value>
+		<value condition="Window.IsActive(gameviewmode)">$LOCALIZE[35233]</value>
+		<value condition="Window.IsActive(gamevideorotation)">$LOCALIZE[35227]</value>
 	</variable>
 	<variable name="DurationInMinutes">
 		<value condition="String.StartsWith(ListItem.Duration,01:00:)">60 $LOCALIZE[12391]</value>
--- a/720p/Includes_DialogSelect.xml
+++ b/720p/Includes_DialogSelect.xml
@ -401,6 +401,7 @@
 						<height>150</height>
 						<viewmode>$INFO[ListItem.Property(game.viewmode)]</viewmode>
 						<videofilter>$INFO[ListItem.Property(game.videofilter)]</videofilter>
+						<rotation>$INFO[ListItem.Property(game.videorotation)]</rotation>
 					</control>
 					<control type="label">
 						<left>7</left>
@ -429,6 +430,7 @@
 						<height>150</height>
 						<viewmode>$INFO[ListItem.Property(game.viewmode)]</viewmode>
 						<videofilter>$INFO[ListItem.Property(game.videofilter)]</videofilter>
+						<rotation>$INFO[ListItem.Property(game.videorotation)]</rotation>
 					</control>
 					<control type="label">
 						<left>7</left>
--- a/addon.xml
+++ b/addon.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.confluence" version="4.4.6" name="Confluence" provider-name="Jezz_X, Team Kodi">
+<addon id="skin.confluence" version="4.4.7" name="Confluence" provider-name="Jezz_X, Team Kodi">
 	<requires>
 		<import addon="xbmc.gui" version="5.13.0"/>
 	</requires>
--- a/changelog.txt
+++ b/changelog.txt
@ -1,3 +1,7 @@
+[B]4.4.7[/B]
+
+- Updated GameOSD dialog
+
 [B]4.1.41[/B]

 - Added GameOSD dialog