Changed: [Confluence] Cosmetics to bring the Peripheral windows in line with other dialog behavior

2 files changed, 220 insertions, 216 deletions

diff --git a/addons/skin.confluence/720p/DialogPeripheralManager.xml b/addons/skin.confluence/720p/DialogPeripheralManager.xml
index e86919b0ad..26d2535c7e 100644
--- a/addons/skin.confluence/720p/DialogPeripheralManager.xml
+++ b/addons/skin.confluence/720p/DialogPeripheralManager.xml
@@ -7,223 +7,227 @@
 	</coordinates>
 	<include>dialogeffect</include>
 	<controls>
-		<control type="image">
-			<description>background image</description>
-			<posx>0</posx>
-			<posy>0</posy>
-			<width>610</width>
-			<height>650</height>
-			<texture border="40">DialogBack.png</texture>
-			<visible>![Window.IsVisible(FullscreenVideo) | Window.IsVisible(Visualisation)]</visible>
-		</control>
-		<control type="image">
-			<description>background image</description>
-			<posx>0</posx>
-			<posy>0</posy>
-			<width>610</width>
-			<height>650</height>
-			<texture border="40">DialogBack2.png</texture>
-			<visible>Window.IsVisible(FullscreenVideo) | Window.IsVisible(Visualisation)</visible>
-		</control>
-		<control type="image">
-			<description>Dialog Header image</description>
-			<posx>40</posx>
-			<posy>16</posy>
-			<width>530</width>
-			<height>40</height>
-			<texture>dialogheader.png</texture>
-		</control>
-		<control type="label" id="1">
-			<description>header label</description>
-			<posx>40</posx>
-			<posy>20</posy>
-			<width>530</width>
-			<height>30</height>
-			<font>font13_title</font>
-			<label>$LOCALIZE[35000]</label>
-			<align>center</align>
-			<aligny>center</aligny>
-			<textcolor>selected</textcolor>
-			<shadowcolor>black</shadowcolor>
-		</control>
-		<control type="button">
-			<description>Close Window button</description>
-			<posx>520</posx>
-			<posy>15</posy>
-			<width>64</width>
-			<height>32</height>
-			<label>-</label>
-			<font>-</font>
-			<onclick>PreviousMenu</onclick>
-			<texturefocus>DialogCloseButton-focus.png</texturefocus>
-			<texturenofocus>DialogCloseButton.png</texturenofocus>
-			<onleft>10</onleft>
-			<onright>10</onright>
-			<onup>10</onup>
-			<ondown>10</ondown>
-			<visible>system.getbool(input.enablemouse)</visible>
-		</control>
+		<control type="group">
+			<visible>!Window.IsVisible(PeripheralSettings)</visible>
+			<include>VisibleFadeEffect</include>
+			<control type="image">
+				<description>background image</description>
+				<posx>0</posx>
+				<posy>0</posy>
+				<width>610</width>
+				<height>650</height>
+				<texture border="40">DialogBack.png</texture>
+				<visible>![Window.IsVisible(FullscreenVideo) | Window.IsVisible(Visualisation)]</visible>
+			</control>
+			<control type="image">
+				<description>background image</description>
+				<posx>0</posx>
+				<posy>0</posy>
+				<width>610</width>
+				<height>650</height>
+				<texture border="40">DialogBack2.png</texture>
+				<visible>Window.IsVisible(FullscreenVideo) | Window.IsVisible(Visualisation)</visible>
+			</control>
+			<control type="image">
+				<description>Dialog Header image</description>
+				<posx>40</posx>
+				<posy>16</posy>
+				<width>530</width>
+				<height>40</height>
+				<texture>dialogheader.png</texture>
+			</control>
+			<control type="label" id="1">
+				<description>header label</description>
+				<posx>40</posx>
+				<posy>20</posy>
+				<width>530</width>
+				<height>30</height>
+				<font>font13_title</font>
+				<label>$LOCALIZE[35000]</label>
+				<align>center</align>
+				<aligny>center</aligny>
+				<textcolor>selected</textcolor>
+				<shadowcolor>black</shadowcolor>
+			</control>
+			<control type="button">
+				<description>Close Window button</description>
+				<posx>520</posx>
+				<posy>15</posy>
+				<width>64</width>
+				<height>32</height>
+				<label>-</label>
+				<font>-</font>
+				<onclick>PreviousMenu</onclick>
+				<texturefocus>DialogCloseButton-focus.png</texturefocus>
+				<texturenofocus>DialogCloseButton.png</texturenofocus>
+				<onleft>10</onleft>
+				<onright>10</onright>
+				<onup>10</onup>
+				<ondown>10</ondown>
+				<visible>system.getbool(input.enablemouse)</visible>
+			</control>
 
