diff --git a/1080i/DialogPVRChannelManager.xml b/1080i/DialogPVRChannelManager.xml index 1357ce97..69f45fae 100644 --- a/1080i/DialogPVRChannelManager.xml +++ b/1080i/DialogPVRChannelManager.xml @@ -676,13 +676,13 @@ ClearProperty(Focus) - 883 + 733 Apply changes - 400 + 500 DialogButtonDimensionsRightAlign - buttons/options-right-fo.png - buttons/options-right-nf.png + buttons/options-right-fo.png + buttons/options-right-nf.png 6 4 33 diff --git a/1080i/DialogPVRChannelsOSD.xml b/1080i/DialogPVRChannelsOSD.xml index 2282a315..3a6e4b4a 100644 --- a/1080i/DialogPVRChannelsOSD.xml +++ b/1080i/DialogPVRChannelsOSD.xml @@ -17,17 +17,17 @@ !Window.IsActive(DialogPVRGuideInfo.xml) visiblehidefadeinfo - + Header - 100 + 210 73 - 680 + 540 38 - center - 30 - - Font-Condensed-S34-B - bbwhite + left + + $INFO[System.Time]$INFO[Container(11).ListItem.EndTime, → ,] + Font-Condensed-S34 + 77white 66000000 @@ -50,15 +50,45 @@ views/list/other/separator.png - 30 - 6 - 83 - 83 - $VAR[PvrListIcon] - keep + 0 + 1 + 680 + 94 + selected.png + 07FFFFFF + center + ListItem.IsPlaying + + + Label + 95 + 0 + 67 + 58 + Font-Condensed-S34-B + right + + 99FFFFFF + SelectedGreen + false + ListItem.HasEpg + + + Label + 95 + 0 + 67 + 96 + Font-Condensed-S34-B + right + + 99FFFFFF + SelectedGreen + false + !ListItem.HasEpg - 131 + 28 60 67 19 @@ -69,78 +99,64 @@ windows/pvr/progress-leftright.png ListItem.Progress 77white - ListItem.HasEpg + ListItem.HasEpg + !ListItem.IsPlaying + + + 28 + 60 + 67 + 19 + true + windows/pvr/progress-back.png + windows/pvr/progress-leftright.png + windows/pvr/progress-mid.png + windows/pvr/progress-leftright.png + ListItem.Progress + D4FFFFFF + ListItem.HasEpg + ListItem.IsPlaying Label - 133 + 110 0 - 517 + 540 58 Font-Condensed-S34-B left 99FFFFFF - 99FFFFFF + SelectedGreen false ListItem.HasEpg Title - 210 + 110 44 - 440 + 540 50 Font-Condensed-S28 left 77white - 77white + D4FFFFFF false ListItem.HasEpg Label - 133 + 110 0 - 517 + 540 95 Font-Condensed-S34-B left 99FFFFFF - 99FFFFFF + SelectedGreen false !ListItem.HasEpg - - Label - 650 - 0 - 587 - 95 - Font-Condensed-S75 - right - - 99FFFFFF - 99FFFFFF - false - !ListItem.HasTimer + !ListItem.IsRecording - - - Label - 602 - 0 - 539 - 95 - Font-Condensed-S75 - right - - 99FFFFFF - 99FFFFFF - false - ListItem.HasTimer | ListItem.IsRecording - ListItem.IsRecording @@ -167,14 +183,6 @@ windows/pvr/epg-timer.png ListItem.HasTimer + !ListItem.IsRecording - - 651 - -10 - 39 - 39 - windows/filemanager/selected.png - ListItem.IsSelected | ListItem.IsPlaying - @@ -184,6 +192,16 @@ 96 views/list/other/separator.png + + 0 + 1 + 680 + 94 + selected.png + 07FFFFFF + center + ListItem.IsPlaying + 0 0 @@ -194,18 +212,70 @@ Control.HasFocus(11) visiblehidefadeinfo - - 30 - 6 - 83 - 83 - $VAR[PvrListIcon] - keep + + Label + 95 + 0 + 67 + 58 + Font-Condensed-S34-B + right + + eewhite + SelectedGreen + false + ListItem.HasEpg + Conditional + + + Label + 110 + 0 + 540 + 58 + Font-Condensed-S34-B + left + + eewhite + SelectedGreen + false + ListItem.HasEpg + Conditional + + + Label + 95 + 0 + 67 + 96 + Font-Condensed-S34-B + right + + eewhite + SelectedGreen + false + !ListItem.HasEpg + Conditional + + + Label + 110 + 0 + 540 + 95 + Font-Condensed-S34-B + left + + eewhite + SelectedGreen + false + !ListItem.HasEpg + Conditional - Conditional + Conditional - 131 + 28 60 67 19 @@ -218,25 +288,11 @@ D4FFFFFF ListItem.HasEpg - - Label - 133 - 0 - 517 - 58 - Font-Condensed-S34-B - left - - eewhite - eewhite - false - ListItem.HasEpg - Title - 210 + 110 44 - 440 + 540 50 Font-Condensed-S28 left @@ -246,48 +302,6 @@ false ListItem.HasEpg - - Label - 133 - 0 - 517 - 95 - Font-Condensed-S34-B - left - - eewhite - eewhite - false - !ListItem.HasEpg - - - Label - 650 - 0 - 587 - 95 - Font-Condensed-S75 - right - - eewhite - eewhite - false - !ListItem.HasTimer + !ListItem.IsRecording - - - Label - 602 - 0 - 539 - 95 - Font-Condensed-S75 - right - - eewhite - eewhite - false - ListItem.HasTimer | ListItem.IsRecording - ListItem.IsRecording @@ -315,14 +329,6 @@ windows/pvr/epg-timer.png ListItem.HasTimer + !ListItem.IsRecording - - 651 - -10 - 39 - 39 - windows/filemanager/selected.png - ListItem.IsSelected | ListItem.IsPlaying - @@ -353,7 +359,7 @@ Conditional - 745 + 750 861 800 100 diff --git a/1080i/DialogPVRGuideOSD.xml b/1080i/DialogPVRGuideOSD.xml index 749030d9..ee26d258 100644 --- a/1080i/DialogPVRGuideOSD.xml +++ b/1080i/DialogPVRGuideOSD.xml @@ -51,44 +51,87 @@ Label - 30 + 102 0 - 620 + 90 76 - Font-Condensed-S34 - left + Font-Condensed-S33-B + right 99FFFFFF 99FFFFFF false + !substring(ListItem.StartTime,AM) + !substring(ListItem.StartTime,PM) Label - 650 + 152 0 - 620 + 130 76 - Font-Condensed-S34-B + Font-Condensed-S33-B right + + 99FFFFFF + 99FFFFFF + false + substring(ListItem.StartTime,AM) | substring(ListItem.StartTime,PM) + + + Label + 122 + 0 + 530 + 76 + Font-Condensed-S34 + left - 77white - 77white + 99FFFFFF + 99FFFFFF false - !ListItem.HasTimer + !ListItem.IsRecording + !ListItem.HasTimer + !ListItem.IsRecording + !substring(ListItem.StartTime,AM) + !substring(ListItem.StartTime,PM) Label - 597 + 122 0 - 567 + 477 76 - Font-Condensed-S34-B - right + Font-Condensed-S34 + left - 77white - 77white + 99FFFFFF + 99FFFFFF false - ListItem.HasTimer | ListItem.IsRecording + [ListItem.HasTimer | ListItem.IsRecording] + !substring(ListItem.StartTime,AM) + !substring(ListItem.StartTime,PM) + + + Label + 172 + 0 + 480 + 76 + Font-Condensed-S34 + left + + 99FFFFFF + 99FFFFFF + false + !ListItem.HasTimer + !ListItem.IsRecording + [substring(ListItem.StartTime,AM) | substring(ListItem.StartTime,PM)] + + + Label + 172 + 0 + 427 + 76 + Font-Condensed-S34 + left + + 99FFFFFF + 99FFFFFF + false + [ListItem.HasTimer | ListItem.IsRecording] + [substring(ListItem.StartTime,AM) | substring(ListItem.StartTime,PM)] ListItem.IsRecording @@ -116,14 +159,6 @@ windows/pvr/epg-timer.png ListItem.HasTimer + !ListItem.IsRecording - - 651 - -10 - 39 - 39 - windows/filemanager/selected.png - ListItem.IsSelected | ListItem.IsPlaying - @@ -147,44 +182,87 @@ Conditional Label - 30 + 102 0 - 620 + 90 76 - Font-Condensed-S34 - left + Font-Condensed-S33-B + right eewhite eewhite false + !substring(ListItem.StartTime,AM) + !substring(ListItem.StartTime,PM) Label - 650 + 152 0 - 620 + 130 76 - Font-Condensed-S34-B + Font-Condensed-S33-B right + + eewhite + eewhite + false + substring(ListItem.StartTime,AM) | substring(ListItem.StartTime,PM) + + + Label + 122 + 0 + 530 + 76 + Font-Condensed-S34 + left - D4FFFFFF - 77white + eewhite + eewhite false - !ListItem.HasTimer + !ListItem.IsRecording + !ListItem.HasTimer + !ListItem.IsRecording + !substring(ListItem.StartTime,AM) + !substring(ListItem.StartTime,PM) Label - 597 + 122 0 - 567 + 477 76 - Font-Condensed-S34-B - right + Font-Condensed-S34 + left - D4FFFFFF - D4FFFFFF + eewhite + eewhite false - ListItem.HasTimer | ListItem.IsRecording + [ListItem.HasTimer | ListItem.IsRecording] + !substring(ListItem.StartTime,AM) + !substring(ListItem.StartTime,PM) + + + Label + 172 + 0 + 480 + 76 + Font-Condensed-S34 + left + + eewhite + eewhite + false + !ListItem.HasTimer + !ListItem.IsRecording + [substring(ListItem.StartTime,AM) | substring(ListItem.StartTime,PM)] + + + Label + 172 + 0 + 427 + 76 + Font-Condensed-S34 + left + + eewhite + eewhite + false + [ListItem.HasTimer | ListItem.IsRecording] + [substring(ListItem.StartTime,AM) | substring(ListItem.StartTime,PM)] @@ -213,14 +291,6 @@ windows/pvr/epg-timer.png ListItem.HasTimer + !ListItem.IsRecording - - 651 - -10 - 39 - 39 - windows/filemanager/selected.png - ListItem.IsSelected | ListItem.IsPlaying - diff --git a/1080i/Includes_Animations.xml b/1080i/Includes_Animations.xml index 46bb6793..be6ab3b4 100644 --- a/1080i/Includes_Animations.xml +++ b/1080i/Includes_Animations.xml @@ -274,10 +274,10 @@ - + - + @@ -413,11 +413,11 @@ - + - + diff --git a/1080i/Includes_Dialogs.xml b/1080i/Includes_Dialogs.xml index ae5dc8bf..072b28d3 100644 --- a/1080i/Includes_Dialogs.xml +++ b/1080i/Includes_Dialogs.xml @@ -34,11 +34,6 @@ $INFO[Container(11).NumItems,, $LOCALIZE[19019]]$INFO[Container(11).CurrentPage, • $LOCALIZE[41819] ,]$INFO[Container(11).NumPages,/,] - - $LOCALIZE[19024]$INFO[VideoPlayer.ChannelGroup, • ,] - $LOCALIZE[19023]$INFO[VideoPlayer.ChannelGroup, • ,] - - $INFO[ListItem.Thumb] $INFO[ListItem.ActualIcon,views/fallbacks/,/medium.png] diff --git a/1080i/Includes_SongInfo.xml b/1080i/Includes_SongInfo.xml index 4f8ce1de..158d858a 100644 --- a/1080i/Includes_SongInfo.xml +++ b/1080i/Includes_SongInfo.xml @@ -106,6 +106,25 @@ IncreaseRating Conditional + + 1167 + -3 + 105 + 105 + views/thumb/other/star_fo.png + + + 1296 + 0 + 100 + 100 + Font-Condensed-S34-B + right + + eewhite + eewhite + false + diff --git a/1080i/Includes_Views.xml b/1080i/Includes_Views.xml index f3f9ca91..304f7aa6 100644 --- a/1080i/Includes_Views.xml +++ b/1080i/Includes_Views.xml @@ -91,18 +91,57 @@ + flags/other/3d-default.png flags/defs/hd.png - flags/defs/sd.png + flags/defs/sd.png + flags/other/3d-ilist.png flags/defs/hd-ilist.png - flags/defs/sd-ilist.png + flags/defs/sd-ilist.png + flags/other/3d-black.png flags/defs/hd-black.png - flags/defs/sd-black.png + flags/defs/sd-black.png + + + + • 3D + • HD + • SD + + + + • 3D + • HD + • SD + + + + • 3D + • HD + • SD + + + + • 3D + • HD + • SD + + + + • 3D + • HD + • SD + + + + • 3D + • HD + • SD @@ -167,7 +206,8 @@ - $INFO[ListItem.Overlay,overlays/,/banner-p-fo.png] + views/banner/other/playing-top.png + $INFO[ListItem.Overlay,overlays/,/banner-p-fo.png] $INFO[ListItem.Overlay,overlays/,/banner-w-fo.png] @@ -438,19 +478,46 @@ $INFO[ListItem.Thumb] - - $INFO[ListItem.Thumb] - $INFO[ListItem.ActualIcon,views/fallbacks/,/landscape.png] + + + [COLOR=SelectedGreen]$INFO[ListItem.Label][/COLOR] + $INFO[ListItem.Label] - - $INFO[ListItem.Thumb] - $INFO[ListItem.ActualIcon,views/fallbacks/,/landscape-small.png] + + [COLOR=SelectedGreen]$INFO[ListItem.Title][/COLOR] + $INFO[ListItem.Title] + + + + [COLOR=SelectedGreen]$INFO[ListItem.ChannelNumber][/COLOR] + $INFO[ListItem.ChannelNumber] + + + + D4FFFFFF + 99FFFFFF + + + + D4FFFFFF + 77white + + + + FFFFFFFF + 7FFFFFFF + + + + [COLOR=SelectedGreen] + + + + [/COLOR] - - $INFO[Container(55).ListItem.Album] $INFO[Container(55).ListItem.Artist] $INFO[Container(55).ListItem.Title]$INFO[ListItem.Duration, (,)] $INFO[Container(55).ListItem.Label] @@ -478,16 +545,33 @@ - $INFO[ListItem.Title] - $INFO[ListItem.Label] + $VAR[SelectedColor.Open]$INFO[ListItem.Title]$VAR[SelectedColor.Close] + $VAR[SelectedColor.Open]$INFO[ListItem.Label]$VAR[SelectedColor.Close] + + + + views/thumb/other/star_pl.png + views/thumb/other/star_nofo.png + + + + views/thumb/other/star_pl.png + views/thumb/other/star_fo.png - $INFO[ListItem.Title] - $INFO[ListItem.TrackNumber,0,. ]$INFO[ListItem.Title] - $INFO[ListItem.TrackNumber,,. ]$INFO[ListItem.Title] + $VAR[SelectedColor.Open]$INFO[ListItem.Title]$VAR[SelectedColor.Close] + $VAR[SelectedColor.Open]$INFO[ListItem.TrackNumber,0,. ]$INFO[ListItem.Title]$VAR[SelectedColor.Close] + $VAR[SelectedColor.Open]$INFO[ListItem.TrackNumber,,. ]$INFO[ListItem.Title]$VAR[SelectedColor.Close] + $VAR[SelectedColor.Open]$INFO[ListItem.Label]$VAR[SelectedColor.Close] + + $INFO[ListItem.PlayCount, [,] ]$INFO[ListItem.Duration] + $INFO[ListItem.Year, [,] ]$INFO[ListItem.Duration] + $INFO[ListItem.Duration, ,] + + $LOCALIZE[21887] $LOCALIZE[183] @@ -509,9 +593,16 @@ - $INFO[ListItem.PlayCount,, • ]$INFO[ListItem.Title] - $INFO[ListItem.TrackNumber,0,. ]$INFO[ListItem.Title] - $INFO[ListItem.TrackNumber,,. ]$INFO[ListItem.Title] + $INFO[ListItem.TrackNumber,0,. ]$INFO[ListItem.Title] + $INFO[ListItem.TrackNumber,,. ]$INFO[ListItem.Title] + $INFO[ListItem.Label] + + + + $INFO[ListItem.PlayCount, [,] ]$INFO[ListItem.Duration] + $INFO[ListItem.Year, [,] ]$INFO[ListItem.Duration] + $INFO[ListItem.Rating, [,★] ]$INFO[ListItem.Duration] + $INFO[ListItem.Duration, ,] @@ -530,8 +621,7 @@ - $INFO[ListItem.Year]$INFO[ListItem.Duration, • , $LOCALIZE[12391]]$INFO[ListItem.Rating, • ,] • HD - $INFO[ListItem.Year]$INFO[ListItem.Duration, • , $LOCALIZE[12391]]$INFO[ListItem.Rating, • ,] • SD + $INFO[ListItem.Year]$INFO[ListItem.Duration, • , $LOCALIZE[12391]]$INFO[ListItem.Rating, • ★ ,]$VAR[LandscapeHDSD3DLabel] $INFO[ListItem.Property(UnWatchedEpisodes),$LOCALIZE[41311],] @@ -552,6 +642,16 @@ $INFO[Container(52).ListItem.Genre] + + $LOCALIZE[133] + $LOCALIZE[41316] + + + + $INFO[ListItem.TagLine] + $INFO[ListItem.Title] + + buttons/radio/radio-button-nf.png @@ -560,7 +660,7 @@ $INFO[Container.NumItems,, $LOCALIZE[41822]] - $INFO[Container.NumItems,, $LOCALIZE[41817]] + $INFO[Container.NumItems,, $LOCALIZE[41817]] \ No newline at end of file diff --git a/1080i/MyPVR.xml b/1080i/MyPVR.xml index 6b090c6a..d2fd0204 100644 --- a/1080i/MyPVR.xml +++ b/1080i/MyPVR.xml @@ -18,8 +18,8 @@ 36 ClearProperty(Movement) 33 - 50 - 50 + 11 + 11 false @@ -30,8 +30,8 @@ 32 ClearProperty(Movement) 31 - 50 - 50 + 12 + 12 false @@ -54,8 +54,8 @@ 31 ClearProperty(Movement) 35 - 50 - 50 + 13 + 13 false diff --git a/1080i/ViewtypesMusic.xml b/1080i/ViewtypesMusic.xml index 2774b14c..ee4a8608 100644 --- a/1080i/ViewtypesMusic.xml +++ b/1080i/ViewtypesMusic.xml @@ -4,7 +4,7 @@ - Control.IsVisible(50) + !Window.IsActive(musicinformation) + !Window.IsActive(addoninformation) + Control.IsVisible(50) + !Window.IsActive(musicinformation) + !Window.IsActive(addoninformation) + !Window.IsActive(favourites) CommonViewAnimations OptionsShutdownAnimation @@ -47,6 +47,16 @@ 101 views/list/other/separator.png + + 0 + 1 + 1420 + 94 + views/other/selected.png + 07FFFFFF + center + ListItem.IsPlaying + 20 7 @@ -73,7 +83,7 @@ left aawhite - aawhite + SelectedGreen false !IsEmpty(ListItem.Artist) @@ -87,7 +97,7 @@ left aawhite - aawhite + SelectedGreen false IsEmpty(ListItem.Artist) @@ -101,7 +111,7 @@ left 99FFFFFF - 99FFFFFF + D4FFFFFF false !IsEmpty(ListItem.Artist) @@ -115,17 +125,9 @@ right 99FFFFFF - 99FFFFFF + D4FFFFFF false - - 1391 - -10 - 39 - 39 - windows/filemanager/selected.png - ListItem.IsSelected | ListItem.IsPlaying - @@ -261,6 +263,7 @@ 105 105 views/thumb/other/star_nofo.png + !IsEmpty(ListItem.Album) 1390 @@ -269,10 +272,11 @@ 100 Font-Condensed-S34-B right - + 99FFFFFF 99FFFFFF false + !IsEmpty(ListItem.Album) @@ -284,6 +288,16 @@ 101 views/list/other/separator.png + + 0 + 1 + 1420 + 94 + views/other/selected.png + 07FFFFFF + center + ListItem.IsPlaying + 20 7 @@ -296,13 +310,13 @@ Label 120 0 - 1160 + 1060 62 Font-Condensed-S34-B left aawhite - aawhite + SelectedGreen false !IsEmpty(ListItem.Artist) @@ -310,13 +324,13 @@ Label 120 0 - 1160 + 1060 100 Font-Condensed-S34-B left aawhite - aawhite + SelectedGreen false IsEmpty(ListItem.Artist) @@ -324,13 +338,13 @@ Artist 120 43 - 1160 + 1060 54 Font-Condensed-S28 left 99FFFFFF - 99FFFFFF + D4FFFFFF false !IsEmpty(ListItem.Artist) @@ -342,7 +356,7 @@ 64 41 views/list/other/unwatched.png - 99FFFFFF + $VAR[Colordiffuse.Color] 1244 @@ -352,7 +366,7 @@ Font-Condensed-S30-B 99FFFFFF - 99FFFFFF + D4FFFFFF no center @@ -364,18 +378,19 @@ 100 Font-Condensed-S34-B right - + 99FFFFFF - 99FFFFFF + D4FFFFFF false - !IsEmpty(ListItem.Duration) + !stringcompare(Container.FolderPath,musicdb://5/1/) + !stringcompare(Container.FolderPath,musicdb://5/1/) 1261 -3 105 105 - views/thumb/other/star_nofo.png + $VAR[MusicListStar] + !IsEmpty(ListItem.Title) 1390 @@ -384,18 +399,11 @@ 100 Font-Condensed-S34-B right - + 99FFFFFF - 99FFFFFF + D4FFFFFF false - - - 1391 - -10 - 39 - 39 - windows/filemanager/selected.png - ListItem.IsPlaying + !IsEmpty(ListItem.Title) @@ -407,6 +415,16 @@ 101 views/list/other/separator.png + + 0 + 1 + 1420 + 94 + views/other/selected.png + 07FFFFFF + center + ListItem.IsPlaying + 0 0 @@ -433,19 +451,12 @@ $INFO[ListItem.Label,special://skin/extras/musicgenres/,.jpg] Container.Content(Genres) - - 1391 - -10 - 39 - 39 - windows/filemanager/selected.png - ListItem.IsSelected | ListItem.IsPlaying - - + - Conditional + Conditional + Conditional Label 120 @@ -456,7 +467,7 @@ left eewhite - eewhite + SelectedGreen false !IsEmpty(ListItem.Artist) @@ -470,7 +481,7 @@ left eewhite - eewhite + SelectedGreen false IsEmpty(ListItem.Artist) @@ -669,6 +680,7 @@ 105 views/thumb/other/star_fo.png defaultfocusanim3 + !IsEmpty(ListItem.Album) 1390 @@ -677,10 +689,11 @@ 100 Font-Condensed-S34-B right - + D4FFFFFF D4FFFFFF false + !IsEmpty(ListItem.Album) @@ -693,6 +706,17 @@ 101 views/list/other/separator.png + + 0 + 1 + 1420 + 94 + views/other/selected.png + 07FFFFFF + center + ListItem.IsPlaying + Conditional> + 0 0 @@ -711,19 +735,11 @@ $INFO[ListItem.Icon] scale - - 1391 - -10 - 39 - 39 - windows/filemanager/selected.png - ListItem.IsPlaying - - + - Conditional + Conditional visiblehidefadeinfo !Window.IsVisible(songinformation) @@ -737,7 +753,7 @@ left eewhite - eewhite + SelectedGreen false !IsEmpty(ListItem.Artist) @@ -751,7 +767,7 @@ left eewhite - eewhite + SelectedGreen false IsEmpty(ListItem.Artist) @@ -798,32 +814,42 @@ 100 Font-Condensed-S34-B right - + D4FFFFFF D4FFFFFF false - !IsEmpty(ListItem.Duration) + !stringcompare(Container.FolderPath,musicdb://5/1/) + !stringcompare(Container.FolderPath,musicdb://5/1/) + + + 1261 + -3 + 105 + 105 + views/thumb/other/star_nofo.png + !IsEmpty(ListItem.Title) + + + 1261 + -3 + 105 + 105 + $VAR[MusicListStarFo] + defaultfocusanim3 + !IsEmpty(ListItem.Title) + + + 1390 + 0 + 100 + 100 + Font-Condensed-S34-B + right + + D4FFFFFF + D4FFFFFF + false + !IsEmpty(ListItem.Title) - - - 1261 - -3 - 105 - 105 - views/thumb/other/star_fo.png - defaultfocusanim3 - - - 1390 - 0 - 100 - 100 - Font-Condensed-S34-B - right - - D4FFFFFF - D4FFFFFF - false @@ -859,7 +885,7 @@ OptionsShutdownAnimation - Control.IsVisible(52) + !Window.IsActive(musicinformation) + Control.IsVisible(52) + !Window.IsActive(musicinformation) + !Window.IsActive(favourites) @@ -899,7 +925,7 @@ - Control.IsVisible(52) + !Window.IsActive(musicinformation) + Control.IsVisible(52) + !Window.IsActive(musicinformation) + !Window.IsActive(favourites) @@ -1022,7 +1048,7 @@ - Control.IsVisible(52) + !Window.IsActive(musicinformation) + Control.IsVisible(52) + !Window.IsActive(musicinformation) + !Window.IsActive(favourites) @@ -1109,29 +1135,24 @@ 100 58 Font-Condensed-S31 - + center 77white 22000000 false + !IsEmpty(ListItem.Album) 610 510 58 Font-Condensed-S31 - + 77white 22000000 false right - - - 530 - 3 - 49 - 49 - views/list/other/star_nofo.png + StringCompare(Container.SortMethod,$LOCALIZE[557]) @@ -1143,40 +1164,42 @@ views/list/other/separator.png - 601 - -10 - 39 - 39 - windows/filemanager/selected.png + 0 + 1 + 630 + 59 + views/other/selected.png + 07FFFFFF + center ListItem.IsPlaying - + + 20 + 0 + 60 + 590 + Font-Condensed-S29-B + + 77white + SelectedGreen + 22000000 + false + !Window.IsActive(songinformation) + visiblehidefadeinfo + + + 610 + 590 + 58 + Font-Condensed-S31 + + 77white + SelectedGreen + 22000000 + false + right !Window.IsActive(songinformation) visiblehidefadeinfo - - 20 - 0 - 60 - 590 - Font-Condensed-S29-B - - 77white - 77white - 22000000 - false - - - 610 - 590 - 58 - Font-Condensed-S31 - - 77white - 77white - 22000000 - false - right - @@ -1254,30 +1277,24 @@ 100 58 Font-Condensed-S31 - + center eewhite 22000000 false + !IsEmpty(ListItem.Album) 610 510 58 Font-Condensed-S31 - + eewhite 22000000 false right - - - 530 - 3 - 49 - 49 - views/list/other/star_fo.png - defaultfocusanim3 + StringCompare(Container.SortMethod,$LOCALIZE[557]) @@ -1303,43 +1320,51 @@ Control.HasFocus(52) - 601 - -10 - 39 - 39 - windows/filemanager/selected.png + 0 + 1 + 630 + 59 + views/other/selected.png + 07FFFFFF + center ListItem.IsPlaying - - - - - Conditional - - 20 - 0 - 60 - 590 - Font-Condensed-S29-B - - eewhite - eewhite - 22000000 - false - - - 610 - 590 - 58 - Font-Condensed-S31 - - eewhite - eewhite - 22000000 - false - right - - + + + 20 + 0 + 60 + 590 + Font-Condensed-S29-B + + eewhite + SelectedGreen + 22000000 + false + !Window.IsActive(songinformation) + visiblehidefadeinfo + + + + Conditional + + + 610 + 590 + 58 + Font-Condensed-S31 + + eewhite + SelectedGreen + 22000000 + false + right + !Window.IsActive(songinformation) + visiblehidefadeinfo + + + + Conditional @@ -1388,7 +1413,7 @@ FullscreenDimensions OptionsShutdownAnimation - Control.IsVisible(53) + !Window.IsActive(musicinformation) + Control.IsVisible(53) + !Window.IsActive(musicinformation) + !Window.IsActive(favourites) @@ -1476,7 +1501,7 @@ - Control.IsVisible(53) + !Window.IsActive(musicinformation) + Control.IsVisible(53) + !Window.IsActive(musicinformation) + !Window.IsActive(favourites) @@ -1522,7 +1547,7 @@ - Control.IsVisible(53) + !Window.IsActive(musicinformation) + Control.IsVisible(53) + !Window.IsActive(musicinformation) + !Window.IsActive(favourites) @@ -1668,7 +1693,7 @@ Visible Hidden - !Window.IsActive(musicinformation) + Control.IsVisible(55) + !Window.IsActive(musicinformation) + Control.IsVisible(55) + !Window.IsActive(favourites) @@ -1697,7 +1722,7 @@ - !Window.IsActive(musicinformation) + Control.IsVisible(55) + !Window.IsActive(musicinformation) + Control.IsVisible(55) + !Window.IsActive(favourites) -372 @@ -1752,7 +1777,7 @@ - !Window.IsActive(musicinformation) + Control.IsVisible(55) + !Window.IsActive(musicinformation) + Control.IsVisible(55) + !Window.IsActive(favourites) 1860 @@ -1807,7 +1832,7 @@ - !Window.IsActive(musicinformation) + Control.IsVisible(55) + !Window.IsActive(musicinformation) + Control.IsVisible(55) + !Window.IsActive(favourites) 1488 @@ -1862,7 +1887,7 @@ - !Window.IsActive(musicinformation) + Control.IsVisible(55) + !Window.IsActive(musicinformation) + Control.IsVisible(55) + !Window.IsActive(favourites) 1116 @@ -1917,7 +1942,7 @@ - !Window.IsActive(musicinformation) + Control.IsVisible(55) + !Window.IsActive(musicinformation) + Control.IsVisible(55) + !Window.IsActive(favourites) 744 @@ -1972,7 +1997,7 @@ - !Window.IsActive(musicinformation) + Control.IsVisible(55) + !Window.IsActive(musicinformation) + Control.IsVisible(55) + !Window.IsActive(favourites) 372 @@ -2026,7 +2051,7 @@ - !Window.IsActive(musicinformation) + Control.IsVisible(55) + !Window.IsActive(musicinformation) + Control.IsVisible(55) + !Window.IsActive(favourites) Reflection -4 @@ -2080,7 +2105,7 @@ - !Window.IsActive(musicinformation) + Control.IsVisible(55) + !Window.IsActive(musicinformation) + Control.IsVisible(55) + !Window.IsActive(favourites) Hidden Visible @@ -2224,7 +2249,7 @@ - !Window.IsActive(musicinformation) + Control.IsVisible(55) + !Window.IsActive(musicinformation) + Control.IsVisible(55) + !Window.IsActive(favourites) @@ -2293,7 +2318,7 @@ FullscreenDimensions OptionsShutdownAnimation - Control.IsVisible(501) + !Window.IsActive(musicinformation) + Control.IsVisible(501) + !Window.IsActive(musicinformation) + !Window.IsActive(favourites) @@ -2418,7 +2443,7 @@ - Control.IsVisible(501) + !Window.IsActive(musicinformation) + Control.IsVisible(501) + !Window.IsActive(musicinformation) + !Window.IsActive(favourites) @@ -2590,12 +2615,17 @@ 747 - - -263 - 23 - 223 - 47 - $INFO[ListItem.StarRating,views/banner/other/,] + + -40 + 0 + 210 + 96 + + Font-Condensed-S60 + 80FFFFFF + 80FFFFFF + false + right Container.Content(Albums) @@ -2645,62 +2675,66 @@ - + + 707 + 0 + 210 + 96 + + Font-Condensed-S80-B + 80FFFFFF + 80FFFFFF + false + right + !stringcompare(Container.FolderPath,musicdb://5/1/) + + + 707 + 0 + 210 + 96 + + Font-Condensed-S80-B + 80FFFFFF + 80FFFFFF + false + right + stringcompare(Container.FolderPath,musicdb://5/1/) + + 747 - - -40 - 0 - 210 - 96 - - Font-Condensed-S80-B - 80FFFFFF - false - right - !stringcompare(Container.FolderPath,musicdb://5/1/) - - - -40 - 0 - 210 - 96 - - Font-Condensed-S80-B - 80FFFFFF - false - right - stringcompare(Container.FolderPath,musicdb://5/1/) - - - 2 - 16 - 22 - 24 - views/banner/other/playing-nf.png - C0FFFFFF - ListItem.IsPlaying - - - 0 - 13 - 690 - - Font-Condensed-S34-B - C0FFFFFF - false - left - Conditional - - - 0 - 51 - 690 - - Font-Condensed-S28 - 80FFFFFF - false - left - + 13 + 690 + + Font-Condensed-S34-B + C0FFFFFF + SelectedGreen + false + left + + + 747 + 51 + 690 + + Font-Condensed-S28 + 80FFFFFF + 80FFFFFF + false + left + + + 747 + 0 + 690 + 96 + + Font-Condensed-S34-B + C0FFFFFF + SelectedGreen + false + left + IsEmpty(ListItem.Title) + IsEmpty(ListItem.Artist) @@ -2827,7 +2861,7 @@ 0 42 690 - + Font-Condensed-S34-B FF333333 false @@ -2923,7 +2957,7 @@ 0 50 690 - + Font-Condensed-S34-B FF333333 false diff --git a/1080i/ViewtypesPVR.xml b/1080i/ViewtypesPVR.xml index db1f9f42..389f7282 100644 --- a/1080i/ViewtypesPVR.xml +++ b/1080i/ViewtypesPVR.xml @@ -4,7 +4,7 @@ FullscreenDimensions OptionsShutdownAnimation - Control.IsVisible(11) + Control.IsVisible(11) + !Window.IsActive(favourites) @@ -41,52 +41,23 @@ 22000000 false - - Container(11).ListItem.HasEpg - visiblehidefadeinfo - - Plot - 30 - 82 - 516 - 416 - Container(11).ListItem.Plot - justify - aawhite - 33000000 - 71 - !Control.HasFocus(71) - Font-Condensed-S34 - !Pvr.IsPlayingTv - - - Plot - 30 - 390 - 516 - 122 - Container(11).ListItem.Plot - justify - aawhite - 33000000 - 71 - !Control.HasFocus(71) - Font-Condensed-S28 - Pvr.IsPlayingTv - - - - video - 30 - 85 - 516 - 290 - stretch - visiblehidefadeinfo - Player.HasVideo + Pvr.IsPlayingTv - Container(11).ListItem.HasEpg + visiblehidefadeinfo + + Plot + 30 + 82 + 516 + 416 + Container(11).ListItem.Plot + justify + aawhite + 33000000 + 71 + !Control.HasFocus(71) + Font-Condensed-S34 + 29 525 @@ -121,10 +92,40 @@ false + + !Container(11).ListItem.HasEpg + visiblehidefadeinfo + 30 + 300 + 516 + 72 + Font-Condensed-S40 + + 77white + 22000000 + false + center + center + + + + Scrollbar + 1755 + 300 + 6 + 416 + 70 + 11 + views/other/scrollbar-sq.png + views/other/scrollbar-sq.png + vertical + false + Conditional + Control.IsVisible(11) - Control.IsVisible(11) + Control.IsVisible(11) + !Window.IsActive(favourites) @@ -189,16 +190,54 @@ 97 views/list/other/separator.png + + 0 + 1 + 1022 + 94 + views/other/selected.png + 07FFFFFF + center + ListItem.IsPlaying + 20 - 5 - 86 - 86 + 8 + 80 + 80 $VAR[PvrListIcon] keep + + + Label + 185 + 0 + 67 + 58 + Font-Condensed-S34-B + right + + 99FFFFFF + SelectedGreen + false + ListItem.HasEpg + + + Label + 185 + 0 + 67 + 96 + Font-Condensed-S34-B + right + + 99FFFFFF + SelectedGreen + false + !ListItem.HasEpg - 124 + 118 58 67 19 @@ -209,78 +248,64 @@ windows/pvr/progress-leftright.png ListItem.Progress 77white - ListItem.HasEpg + ListItem.HasEpg + !ListItem.IsPlaying + + + 118 + 58 + 67 + 19 + true + windows/pvr/progress-back.png + windows/pvr/progress-leftright.png + windows/pvr/progress-mid.png + windows/pvr/progress-leftright.png + ListItem.Progress + D4FFFFFF + ListItem.HasEpg + ListItem.IsPlaying Label - 126 + 200 0 - 876 + 765 58 Font-Condensed-S34-B left 99FFFFFF - 99FFFFFF + SelectedGreen false ListItem.HasEpg Title - 203 + 200 42 - 799 + 765 50 Font-Condensed-S28 left 77white - 77white + D4FFFFFF false ListItem.HasEpg Label - 126 + 200 0 - 876 + 765 96 Font-Condensed-S34-B left 99FFFFFF - 99FFFFFF + SelectedGreen false !ListItem.HasEpg - - Label - 1002 - 0 - 946 - 96 - Font-Condensed-S75 - right - - 99FFFFFF - 99FFFFFF - false - !ListItem.HasTimer + !ListItem.IsRecording - - - Label - 956 - 0 - 900 - 96 - Font-Condensed-S75 - right - - 99FFFFFF - 99FFFFFF - false - ListItem.HasTimer | ListItem.IsRecording - ListItem.IsRecording @@ -307,14 +332,6 @@ windows/pvr/epg-timer.png ListItem.HasTimer + !ListItem.IsRecording - - 993 - -10 - 39 - 39 - windows/filemanager/selected.png - ListItem.IsSelected | ListItem.IsPlaying - @@ -324,6 +341,16 @@ 97 views/list/other/separator.png + + 0 + 1 + 1022 + 94 + views/other/selected.png + 07FFFFFF + center + ListItem.IsPlaying + 0 0 @@ -337,19 +364,75 @@ 20 - 5 - 86 - 86 + 8 + 80 + 80 $VAR[PvrListIcon] keep - + - Conditional + Conditional + + Label + 185 + 0 + 67 + 58 + Font-Condensed-S34-B + right + + eewhite + SelectedGreen + false + ListItem.HasEpg + + + Label + 185 + 0 + 67 + 96 + Font-Condensed-S34-B + right + + eewhite + SelectedGreen + false + !ListItem.HasEpg + + + Label + 200 + 0 + 765 + 58 + Font-Condensed-S34-B + left + + eewhite + SelectedGreen + false + ListItem.HasEpg + + + Label + 200 + 0 + 765 + 96 + Font-Condensed-S34-B + left + + eewhite + SelectedGreen + false + !ListItem.HasEpg + - 124 + 118 58 67 19 @@ -362,25 +445,11 @@ D4FFFFFF ListItem.HasEpg - - Label - 126 - 0 - 876 - 58 - Font-Condensed-S34-B - left - - eewhite - eewhite - false - ListItem.HasEpg - Title - 203 + 200 42 - 799 + 765 50 Font-Condensed-S28 left @@ -390,48 +459,6 @@ false ListItem.HasEpg - - Label - 126 - 0 - 876 - 96 - Font-Condensed-S34-B - left - - eewhite - eewhite - false - !ListItem.HasEpg - - - Label - 1002 - 0 - 946 - 96 - Font-Condensed-S75 - right - - eewhite - eewhite - false - !ListItem.HasTimer + !ListItem.IsRecording - - - Label - 956 - 0 - 900 - 96 - Font-Condensed-S75 - right - - eewhite - eewhite - false - ListItem.HasTimer | ListItem.IsRecording - ListItem.IsRecording @@ -459,14 +486,6 @@ windows/pvr/epg-timer.png ListItem.HasTimer + !ListItem.IsRecording - - 993 - -10 - 39 - 39 - windows/filemanager/selected.png - ListItem.IsSelected | ListItem.IsPlaying - @@ -484,21 +503,6 @@ Conditional Control.IsVisible(11) - - Scrollbar - 1755 - 300 - 6 - 416 - 70 - 11 - views/other/scrollbar-sq.png - views/other/scrollbar-sq.png - vertical - false - Conditional - Control.IsVisible(11) - @@ -508,7 +512,7 @@ FullscreenDimensions OptionsShutdownAnimation - Control.IsVisible(12) + Control.IsVisible(12) + !Window.IsActive(favourites) @@ -545,52 +549,23 @@ 22000000 false - - Container(12).ListItem.HasEpg - visiblehidefadeinfo - - Plot - 30 - 82 - 516 - 416 - Container(12).ListItem.Plot - justify - aawhite - 33000000 - 71 - !Control.HasFocus(71) - Font-Condensed-S34 - !Pvr.IsPlayingTv - - - Plot - 30 - 390 - 516 - 122 - Container(12).ListItem.Plot - justify - aawhite - 33000000 - 71 - !Control.HasFocus(71) - Font-Condensed-S28 - Pvr.IsPlayingTv - - - - video - 30 - 85 - 516 - 290 - stretch - visiblehidefadeinfo - Player.HasVideo + Pvr.IsPlayingTv - Container(12).ListItem.HasEpg + visiblehidefadeinfo + + Plot + 30 + 82 + 516 + 416 + Container(12).ListItem.Plot + justify + aawhite + 33000000 + 71 + !Control.HasFocus(71) + Font-Condensed-S34 + 29 526 @@ -625,10 +600,40 @@ false + + !Container(12).ListItem.HasEpg + visiblehidefadeinfo + 30 + 300 + 516 + 72 + Font-Condensed-S40 + + 77white + 22000000 + false + center + center + + + + Scrollbar + 1755 + 300 + 6 + 416 + 70 + 12 + views/other/scrollbar-sq.png + views/other/scrollbar-sq.png + vertical + false + Conditional + Control.IsVisible(12) - Control.IsVisible(12) + Control.IsVisible(12) + !Window.IsActive(favourites) @@ -693,16 +698,54 @@ 97 views/list/other/separator.png + + 0 + 1 + 1022 + 94 + views/other/selected.png + 07FFFFFF + center + ListItem.IsPlaying + 20 - 5 - 86 - 86 + 8 + 80 + 80 $VAR[PvrListIcon] keep + + Label + 185 + 0 + 67 + 58 + Font-Condensed-S34-B + right + + 99FFFFFF + SelectedGreen + false + ListItem.HasEpg + + + Label + 185 + 0 + 67 + 96 + Font-Condensed-S34-B + right + + 99FFFFFF + SelectedGreen + false + !ListItem.HasEpg + - 124 + 118 58 67 19 @@ -713,78 +756,64 @@ windows/pvr/progress-leftright.png ListItem.Progress 77white - ListItem.HasEpg + ListItem.HasEpg + !ListItem.IsPlaying + + + 118 + 58 + 67 + 19 + true + windows/pvr/progress-back.png + windows/pvr/progress-leftright.png + windows/pvr/progress-mid.png + windows/pvr/progress-leftright.png + ListItem.Progress + D4FFFFFF + ListItem.HasEpg + ListItem.IsPlaying Label - 126 + 200 0 - 876 + 765 58 Font-Condensed-S34-B left 99FFFFFF - 99FFFFFF + SelectedGreen false ListItem.HasEpg Title - 203 + 200 42 - 799 + 765 50 Font-Condensed-S28 left 77white - 77white + D4FFFFFF false ListItem.HasEpg Label - 126 + 200 0 - 876 + 765 96 Font-Condensed-S34-B left 99FFFFFF - 99FFFFFF + SelectedGreen false !ListItem.HasEpg - - Label - 1002 - 0 - 946 - 96 - Font-Condensed-S75 - right - - 99FFFFFF - 99FFFFFF - false - !ListItem.HasTimer + !ListItem.IsRecording - - - Label - 956 - 0 - 900 - 96 - Font-Condensed-S75 - right - - 99FFFFFF - 99FFFFFF - false - ListItem.HasTimer | ListItem.IsRecording - ListItem.IsRecording @@ -811,14 +840,6 @@ windows/pvr/epg-timer.png ListItem.HasTimer + !ListItem.IsRecording - - 993 - -10 - 39 - 39 - windows/filemanager/selected.png - ListItem.IsSelected | ListItem.IsPlaying - @@ -828,6 +849,16 @@ 97 views/list/other/separator.png + + 0 + 1 + 1022 + 94 + views/other/selected.png + 07FFFFFF + center + ListItem.IsPlaying + 0 0 @@ -841,100 +872,100 @@ 20 - 5 - 86 - 86 + 8 + 80 + 80 $VAR[PvrListIcon] keep - + - Conditional - - 124 - 58 - 67 - 19 - true - windows/pvr/progress-back.png - windows/pvr/progress-leftright.png - windows/pvr/progress-mid.png - windows/pvr/progress-leftright.png - ListItem.Progress - D4FFFFFF - ListItem.HasEpg - + Conditional Label - 126 + 185 0 - 876 + 67 58 Font-Condensed-S34-B - left - + right + eewhite - eewhite - false - ListItem.HasEpg - - - Title - 203 - 42 - 799 - 50 - Font-Condensed-S28 - left - - D4FFFFFF - D4FFFFFF + SelectedGreen false ListItem.HasEpg Label - 126 + 185 0 - 876 + 67 96 Font-Condensed-S34-B - left - + right + eewhite - eewhite + SelectedGreen false !ListItem.HasEpg Label - 1002 + 200 0 - 946 - 96 - Font-Condensed-S75 - right - + 765 + 58 + Font-Condensed-S34-B + left + eewhite - eewhite + SelectedGreen false - !ListItem.HasTimer + !ListItem.IsRecording + ListItem.HasEpg Label - 956 + 200 0 - 900 + 765 96 - Font-Condensed-S75 - right - + Font-Condensed-S34-B + left + eewhite - eewhite + SelectedGreen false - ListItem.HasTimer | ListItem.IsRecording + !ListItem.HasEpg + + + 118 + 58 + 67 + 19 + true + windows/pvr/progress-back.png + windows/pvr/progress-leftright.png + windows/pvr/progress-mid.png + windows/pvr/progress-leftright.png + ListItem.Progress + D4FFFFFF + ListItem.HasEpg + + + Title + 200 + 42 + 765 + 50 + Font-Condensed-S28 + left + + D4FFFFFF + D4FFFFFF + false + ListItem.HasEpg @@ -963,14 +994,6 @@ windows/pvr/epg-timer.png ListItem.HasTimer + !ListItem.IsRecording - - 993 - -10 - 39 - 39 - windows/filemanager/selected.png - ListItem.IsSelected | ListItem.IsPlaying - @@ -988,21 +1011,6 @@ Conditional Control.IsVisible(12) - - Scrollbar - 1755 - 300 - 6 - 416 - 70 - 12 - views/other/scrollbar-sq.png - views/other/scrollbar-sq.png - vertical - false - Conditional - Control.IsVisible(12) - @@ -1011,7 +1019,7 @@ TV Guide Timeline OptionsShutdownAnimation - Control.IsVisible(10) + Control.IsVisible(10) + !Window.IsActive(favourites) @@ -1080,6 +1088,16 @@ 81 views/list/other/separator.png + + 0 + 1 + 500 + 79 + views/other/selected.png + 07FFFFFF + center + ListItem.IsSelected | ListItem.IsPlaying + 20 5 @@ -1098,7 +1116,7 @@ left 99FFFFFF - 99FFFFFF + SelectedGreen false @@ -1111,17 +1129,9 @@ right 99FFFFFF - 99FFFFFF + SelectedGreen false - - 471 - -10 - 39 - 39 - windows/filemanager/selected.png - ListItem.IsSelected | ListItem.IsPlaying - @@ -1131,6 +1141,16 @@ 81 views/list/other/separator.png + + 0 + 1 + 500 + 79 + views/other/selected.png + 07FFFFFF + center + ListItem.IsSelected | ListItem.IsPlaying + 0 0 @@ -1148,42 +1168,33 @@ $VAR[PvrListIcon] keep - - 471 - -10 - 39 - 39 - windows/filemanager/selected.png - ListItem.IsSelected | ListItem.IsPlaying + + Label + 105 + 0 + 375 + 80 + Font-Condensed-S34-B + left + + eewhite + SelectedGreen + false + Conditional - - Conditional - - Label - 105 - 0 - 375 - 80 - Font-Condensed-S34-B - left - - eewhite - eewhite - false - - - Label - 480 - 0 - 375 - 80 - Font-Condensed-S34 - right - - eewhite - eewhite - false - + + Label + 480 + 0 + 375 + 80 + Font-Condensed-S34 + right + + eewhite + SelectedGreen + false + Conditional @@ -1352,35 +1363,27 @@ $INFO[Container(10).ListItem.Icon] keep - + 143 0 1157 86 - - ddwhite - 55000000 - Font-Condensed-S38-B - center - - - 143 - 50 - 1157 - 86 - - 99FFFFFF + + $INFO[ListItem.StartTime]$INFO[ListItem.EndTime, - ] + ddwhite 55000000 - Font-Condensed-S36 + Font-Condensed-S38 + left center + false Plot value 143 - 117 + 70 1157 - 90 - Font-Condensed-S34 + 135 + Font-Condensed-S33 justify aawhite 55000000 @@ -1397,7 +1400,7 @@ FullscreenDimensions OptionsShutdownAnimation - Control.IsVisible(15) + Pvr.IsPlayingTv + IntegerGreaterThan(Container(15).NumItems,0) + Control.IsVisible(15) + IntegerGreaterThan(Container(15).NumItems,0) + !Window.IsActive(favourites) @@ -1416,13 +1419,13 @@ Channel Preview + Info 1184 - 277 + 216 -2 -3 580 - 604 - views/list/panel/panel.png + 679 + views/list/panel/panel.png 30 @@ -1434,53 +1437,25 @@ 22000000 false - - !IsEmpty(Container(15).ListItem.Plot) - visiblehidefadeinfo - - Plot - 30 - 78 - 516 - 440 - Container(15).ListItem.Plot - justify - aawhite - 33000000 - 71 - !Control.HasFocus(71) - Font-Condensed-S32 - !Pvr.IsPlayingTv - - - Plot - 30 - 380 - 516 - 150 - Container(15).ListItem.Plot - justify - aawhite - 33000000 - 71 - !Control.HasFocus(71) - Font-Condensed-S28 - Pvr.IsPlayingTv - - - - video + + Plot 30 - 80 + 78 516 - 290 - stretch + 505 + Container(15).ListItem.Plot + justify + aawhite + 33000000 + 71 + !Control.HasFocus(71) + Font-Condensed-S34 + !IsEmpty(Container(15).ListItem.Plot) visiblehidefadeinfo - Player.HasVideo + Pvr.IsPlayingTv 30 - 543 + 618 516 Font-Condensed-S30-B @@ -1488,10 +1463,25 @@ 22000000 false + + Scrollbar + 572 + 78 + 6 + 505 + 70 + 16 + views/other/scrollbar-sq.png + views/other/scrollbar-sq.png + vertical + false + Conditional + Control.IsVisible(15) + - Control.IsVisible(15) + Control.IsVisible(15) + !Window.IsActive(favourites) @@ -1508,28 +1498,40 @@ Conditional Conditional Conditional + + 168 + 178 + 200 + 30 + Font-Condensed-S30-B + 99FFFFFF + 55000000 + left + center + + Shadow 50 - 870 + 883 1820 150 windows/home/item-shadow.png - Conditional + Conditional List Panel 148 - 274 + 213 1026 - 604 - views/list/panel/panel.png + 679 + views/list/panel/panel.png - 150 - 277 - 1022 - 600 + 180 + 503 + 962 + 100 77white Font-Condensed-S50 @@ -1539,9 +1541,9 @@ 150 - 277 + 216 1022 - 600 + 675 70 9001 70 @@ -1575,7 +1577,7 @@ Label 290 0 - 812 + 712 75 Font-Condensed-S34-B left @@ -1588,7 +1590,7 @@ Label 1002 0 - 812 + 712 74 Font-Condensed-S31 right @@ -1602,7 +1604,7 @@ Label 956 0 - 766 + 666 74 Font-Condensed-S31 right @@ -1638,14 +1640,6 @@ windows/pvr/epg-timer.png ListItem.HasTimer + !ListItem.IsRecording - - 993 - -10 - 39 - 39 - windows/filemanager/selected.png - ListItem.IsSelected | ListItem.IsPlaying - @@ -1688,7 +1682,7 @@ Label 290 0 - 812 + 712 75 Font-Condensed-S34-B left @@ -1701,7 +1695,7 @@ Label 1002 0 - 812 + 712 74 Font-Condensed-S31 right @@ -1715,7 +1709,7 @@ Label 956 0 - 766 + 666 74 Font-Condensed-S31 right @@ -1752,22 +1746,14 @@ windows/pvr/epg-timer.png ListItem.HasTimer + !ListItem.IsRecording - - 993 - -10 - 39 - 39 - windows/filemanager/selected.png - ListItem.IsSelected | ListItem.IsPlaying - Scrollbar 1166 - 277 + 216 6 - 600 + 675 15 71 views/other/scrollbar-sq.png @@ -1777,21 +1763,6 @@ Conditional Control.IsVisible(15) - - Scrollbar - 1755 - 357 - 6 - 375 - 70 - 15 - views/other/scrollbar-sq.png - views/other/scrollbar-sq.png - vertical - false - Conditional - Control.IsVisible(15) - @@ -1801,7 +1772,7 @@ FullscreenDimensions OptionsShutdownAnimation - Control.IsVisible(16) + Control.IsVisible(16) + !Window.IsActive(favourites) @@ -1820,13 +1791,13 @@ Channel Preview + Info 1184 - 277 + 216 -2 -3 580 - 604 - views/list/panel/panel.png + 679 + views/list/panel/panel.png 30 @@ -1838,53 +1809,25 @@ 22000000 false - - !IsEmpty(Container(16).ListItem.Plot) - visiblehidefadeinfo - - Plot - 30 - 78 - 516 - 430 - Container(16).ListItem.Plot - justify - aawhite - 33000000 - 71 - !Control.HasFocus(71) - Font-Condensed-S32 - !Pvr.IsPlayingTv - - - Plot - 30 - 380 - 516 - 150 - Container(16).ListItem.Plot - justify - aawhite - 33000000 - 71 - !Control.HasFocus(71) - Font-Condensed-S28 - Pvr.IsPlayingTv - - - - video + + Plot 30 - 80 + 78 516 - 290 - stretch + 505 + Container(16).ListItem.Plot + justify + aawhite + 33000000 + 71 + !Control.HasFocus(71) + Font-Condensed-S34 + !IsEmpty(Container(16).ListItem.Plot) visiblehidefadeinfo - Player.HasVideo + Pvr.IsPlayingTv 30 - 543 + 618 516 Font-Condensed-S30-B @@ -1892,10 +1835,25 @@ 22000000 false + + Scrollbar + 572 + 78 + 6 + 505 + 70 + 16 + views/other/scrollbar-sq.png + views/other/scrollbar-sq.png + vertical + false + Conditional + Control.IsVisible(16) + - Control.IsVisible(16) + Control.IsVisible(16) + !Window.IsActive(favourites) @@ -1911,10 +1869,22 @@ Conditional Conditional Conditional + + 168 + 178 + 200 + 30 + Font-Condensed-S30-B + 99FFFFFF + 55000000 + left + center + + Shadow 50 - 870 + 883 1820 150 windows/home/item-shadow.png @@ -1922,16 +1892,16 @@ List Panel 148 - 274 + 213 1026 - 604 - views/list/panel/panel.png + 679 + views/list/panel/panel.png 150 - 277 + 216 1022 - 600 + 675 70 9001 70 @@ -1948,40 +1918,39 @@ 76 views/list/other/separator.png - + + Title + 145 + 0 + 125 + 75 + Font-Condensed-S33 + right + + 99FFFFFF + 99FFFFFF + false + Conditional + + + Label + 165 + 0 + 837 + 74 + Font-Condensed-S34 + left + + 77white + 77white + false Conditional - - Title - 145 - 0 - 125 - 75 - Font-Condensed-S33 - right - - 99FFFFFF - 99FFFFFF - false - - - Label - 165 - 0 - 937 - 74 - Font-Condensed-S35 - left - - 77white - 77white - false - Label 1002 0 - 937 + 837 75 Font-Condensed-S33 right @@ -1995,7 +1964,7 @@ Label 956 0 - 891 + 791 75 Font-Condensed-S33 right @@ -2031,14 +2000,6 @@ windows/pvr/epg-timer.png ListItem.HasTimer + !ListItem.IsRecording - - 993 - -10 - 39 - 39 - windows/filemanager/selected.png - ListItem.IsSelected | ListItem.IsPlaying - @@ -2064,40 +2025,39 @@ Conditional - + + Title + 145 + 0 + 125 + 75 + Font-Condensed-S33 + right + + eewhite + eewhite + false + Conditional + + + Label + 165 + 0 + 837 + 74 + Font-Condensed-S34 + left + + D4FFFFFF + D4FFFFFF + false Conditional - - Title - 145 - 0 - 125 - 75 - Font-Condensed-S33 - right - - eewhite - eewhite - false - - - Label - 165 - 0 - 937 - 74 - Font-Condensed-S35 - left - - D4FFFFFF - D4FFFFFF - false - - + Label 1002 0 - 937 + 837 75 Font-Condensed-S33 right @@ -2111,7 +2071,7 @@ Label 956 0 - 891 + 791 75 Font-Condensed-S33 right @@ -2148,22 +2108,14 @@ windows/pvr/epg-timer.png ListItem.HasTimer + !ListItem.IsRecording - - 993 - -10 - 39 - 39 - windows/filemanager/selected.png - ListItem.IsSelected | ListItem.IsPlaying - Scrollbar 1166 - 277 + 216 6 - 600 + 675 16 71 views/other/scrollbar-sq.png @@ -2173,21 +2125,6 @@ Conditional Control.IsVisible(16) - - Scrollbar - 1755 - 357 - 6 - 375 - 70 - 16 - views/other/scrollbar-sq.png - views/other/scrollbar-sq.png - vertical - false - Conditional - Control.IsVisible(16) - @@ -2197,7 +2134,7 @@ FullscreenDimensions OptionsShutdownAnimation - Control.IsVisible(13) + Control.IsVisible(13) + !Window.IsActive(favourites) @@ -2216,13 +2153,13 @@ Channel Preview + Info 1184 - 277 + 216 -2 -3 580 - 604 - views/list/panel/panel.png + 679 + views/list/panel/panel.png 30 @@ -2234,32 +2171,25 @@ 22000000 false - - Plot - 30 - 380 - 516 - 150 - Container(13).ListItem.Plot - justify - aawhite - 33000000 - 71 - !Control.HasFocus(71) - Font-Condensed-S28 - - - Icon + + Plot 30 - 80 + 78 516 - 290 - keep - $VAR[PvrRecordingsIcon] + 505 + Container(15).ListItem.Plot + justify + aawhite + 33000000 + 71 + !Control.HasFocus(71) + Font-Condensed-S34 + !IsEmpty(Container(13).ListItem.Plot) + visiblehidefadeinfo 30 - 543 + 618 516 Font-Condensed-S30-B @@ -2267,10 +2197,25 @@ 22000000 false + + Scrollbar + 572 + 78 + 6 + 505 + 70 + 16 + views/other/scrollbar-sq.png + views/other/scrollbar-sq.png + vertical + false + Conditional + Control.IsVisible(13) + - Control.IsVisible(13) + Control.IsVisible(13) + !Window.IsActive(favourites) @@ -2286,10 +2231,22 @@ Conditional Conditional Conditional + + 168 + 178 + 200 + 30 + Font-Condensed-S30-B + 99FFFFFF + 55000000 + left + center + + Shadow 50 - 870 + 883 1820 150 windows/home/item-shadow.png @@ -2297,16 +2254,16 @@ List Panel 148 - 274 + 213 1026 - 604 - views/list/panel/panel.png + 679 + views/list/panel/panel.png 150 - 277 + 216 1022 - 600 + 675 70 9001 70 @@ -2324,37 +2281,39 @@ views/list/other/separator.png - 20 - 10 - 98 - 55 - $VAR[PvrRecordingsIconSmall] - scale + 0 + 1 + 1022 + 74 + views/other/selected.png + 07FFFFFF + center + ListItem.IsSelected | ListItem.IsPlaying Title - 138 + 20 0 - 822 + 940 75 Font-Condensed-S33 left 99FFFFFF - 99FFFFFF + SelectedGreen false Label 960 0 - 822 + 940 75 Font-Condensed-S31 right 77white - 77white + SelectedGreen false @@ -2367,14 +2326,6 @@ 7FFFFFFF $VAR[DefaultListOverlay] - - 993 - -10 - 39 - 39 - windows/filemanager/selected.png - ListItem.IsSelected | ListItem.IsPlaying - @@ -2384,6 +2335,16 @@ 76 views/list/other/separator.png + + 0 + 1 + 1022 + 74 + views/other/selected.png + 07FFFFFF + center + ListItem.IsSelected | ListItem.IsPlaying + 0 0 @@ -2395,55 +2356,53 @@ visiblehidefadeinfo Control.HasFocus(13) - + + Title 20 - 10 - 98 - 55 - $VAR[PvrRecordingsIconSmall] - scale + 0 + 940 + 75 + Font-Condensed-S33 + left + + eewhite + SelectedGreen + false + + + + Conditional - + + Label + 960 + 0 + 940 + 75 + Font-Condensed-S31 + right + + D4FFFFFF + SelectedGreen + false + + + + Conditional + + + Watched/unwatched overlay + 940 + -12 + 100 + 100 + keepaspect + D4FFFFFF + $VAR[DefaultListOverlay] Conditional - - Title - 138 - 0 - 822 - 75 - Font-Condensed-S33 - left - - eewhite - eewhite - false - - - Label - 960 - 0 - 822 - 75 - Font-Condensed-S31 - right - - D4FFFFFF - D4FFFFFF - false - - - Watched/unwatched overlay - 940 - -12 - 100 - 100 - keepaspect - D4FFFFFF - $VAR[DefaultListOverlay] - Watched/unwatched overlay @@ -2455,22 +2414,14 @@ 7FFFFFFF $VAR[DefaultListOverlay] - - 993 - -10 - 39 - 39 - windows/filemanager/selected.png - ListItem.IsSelected | ListItem.IsPlaying - Scrollbar 1166 - 277 + 216 6 - 600 + 675 13 71 views/other/scrollbar-sq.png @@ -2480,21 +2431,6 @@ Conditional Control.IsVisible(13) - - Scrollbar - 1755 - 357 - 6 - 375 - 70 - 13 - views/other/scrollbar-sq.png - views/other/scrollbar-sq.png - vertical - false - Conditional - Control.IsVisible(13) - @@ -2504,7 +2440,7 @@ FullscreenDimensions OptionsShutdownAnimation - Control.IsVisible(14) + Control.IsVisible(14) + !Window.IsActive(favourites) @@ -2520,10 +2456,22 @@ Conditional Conditional Conditional + + 318 + 178 + 200 + 30 + Font-Condensed-S30-B + 99FFFFFF + 55000000 + left + center + + Shadow 200 - 870 + 883 1520 150 windows/home/item-shadow.png @@ -2531,16 +2479,16 @@ List Panel 298 - 274 + 213 1324 - 604 - views/list/panel/panel.png + 679 + views/list/panel/panel.png 300 - 277 + 216 1320 - 600 + 675 70 9001 70 @@ -2604,14 +2552,6 @@ 75 $VAR[TVTimerRadioButtonTexture] - - 1291 - -10 - 39 - 39 - windows/filemanager/selected.png - ListItem.IsSelected | ListItem.IsPlaying - @@ -2685,22 +2625,14 @@ 75 $VAR[TVTimerRadioButtonTexture] - - 1291 - -10 - 39 - 39 - windows/filemanager/selected.png - ListItem.IsSelected | ListItem.IsPlaying - Scrollbar 1614 - 277 + 216 6 - 600 + 675 14 14 views/other/scrollbar-sq.png @@ -2719,7 +2651,7 @@ FullscreenDimensions OptionsShutdownAnimation - Control.IsVisible(17) + Control.IsVisible(17) + !Window.IsActive(favourites) @@ -2735,10 +2667,22 @@ Conditional Conditional Conditional + + 318 + 178 + 200 + 30 + Font-Condensed-S30-B + 99FFFFFF + 55000000 + left + center + + Shadow 200 - 870 + 883 1520 150 windows/home/item-shadow.png @@ -2746,16 +2690,16 @@ List Panel 298 - 274 + 213 1324 - 604 - views/list/panel/panel.png + 679 + views/list/panel/panel.png 300 - 277 + 216 1320 - 600 + 675 70 9001 70 @@ -2778,7 +2722,7 @@ 0 265 74 - Font-Condensed-S35 + Font-Condensed-S34 right 99FFFFFF @@ -2805,7 +2749,7 @@ 0 995 74 - Font-Condensed-S35 + Font-Condensed-S34 right 77white @@ -2819,7 +2763,7 @@ 0 939 74 - Font-Condensed-S35 + Font-Condensed-S34 right 77white @@ -2892,7 +2836,7 @@ 0 265 74 - Font-Condensed-S35 + Font-Condensed-S34 right eewhite @@ -2919,7 +2863,7 @@ 0 995 74 - Font-Condensed-S35 + Font-Condensed-S34 right D4FFFFFF @@ -2933,7 +2877,7 @@ 0 939 74 - Font-Condensed-S35 + Font-Condensed-S34 right D4FFFFFF @@ -2981,9 +2925,9 @@ Scrollbar 1614 - 277 + 216 6 - 600 + 675 17 17 views/other/scrollbar-sq.png diff --git a/1080i/ViewtypesVideos.xml b/1080i/ViewtypesVideos.xml index a7aa81dd..0e9adbea 100644 --- a/1080i/ViewtypesVideos.xml +++ b/1080i/ViewtypesVideos.xml @@ -48,6 +48,16 @@ 101 views/list/other/separator.png + + 0 + 1 + 1420 + 94 + views/other/selected.png + 07FFFFFF + center + ListItem.IsPlaying + Label 120 @@ -58,7 +68,7 @@ left aawhite - aawhite + SelectedGreen false Conditional @@ -72,7 +82,7 @@ right 99FFFFFF - 99FFFFFF + D4FFFFFF false IsEmpty(ListItem.Overlay) + IsEmpty(ListItem.Rating) @@ -86,7 +96,7 @@ right 99FFFFFF - 99FFFFFF + D4FFFFFF false !IsEmpty(ListItem.Overlay) | !IsEmpty(ListItem.Rating) Conditional @@ -98,7 +108,7 @@ 0 100 100 - 7FFFFFFF + $VAR[Colordiffuse.Color] $VAR[DefaultListOverlay] !IsEmpty(ListItem.Overlay) Conditional @@ -110,9 +120,9 @@ 100 Font-Condensed-S34-B right - + 99FFFFFF - 99FFFFFF + D4FFFFFF false !IsEmpty(ListItem.Rating) @@ -133,14 +143,6 @@ $INFO[ListItem.Label,special://skin/extras/moviegenres/,.jpg] Container.Content(genres) - - 1391 - -10 - 39 - 39 - windows/filemanager/selected.png - ListItem.IsSelected | ListItem.IsPlaying - @@ -151,6 +153,16 @@ 101 views/list/other/separator.png + + 0 + 1 + 1420 + 94 + views/other/selected.png + 07FFFFFF + center + ListItem.IsPlaying + Thumbnail 20 @@ -169,7 +181,7 @@ Font-Condensed-S34-B left - aawhite + SelectedGreen aawhite false @@ -182,7 +194,7 @@ Font-Condensed-S28 left - 99FFFFFF + D4FFFFFF 99FFFFFF false @@ -193,7 +205,7 @@ 140 100 $VAR[ListHDSDFlag] - 7FFFFFFF + $VAR[Colordiffuse.Color] !IsEmpty(ListItem.VideoResolution) @@ -204,7 +216,7 @@ 100 flags/other/set-default.png substring(ListItem.Path,videodb://1/7,left) - 7FFFFFFF + $VAR[Colordiffuse.Color] Watched/unwatched overlay @@ -212,7 +224,7 @@ 0 100 100 - 7FFFFFFF + $VAR[Colordiffuse.Color] $VAR[DefaultListOverlay] @@ -222,18 +234,11 @@ 100 Font-Condensed-S34-B right - - 99FFFFFF + + D4FFFFFF 99FFFFFF false - - - 1391 - -10 - 39 - 39 - windows/filemanager/selected.png - ListItem.IsSelected | ListItem.IsPlaying + !IsEmpty(ListItem.Title) @@ -294,12 +299,13 @@ 100 Font-Condensed-S34-B right - + 99FFFFFF false + !IsEmpty(ListItem.Title) - !stringcompare(Container.Listitem(0).Label,..) + IntegerGreaterThan(ListItem.Property(unWatchedEpisodes),0) + IntegerGreaterThan(ListItem.Property(unWatchedEpisodes),0) 1212 29 @@ -373,7 +379,7 @@ $VAR[DefaultListOverlay] - !stringcompare(Container.Listitem(0).Label,..) + [Container.Content(tvshows) | Container.Content(seasons)] + IntegerGreaterThan(ListItem.Property(unWatchedEpisodes),0) + [Container.Content(tvshows) | Container.Content(seasons)] + IntegerGreaterThan(ListItem.Property(unWatchedEpisodes),0) 1282 29 @@ -404,6 +410,16 @@ 101 views/list/other/separator.png + + 0 + 1 + 1420 + 94 + views/other/selected.png + 07FFFFFF + center + ListItem.IsPlaying + Thumbnail 20 @@ -422,7 +438,7 @@ Font-Condensed-S34-B left - aawhite + SelectedGreen aawhite false @@ -435,7 +451,7 @@ Font-Condensed-S28 left - 99FFFFFF + D4FFFFFF 99FFFFFF false @@ -446,7 +462,7 @@ 140 100 $VAR[ListHDSDFlag] - 7FFFFFFF + $VAR[Colordiffuse.Color] !IsEmpty(ListItem.VideoResolution) @@ -455,7 +471,7 @@ 0 100 100 - 7FFFFFFF + $VAR[Colordiffuse.Color] $VAR[DefaultListOverlay] @@ -465,18 +481,11 @@ 100 Font-Condensed-S34-B right - - 99FFFFFF + + D4FFFFFF 99FFFFFF false - - - 1391 - -10 - 39 - 39 - windows/filemanager/selected.png - ListItem.IsSelected | ListItem.IsPlaying + !IsEmpty(ListItem.Title) @@ -488,6 +497,16 @@ 101 views/list/other/separator.png + + 0 + 1 + 1420 + 94 + views/other/selected.png + 07FFFFFF + center + ListItem.IsPlaying + 0 0 @@ -515,19 +534,11 @@ $INFO[ListItem.Label,special://skin/extras/moviegenres/,.jpg] Container.Content(genres) - - 1391 - -10 - 39 - 39 - windows/filemanager/selected.png - ListItem.IsSelected | ListItem.IsPlaying - - + - Conditional + Conditional Label 120 @@ -536,9 +547,9 @@ 100 Font-Condensed-S34-B left - + eewhite - eewhite + SelectedGreen Conditional @@ -589,7 +600,7 @@ 100 Font-Condensed-S34-B right - + D4FFFFFF D4FFFFFF false @@ -606,6 +617,16 @@ 101 views/list/other/separator.png + + 0 + 1 + 1420 + 94 + views/other/selected.png + 07FFFFFF + center + ListItem.IsPlaying + 0 0 @@ -625,19 +646,11 @@ $VAR[DefaultListPoster] scale - - 1391 - -10 - 39 - 39 - windows/filemanager/selected.png - ListItem.IsSelected | ListItem.IsPlaying - - + - Conditional + Conditional Label 100 @@ -646,8 +659,8 @@ 62 Font-Condensed-S34-B left - - eewhite + + SelectedGreen eewhite @@ -699,10 +712,11 @@ 100 Font-Condensed-S34-B right - + D4FFFFFF D4FFFFFF false + !IsEmpty(ListItem.Title) @@ -778,12 +792,13 @@ 100 Font-Condensed-S34-B right - + D4FFFFFF false + !IsEmpty(ListItem.Title) - !stringcompare(Container.Listitem(0).Label,..) + IntegerGreaterThan(ListItem.Property(unWatchedEpisodes),0) + IntegerGreaterThan(ListItem.Property(unWatchedEpisodes),0) 1212 29 @@ -872,7 +887,7 @@ $VAR[DefaultListOverlay] - !stringcompare(Container.Listitem(0).Label,..) + [Container.Content(tvshows) | Container.Content(seasons)] + IntegerGreaterThan(ListItem.Property(unWatchedEpisodes),0) + [Container.Content(tvshows) | Container.Content(seasons)] + IntegerGreaterThan(ListItem.Property(unWatchedEpisodes),0) 1282 29 @@ -903,6 +918,16 @@ 101 views/list/other/separator.png + + 0 + 1 + 1420 + 94 + views/other/selected.png + 07FFFFFF + center + ListItem.IsPlaying + 0 0 @@ -922,19 +947,11 @@ $VAR[DefaultListLandscape] scale - - 1391 - -10 - 39 - 39 - windows/filemanager/selected.png - ListItem.IsSelected | ListItem.IsPlaying - - + - Conditional + Conditional Label 182 @@ -943,8 +960,8 @@ 62 Font-Condensed-S34-B left - - eewhite + + SelectedGreen eewhite @@ -986,10 +1003,11 @@ 100 Font-Condensed-S34-B right - + D4FFFFFF D4FFFFFF false + !IsEmpty(ListItem.Title) @@ -1319,6 +1337,16 @@ 61 views/list/other/separator.png + + 0 + 1 + 710 + 59 + views/other/selected.png + 07FFFFFF + center + ListItem.IsPlaying + 20 0 @@ -1326,6 +1354,7 @@ 670 Font-Condensed-S29-B + SelectedGreen 77white 22000000 false @@ -1336,6 +1365,7 @@ 58 Font-Condensed-S31 + eewhite 77white 22000000 false @@ -1348,6 +1378,7 @@ 58 Font-Condensed-S31 + eewhite 77white 22000000 false @@ -1361,7 +1392,8 @@ 590 58 Font-Condensed-S31 - + + eewhite 77white 22000000 false @@ -1374,7 +1406,7 @@ 60 60 $VAR[InfoListOverlay] - 7FFFFFFF + $VAR[Colordiffuse.Color.3] !IsEmpty(ListItem.Overlay) Conditional @@ -1387,6 +1419,16 @@ 61 views/list/other/separator.png + + 0 + 1 + 710 + 59 + views/other/selected.png + 07FFFFFF + center + ListItem.IsPlaying + 20 0 @@ -1394,7 +1436,7 @@ 660 Font-Condensed-S29-B - 77white + SelectedGreen 77white 22000000 false @@ -1407,7 +1449,7 @@ 590 Font-Condensed-S29-B - 77white + SelectedGreen 77white 22000000 false @@ -1418,25 +1460,26 @@ 100 58 Font-Condensed-S31 - + center - 77white + eewhite 77white 22000000 false - !Container.Content(Episodes) + !Container.Content(Episodes) + !IsEmpty(ListItem.Year) 690 590 58 Font-Condensed-S31 - - 77white + + eewhite 77white 22000000 false right + !IsEmpty(ListItem.Title) 602 @@ -1445,7 +1488,7 @@ 60 $VAR[InfoListOverlay] !IsEmpty(ListItem.Overlay) - 7FFFFFFF + $VAR[Colordiffuse.Color.3] 536 @@ -1454,7 +1497,7 @@ 60 $VAR[ListHDSDFlagSmall] !IsEmpty(ListItem.VideoResolution) - 7FFFFFFF + $VAR[Colordiffuse.Color.2] 536 @@ -1463,7 +1506,7 @@ 60 flags/other/set-list.png substring(ListItem.Path,videodb://1/7,left) - 7FFFFFFF + $VAR[Colordiffuse.Color.2] Container.Content(TVShows) + IntegerGreaterThan(ListItem.Property(unWatchedEpisodes),0) @@ -1487,14 +1530,6 @@ false - - 681 - -10 - 39 - 39 - windows/filemanager/selected.png - ListItem.IsSelected | ListItem.IsPlaying - @@ -1555,6 +1590,16 @@ 61 views/list/other/separator.png + + 0 + 1 + 710 + 59 + views/other/selected.png + 07FFFFFF + center + ListItem.IsPlaying + 0 0 @@ -1566,17 +1611,17 @@ Control.HasFocus(52) - + - Conditional + Conditional 20 0 60 670 Font-Condensed-S29-B - + eewhite 22000000 @@ -1585,7 +1630,7 @@ 670 58 Font-Condensed-S31 - + eewhite 22000000 false @@ -1611,7 +1656,7 @@ 590 58 Font-Condensed-S31 - + eewhite 22000000 false @@ -1638,6 +1683,16 @@ 61 views/list/other/separator.png + + 0 + 1 + 710 + 59 + views/other/selected.png + 07FFFFFF + center + ListItem.IsPlaying + 0 0 @@ -1648,26 +1703,18 @@ visiblehidefadeinfo Control.HasFocus(52) - - 681 - -10 - 39 - 39 - windows/filemanager/selected.png - ListItem.IsSelected | ListItem.IsPlaying - - + - Conditional + Conditional 20 0 60 660 Font-Condensed-S29-B - + eewhite eewhite 22000000 @@ -1679,7 +1726,7 @@ 60 590 Font-Condensed-S29-B - + eewhite eewhite 22000000 @@ -1690,25 +1737,26 @@ 100 58 Font-Condensed-S31 - + center eewhite eewhite 22000000 false - !Container.Content(Episodes) + !Container.Content(Episodes) + !IsEmpty(ListItem.Year) 690 590 58 Font-Condensed-S31 - + eewhite eewhite 22000000 false right + !IsEmpty(ListItem.Title) 602 @@ -4694,8 +4742,9 @@ 0 31 705 - + Font-Condensed-S34-B + SelectedGreen C0FFFFFF false left @@ -4705,8 +4754,9 @@ 0 13 705 - + Font-Condensed-S34-B + SelectedGreen C0FFFFFF false left @@ -4749,23 +4799,23 @@ 0 33 690 - + Font-Condensed-S34-B C0FFFFFF false left - stringcompare(ListItem.ActualIcon,DefaultFolderBack.png) + IsEmpty(ListItem.Title) 40 13 650 - + Font-Condensed-S34-B C0FFFFFF false left - !stringcompare(ListItem.ActualIcon,DefaultFolderBack.png) + !IsEmpty(ListItem.Title) 0 diff --git a/media/views/banner/other/playing-top.png b/media/views/banner/other/playing-top.png new file mode 100644 index 00000000..665ff025 Binary files /dev/null and b/media/views/banner/other/playing-top.png differ diff --git a/media/views/thumb/other/star_pl.png b/media/views/thumb/other/star_pl.png new file mode 100644 index 00000000..d50fdfbf Binary files /dev/null and b/media/views/thumb/other/star_pl.png differ