Updated: [Confluence] Picture Views to new layout

3 files changed, 71 insertions, 40 deletions

diff --git a/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml b/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml
index ba8022135c..363835dc30 100644
--- a/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml
+++ b/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml
@@ -160,6 +160,38 @@
 					<texture border="10">ContentPanelMirror.png</texture>
 				</control>
 			</control>
+			<control type="group">
+				<include>VisibleFadeEffect</include>
+				<visible>Control.IsVisible(514)</visible>
+				<control type="image">
+					<posx>50</posx>
+					<posy>60</posy>
+					<width>490</width>
+					<height>600</height>
+					<texture border="10">ContentPanel.png</texture>
+				</control>
+				<control type="image">
+					<posx>50</posx>
+					<posy>652</posy>
+					<width>490</width>
+					<height>64</height>
+					<texture border="10">ContentPanelMirror.png</texture>
+				</control>
+				<control type="image">
+					<posx>550</posx>
+					<posy>60</posy>
+					<width>680</width>
+					<height>600</height>
+					<texture border="10">ContentPanel.png</texture>
+				</control>
+				<control type="image">
+					<posx>550</posx>
+					<posy>652</posy>
+					<width>680</width>
+					<height>64</height>
+					<texture border="10">ContentPanelMirror.png</texture>
+				</control>
+			</control>
 		</control>
 	</include>
 </includes>
\ No newline at end of file
diff --git a/addons/skin.confluence/720p/MyPics.xml b/addons/skin.confluence/720p/MyPics.xml
index 325386286e..a7aad395ce 100644
--- a/addons/skin.confluence/720p/MyPics.xml
+++ b/addons/skin.confluence/720p/MyPics.xml
@@ -1,10 +1,22 @@
 <window id="2">
 	<defaultcontrol always="true">50</defaultcontrol>
 	<allowoverlay>no</allowoverlay>
-	<views>50,51,550,551,500,511,510</views>
+	<views>50,51,550,551,500,514,510</views>
 	<controls>
 		<include>CommonPictureBackground</include>
 		<include>CommonMediaPlayingBackground</include>
+		<control type="image">
+			<posx>0</posx>
+			<posy>0</posy>
+			<width>1280</width>
+			<height>625</height>
+			<texture background="true">$INFO[ListItem.FilenameAndPath]</texture>
+			<fadetime>1000</fadetime>
+			<aspectratio>keep</aspectratio>
+			<include>VisibleFadeEffect</include>
+			<visible>Control.IsVisible(510)</visible>
+			<include>Window_OpenClose_Animation</include>		
+		</control>
 		<include>ContentPanelBackgrounds</include>
 		<control type="group">
 			<include>Window_OpenClose_Animation</include>		
@@ -12,7 +24,7 @@
 			<include>FullWidthList</include> <!-- view id = 51 -->
 			<include>ThumbnailView</include> <!-- view id = 500 -->
 			<include>PictureWrapView</include> <!-- view id = 510 -->
-			<include>PictureThumbView</include> <!-- view id = 511 -->
+			<include>PictureThumbView</include> <!-- view id = 514 -->
 			<include>AddonInfoListView1</include> <!-- view id = 550 -->
 			<include>AddonInfoThumbView1</include> <!-- view id = 551 -->
 		</control>
diff --git a/addons/skin.confluence/720p/ViewsPictures.xml b/addons/skin.confluence/720p/ViewsPictures.xml
index d428260bf5..054085837b 100644
--- a/addons/skin.confluence/720p/ViewsPictures.xml
+++ b/addons/skin.confluence/720p/ViewsPictures.xml
@@ -67,22 +67,9 @@
 					</control>
 				</focusedlayout>
 			</control>
-			<control type="label">
-				<posx>40</posx>
-				<posy>200</posy>
-				<width>1200</width>
-				<height>30</height>
-				<font>font13_title</font>
-				<textcolor>white</textcolor>
-				<shadowcolor>black</shadowcolor>
-				<scroll>true</scroll>
-				<align>center</align>
-				<aligny>center</aligny>
-				<label>$INFO[ListItem.Label]</label>
-			</control>
 			<control type="scrollbar" id="60">
 				<posx>310</posx>