-		<control type="list" id="20">
-			<posx>20</posx>
-			<posy>65</posy>
-			<width>550</width>
-			<height>510</height>
-			<onup>6</onup>
-			<ondown>6</ondown>
-			<onleft>5</onleft>
-			<onright>61</onright>
-			<pagecontrol>61</pagecontrol>
-			<scrolltime>200</scrolltime>
-			<animation effect="slide" start="0,0" end="10,0" time="0" condition="!Control.IsVisible(61)">Conditional</animation>
-			<itemlayout height="85" width="550">
-				<control type="image">
-					<posx>0</posx>
-					<posy>0</posy>
-					<width>550</width>
-					<height>80</height>
-					<texture border="5">button-nofocus.png</texture>
-				</control>
-				<control type="label">
-					<description>Name</description>
-					<posx>10</posx>
-					<posy>5</posy>
-					<width>520</width>
-					<height>20</height>
-					<label>$INFO[ListItem.Label]</label>
-					<align>left</align>
-					<aligny>center</aligny>
-					<font>font13</font>
-					<textcolor>white</textcolor>
-				</control>
-				<control type="label">
-					<description>Product ID Vendor ID</description>
-					<posx>10</posx>
-					<posy>30</posy>
-					<width>520</width>
-					<height>20</height>
-					<label>$LOCALIZE[35504]:  [COLOR=grey2]$INFO[ListItem.Property(Product)][/COLOR]    $LOCALIZE[35503]:  [COLOR=grey2]$INFO[ListItem.Property(Vendor)][/COLOR]</label>
-					<align>left</align>
-					<aligny>center</aligny>
-					<font>font12</font>
-					<textcolor>blue</textcolor>
-				</control>
-				<control type="label">
-					<description>class</description>
-					<posx>10</posx>
-					<posy>50</posy>
-					<width>520</width>
-					<height>20</height>
-					<label>$LOCALIZE[35501]:  [COLOR=grey2]$INFO[ListItem.Property(Class)][/COLOR]</label>
-					<align>left</align>
-					<aligny>center</aligny>
-					<font>font12</font>
-					<textcolor>blue</textcolor>
-				</control>
-			</itemlayout>
-			<focusedlayout height="85" width="550">
-				<control type="image">
-					<posx>0</posx>
-					<posy>0</posy>
-					<width>550</width>
-					<height>80</height>
-					<texture border="5">button-nofocus.png</texture>
-					<visible>!Control.HasFocus(20)</visible>
-					<include>VisibleFadeEffect</include>
-				</control>
-				<control type="image">
-					<posx>0</posx>
-					<posy>0</posy>
-					<width>550</width>
-					<height>80</height>
-					<texture border="5">button-focus2.png</texture>
-					<visible>Control.HasFocus(20)</visible>
-					<include>VisibleFadeEffect</include>
-				</control>
-				<control type="label">
-					<description>Name</description>
-					<posx>10</posx>
-					<posy>5</posy>
-					<width>520</width>
-					<height>20</height>
-					<label>$INFO[ListItem.Label]</label>
-					<align>left</align>
-					<aligny>center</aligny>
-					<font>font13</font>
-					<textcolor>white</textcolor>
-				</control>
-				<control type="label">
-					<description>Product ID Vendor ID</description>
-					<posx>10</posx>
-					<posy>30</posy>
-					<width>520</width>
-					<height>20</height>
-					<label>$LOCALIZE[35504]:  [COLOR=grey2]$INFO[ListItem.Property(Product)][/COLOR]    $LOCALIZE[35503]:  [COLOR=grey2]$INFO[ListItem.Property(Vendor)][/COLOR]</label>
-					<align>left</align>
-					<aligny>center</aligny>
-					<font>font12</font>
-					<textcolor>blue</textcolor>
-				</control>
-				<control type="label">
-					<description>class</description>
-					<posx>10</posx>
-					<posy>50</posy>
-					<width>520</width>
-					<height>20</height>
-					<label>$LOCALIZE[35501]:  [COLOR=grey2]$INFO[ListItem.Property(Class)][/COLOR]</label>
-					<align>left</align>
-					<aligny>center</aligny>
-					<font>font12</font>
-					<textcolor>blue</textcolor>
-				</control>
-			</focusedlayout>
-		</control>
+			<control type="list" id="20">
+				<posx>20</posx>
+				<posy>65</posy>
+				<width>550</width>
+				<height>510</height>
+				<onup>6</onup>
+				<ondown>6</ondown>
+				<onleft>5</onleft>
+				<onright>61</onright>
+				<pagecontrol>61</pagecontrol>
+				<scrolltime>200</scrolltime>
+				<animation effect="slide" start="0,0" end="10,0" time="0" condition="!Control.IsVisible(61)">Conditional</animation>
+				<itemlayout height="85" width="550">
+					<control type="image">
+						<posx>0</posx>
+						<posy>0</posy>
+						<width>550</width>
+						<height>80</height>
+						<texture border="5">button-nofocus.png</texture>
+					</control>
+					<control type="label">
+						<description>Name</description>
+						<posx>10</posx>
+						<posy>5</posy>
+						<width>520</width>
+						<height>20</height>
+						<label>$INFO[ListItem.Label]</label>
+						<align>left</align>
+						<aligny>center</aligny>
+						<font>font13</font>
+						<textcolor>white</textcolor>
+					</control>
+					<control type="label">
+						<description>Product ID Vendor ID</description>
+						<posx>10</posx>
+						<posy>30</posy>
+						<width>520</width>
+						<height>20</height>
+						<label>$LOCALIZE[35504]:  [COLOR=grey2]$INFO[ListItem.Property(Product)][/COLOR]    $LOCALIZE[35503]:  [COLOR=grey2]$INFO[ListItem.Property(Vendor)][/COLOR]</label>
+						<align>left</align>
+						<aligny>center</aligny>
+						<font>font12</font>
+						<textcolor>blue</textcolor>
+					</control>
+					<control type="label">
+						<description>class</description>
+						<posx>10</posx>
+						<posy>50</posy>
+						<width>520</width>
+						<height>20</height>
+						<label>$LOCALIZE[35501]:  [COLOR=grey2]$INFO[ListItem.Property(Class)][/COLOR]</label>
+						<align>left</align>
+						<aligny>center</aligny>
+						<font>font12</font>
+						<textcolor>blue</textcolor>
+					</control>
+				</itemlayout>
+				<focusedlayout height="85" width="550">
+					<control type="image">
+						<posx>0</posx>
+						<posy>0</posy>
+						<width>550</width>
+						<height>80</height>
+						<texture border="5">button-nofocus.png</texture>
+						<visible>!Control.HasFocus(20)</visible>
+						<include>VisibleFadeEffect</include>
+					</control>
+					<control type="image">
+						<posx>0</posx>
+						<posy>0</posy>
+						<width>550</width>
+						<height>80</height>
+						<texture border="5">button-focus2.png</texture>
+						<visible>Control.HasFocus(20)</visible>
+						<include>VisibleFadeEffect</include>
+					</control>
+					<control type="label">
+						<description>Name</description>
+						<posx>10</posx>
+						<posy>5</posy>
+						<width>520</width>
+						<height>20</height>
+						<label>$INFO[ListItem.Label]</label>
+						<align>left</align>
+						<aligny>center</aligny>
+						<font>font13</font>
+						<textcolor>white</textcolor>
+					</control>
+					<control type="label">
+						<description>Product ID Vendor ID</description>
+						<posx>10</posx>
+						<posy>30</posy>
+						<width>520</width>
+						<height>20</height>
+						<label>$LOCALIZE[35504]:  [COLOR=grey2]$INFO[ListItem.Property(Product)][/COLOR]    $LOCALIZE[35503]:  [COLOR=grey2]$INFO[ListItem.Property(Vendor)][/COLOR]</label>
+						<align>left</align>
+						<aligny>center</aligny>
+						<font>font12</font>
+						<textcolor>blue</textcolor>
+					</control>
+					<control type="label">
+						<description>class</description>
+						<posx>10</posx>
+						<posy>50</posy>
+						<width>520</width>
+						<height>20</height>
+						<label>$LOCALIZE[35501]:  [COLOR=grey2]$INFO[ListItem.Property(Class)][/COLOR]</label>
+						<align>left</align>
+						<aligny>center</aligny>
+						<font>font12</font>
+						<textcolor>blue</textcolor>
+					</control>
+				</focusedlayout>
+			</control>
 
