From 31448a071d47db939bd73c1846732e4378df7c55 Mon Sep 17 00:00:00 2001
From: Kolja Lampe <razzeee@gmail.com>
Date: Fri, 16 Oct 2015 10:16:14 +0200
Subject: [confluence] Add user rating item to list and add a button for
 setting the user rating of this item

---
 addons/skin.confluence/720p/DialogSongInfo.xml  | 82 +++++--------------------
 addons/skin.confluence/720p/DialogVideoInfo.xml | 39 ++++++++++--
 2 files changed, 51 insertions(+), 70 deletions(-)

diff --git a/addons/skin.confluence/720p/DialogSongInfo.xml b/addons/skin.confluence/720p/DialogSongInfo.xml
index 58eb6e7533..9800c84b7b 100644
--- a/addons/skin.confluence/720p/DialogSongInfo.xml
+++ b/addons/skin.confluence/720p/DialogSongInfo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
-	<defaultcontrol always="true">10</defaultcontrol>
+	<defaultcontrol always="true">12</defaultcontrol>
 	<coordinates>
 		<left>185</left>
 		<top>105</top>
@@ -201,34 +201,6 @@
 						<aspectratio align="left">keep</aspectratio>
 						<texture>LeftRating/$INFO[ListItem.StarRating]</texture>
 					</control>
-					<control type="button" id="14">
-						<description>Decrease Rating</description>
-						<left>160</left>
-						<top>5</top>
-						<width>33</width>
-						<height>22</height>
-						<onclick>DecreaseRating</onclick>
-						<texturenofocus>scroll-down-2.png</texturenofocus>
-						<texturefocus>scroll-down-focus-2.png</texturefocus>
-						<onleft>15</onleft>
-						<onright>15</onright>
-						<ondown>9000</ondown>
-						<onup>9000</onup>
-					</control>
-					<control type="button" id="15">
-						<description>Increase Rating</description>
-						<left>193</left>
-						<top>5</top>
-						<width>33</width>
-						<height>22</height>
-						<onclick>IncreaseRating</onclick>
-						<texturenofocus>scroll-up-2.png</texturenofocus>
-						<texturefocus>scroll-up-focus-2.png</texturefocus>
-						<onleft>14</onleft>
-						<onright>14</onright>
-						<ondown>9000</ondown>
-						<onup>9000</onup>
-					</control>
 				</control>
 				<control type="label">
 					<description>Comment Title</description>
@@ -254,63 +226,43 @@
 				</control>
 			</control>
 			<control type="group" id="9000">
-				<left>40</left>
+				<left>140</left>
 				<top>445</top>
-				<control type="button" id="10">
-					<description>Ok button</description>
+				<control type="button" id="12">
+					<description>Album Info button</description>
 					<left>0</left>
 					<top>0</top>
 					<width>200</width>
 					<height>40</height>
-					<label>186</label>
+					<label>10523</label>
 					<font>font12_title</font>
 					<align>center</align>
-					<onleft>13</onleft>
-					<onright>11</onright>
-					<onup>14</onup>
-					<ondown>14</ondown>
+					<onleft>7</onleft>
+					<onright>13</onright>
 				</control>
-				<control type="button" id="11">
-					<description>Cancel button</description>
+				<control type="button" id="13">
+					<description>Get Thumb button</description>
 					<left>210</left>
 					<top>0</top>
 					<width>200</width>
 					<height>40</height>
-					<label>222</label>
+					<label>13405</label>
 					<font>font12_title</font>
 					<align>center</align>
-					<onleft>10</onleft>
-					<onright>12</onright>
-					<onup>14</onup>
-					<ondown>14</ondown>
+					<onleft>12</onleft>
+					<onright>7</onright>
 				</control>
-				<control type="button" id="12">
-					<description>Album Info button</description>
+				<control type="button" id="7">
+					<description>Set my rating</description>
 					<left>420</left>
 					<top>0</top>
 					<width>200</width>
 					<height>40</height>
-					<label>10523</label>
-					<font>font12_title</font>
-					<align>center</align>
-					<onleft>11</onleft>
-					<onright>13</onright>
-					<onup>14</onup>
-					<ondown>14</ondown>
-				</control>
-				<control type="button" id="13">
-					<description>Get Thumb button</description>
-					<left>630</left>
-					<top>0</top>
-					<width>200</width>
-					<height>40</height>
-					<label>13405</label>
+					<label>38023</label>
 					<font>font12_title</font>
 					<align>center</align>