-				<posy>225</posy>
+				<posy>200</posy>
 				<width>660</width>
 				<height>25</height>
 				<texturesliderbackground border="14,0,14,0">ScrollBarH.png</texturesliderbackground>
@@ -100,10 +87,10 @@
 	</include>
 	<include name="PictureThumbView">
 		<control type="group">
-			<visible>Control.IsVisible(511)</visible>
-			<control type="panel" id="511">
-				<posx>40</posx>
-				<posy>80</posy>
+			<visible>Control.IsVisible(514)</visible>
+			<control type="panel" id="514">
+				<posx>60</posx>
+				<posy>75</posy>
 				<width>432</width>
 				<height>576</height>
 				<onleft>2</onleft>
@@ -158,8 +145,8 @@
 				</focusedlayout>
 			</control>
 			<control type="scrollbar" id="60">
-				<posx>480</posx>
-				<posy>80</posy>
+				<posx>500</posx>
+				<posy>70</posy>
 				<width>25</width>
 				<height>576</height>
 				<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
@@ -167,62 +154,62 @@
 				<texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
 				<textureslidernib>ScrollBarNib.png</textureslidernib>
 				<textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
-				<onleft>510</onleft>
+				<onleft>514</onleft>
 				<onright>2</onright>
 				<showonepage>false</showonepage>
 				<orientation>vertical</orientation>
-				<visible>Control.IsVisible(511)</visible>
+				<visible>Control.IsVisible(514)</visible>
 			</control>
 			<control type="group">
-				<posx>540</posx>
-				<posy>60</posy>
+				<posx>570</posx>
+				<posy>80</posy>
 				<control type="label">
 					<description>Title txt</description>
 					<posx>0</posx>
-					<posy>20</posy>
-					<width>700</width>
+					<posy>0</posy>
+					<width>640</width>
 					<height>15</height>
 					<label>$INFO[ListItem.Label]</label>
-					<align>left</align>
+					<align>center</align>
 					<aligny>center</aligny>
 					<font>font24_title</font>
 					<textcolor>white</textcolor>
 					<shadowcolor>black</shadowcolor>
 				</control>
 				<control type="image">
-					<posx>-9</posx>
-					<posy>50</posy>
-					<width>700</width>
-					<height>500</height>
+					<posx>0</posx>
+					<posy>30</posy>
+					<width>640</width>
+					<height>470</height>
 					<texture background="true">$INFO[ListItem.FilenameAndPath]</texture>
 					<fadetime>600</fadetime>
-					<aspectratio>keep</aspectratio>
+					<aspectratio>stretch</aspectratio>
 					<bordertexture border="8">ThumbShadow.png</bordertexture>
 					<bordersize>9</bordersize>
 				</control>
 				<control type="label">
 					<description>Date time txt</description>
 					<posx>0</posx>
-					<posy>570</posy>
-					<width>700</width>
+					<posy>510</posy>
+					<width>640</width>
 					<height>15</height>
 					<label>$INFO[ListItem.PictureDateTime,[COLOR=blue]$LOCALIZE[31326][/COLOR] - ]</label>
 					<align>left</align>
 					<aligny>center</aligny>
-					<font>font13caps</font>
+					<font>font13</font>
 					<textcolor>white</textcolor>
 					<shadowcolor>black</shadowcolor>
 				</control>
 				<control type="label">
 					<description>Resolution txt</description>
 					<posx>0</posx>
-					<posy>600</posy>
-					<width>700</width>
+					<posy>535</posy>
+					<width>640</width>
 					<height>15</height>
 					<label>$INFO[ListItem.PictureResolution,[COLOR=blue]$LOCALIZE[31327][/COLOR] - ]</label>
 					<align>left</align>
 					<aligny>center</aligny>
-					<font>font13caps</font>
+					<font>font13</font>
 					<textcolor>white</textcolor>
 					<shadowcolor>black</shadowcolor>
 				</control>