diff options
author | jezz_x <jezz_x@svn> | 2010-09-02 02:26:13 +0000 |
---|---|---|
committer | jezz_x <jezz_x@svn> | 2010-09-02 02:26:13 +0000 |
commit | 5ad7eb06507c74a6fa493cabb8e4884dcdff3eba (patch) | |
tree | d848d991c84f9962abc3df71e3780edfb49bcc55 /addons | |
parent | db57921b511d096bb0940251976ccd9016070750 (diff) |
Added: [Confluence] the ability to select the Add-on "Info" view (same one as the add-on browser) in all media windows add-ons lists
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@33413 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'addons')
-rw-r--r-- | addons/skin.confluence/720p/AddonBrowser.xml | 8 | ||||
-rw-r--r-- | addons/skin.confluence/720p/MyMusicNav.xml | 7 | ||||
-rw-r--r-- | addons/skin.confluence/720p/MyMusicSongs.xml | 7 | ||||
-rw-r--r-- | addons/skin.confluence/720p/MyPics.xml | 12 | ||||
-rw-r--r-- | addons/skin.confluence/720p/MyPrograms.xml | 8 | ||||
-rw-r--r-- | addons/skin.confluence/720p/MyVideo.xml | 12 | ||||
-rw-r--r-- | addons/skin.confluence/720p/MyVideoNav.xml | 7 | ||||
-rw-r--r-- | addons/skin.confluence/720p/ViewsAddonBrowser.xml | 23 |
8 files changed, 54 insertions, 30 deletions
diff --git a/addons/skin.confluence/720p/AddonBrowser.xml b/addons/skin.confluence/720p/AddonBrowser.xml index 965f181491..8ac54d5fc5 100644 --- a/addons/skin.confluence/720p/AddonBrowser.xml +++ b/addons/skin.confluence/720p/AddonBrowser.xml @@ -1,7 +1,7 @@ <window id="40">
<defaultcontrol always="true">50</defaultcontrol>
<allowoverlay>no</allowoverlay>
- <views>50,51,503</views>
+ <views>50,51,550</views>
<controls>
<include>CommonSettingsBackground</include>
<control type="image">
@@ -40,9 +40,9 @@ <posy>-5</posy>
<width>1280</width>
<height>725</height>
- <texture border="0.5.0.0">ContentPanel4.png</texture>
+ <texture border="0,5,0,0">ContentPanel4.png</texture>
<include>VisibleFadeEffect</include>
- <visible>Control.IsVisible(503)</visible>
+ <visible>Control.IsVisible(550)</visible>
</control>
<control type="group">
<include>VisibleFadeEffect</include>
@@ -87,7 +87,7 @@ <include>Window_OpenClose_Animation</include>
<include>CommonRootView</include> <!-- view id = 50 -->
<include>FullWidthList</include> <!-- view id = 51 -->
- <include>AddonInfoListView1</include> <!-- view id = 503 -->
+ <include>AddonInfoListView1</include> <!-- view id = 550 -->
</control>
<include>CommonPageCount</include>
<include>BehindDialogFadeOut</include>
diff --git a/addons/skin.confluence/720p/MyMusicNav.xml b/addons/skin.confluence/720p/MyMusicNav.xml index 78cbe8cb2c..82fb9d72fd 100644 --- a/addons/skin.confluence/720p/MyMusicNav.xml +++ b/addons/skin.confluence/720p/MyMusicNav.xml @@ -1,7 +1,7 @@ <window id="502">
<defaultcontrol always="true">50</defaultcontrol>
<allowoverlay>no</allowoverlay>
- <views>50,500,509,506,511,512,513</views>
+ <views>50,500,550,509,506,511,512,513</views>
<controls>
<include>CommonMusicBackground</include>
<control type="group">
@@ -91,9 +91,9 @@ <posy>-5</posy>
<width>1280</width>
<height>725</height>
- <texture border="0.5.0.0">ContentPanel4.png</texture>
+ <texture border="0,5,0,0">ContentPanel4.png</texture>
<include>VisibleFadeEffect</include>
- <visible>Control.IsVisible(506) | Control.IsVisible(511) | Control.IsVisible(512) | Control.IsVisible(513)</visible>
+ <visible>Control.IsVisible(506) | Control.IsVisible(511) | Control.IsVisible(512) | Control.IsVisible(513) | Control.IsVisible(550)</visible>
</control>
</control>
<control type="group">
@@ -105,6 +105,7 @@ <include>MusicVideoInfoListView</include> <!-- view id = 511 -->
<include>ArtistMediaListView</include> <!-- view id = 512 -->
<include>AlbumInfoListView</include> <!-- view id = 513 -->
+ <include>AddonInfoListView1</include> <!-- view id = 550 -->
</control>
<include>CommonPageCount</include>
<include>BehindDialogFadeOut</include>
diff --git a/addons/skin.confluence/720p/MyMusicSongs.xml b/addons/skin.confluence/720p/MyMusicSongs.xml index d7c4e56011..2580590783 100644 --- a/addons/skin.confluence/720p/MyMusicSongs.xml +++ b/addons/skin.confluence/720p/MyMusicSongs.xml @@ -1,7 +1,7 @@ <window id="501">
<defaultcontrol always="true">50</defaultcontrol>
<allowoverlay>no</allowoverlay>
- <views>50,51,500,506</views>
+ <views>50,51,550,500,506</views>
<controls>
<include>CommonMusicBackground</include>
<include>CommonMediaPlayingBackground</include>
@@ -68,9 +68,9 @@ <posy>-5</posy>
<width>1280</width>
<height>725</height>
- <texture border="0.5.0.0">ContentPanel4.png</texture>
+ <texture border="0,5,0,0">ContentPanel4.png</texture>
<include>VisibleFadeEffect</include>
- <visible>Control.IsVisible(506)</visible>
+ <visible>Control.IsVisible(506) | Control.IsVisible(550)</visible>
</control>
</control>
<control type="group">
@@ -79,6 +79,7 @@ <include>FullWidthList</include> <!-- view id = 51 -->
<include>ThumbnailView</include> <!-- view id = 500 -->
<include>MusicInfoListView</include> <!-- view id = 506 -->
+ <include>AddonInfoListView1</include> <!-- view id = 550 -->
</control>
<include>CommonPageCount</include>
<include>BehindDialogFadeOut</include>
diff --git a/addons/skin.confluence/720p/MyPics.xml b/addons/skin.confluence/720p/MyPics.xml index 1ec93c916c..70ee85e67a 100644 --- a/addons/skin.confluence/720p/MyPics.xml +++ b/addons/skin.confluence/720p/MyPics.xml @@ -1,7 +1,7 @@ <window id="2">
<defaultcontrol always="true">50</defaultcontrol>
<allowoverlay>no</allowoverlay>
- <views>50,51,500,511,510</views>
+ <views>50,51,550,500,511,510</views>
<controls>
<include>CommonPictureBackground</include>
<include>CommonMediaPlayingBackground</include>
@@ -83,6 +83,15 @@ <texture diffuse="diffuse_mirror3.png" flipy="true" border="20">ContentPanel.png</texture>
</control>
</control>
+ <control type="image">
+ <posx>0</posx>
+ <posy>-5</posy>
+ <width>1280</width>
+ <height>725</height>
+ <texture border="0,5,0,0">ContentPanel4.png</texture>
+ <include>VisibleFadeEffect</include>
+ <visible>Control.IsVisible(550)</visible>
+ </control>
</control>
<control type="group">
<include>Window_OpenClose_Animation</include>
@@ -91,6 +100,7 @@ <include>ThumbnailView</include> <!-- view id = 500 -->
<include>PictureWrapView</include> <!-- view id = 510 -->
<include>PictureThumbView</include> <!-- view id = 511 -->
+ <include>AddonInfoListView1</include> <!-- view id = 550 -->
</control>
<include>CommonPageCount</include>
<include>BehindDialogFadeOut</include>
diff --git a/addons/skin.confluence/720p/MyPrograms.xml b/addons/skin.confluence/720p/MyPrograms.xml index 74b6025d41..593328162b 100644 --- a/addons/skin.confluence/720p/MyPrograms.xml +++ b/addons/skin.confluence/720p/MyPrograms.xml @@ -1,7 +1,7 @@ <window id="1">
<defaultcontrol always="true">50</defaultcontrol>
<allowoverlay>no</allowoverlay>
- <views>50,51,500,503</views>
+ <views>50,51,500,550</views>
<controls>
<include>CommonProgramsBackground</include>
<include>CommonMediaPlayingBackground</include>
@@ -30,9 +30,9 @@ <posy>-5</posy>
<width>1280</width>
<height>725</height>
- <texture border="0.5.0.0">ContentPanel4.png</texture>
+ <texture border="0,5,0,0">ContentPanel4.png</texture>
<include>VisibleFadeEffect</include>
- <visible>Control.IsVisible(503)</visible>
+ <visible>Control.IsVisible(550)</visible>
</control>
<control type="group">
<include>VisibleFadeEffect</include>
@@ -78,7 +78,7 @@ <include>CommonRootView</include> <!-- view id = 50 -->
<include>FullWidthList</include> <!-- view id = 51 -->
<include>ThumbnailView</include> <!-- view id = 500 -->
- <include>AddonInfoListView1</include> <!-- view id = 503 -->
+ <include>AddonInfoListView1</include> <!-- view id = 550 -->
</control>
<include>CommonPageCount</include>
<include>BehindDialogFadeOut</include>
diff --git a/addons/skin.confluence/720p/MyVideo.xml b/addons/skin.confluence/720p/MyVideo.xml index dc2a7d74e4..1805d83e19 100644 --- a/addons/skin.confluence/720p/MyVideo.xml +++ b/addons/skin.confluence/720p/MyVideo.xml @@ -1,7 +1,7 @@ <window id="6">
<defaultcontrol always="true">50</defaultcontrol>
<allowoverlay>no</allowoverlay>
- <views>50,51,500,501,508,505</views>
+ <views>50,51,550,500,501,508,505</views>
<controls>
<include>CommonVideoBackground</include>
<control type="image">
@@ -83,6 +83,15 @@ <texture diffuse="diffuse_mirror3.png" flipy="true" border="20">ContentPanel.png</texture>
</control>
</control>
+ <control type="image">
+ <posx>0</posx>
+ <posy>-5</posy>
+ <width>1280</width>
+ <height>725</height>
+ <texture border="0,5,0,0">ContentPanel4.png</texture>
+ <include>VisibleFadeEffect</include>
+ <visible>Control.IsVisible(550)</visible>
+ </control>
</control>
<control type="group">
<include>Window_OpenClose_Animation</include>
@@ -92,6 +101,7 @@ <include>PosterWrapView</include> <!-- view id = 501 -->
<include>PosterWrapView2_Fanart</include> <!-- view id = 508 -->
<include>WideIconView</include> <!-- view id = 505 -->
+ <include>AddonInfoListView1</include> <!-- view id = 550 -->
</control>
<include>CommonPageCount</include>
<include>BehindDialogFadeOut</include>
diff --git a/addons/skin.confluence/720p/MyVideoNav.xml b/addons/skin.confluence/720p/MyVideoNav.xml index e04479da58..5d38a504a7 100644 --- a/addons/skin.confluence/720p/MyVideoNav.xml +++ b/addons/skin.confluence/720p/MyVideoNav.xml @@ -1,7 +1,7 @@ <window id="25">
<defaultcontrol always="true">50</defaultcontrol>
<allowoverlay>no</allowoverlay>
- <views>50,500,501,508,504,503,505,511</views>
+ <views>50,500,550,501,508,504,503,505,511</views>
<controls>
<include>CommonVideoBackground</include>
<control type="group">
@@ -115,9 +115,9 @@ <posy>-5</posy>
<width>1280</width>
<height>725</height>
- <texture border="0.5.0.0">ContentPanel4.png</texture>
+ <texture border="0,5,0,0">ContentPanel4.png</texture>
<include>VisibleFadeEffect</include>
- <visible>Control.IsVisible(504) | Control.IsVisible(511)</visible>
+ <visible>Control.IsVisible(504) | Control.IsVisible(511) | Control.IsVisible(550)</visible>
</control>
<control type="group">
<include>VisibleFadeEffect</include>
@@ -149,6 +149,7 @@ <include>MediaListView2</include> <!-- view id = 504 -->
<include>WideIconView</include> <!-- view id = 505 -->
<include>MusicVideoInfoListView</include> <!-- view id = 511 -->
+ <include>AddonInfoListView1</include> <!-- view id = 550 -->
</control>
<include>CommonPageCount</include>
<include>BehindDialogFadeOut</include>
diff --git a/addons/skin.confluence/720p/ViewsAddonBrowser.xml b/addons/skin.confluence/720p/ViewsAddonBrowser.xml index 31017f63f3..0480e2ab4d 100644 --- a/addons/skin.confluence/720p/ViewsAddonBrowser.xml +++ b/addons/skin.confluence/720p/ViewsAddonBrowser.xml @@ -1,18 +1,19 @@ <includes>
<include name="AddonInfoListView1">
<control type="group">
- <visible>Control.IsVisible(503)</visible>
+ <visible>Control.IsVisible(550)</visible>
<include>VisibleFadeEffect</include>
- <control type="list" id="503">
+ <control type="list" id="550">
<posx>660</posx>
<posy>60</posy>
<width>580</width>
<height>601</height>
<onleft>2</onleft>
<onright>60</onright>
- <onup>503</onup>
- <ondown>503</ondown>
+ <onup>550</onup>
+ <ondown>550</ondown>
<viewtype label="$LOCALIZE[31033]">list</viewtype>
+ <visible>Window.IsVisible(AddonBrowser) | stringcompare(ListItem.Path,plugin://) | stringcompare(ListItem.Path,script://)</visible>
<pagecontrol>60</pagecontrol>
<scrolltime>200</scrolltime>
<itemlayout height="40" width="580">
@@ -55,7 +56,7 @@ <width>580</width>
<height>41</height>
<texture border="0,2,0,2">MenuItemNF.png</texture>
- <visible>!Control.HasFocus(503)</visible>
+ <visible>!Control.HasFocus(550)</visible>
<include>VisibleFadeEffect</include>
</control>
<control type="image">
@@ -64,7 +65,7 @@ <width>580</width>
<height>41</height>
<texture border="0,2,0,2">MenuItemFO.png</texture>
- <visible>Control.HasFocus(503)</visible>
+ <visible>Control.HasFocus(550)</visible>
<include>VisibleFadeEffect</include>
</control>
<control type="image">
@@ -73,7 +74,7 @@ <width>200</width>
<height>31</height>
<texture border="0,0,14,0">MediaItemDetailBG.png</texture>
- <visible>Control.HasFocus(503) + !IsEmpty(ListItem.Property(Addon.Status))</visible>
+ <visible>Control.HasFocus(550) + !IsEmpty(ListItem.Property(Addon.Status))</visible>
</control>
<control type="label">
<posx>10</posx>
@@ -104,7 +105,7 @@ <control type="group">
<posx>50</posx>
<posy>60</posy>
- <visible>Control.IsVisible(503)</visible>
+ <visible>Control.IsVisible(550)</visible>
<control type="scrollbar" id="60">
<posx>1180</posx>
<posy>0</posy>
@@ -115,17 +116,17 @@ <texturesliderbarfocus border="10,14,10,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
<textureslidernib>ScrollBarNib.png</textureslidernib>
<textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
- <onleft>503</onleft>
+ <onleft>550</onleft>
<onright>2</onright>
<showonepage>false</showonepage>
<orientation>vertical</orientation>
- <visible>Control.IsVisible(503)</visible>
+ <visible>Control.IsVisible(550)</visible>
</control>
</control>
<control type="group">
<posx>50</posx>
<posy>60</posy>
- <visible>Control.IsVisible(503)</visible>
+ <visible>Control.IsVisible(550)</visible>
<control type="label">
<description>Show Title txt</description>
<posx>0</posx>
|