-					<onleft>12</onleft>
-					<onright>10</onright>
-					<onup>14</onup>
-					<ondown>14</ondown>
+					<onleft>13</onleft>
+					<onright>12</onright>
 				</control>
 			</control>
 		</control>
diff --git a/addons/skin.confluence/720p/DialogVideoInfo.xml b/addons/skin.confluence/720p/DialogVideoInfo.xml
index 5bd442860f..b0a6b75557 100644
--- a/addons/skin.confluence/720p/DialogVideoInfo.xml
+++ b/addons/skin.confluence/720p/DialogVideoInfo.xml
@@ -178,9 +178,9 @@
 					</control>
 					<control type="list" id="49">
 						<left>290</left>
-						<top>20</top>
+						<top>-4</top>
 						<width>740</width>
-						<height>330</height>
+						<height>390</height>
 						<onleft>49</onleft>
 						<onright>49</onright>
 						<onup>9000</onup>
@@ -291,6 +291,12 @@
 								<onclick>noop</onclick>
 								<visible>!IsEmpty(ListItem.Duration)</visible>
 							</item>
+							<item>
+								<label>$LOCALIZE[38018]:</label>
+								<label2>$INFO[ListItem.Userrating]</label2>
+								<onclick>noop</onclick>
+								<visible>!IsEmpty(ListItem.Userrating)</visible>
+							</item>
 							<item>
 								<label>$LOCALIZE[563]:</label>
 								<label2>$INFO[ListItem.RatingAndVotes]</label2>
@@ -325,7 +331,7 @@
 					</control>
 					<control type="image">
 						<left>290</left>
-						<top>370</top>
+						<top>382</top>
 						<width>740</width>
 						<height>4</height>
 						<aspectratio>stretch</aspectratio>
@@ -453,6 +459,12 @@
 								<onclick>noop</onclick>
 								<visible>!IsEmpty(ListItem.Year)</visible>
 							</item>
+							<item>
+								<label>$LOCALIZE[38018]:</label>
+								<label2>$INFO[ListItem.Userrating]</label2>
+								<onclick>noop</onclick>
+								<visible>!IsEmpty(ListItem.Userrating)</visible>
+							</item>
 							<item>
 								<label>$LOCALIZE[563]:</label>
 								<label2>$INFO[ListItem.RatingAndVotes]</label2>
@@ -503,9 +515,9 @@
 					</control>
 					<control type="list" id="49">
 						<left>390</left>
-						<top>20</top>
+						<top>0</top>
 						<width>640</width>
-						<height>330</height>
+						<height>360</height>
 						<onleft>49</onleft>
 						<onright>49</onright>
 						<onup>9000</onup>
@@ -628,6 +640,12 @@
 								<onclick>noop</onclick>
 								<visible>!IsEmpty(ListItem.Duration)</visible>
 							</item>
+							<item>
+								<label>$LOCALIZE[38018]:</label>
+								<label2>$INFO[ListItem.Userrating]</label2>
+								<onclick>noop</onclick>
+								<visible>!IsEmpty(ListItem.Userrating)</visible>
+							</item>
 							<item>
 								<label>$LOCALIZE[563]:</label>
 								<label2>$INFO[ListItem.RatingAndVotes]</label2>
@@ -787,6 +805,12 @@
 								<onclick>noop</onclick>
 								<visible>!IsEmpty(ListItem.Duration)</visible>
 							</item>
+							<item>
+								<label>$LOCALIZE[38018]:</label>
+								<label2>$INFO[ListItem.Userrating]</label2>
+								<onclick>noop</onclick>
+								<visible>!IsEmpty(ListItem.Userrating)</visible>
+							</item>
 							<item>
 								<label>$LOCALIZE[15311]</label>
 								<label2>$INFO[ListItem.FilenameAndPath]</label2>
@@ -983,6 +1007,11 @@
 						<onclick>PlayMedia($INFO[ListItem.Trailer],1)</onclick>
 						<visible>!IsEmpty(ListItem.Trailer) + Skin.HasSetting(WindowedTrailer)</visible>
 					</control>
+					<control type="button" id="7">
+						<description>Set my rating</description>
+						<include>ButtonInfoDialogsCommonValues</include>
+						<label>38023</label>
+					</control>
 					<control type="button" id="100">
 						<description>Fetch TvTunes stuff</description>
 						<include>ButtonInfoDialogsCommonValues</include>
-- 
cgit v1.2.3