-		<control type="scrollbar" id="61">
-			<posx>570</posx>
-			<posy>65</posy>
-			<width>25</width>
-			<height>510</height>
-			<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
-			<texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
-			<texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
-			<textureslidernib>ScrollBarNib.png</textureslidernib>
-			<textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
-			<onleft>3</onleft>
-			<onright>3</onright>
-			<ondown>61</ondown>
-			<onup>61</onup>
-			<showonepage>false</showonepage>
-			<orientation>vertical</orientation>
-		</control>
-		<control type="label">
-			<description>number of files/pages in list text label</description>
-			<posx>580</posx>
-			<posy>585</posy>
-			<width>300</width>
-			<height>35</height>
-			<font>font12</font>
-			<align>right</align>
-			<aligny>center</aligny>
-			<scroll>true</scroll>
-			<textcolor>grey</textcolor>
-			<label>([COLOR=blue]$INFO[Container(20).NumItems][/COLOR]) $LOCALIZE[31025] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(20).CurrentPage]/$INFO[Container(20).NumPages][/COLOR])</label>
-		</control>
-		<control type="button" id="10">
-			<description>Close button</description>
-			<posx>20</posx>
-			<posy>585</posy>
-			<width>200</width>
-			<height>40</height>
-			<label>186</label>
-			<font>font12_title</font>
-			<textcolor>white</textcolor>
-			<focusedcolor>white</focusedcolor>
-			<align>center</align>
-			<onleft>61</onleft>
-			<onright>20</onright>
-			<onup>20</onup>
-			<ondown>20</ondown>
+			<control type="scrollbar" id="61">
+				<posx>570</posx>
+				<posy>65</posy>
+				<width>25</width>
+				<height>510</height>
+				<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
+				<texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
+				<texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
+				<textureslidernib>ScrollBarNib.png</textureslidernib>
+				<textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
+				<onleft>3</onleft>
+				<onright>3</onright>
+				<ondown>61</ondown>
+				<onup>61</onup>
+				<showonepage>false</showonepage>
+				<orientation>vertical</orientation>
+			</control>
+			<control type="label">
+				<description>number of files/pages in list text label</description>
+				<posx>580</posx>
+				<posy>585</posy>
+				<width>300</width>
+				<height>35</height>
+				<font>font12</font>
+				<align>right</align>
+				<aligny>center</aligny>
+				<scroll>true</scroll>
+				<textcolor>grey</textcolor>
+				<label>([COLOR=blue]$INFO[Container(20).NumItems][/COLOR]) $LOCALIZE[31025] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(20).CurrentPage]/$INFO[Container(20).NumPages][/COLOR])</label>
+			</control>
+			<control type="button" id="10">
+				<description>Close button</description>
+				<posx>20</posx>
+				<posy>585</posy>
+				<width>200</width>
+				<height>40</height>
+				<label>186</label>
+				<font>font12_title</font>
+				<textcolor>white</textcolor>
+				<focusedcolor>white</focusedcolor>
+				<align>center</align>
+				<onleft>61</onleft>
+				<onright>20</onright>
+				<onup>20</onup>
+				<ondown>20</ondown>
+			</control>
 		</control>
 	</controls>
 </window>
