Permalink
Browse files

FIX-(GIT-452): Search results window for LowList & List views.

  • Loading branch information...
Andrew Blackburn Andrew Blackburn
Andrew Blackburn authored and Andrew Blackburn committed Oct 7, 2009
1 parent fe104b2 commit 2c86dc67d78669e1ce6f3c42d0c4a98ede3047fd
Showing with 53 additions and 46 deletions.
  1. +1 −1 720p/Customisation.xml
  2. +1 −1 720p/Includes_Objects.xml
  3. +1 −1 720p/MyMusicNav.xml
  4. +27 −27 720p/Viewtype_List.xml
  5. +23 −16 720p/Viewtype_LowList.xml
View
@@ -22,7 +22,7 @@
<width>500</width>
<height>49</height>
<font>Font_SettingsOptions</font>
- <label>VER: 2.1 (GIT-451)</label>
+ <label>VER: 2.1 (GIT-452)</label>
</control>
<control type="label">
@@ -9,7 +9,7 @@
<onfocus>Skin.SetBool(MusicArtistsInfoPopupauto)</onfocus>
<onfocus>Skin.SetBool(MusicAlbumsInfoPopupauto)</onfocus>
<onfocus>Skin.SetBool(MusicSongsInfoPopupauto)</onfocus>
- <onfocus>Skin.SetBool(CommonInfoPopuptrigger)</onfocus>
+ <onfocus>Skin.SetBool(CommonInfoPopupauto)</onfocus>
<onfocus>Skin.SetBool(FullscreenMovieMultiplex)</onfocus>
<onfocus>Skin.SetBool(FullscreenTVShowsMultiplex)</onfocus>
<onfocus>Skin.SetBool(FullscreenTVSeasonsMultiplex)</onfocus>
View
@@ -210,7 +210,7 @@
<pauseatend>3000</pauseatend>
<scroll>true</scroll>
<textcolor>FFFFFFFF</textcolor>
- <label>** $INFO[listitem.filenameandpath]</label>
+ <label>Database Path: $INFO[container.folderpath][CR]File Path: $INFO[listitem.filenameandpath]</label>
<visible>Skin.HasSetting(debug)</visible>
</control>
View
@@ -266,7 +266,7 @@
<width>1180</width>
<height>653</height>
<texture>list/listpanel_mask_square_window.png</texture>
- <visible>Control.IsVisible(50) + [[![Window.IsActive(24)|Window.IsActive(25)]+!Skin.HasSetting(listgamesposter)] | [[Window.IsActive(24)|Window.IsActive(25)]+[[Container.Content(seasons)+!Skin.HasSetting(tvseasonposterview)]|[Container.Content(tvshows)+!Skin.HasSetting(tvshowposterview)]|[[!Container.Content(genres)+!Container.Content(movies)+!Container.Content(tvshows)+!Container.Content(seasons)]+!Skin.HasSetting(listvideoposter)]]] | [Window.IsActive(500) | Window.IsActive(501) | Window.IsActive(502)]]</visible>
+ <visible>Control.IsVisible(50) + [[![Window.IsActive(24)|Window.IsActive(25)]+!Skin.HasSetting(listgamesposter)] | [[Window.IsActive(24)|Window.IsActive(25)]+[Container.Content(episodes)|[Container.Content(seasons)+!Skin.HasSetting(tvseasonposterview)]|[Container.Content(tvshows)+!Skin.HasSetting(tvshowposterview)]|[[!Container.Content(genres)+!Container.Content(movies)+!Container.Content(tvshows)+!Container.Content(seasons)]+!Skin.HasSetting(listvideoposter)]]] | [Window.IsActive(500) | Window.IsActive(501) | Window.IsActive(502)]]</visible>
</control>
<control type="image">
<posy>67</posy>
@@ -280,7 +280,7 @@
<!-- POPUP WINDOW BACKGROUND -- SQARE -->
<control type="group">
- <visible>Control.IsVisible(50) + [[![Window.IsActive(24)|Window.IsActive(25)]+!Skin.HasSetting(listgamesposter)] | [[Window.IsActive(24)|Window.IsActive(25)]+[[Container.Content(seasons)+!Skin.HasSetting(tvseasonposterview)]|[Container.Content(tvshows)+!Skin.HasSetting(tvshowposterview)]|[[!Container.Content(genres)+!Container.Content(movies)+!Container.Content(tvshows)+!Container.Content(seasons)]+!Skin.HasSetting(listvideoposter)]]] | [Window.IsActive(500) | Window.IsActive(501) | Window.IsActive(502)]]</visible>
+ <visible>Control.IsVisible(50) + [[![Window.IsActive(24)|Window.IsActive(25)]+!Skin.HasSetting(listgamesposter)] | [[Window.IsActive(24)|Window.IsActive(25)]+[Container.Content(episodes)|[Container.Content(seasons)+!Skin.HasSetting(tvseasonposterview)]|[Container.Content(tvshows)+!Skin.HasSetting(tvshowposterview)]|[[!Container.Content(genres)+!Container.Content(movies)+!Container.Content(tvshows)+!Container.Content(seasons)]+!Skin.HasSetting(listvideoposter)]]] | [Window.IsActive(500) | Window.IsActive(501) | Window.IsActive(502)]]</visible>
<control type="image">
<posy>67</posy>
<posx>58</posx>
@@ -504,14 +504,20 @@
<control type="label">
<include>ListLabel_MainSmall</include>
<include>listcolornofocus</include>
- <label>$INFO[ListItem.Artist] - $INFO[ListItem.Title]</label>
- <visible>[Window.IsActive(500) | Container.Content(songs) | substring(container.folderpath,special://profile/playlists/music/,Left)] + !IsEmpty(ListItem.Artist)</visible>
+ <label>$INFO[ListItem.Artist,, - ]$INFO[ListItem.Title]</label>
+ <visible>[Window.IsActive(500) | Window.IsActive(501) | Window.IsActive(502)] + ![Container.Content(albums)|Container.Content(artists)]</visible>
</control>
<control type="label">
<include>ListLabel_MainSmall</include>
<include>listcolornofocus</include>
- <label>$INFO[ListItem.Artist] - $INFO[ListItem.Title]</label>
- <visible>Window.IsActive(501) + !IsEmpty(ListItem.Artist) + !substring(container.folderpath,shout:,Left)</visible>
+ <info>ListItem.Label</info>
+ <visible>[![Window.IsActive(500) | Window.IsActive(501) | Window.IsActive(502)] + !Container.Content(episodes)] | IsEmpty(ListItem.Title)</visible>
+ </control>
+ <control type="label">
+ <include>ListLabel_MainSmall</include>
+ <include>listcolornofocus</include>
+ <label>$INFO[ListItem.Artist]</label>
+ <visible>Container.Content(artists)</visible>
</control>
<control type="label">
<include>ListLabel_Track</include>
@@ -531,12 +537,6 @@
<info>ListItem.Label2</info>
<visible>substring(container.folderpath,SHOUT:,Left)</visible>
</control>
- <control type="label">
- <include>ListLabel_MainSmall</include>
- <include>listcolornofocus</include>
- <info>ListItem.Label</info>
- <visible>[[![Window.IsActive(500) | Window.IsActive(501) | Window.IsActive(502)]] | [[Window.IsActive(500) | Window.IsActive(501) | Window.IsActive(502)] + IsEmpty(ListItem.Artist)] | Container.Content(artists)] + !Container.Content(episodes)</visible>
- </control>
<control type="label">
<include>ListLabel_MainSmall</include>
<include>listcolornofocus</include>
@@ -552,8 +552,8 @@
<control type="label">
<include>ListLabel_DetailSmall</include>
<include>detailcolornofocus</include>
- <label>[UPPERCASE]$INFO[ListItem.Label2][/UPPERCASE]</label>
- <visible>![Container.Content(movies) | Container.Content(albums) | Container.Content(tvshows)] + !substring(container.folderpath,shout:,Left)</visible>
+ <label>[UPPERCASE]$INFO[ListItem.Duration][/UPPERCASE]</label>
+ <visible>[Window.IsActive(500) | Window.IsActive(501) | Window.IsActive(502)]</visible>
</control>
<control type="label">
<include>ListLabel_Track</include>
@@ -614,14 +614,20 @@
<control type="label">
<include>ListLabel_MainSmall</include>
<include>listcolorfocus</include>
- <label>$INFO[ListItem.Artist] - $INFO[ListItem.Title]</label>
- <visible>[Window.IsActive(500) | Container.Content(songs) | substring(container.folderpath,special://profile/playlists/music/,Left)] + !IsEmpty(ListItem.Artist)</visible>
+ <label>$INFO[ListItem.Artist,, - ]$INFO[ListItem.Title]</label>
+ <visible>[Window.IsActive(500) | Window.IsActive(501) | Window.IsActive(502)] + ![Container.Content(albums)|Container.Content(artists)]</visible>
</control>
<control type="label">
<include>ListLabel_MainSmall</include>
<include>listcolorfocus</include>
- <label>$INFO[ListItem.Artist] - $INFO[ListItem.Title]</label>
- <visible>Window.IsActive(501) + !IsEmpty(ListItem.Artist) + !substring(container.folderpath,shout:,Left)</visible>
+ <info>ListItem.Label</info>
+ <visible>[![Window.IsActive(500) | Window.IsActive(501) | Window.IsActive(502)] + !Container.Content(episodes)] | IsEmpty(ListItem.Title)</visible>
+ </control>
+ <control type="label">
+ <include>ListLabel_MainSmall</include>
+ <include>listcolorfocus</include>
+ <label>$INFO[ListItem.Artist]</label>
+ <visible>Container.Content(artists)</visible>
</control>
<control type="label">
<include>ListLabel_Track</include>
@@ -641,12 +647,6 @@
<info>ListItem.Label2</info>
<visible>substring(container.folderpath,SHOUT:,Left)</visible>
</control>
- <control type="label">
- <include>ListLabel_MainSmall</include>
- <include>listcolorfocus</include>
- <info>ListItem.Label</info>
- <visible>[[![Window.IsActive(500) | Window.IsActive(501) | Window.IsActive(502)]] | [[Window.IsActive(500) | Window.IsActive(501) | Window.IsActive(502)] + IsEmpty(ListItem.Artist)] | Container.Content(artists)] + !Container.Content(episodes)</visible>
- </control>
<control type="label">
<include>ListLabel_MainSmall</include>
<include>listcolorfocus</include>
@@ -662,8 +662,8 @@
<control type="label">
<include>ListLabel_DetailSmall</include>
<include>detailcolorfocus</include>
- <label fallback="-">[UPPERCASE]$INFO[ListItem.Label2][/UPPERCASE]</label>
- <visible>!Control.IsVisible(76) + ![Container.Content(movies) | Container.Content(albums) | Container.Content(tvshows)] + !substring(container.folderpath,shout:,Left)</visible>
+ <label>[UPPERCASE]$INFO[ListItem.Duration][/UPPERCASE]</label>
+ <visible>[Window.IsActive(500) | Window.IsActive(501) | Window.IsActive(502)]</visible>
</control>
<control type="label">
<include>ListLabel_Track</include>
@@ -1212,7 +1212,7 @@
</control>
<control type="group">
- <visible>[![Window.IsActive(24)|Window.IsActive(25)]+!Skin.HasSetting(listgamesposter)] | [[Window.IsActive(24)|Window.IsActive(25)]+[[Container.Content(seasons)+!Skin.HasSetting(tvseasonposterview)]|[Container.Content(tvshows)+!Skin.HasSetting(tvshowposterview)]|[[!Container.Content(genres)+!Container.Content(movies)+!Container.Content(tvshows)+!Container.Content(seasons)]+!Skin.HasSetting(listvideoposter)]]] | [Window.IsActive(500) | Window.IsActive(501) | Window.IsActive(502)]</visible>
+ <visible>[![Window.IsActive(24)|Window.IsActive(25)]+!Skin.HasSetting(listgamesposter)] | [[Window.IsActive(24)|Window.IsActive(25)]+[Container.Content(episodes)|[Container.Content(seasons)+!Skin.HasSetting(tvseasonposterview)]|[Container.Content(tvshows)+!Skin.HasSetting(tvshowposterview)]|[[!Container.Content(genres)+!Container.Content(movies)+!Container.Content(tvshows)+!Container.Content(seasons)]+!Skin.HasSetting(listvideoposter)]]] | [Window.IsActive(500) | Window.IsActive(501) | Window.IsActive(502)]</visible>
<posx>28</posx>
<posy>106</posy>
<control type="image">
View
@@ -24,8 +24,8 @@
<scrollout>true</scrollout>
<pauseatend>3000</pauseatend>
<scroll>true</scroll>
- <animation effect="slide" end="0,-10" time="0" condition="Container.Content(albums)|Container.Content(songs)|Container.Content(artists)|Container.Content(movies)|substring(container.folderpath,special://profile/playlists/music/,Left) | substring(container.folderpath,playlistmusic://,Left)|[Container(550).HasFiles + Window.IsActive(501)+ !Container(550).HasFolders]">Conditional</animation>
- <animation effect="slide" end="45," time="0" condition="Container.Content(songs)|Container.Content(episodes)|substring(container.folderpath,shout:,Left)|substring(container.folderpath,special://profile/playlists/music/,Left) | substring(container.folderpath,playlistmusic://,Left)|[Container(550).HasFiles + Window.IsActive(501)+ !Container(550).HasFolders]">Conditional</animation>
+ <animation effect="slide" end="0,-10" time="0" condition="!IsEmpty(ListItem.Genres) | !IsEmpty(ListItem.Artist) | [!IsEmpty(ListItem.Genre) + Container.Content(movies)]">Conditional</animation>
+ <animation effect="slide" end="45," time="0" condition="Container.Content(songs)|Container.Content(episodes)|substring(container.folderpath,shout:,Left)|[substring(container.folderpath,special://profile/playlists/music/,Left)+!substring(ListItem.FolderName,shout:,Left)] | substring(container.folderpath,playlistmusic://,Left)|[Container(550).HasFiles + Window.IsActive(501)+ !Container(550).HasFolders]">Conditional</animation>
</include>
<include name="LowListLabel_MainSmall">
@@ -37,7 +37,7 @@
<height>30</height>
<font>Font_ListSmall</font>
<aligny>center</aligny>
- <animation effect="slide" end="45,0" time="0" condition="Container.Content(episodes)|Container.Content(songs) | substring(container.folderpath,special://profile/playlists/music/,Left) | substring(container.folderpath,playlistmusic://,Left)|[Container(550).HasFiles + Window.IsActive(501)+ !Container(550).HasFolders]">Conditional</animation>
+ <animation effect="slide" end="45,0" time="0" condition="Container.Content(episodes)|Container.Content(songs) | [substring(container.folderpath,special://profile/playlists/music/,Left)+!substring(ListItem.FolderName,shout:,Left)] | substring(container.folderpath,playlistmusic://,Left)|[Container(550).HasFiles + Window.IsActive(501)+ !Container(550).HasFolders]">Conditional</animation>
</include>
<include name="LowListLabel_MainMusic">
@@ -212,7 +212,7 @@
<onclick>SetFocus(550)</onclick>
</control>
<control type="button" id="117">
- <visible>[![Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(songs) | Container.Content(albums) | Container.Content(artists)] + Skin.HasSetting(CommonInfoPopuptrigger)] | [Container.Content(movies) + Skin.HasSetting(MovieInfoPopuptrigger) + Skin.HasSetting(movietrailers) + !IsEmpty(ListItem.Trailer)] | [Skin.HasSetting(tvpreview) + Skin.HasSetting(TVEpisodesInfoPopuptrigger) + Container.Content(episodes)]</visible>
+ <visible>[Container.Content(movies) + Skin.HasSetting(MovieInfoPopuptrigger) + Skin.HasSetting(movietrailers) + !IsEmpty(ListItem.Trailer)] | [Skin.HasSetting(tvpreview) + Skin.HasSetting(TVEpisodesInfoPopuptrigger) + Container.Content(episodes)]</visible>
<posx>0</posx>
<posy>0</posy>
<width>0</width>
@@ -234,27 +234,27 @@
<control type="group" id="606">
<visible>Control.IsVisible(550)</visible>
<control type="button" id="607">
- <visible>![Window.IsActive(502)|Window.IsActive(501)|Window.IsActive(502)] + Container.Content(episodes) + Skin.HasSetting(tvpreview) + !Player.Playing + !Skin.HasSetting(TVEpisodesInfoPopupoff)</visible>
+ <visible>![Window.IsActive(500)|Window.IsActive(501)|Window.IsActive(502)] + Container.Content(episodes) + Skin.HasSetting(tvpreview) + !Player.Playing + !Skin.HasSetting(TVEpisodesInfoPopupoff)</visible>
<onleft>7000</onleft>
<onright>611</onright>
<onup>550</onup>
<ondown>550</ondown>
<onfocus>PlayMedia($INFO[listitem.path]$INFO[listitem.filename],1,noresume)</onfocus>
</control>
<control type="button" id="608">
- <visible>![Window.IsActive(502)|Window.IsActive(501)|Window.IsActive(502)]+[Container.Content(movies) + Skin.HasSetting(movietrailers) + !Player.Playing + !Skin.HasSetting(MovieInfoPopupoff) + !IsEmpty(ListItem.Trailer)]</visible>
+ <visible>![Window.IsActive(500)|Window.IsActive(501)|Window.IsActive(502)]+[Container.Content(movies) + Skin.HasSetting(movietrailers) + !Player.Playing + !Skin.HasSetting(MovieInfoPopupoff) + !IsEmpty(ListItem.Trailer)]</visible>
<onleft>7000</onleft>
<onright>611</onright>
<onup>550</onup>
<ondown>550</ondown>
<onfocus>PlayMedia($INFO[ListItem.Trailer],1,noresume)</onfocus>
</control>
<control type="button" id="609">
- <visible>[Window.IsActive(502)|Window.IsActive(501)|Window.IsActive(502)] | [Container.Content(movies) + IsEmpty(ListItem.Trailer)] | ![Skin.HasSetting(movietrailers) | Skin.HasSetting(tvpreview) | Player.Playing] | [[Container.Content(movies) + Skin.HasSetting(MovieInfoPopupoff)] | [Container.Content(tvshows) | Container.Content(seasons)] | [Container.Content(episodes) + Skin.HasSetting(TVEpisodesInfoPopupoff)]]</visible>
+ <visible>[Window.IsActive(500)|Window.IsActive(501)|Window.IsActive(502)] | [Container.Content(movies) + IsEmpty(ListItem.Trailer)] | ![Skin.HasSetting(movietrailers) | Skin.HasSetting(tvpreview) | Player.Playing] | [[Container.Content(movies) + Skin.HasSetting(MovieInfoPopupoff)] | [Container.Content(tvshows) | Container.Content(seasons)] | [Container.Content(episodes) + Skin.HasSetting(TVEpisodesInfoPopupoff)]]</visible>
<onfocus>SetFocus(65)</onfocus>
</control>
<control type="button" id="610">
- <visible>Player.Playing+![Window.IsActive(502)|Window.IsActive(501)|Window.IsActive(502)]</visible>
+ <visible>Player.Playing+![Window.IsActive(500)|Window.IsActive(501)|Window.IsActive(502)]</visible>
<onleft>7000</onleft>
<onright>611</onright>
<onup>550</onup>
@@ -343,7 +343,7 @@
<include>LowListLabel_MainSmall</include>
<include>listcolornofocus</include>
<label>$INFO[ListItem.Title]</label>
- <visible>[Window.IsActive(500) | Window.IsActive(501) | Container.Content(songs) | substring(container.folderpath,special://profile/playlists/music/,Left)] + !IsEmpty(ListItem.Artist)</visible>
+ <visible>[Window.IsActive(500) | Window.IsActive(501) | Window.IsActive(502)]</visible>
</control>
<control type="label">
<include>LowListLabel_MainSmall</include>
@@ -373,7 +373,13 @@
<include>LowListLabel_DetailSmall</include>
<include>detailcolornofocus</include>
<label>[UPPERCASE]$INFO[ListItem.Label2][/UPPERCASE]</label>
- <visible>![Container.Content(movies) | Container.Content(albums) | Container.Content(tvshows) | Container.Content(episodes)]</visible>
+ <visible>Container.Content(tvshows)|substring(container.folderpath,shout:,Left)</visible>
+ </control>
+ <control type="label">
+ <include>LowListLabel_DetailFull</include>
+ <include>detailcolornofocus</include>
+ <label>[UPPERCASE]$INFO[ListItem.Duration][/UPPERCASE]</label>
+ <visible>[Window.IsActive(500) | Window.IsActive(501) | Window.IsActive(502)]</visible>
</control>
<control type="label">
<include>LowListLabel_DetailTV</include>
@@ -431,6 +437,7 @@
<animation effect="slide" end="-115,0" time="0" condition="Container.Content(movies)">Conditional</animation>
</control>
</itemlayout>
+
<focusedlayout height="60">
<control type="image">
<posx>10</posx>
@@ -467,6 +474,12 @@
<info>ListItem.Title</info>
<visible>[Window.IsActive(500) | Window.IsActive(501) | Window.IsActive(502)]</visible>
</control>
+ <control type="label">
+ <include>LowListLabel_Main</include>
+ <include>listcolorfocus</include>
+ <info>ListItem.Label</info>
+ <visible>[![Window.IsActive(500) | Window.IsActive(501) | Window.IsActive(502)] + !Container.Content(episodes)] | IsEmpty(ListItem.Title)</visible>
+ </control>
<control type="label">
<include>LowListLabel_Track_LargeTV</include>
@@ -481,12 +494,6 @@
<info>ListItem.Title</info>
<visible>Container.Content(episodes)</visible>
</control>
- <control type="label">
- <include>LowListLabel_Main</include>
- <include>listcolorfocus</include>
- <info>ListItem.Label</info>
- <visible>[![Window.IsActive(500) | Window.IsActive(501) | Window.IsActive(502)] + !Container.Content(episodes)] | IsEmpty(ListItem.Title)</visible>
- </control>
<control type="label" id="623">
<include>LowListLabel_Sub</include>
<include>subcolorfocus</include>

0 comments on commit 2c86dc6

Please sign in to comment.