diff --git a/addons/skin.confluence/720p/includes.xml b/addons/skin.confluence/720p/includes.xml
index c885b267ca..b563db5f16 100644
--- a/addons/skin.confluence/720p/includes.xml
+++ b/addons/skin.confluence/720p/includes.xml
@@ -28,7 +28,7 @@
 			<texture>black-back.png</texture>
 			<animation effect="fade" time="400">Visible</animation>
 			<animation effect="fade" time="200">Hidden</animation>
-			<visible>Window.IsActive(MovieInformation) | Window.IsActive(MusicInformation) | Window.IsActive(SongInformation) | Window.IsActive(FileBrowser) | Window.IsActive(TextViewer) | Window.IsActive(AddonSettings) | Window.IsActive(ContentSettings) | Window.IsActive(SelectDialog) | Window.IsActive(FileStackingDialog) | Window.IsActive(MediaSource) | Window.IsActive(PictureInfo) | Window.IsActive(PlayerControls) | Window.IsActive(VirtualKeyboard) | Window.IsActive(NumericInput) | Window.IsActive(ProfileSettings) | Window.IsActive(LockSettings) | Window.IsActive(SmartPlaylistEditor) | Window.IsActive(SmartPlaylistRule) | Window.IsActive(script-Apple_Movie_Trailers-settings.xml) | Window.IsActive(script-Apple_Movie_Trailers-chooser.xml) | Window.IsActive(script-Apple_Movie_Trailers-search.xml) | Window.IsActive(script-Apple_Movie_Trailers-showtimes.xml) | Window.IsActive(script-XBMC_Lyrics-settings.xml) | Window.IsActive(script-RSS_Editor-rssEditor.xml) | Window.IsActive(script-RSS_Editor-setEditor.xml) | Window.IsActive(AddonInformation)</visible>
+			<visible>Window.IsActive(MovieInformation) | Window.IsActive(MusicInformation) | Window.IsActive(SongInformation) | Window.IsActive(FileBrowser) | Window.IsActive(TextViewer) | Window.IsActive(AddonSettings) | Window.IsActive(ContentSettings) | Window.IsActive(SelectDialog) | Window.IsActive(FileStackingDialog) | Window.IsActive(MediaSource) | Window.IsActive(PictureInfo) | Window.IsActive(PlayerControls) | Window.IsActive(VirtualKeyboard) | Window.IsActive(NumericInput) | Window.IsActive(ProfileSettings) | Window.IsActive(LockSettings) | Window.IsActive(SmartPlaylistEditor) | Window.IsActive(SmartPlaylistRule) | Window.IsActive(script-Apple_Movie_Trailers-settings.xml) | Window.IsActive(script-Apple_Movie_Trailers-chooser.xml) | Window.IsActive(script-Apple_Movie_Trailers-search.xml) | Window.IsActive(script-Apple_Movie_Trailers-showtimes.xml) | Window.IsActive(script-XBMC_Lyrics-settings.xml) | Window.IsActive(script-RSS_Editor-rssEditor.xml) | Window.IsActive(script-RSS_Editor-setEditor.xml) | Window.IsActive(AddonInformation) | Window.IsActive(Peripherals) | Window.IsActive(PeripheralSettings)</visible>
 		</control>
 	</include>
 	<include name="WindowTitleCommons">