diff --git a/Changelog.md b/Changelog.md index cb702566..64cea1b7 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,18 @@ --- +**_v20.2.1 - March 2024_** + +_Improved_ +- improve video info dialog button navigation when moving away from the cast list + +_Fixed_ +- fix select dialog icons +- fix dialog background fallback layers +- minor fixes before transition to v21 + +--- + **_v20.2.0 - December 2023_** _New_ @@ -494,234 +506,54 @@ Release --- -**Changelog v20.1.1** - -_rename default live TV home menu items to use new heading localize ID_ - -strings.po: -- add localizes for new adjust select action of album, TV show and movie set main menu widgets settings (31438, 31439, 31440, 31441, 31442, 31443) -- remove deprecated live TV localize and replace it with new favourite content label (31015) -- remove deprecated search result and timer localizes (31293, 31433, 31434) -- add new localizes for TV/radio guide genre colour setting (31293, 31433) - -textures.xbt: -- update textures file with new TV/radio guide genre colour assets - -mainmenu.DATA.xml: -- replace live TV home menu item localize to use the new localize ID - -overrides.xml: -- rework TV and radio nodes for home menu item and widgets sections using the new localize ID for the TV section +**Changelog v20.2.1** template.xml: -- add new widget onclick controls -- add new recording, timer and reminder icons to the widget template - -Coordinates_Custom_DialogMasking.xml: -- rework coordinates includes to add and adjust textwidth tags for radio button controls - -Coordinates_DialogAddonSettings.xml: -- rework coordinates includes to add and adjust textwidth tags for radio button controls - -Coordinates_DialogExtendedProgressBar.xml: -- add coordinates includes for new progress bar busy spinner icon - -Coordinates_DialogKeyboard.xml: -- rework coordinates includes to add and adjust textwidth tags for radio button controls - -Coordinates_DialogPVRChannelGuide.xml: -- add new reminder icons and rework recording and timer icons for consistency - -Coordinates_DialogPVRChannelManager.xml: -- rework coordinates includes to add and adjust textwidth tags for radio button controls - -Coordinates_DialogPVRChannelsOSD.xml: -- add missing recording and timer and new reminder icons - -Coordinates_DialogPVRGroupManager.xml: -- add missing channel icons to lists - -Coordinates_DialogPVRGuideSearch.xml: -- rework coordinates includes to add and adjust textwidth tags for radio button controls - -Coordinates_DialogSettings.xml: -- rework coordinates includes to add and adjust textwidth tags for radio button controls - -Coordinates_Includes_SubMenu.xml: -- rework coordinates includes to add and adjust textwidth tags for radio button controls - -Coordinates_Includes_Time_NowPlaying.xml: -- add coordinates includes for new dialog confirm busy spinner icon - -Coordinates_MyPVRChannels.xml: -- rework coordinates includes for more consistent window look -- add missing recording and timer and new reminder icons - -Coordinates_MyPVRGuide.xml: -- fix colours of timer and reminder icons -- adjust position of recording, timer and reminder images to prevent overlap with added highlighting textures -- adjust TV/radio guide background textures for new TV/radio guide genre colours - -Coordinates_MyPVRRecordings.xml: -- rework coordinates includes for more consistent window look -- add missing recording and timer and new reminder icons - -Coordinates_MyPVRSearch.xml: -- rework coordinates includes for more consistent window look -- add missing recording and timer and new reminder icons - -Coordinates_MyPVRTimers.xml: -- rework coordinates includes for more consistent window look -- add missing recording and timer and new reminder icons - -Coordinates_script-skinshortcuts.xml: -- add new coordinates includes to add textwidth tags for radio button control - -Coordinates_SettingsCategory.xml: -- rework coordinates includes to add and adjust textwidth tags for radio button controls +- fix animation condition of recording, timer and reminder icon slide animations -Coordinates_SettingsProfiles.xml: -- rework coordinates includes to add and adjust textwidth tags for radio button controls +Coordinates_DialogSelect.xml: +- remove deprecated image controls for cases where the icon info label was populated with a 'Default' string -Coordinates_SkinSettings.xml: -- rework coordinates includes to add and adjust textwidth tags for radio button controls +Coordinates_FileBrowser.xml: +- remove deprecated image controls for cases where the icon info label was populated with a 'Default' string -Coordinates_SmartPlaylistEditor.xml: -- rework coordinates includes to add and adjust textwidth tags for radio button controls +DialogSelect.xml: +- remove deprecated image control for cases where the icon info label was populated with a 'Default' string -Coordinates_Viewtype52.xml: -- fix focus cover animation - -Coordinates_Viewtype521.xml: -- fix focus cover animation - -Coordinates_Viewtype522.xml: -- fix focus cover animation - -Coordinates_Viewtype523.xml: -- fix focus cover animation - -Coordinates_Viewtype524.xml: -- fix focus cover animation - -Coordinates_Viewtype525.xml: -- fix focus cover animation - -Defaults.xml: -- adjust textwidth tag of default radio button control - -DialogAddonInfo.xml: -- adjust textwidth tag of radio button control - -DialogConfirm.xml: -- adjust time include for new progress busy spinner icon - -DialogExtendedProgressBar.xml: -- add new busy spinner icon - -DialogFavourites.xml: -- rework item count visibility condition and animation - -DialogKeybard.xml: -- replace coordinates includes to add and adjust textwidth tags for radio button controls - -DialogPVRChannelManager.xml: -- fix defaultcontrol -- replace coordinates includes of edit, button, spincontrolex and radio button controls - -DialogPVRGroupManager.xml: -- fix defaultcontrol -- add textwidth tag to radio button control - -DialogPVRGuideSearch.xml: -- replace coordinates includes to add and adjust textwidth tags for radio button controls +DialogVideoInfo.xml: +- fix onright and onleft of cast list to always navigate to last used button FileBrowser.xml: -- add textwidth tag to radio button control - -FileManager.xml: -- rework item count visibility condition and animation - -Includes.xml: -- add new onload conditions for new adjust select action of album, TV show and movie set main menu widgets settings - -Includes_DialogSettings.xml: -- replace coordinates include to add and adjust textwidth tags for radio button control - -Includes_MediaFlags.xml: -- add fade animation during on next and on previous transitions to hide media flags glitch -- adjust media flags animations for more consitent behaviour -- rework duration only label to incorporate MyPlaylist window more seamlessly -- rework item count visibility condition and animation - -Includes_SubMenu.xml: -- adjust addon browser submenu onleft, onright and onback tags for now utilized view types 50 and 51 -- replace PVR & live TV settings sub menu item localize to use the new localize ID - -Includes_Time_NowPlaying.xml: -- adjust now playing labels conditional visibility for better pre-playback information (before streams or network resources are available) -- adjust time include for new dialog confirm busy spinner icon +- remove deprecated image control for cases where the icon info label was populated with a 'Default' string Includes_Windows_Dialogs.xml: -- add new background transition fallback when media window view type controls are not yet visible - -MyPrograms.xml: -- adjust scrollbar visibility condition to remove never used control - -MyPVRChannels.xml: -- rework window for more consistent look - -MyPVRGuide.xml: -- rework item count visibility condition and animation -- add new colour diffuse variable to guide grid progress timeline - -MyPVRRecordings.xml: -- rework window for more consistent look +- adjust color as well as single and multiple background image controls' visibility condition to always render these layers as fallback -MyPVRSearch.xml: -- rework scrollbar position for more consistent look - -MyPVRTimers.xml: -- rework scrollbar position for more consistent look +MyVideoNav.xml: +- remove deprecated movie sets hidden list script-skinshortcuts-static.xml: -- add new widget onclick controls -- add new recording, timer and reminder icons to the widget template - -script-skinshortcuts.xml: -- replace coordinates includes to add and adjust textwidth tags for radio button control - -Settings.xml: -- replace PVR & live TV settings section localize to use the new localize ID - -SettingsCategory.xml: -- replace coordinates includes to add and adjust textwidth tags for radio button controls - -SettingsProfiles.xml: -- replace coordinates includes to add and adjust textwidth tags for radio button control - -SkinSettings.xml: -- add new adjust select action of album, TV show and movie set main menu widgets settings -- replace coordinates includes to add and adjust textwidth tags for radio button controls -- add setting for new TV/radio guide colours +- fix animation condition of recording, timer and reminder icon slide animations Variables.xml: -- add new value condition to HeadingLabelSecondary variable for new PVR & live TV settings section localize ID -- rework PlayerIcon variable for better pre-playback player icon -- add new epggridunfocusdim variable for unfocus dimming of TV/radio guide grid progress timeline +- add missing variable condition to SelectImage variable +- add variable conditions for movie sets to Label2 variable +- remove deprecated SetListContent, SetLabel and VideoInfoListPlot variables + +Viewtype511.xml: +- remove deprecated VideoInfoListPlot variable from plot textbox -Variables_Settings.xml: -- add new variable values to SkinSettingsExplanation for new adjust select action of album, TV show and movie set main menu widgets settings -- add new variable value for TV/radio guide colour setting explanation text +Viewtype522.xml: +- remove deprecated VideoInfoListPlot variable from plot textbox -Variables_Skinshortcuts.xml: -- add new WidgetOnClickAlbum, WidgetOnClickTVShow and WidgetOnClickMovieSet variables for new widget onclick controls +Viewtype531.xml: +- remove deprecated movie set info label -Viewtype50.xml: -- rework view type for better content type related icons and instances where the content type is returned empty +Viewtype533.xml: +- remove deprecated movie set info label Addon.xml: -- bump version to 20.2.0 +- bump version to 20.2.1 - update changelog Changelog.md: diff --git a/addon.xml b/addon.xml index d0ef8d07..de5289b2 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - + @@ -17,6 +17,6 @@ resources/icon.png resources/fanart.jpg - [B]New[/B][CR]- add new setting to adjust select action of album, TV show and movie set main menu widgets[CR]- add consistent reminder icons for v20 PVR reminder feature[CR]- add genre colours to TV/radio guide[CR][CR][B]Improved[/B][CR]- improve live TV and radio related localizes[CR]- improve pre-playback behaviour of now playing information section in the top right corner of each window/dialog[CR]- improve consistency between PVR windows and dialogs (feature parity as well as cosmetic appearance)[CR]- improve media flags behaviour during window transitions and when encountering edge cases[CR]- improve progress feedback of confirm dialog as well as the extended progress notification[CR][CR][B]Fixed[/B][CR]- fix focus cover animation in wide views[CR]- fix media flags transition glitch[CR]- fix radio button control text width[CR]- fix behaviour when the correct view type or content type is not yet ready (especially related to addons loading new pages) + [B]Improved[/B][CR]- - improve video info dialog button navigation when moving away from the cast list[CR][CR][B]Fixed[/B][CR]- fix select dialog icons[CR]- fix dialog background fallback layers[CR]- minor fixes before transition to v21 diff --git a/shortcuts/template.xml b/shortcuts/template.xml index 17ef8008..518a31ea 100644 --- a/shortcuts/template.xml +++ b/shortcuts/template.xml @@ -452,7 +452,7 @@ pvr/Recording.png $VAR[DiffusePosterNF] ListItem.IsRecording - Conditional + Conditional $PYTHON[int(imageWidthNoFocus) * 0.11] @@ -460,7 +460,7 @@ pvr/Timer.png $VAR[DiffusePosterNF] [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional $PYTHON[int(imageWidthNoFocus) * 0.11] @@ -468,7 +468,7 @@ pvr/Reminder.png $VAR[DiffusePosterNF] [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional $PYTHON[int(imageWidthNoFocus) * 0.11] @@ -535,21 +535,21 @@ $PYTHON[int(imageWidthNoFocus) / 2] pvr/Recording.png ListItem.IsRecording - Conditional + Conditional $PYTHON[int(imageWidthNoFocus) * 0.11] $PYTHON[int(imageWidthNoFocus) / 2] pvr/Timer.png [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional $PYTHON[int(imageWidthNoFocus) * 0.11] $PYTHON[int(imageWidthNoFocus) / 2] pvr/Reminder.png [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional $PYTHON[int(imageWidthNoFocus) * 0.11] @@ -614,7 +614,7 @@ pvr/Recording.png $VAR[DiffusePosterNF] ListItem.IsRecording - Conditional + Conditional $PYTHON[int(imageWidthNoFocus) * 0.11] @@ -622,7 +622,7 @@ pvr/Timer.png $VAR[DiffusePosterNF] [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional $PYTHON[int(imageWidthNoFocus) * 0.11] @@ -630,7 +630,7 @@ pvr/Reminder.png $VAR[DiffusePosterNF] [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional $PYTHON[int(imageWidthNoFocus) * 0.11] @@ -697,7 +697,7 @@ pvr/Recording.png $VAR[DiffusePosterNF] ListItem.IsRecording - Conditional + Conditional $PYTHON[int(imageWidthNoFocus) * 0.11] @@ -705,14 +705,14 @@ pvr/Timer.png $VAR[DiffusePosterNF] [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional $PYTHON[int(imageWidthNoFocus) * 0.11] $PYTHON[int(imageWidthNoFocus) / 2] pvr/Reminder.png $VAR[DiffusePosterNF] - [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecordingConditional + [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecordingConditional $PYTHON[int(imageWidthNoFocus) * 0.11] diff --git a/xml/Coordinates_DialogFullScreenInfo.xml b/xml/Coordinates_DialogFullScreenInfo.xml index 279539bf..d7183e95 100644 --- a/xml/Coordinates_DialogFullScreenInfo.xml +++ b/xml/Coordinates_DialogFullScreenInfo.xml @@ -1,31 +1,31 @@ - - DialogFavourites_coords_16:9 - DialogFavourites_coords_21:9 - DialogFavourites_coords_21:9_masked - DialogFavourites_coords_4:3 + + DialogFullScreenInfo_coords_16:9 + DialogFullScreenInfo_coords_21:9 + DialogFullScreenInfo_coords_21:9_masked + DialogFullScreenInfo_coords_4:3 - + 0 292 1620 40 - + 0 472 1620 40 - + 0 292 1620 40 - + 150 225 405 diff --git a/xml/Coordinates_DialogSelect.xml b/xml/Coordinates_DialogSelect.xml index 94797a9a..13926f69 100644 --- a/xml/Coordinates_DialogSelect.xml +++ b/xml/Coordinates_DialogSelect.xml @@ -259,16 +259,6 @@ keep $VAR[SelectImage] NonFocusImageFadeAnimation - !String.Contains(ListItem.Icon,Default) - - - 96 - 96 - 6 - keep - NonFocusImageFadeAnimation - $INFO[ListItem.Icon] - String.Contains(ListItem.Icon,Default) 140 @@ -311,16 +301,6 @@ keep $VAR[SelectImage] NonFocusImageFadeAnimation - !String.Contains(ListItem.Icon,Default) - - - 96 - 96 - 6 - keep - NonFocusImageFadeAnimation - $INFO[ListItem.Icon] - String.Contains(ListItem.Icon,Default) 140 @@ -363,16 +343,6 @@ keep $VAR[SelectImage] NonFocusImageFadeAnimation - !String.Contains(ListItem.Icon,Default) - - - 96 - 96 - 6 - keep - NonFocusImageFadeAnimation - $INFO[ListItem.Icon] - String.Contains(ListItem.Icon,Default) 140 @@ -415,16 +385,6 @@ keep $VAR[SelectImage] NonFocusImageFadeAnimation - !String.Contains(ListItem.Icon,Default) - - - 96 - 96 - 6 - keep - NonFocusImageFadeAnimation - $INFO[ListItem.Icon] - String.Contains(ListItem.Icon,Default) 140 @@ -477,16 +437,6 @@ 6 keep $VAR[SelectImage] - !String.Contains(ListItem.Icon,Default) - - - 96 - 96 - 6 - keep - $VAR[OverlayColorFO] - $INFO[ListItem.Icon] - String.Contains(ListItem.Icon,Default) String.IsEmpty(ListItem.Label2) @@ -537,7 +487,6 @@ $VAR[TextColorFO] True - !String.IsEmpty(ListItem.Label2) @@ -555,16 +504,6 @@ 6 keep $VAR[SelectImage] - !String.Contains(ListItem.Icon,Default) - - - 96 - 96 - 6 - keep - $VAR[OverlayColorFO] - $INFO[ListItem.Icon] - String.Contains(ListItem.Icon,Default) String.IsEmpty(ListItem.Label2) @@ -615,7 +554,6 @@ $VAR[TextColorFO] True - !String.IsEmpty(ListItem.Label2) @@ -633,16 +571,6 @@ 6 keep $VAR[SelectImage] - !String.Contains(ListItem.Icon,Default) - - - 96 - 96 - 6 - keep - $VAR[OverlayColorFO] - $INFO[ListItem.Icon] - String.Contains(ListItem.Icon,Default) String.IsEmpty(ListItem.Label2) @@ -710,16 +638,6 @@ 6 keep $VAR[SelectImage] - !String.Contains(ListItem.Icon,Default) - - - 96 - 96 - 6 - keep - $VAR[OverlayColorFO] - $INFO[ListItem.Icon] - String.Contains(ListItem.Icon,Default) String.IsEmpty(ListItem.Label2) diff --git a/xml/Coordinates_FileBrowser.xml b/xml/Coordinates_FileBrowser.xml index 055ad014..a3d4e64c 100644 --- a/xml/Coordinates_FileBrowser.xml +++ b/xml/Coordinates_FileBrowser.xml @@ -446,16 +446,6 @@ keep $INFO[ListItem.Icon] NonFocusImageFadeAnimation - !String.Contains(ListItem.Icon,Default) - - - 96 - 96 - 6 - keep - NonFocusImageFadeAnimation - $INFO[ListItem.Icon] - String.Contains(ListItem.Icon,Default) 140 @@ -476,16 +466,6 @@ keep $INFO[ListItem.Icon] NonFocusImageFadeAnimation - !String.Contains(ListItem.Icon,Default) - - - 96 - 96 - 6 - keep - NonFocusImageFadeAnimation - $INFO[ListItem.Icon] - String.Contains(ListItem.Icon,Default) 140 @@ -506,16 +486,6 @@ keep $INFO[ListItem.Icon] NonFocusImageFadeAnimation - !String.Contains(ListItem.Icon,Default) - - - 96 - 96 - 6 - keep - NonFocusImageFadeAnimation - $INFO[ListItem.Icon] - String.Contains(ListItem.Icon,Default) 140 @@ -536,16 +506,6 @@ keep $INFO[ListItem.Icon] NonFocusImageFadeAnimation - !String.Contains(ListItem.Icon,Default) - - - 96 - 96 - 6 - keep - NonFocusImageFadeAnimation - $INFO[ListItem.Icon] - String.Contains(ListItem.Icon,Default) 140 @@ -576,16 +536,6 @@ 6 keep $INFO[ListItem.Icon] - !String.Contains(ListItem.Icon,Default) - - - 96 - 96 - 6 - keep - $VAR[OverlayColorFO] - $INFO[ListItem.Icon] - String.Contains(ListItem.Icon,Default) 140 @@ -619,16 +569,6 @@ 6 keep $INFO[ListItem.Icon] - !String.Contains(ListItem.Icon,Default) - - - 96 - 96 - 6 - keep - $VAR[OverlayColorFO] - $INFO[ListItem.Icon] - String.Contains(ListItem.Icon,Default) 140 @@ -662,16 +602,6 @@ 6 keep $INFO[ListItem.Icon] - !String.Contains(ListItem.Icon,Default) - - - 96 - 96 - 6 - keep - $VAR[OverlayColorFO] - $INFO[ListItem.Icon] - String.Contains(ListItem.Icon,Default) 140 @@ -705,16 +635,6 @@ 6 keep $INFO[ListItem.Icon] - !String.Contains(ListItem.Icon,Default) - - - 96 - 96 - 6 - keep - $VAR[OverlayColorFO] - $INFO[ListItem.Icon] - String.Contains(ListItem.Icon,Default) 140 diff --git a/xml/Coordinates_Viewtype539.xml b/xml/Coordinates_Viewtype539.xml index 28da9abc..a919cd07 100644 --- a/xml/Coordinates_Viewtype539.xml +++ b/xml/Coordinates_Viewtype539.xml @@ -406,9 +406,7 @@ 15 - 0 - 133 - 15 + 67 15 diff --git a/xml/DialogFullScreenInfo.xml b/xml/DialogFullScreenInfo.xml index bab932ae..a57bed14 100644 --- a/xml/DialogFullScreenInfo.xml +++ b/xml/DialogFullScreenInfo.xml @@ -12,7 +12,7 @@ - DialogFavourites_coords + DialogFullScreenInfo_coords SetProperty(shownext,True,12005) SetProperty(shownext,True,12005) ClearProperty(shownext,12005) diff --git a/xml/DialogPlayerProcessInfo.xml b/xml/DialogPlayerProcessInfo.xml index 453f2a6f..0350d340 100644 --- a/xml/DialogPlayerProcessInfo.xml +++ b/xml/DialogPlayerProcessInfo.xml @@ -75,7 +75,7 @@ DialogPlayerProcessInfo_coords5 bottom - + Font25 Player.HasVideo diff --git a/xml/DialogSelect.xml b/xml/DialogSelect.xml index 45cb5de5..ef4437bb 100644 --- a/xml/DialogSelect.xml +++ b/xml/DialogSelect.xml @@ -17,6 +17,7 @@ DialogDepth + DialogZoomAnimation @@ -35,14 +36,7 @@ DialogSelect_coords1 $VAR[SelectImage] keep - Control.IsVisible(6) + !String.Contains(Container(6).ListItem.Icon,Default) - - - DialogSelect_coords1 - $INFO[Container(6).ListItem.Icon] - $VAR[OverlayColorFO] - keep - Control.IsVisible(6) + String.Contains(Container(6).ListItem.Icon,Default) + Control.IsVisible(6) @@ -135,6 +129,7 @@ DialogDepth [Window.IsVisible(gamevideofilter) | Window.IsVisible(gamestretchmode) | Window.IsVisible(gamevideorotation)] + !Window.IsVisible(shutdownmenu) + WindowOpen WindowClose diff --git a/xml/DialogVideoInfo.xml b/xml/DialogVideoInfo.xml index 3c7775e5..60f090a9 100644 --- a/xml/DialogVideoInfo.xml +++ b/xml/DialogVideoInfo.xml @@ -610,7 +610,8 @@ 50 50 60 - 9000 + 17 + 18 vertical list 60 @@ -627,7 +628,8 @@ DialogVideoInfo_coords12 - 9000 + 17 + 18 50 false vertical diff --git a/xml/FileBrowser.xml b/xml/FileBrowser.xml index c770ef5e..31c6ffcd 100644 --- a/xml/FileBrowser.xml +++ b/xml/FileBrowser.xml @@ -32,20 +32,13 @@ FileBrowser_coords1 $INFO[ListItem.Icon] keep - !String.Contains(ListItem.Icon,Default) + !String.Contains(Control.GetLabel(416),*) + !String.Contains(Control.GetLabel(416),*) FileBrowser_coords1 $INFO[ListItem.Icon] keep - !String.Contains(ListItem.Icon,Default) + String.Contains(Control.GetLabel(416),*) - - - FileBrowser_coords1 - $INFO[ListItem.Icon] - $VAR[OverlayColorFO] - keep - String.Contains(ListItem.Icon,Default) + String.Contains(Control.GetLabel(416),*) FileBrowser_coords1 diff --git a/xml/Includes_Windows_Dialogs.xml b/xml/Includes_Windows_Dialogs.xml index eb673519..c9418a42 100644 --- a/xml/Includes_Windows_Dialogs.xml +++ b/xml/Includes_Windows_Dialogs.xml @@ -288,7 +288,7 @@ FullscreenDimensions common/white.png $VAR[SolidBackgroundColor] - [String.IsEqual(Skin.String(BackgroundDefaultImage),no) | String.IsEqual(Skin.String(BackgroundSingleImage),solid)] + ![!String.IsEmpty(ListItem.Art(fanart)) + !Skin.HasSetting(HideFanart)] + String.IsEqual(Skin.String(BackgroundDefaultImage),no) | String.IsEqual(Skin.String(BackgroundSingleImage),solid) scale DialogZoomAnimation DialogBackgroundDepth @@ -298,7 +298,7 @@ FullscreenDimensions $VAR[OSMCBackgroundImage] - [String.IsEqual(Skin.String(BackgroundDefaultImage),yes) | String.IsEqual(Skin.String(BackgroundSingleImage),yes) | String.IsEqual(Skin.String(BackgroundSingleImage),no) + String.IsEmpty(Skin.String(CustomBackgroundFolder))] + String.IsEmpty(Container(9000).ListItem.Property(background)) + ![!String.IsEmpty(ListItem.Art(fanart)) + !Skin.HasSetting(HideFanart)] + [String.IsEqual(Skin.String(BackgroundDefaultImage),yes) | String.IsEqual(Skin.String(BackgroundSingleImage),yes) | String.IsEqual(Skin.String(BackgroundSingleImage),no) + String.IsEmpty(Skin.String(CustomBackgroundFolder))] + String.IsEmpty(Container(9000).ListItem.Property(background)) scale DialogZoomAnimation DialogBackgroundDepth @@ -308,7 +308,7 @@ FullscreenDimensions $VAR[OSMCBackgroundImage] - String.IsEqual(Skin.String(BackgroundSingleImage),no) + !String.IsEmpty(Skin.String(CustomBackgroundFolder)) + String.IsEmpty(Container(9000).ListItem.Property(background)) + ![!String.IsEmpty(ListItem.Art(fanart)) + !Skin.HasSetting(HideFanart)] + String.IsEqual(Skin.String(BackgroundSingleImage),no) + !String.IsEmpty(Skin.String(CustomBackgroundFolder)) + String.IsEmpty(Container(9000).ListItem.Property(background)) scale CustomBackgroundFolderDuration 2000 diff --git a/xml/MyVideoNav.xml b/xml/MyVideoNav.xml index eedb7a1b..e1e68c01 100644 --- a/xml/MyVideoNav.xml +++ b/xml/MyVideoNav.xml @@ -136,17 +136,6 @@ SubMenu - - - - -100 - -100 - 100 - 100 - - - $VAR[SetListContent] - MaskingBars diff --git a/xml/Variables.xml b/xml/Variables.xml index 4b39698b..2ecd2269 100644 --- a/xml/Variables.xml +++ b/xml/Variables.xml @@ -448,6 +448,7 @@ $INFO[Container(6).ListItem.Art(poster)] + $INFO[Container(6).ListItem.Art(thumb)] $INFO[Container(6).ListItem.Icon] @@ -483,7 +484,11 @@ $INFO[ListItem.Year]$INFO[ListItem.Genre, • ,]$VAR[LabelUserRating] $INFO[ListItem.Genre]$VAR[LabelUserRating] - $LOCALIZE[20457] + $INFO[ListItem.Property(Watched),$LOCALIZE[20457] • $LOCALIZE[16102]: , $LOCALIZE[1443] ]$INFO[ListItem.Property(Total),, $LOCALIZE[36900]] + $INFO[ListItem.Property(Total),$LOCALIZE[20457] • , $LOCALIZE[36901]] + $INFO[ListItem.Property(Watched),$LOCALIZE[20457] • $LOCALIZE[16102]: , $LOCALIZE[1443] ]$INFO[ListItem.Property(Total),, $LOCALIZE[36900]] + $INFO[ListItem.Property(Total),$LOCALIZE[20457] • , $LOCALIZE[36900]] + $INFO[ListItem.Property(Total),$LOCALIZE[20457] • , $LOCALIZE[36901]] $INFO[ListItem.Year,, • ]$INFO[ListItem.Property(TotalSeasons),, $LOCALIZE[36905] • ]$INFO[ListItem.Property(WatchedEpisodes),$LOCALIZE[16102]: , $LOCALIZE[1443] ]$INFO[ListItem.Property(TotalEpisodes),, $LOCALIZE[36907]]$VAR[LabelUserRating] $INFO[ListItem.Year,, • ]$INFO[ListItem.Property(TotalSeasons),, $LOCALIZE[36905] • ]$INFO[ListItem.Property(TotalEpisodes),, $LOCALIZE[36907]]$VAR[LabelUserRating] $INFO[ListItem.Year,, • ]$INFO[ListItem.Property(TotalSeasons),, $LOCALIZE[36904] • ]$INFO[ListItem.Property(WatchedEpisodes),$LOCALIZE[16102]: , $LOCALIZE[1443] ]$INFO[ListItem.Property(TotalEpisodes),, $LOCALIZE[36907]]$VAR[LabelUserRating] @@ -517,21 +522,6 @@ $INFO[ListItem.UserRating, • $LOCALIZE[38018]: ,] - - - videodb://movies/sets/$INFO[ListItem.DBID]/?setid=$INFO[ListItem.DBID] - - - - - - $INFO[Container(4500).ListItem(0).Year,, • ]$INFO[Container(4500).NumItems,, $LOCALIZE[20338]] - $INFO[Container(4500).ListItem(0).Year]$INFO[Container(4500).ListItem(-1).Year, - , • ]$INFO[Container(4500).NumItems,, $LOCALIZE[342]] - - - - $VAR[SetLabel][CR][CR]$INFO[ListItem.Plot] - $INFO[ListItem.Plot] - diff --git a/xml/Viewtype511.xml b/xml/Viewtype511.xml index e05b5661..031a55e6 100644 --- a/xml/Viewtype511.xml +++ b/xml/Viewtype511.xml @@ -38,7 +38,7 @@ Viewtype511_coords4 left Font27 - + $VAR[TextColorFO] true Skin.String(PlotFont,S) @@ -47,7 +47,7 @@ Viewtype511_coords5 left Font30 - + $VAR[TextColorFO] true Skin.String(PlotFont,M) @@ -56,7 +56,7 @@ Viewtype511_coords6 left Font33 - + $VAR[TextColorFO] true Skin.String(PlotFont,L) diff --git a/xml/Viewtype522.xml b/xml/Viewtype522.xml index 4f514179..622b4433 100644 --- a/xml/Viewtype522.xml +++ b/xml/Viewtype522.xml @@ -60,7 +60,7 @@ Viewtype522_coords8 left Font27 - + $VAR[TextColorFO] true Skin.String(PlotFont,S) @@ -69,7 +69,7 @@ Viewtype522_coords9 left Font30 - + $VAR[TextColorFO] true Skin.String(PlotFont,M) @@ -78,7 +78,7 @@ Viewtype522_coords10 left Font33 - + $VAR[TextColorFO] true Skin.String(PlotFont,L) diff --git a/xml/Viewtype531.xml b/xml/Viewtype531.xml index 533269c8..eacd627d 100644 --- a/xml/Viewtype531.xml +++ b/xml/Viewtype531.xml @@ -44,17 +44,6 @@ [!String.IsEmpty(ListItem.Plot) | !String.IsEmpty(ListItem.PlotOutline)] + Skin.HasSetting(UserRating) + !String.IsEmpty(ListItem.UserRating) + ![Container.Content(sets) | ListItem.IsCollection] - - - Viewtype531_coords4 - Font27 - center - top - - $VAR[TextColorFO] - Container.Content(sets) | ListItem.IsCollection - - Viewtype531_coords5 diff --git a/xml/Viewtype533.xml b/xml/Viewtype533.xml index b7c1a0c0..bb9d3ecd 100644 --- a/xml/Viewtype533.xml +++ b/xml/Viewtype533.xml @@ -44,17 +44,6 @@ [!String.IsEmpty(ListItem.Plot) | !String.IsEmpty(ListItem.PlotOutline)] + Skin.HasSetting(UserRating) + !String.IsEmpty(ListItem.UserRating) + ![Container.Content(sets) | ListItem.IsCollection] - - - Viewtype533_coords4 - Font27 - center - top - - $VAR[TextColorFO] - Container.Content(sets) | ListItem.IsCollection - - Viewtype533_coords5 diff --git a/xml/script-skinshortcuts-static.xml b/xml/script-skinshortcuts-static.xml index d8378c25..136ef8ac 100644 --- a/xml/script-skinshortcuts-static.xml +++ b/xml/script-skinshortcuts-static.xml @@ -1601,7 +1601,7 @@ pvr/Recording.png $VAR[DiffusePosterNF] ListItem.IsRecording - Conditional + Conditional 24 @@ -1609,7 +1609,7 @@ pvr/Timer.png $VAR[DiffusePosterNF] [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 24 @@ -1617,7 +1617,7 @@ pvr/Reminder.png $VAR[DiffusePosterNF] [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 24 @@ -1682,21 +1682,21 @@ 108 pvr/Recording.png ListItem.IsRecording - Conditional + Conditional 24 108 pvr/Timer.png [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 24 108 pvr/Reminder.png [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 24 @@ -1760,7 +1760,7 @@ pvr/Recording.png $VAR[DiffusePosterNF] ListItem.IsRecording - Conditional + Conditional 24 @@ -1768,7 +1768,7 @@ pvr/Timer.png $VAR[DiffusePosterNF] [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 24 @@ -1776,7 +1776,7 @@ pvr/Reminder.png $VAR[DiffusePosterNF] [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 24 @@ -1843,7 +1843,7 @@ pvr/Recording.png $VAR[DiffusePosterNF] ListItem.IsRecording - Conditional + Conditional 24 @@ -1851,7 +1851,7 @@ pvr/Timer.png $VAR[DiffusePosterNF] [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 24 @@ -1859,7 +1859,7 @@ pvr/Reminder.png $VAR[DiffusePosterNF] [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 24 @@ -1958,7 +1958,7 @@ pvr/Recording.png $VAR[DiffusePosterNF] ListItem.IsRecording - Conditional + Conditional 24 @@ -1966,7 +1966,7 @@ pvr/Timer.png $VAR[DiffusePosterNF] [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 24 @@ -1974,7 +1974,7 @@ pvr/Reminder.png $VAR[DiffusePosterNF] [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 24 @@ -2039,21 +2039,21 @@ 108 pvr/Recording.png ListItem.IsRecording - Conditional + Conditional 24 108 pvr/Timer.png [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 24 108 pvr/Reminder.png [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 24 @@ -2117,7 +2117,7 @@ pvr/Recording.png $VAR[DiffusePosterNF] ListItem.IsRecording - Conditional + Conditional 24 @@ -2125,7 +2125,7 @@ pvr/Timer.png $VAR[DiffusePosterNF] [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 24 @@ -2133,7 +2133,7 @@ pvr/Reminder.png $VAR[DiffusePosterNF] [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 24 @@ -2200,7 +2200,7 @@ pvr/Recording.png $VAR[DiffusePosterNF] ListItem.IsRecording - Conditional + Conditional 24 @@ -2208,7 +2208,7 @@ pvr/Timer.png $VAR[DiffusePosterNF] [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 24 @@ -2216,7 +2216,7 @@ pvr/Reminder.png $VAR[DiffusePosterNF] [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 24 @@ -2315,7 +2315,7 @@ pvr/Recording.png $VAR[DiffusePosterNF] ListItem.IsRecording - Conditional + Conditional 24 @@ -2323,7 +2323,7 @@ pvr/Timer.png $VAR[DiffusePosterNF] [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 24 @@ -2331,7 +2331,7 @@ pvr/Reminder.png $VAR[DiffusePosterNF] [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 24 @@ -2396,21 +2396,21 @@ 108 pvr/Recording.png ListItem.IsRecording - Conditional + Conditional 24 108 pvr/Timer.png [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 24 108 pvr/Reminder.png [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 24 @@ -2474,7 +2474,7 @@ pvr/Recording.png $VAR[DiffusePosterNF] ListItem.IsRecording - Conditional + Conditional 24 @@ -2482,7 +2482,7 @@ pvr/Timer.png $VAR[DiffusePosterNF] [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 24 @@ -2490,7 +2490,7 @@ pvr/Reminder.png $VAR[DiffusePosterNF] [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 24 @@ -2556,7 +2556,7 @@ pvr/Recording.png $VAR[DiffusePosterNF] ListItem.IsRecording - Conditional + Conditional 24 @@ -2564,7 +2564,7 @@ pvr/Timer.png $VAR[DiffusePosterNF] [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 24 @@ -2572,7 +2572,7 @@ pvr/Reminder.png $VAR[DiffusePosterNF] [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 24 @@ -2670,7 +2670,7 @@ pvr/Recording.png $VAR[DiffusePosterNF] ListItem.IsRecording - Conditional + Conditional 24 @@ -2678,7 +2678,7 @@ pvr/Timer.png $VAR[DiffusePosterNF] [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 24 @@ -2686,7 +2686,7 @@ pvr/Reminder.png $VAR[DiffusePosterNF] [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 24 @@ -2751,21 +2751,21 @@ 108 pvr/Recording.png ListItem.IsRecording - Conditional + Conditional 24 108 pvr/Timer.png [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 24 108 pvr/Reminder.png [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 24 @@ -2829,7 +2829,7 @@ pvr/Recording.png $VAR[DiffusePosterNF] ListItem.IsRecording - Conditional + Conditional 24 @@ -2837,7 +2837,7 @@ pvr/Timer.png $VAR[DiffusePosterNF] [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 24 @@ -2845,7 +2845,7 @@ pvr/Reminder.png $VAR[DiffusePosterNF] [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 24 @@ -2911,7 +2911,7 @@ pvr/Recording.png $VAR[DiffusePosterNF] ListItem.IsRecording - Conditional + Conditional 24 @@ -2919,7 +2919,7 @@ pvr/Timer.png $VAR[DiffusePosterNF] [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 24 @@ -2927,7 +2927,7 @@ pvr/Reminder.png $VAR[DiffusePosterNF] [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 24 @@ -3025,7 +3025,7 @@ pvr/Recording.png $VAR[DiffusePosterNF] ListItem.IsRecording - Conditional + Conditional 24 @@ -3033,7 +3033,7 @@ pvr/Timer.png $VAR[DiffusePosterNF] [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 24 @@ -3041,7 +3041,7 @@ pvr/Reminder.png $VAR[DiffusePosterNF] [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 24 @@ -3106,21 +3106,21 @@ 108 pvr/Recording.png ListItem.IsRecording - Conditional + Conditional 24 108 pvr/Timer.png [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 24 108 pvr/Reminder.png [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 24 @@ -3184,7 +3184,7 @@ pvr/Recording.png $VAR[DiffusePosterNF] ListItem.IsRecording - Conditional + Conditional 24 @@ -3192,7 +3192,7 @@ pvr/Timer.png $VAR[DiffusePosterNF] [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 24 @@ -3200,7 +3200,7 @@ pvr/Reminder.png $VAR[DiffusePosterNF] [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 24 @@ -3266,7 +3266,7 @@ pvr/Recording.png $VAR[DiffusePosterNF] ListItem.IsRecording - Conditional + Conditional 24 @@ -3274,7 +3274,7 @@ pvr/Timer.png $VAR[DiffusePosterNF] [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 24 @@ -3282,7 +3282,7 @@ pvr/Reminder.png $VAR[DiffusePosterNF] [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 24 @@ -3380,7 +3380,7 @@ pvr/Recording.png $VAR[DiffusePosterNF] ListItem.IsRecording - Conditional + Conditional 24 @@ -3388,7 +3388,7 @@ pvr/Timer.png $VAR[DiffusePosterNF] [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 24 @@ -3396,7 +3396,7 @@ pvr/Reminder.png $VAR[DiffusePosterNF] [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 24 @@ -3461,21 +3461,21 @@ 108 pvr/Recording.png ListItem.IsRecording - Conditional + Conditional 24 108 pvr/Timer.png [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 24 108 pvr/Reminder.png [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 24 @@ -3539,7 +3539,7 @@ pvr/Recording.png $VAR[DiffusePosterNF] ListItem.IsRecording - Conditional + Conditional 24 @@ -3547,7 +3547,7 @@ pvr/Timer.png $VAR[DiffusePosterNF] [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 24 @@ -3555,7 +3555,7 @@ pvr/Reminder.png $VAR[DiffusePosterNF] [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 24 @@ -3621,7 +3621,7 @@ pvr/Recording.png $VAR[DiffusePosterNF] ListItem.IsRecording - Conditional + Conditional 24 @@ -3629,7 +3629,7 @@ pvr/Timer.png $VAR[DiffusePosterNF] [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 24 @@ -3637,7 +3637,7 @@ pvr/Reminder.png $VAR[DiffusePosterNF] [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 24 @@ -3735,7 +3735,7 @@ pvr/Recording.png $VAR[DiffusePosterNF] ListItem.IsRecording - Conditional + Conditional 24 @@ -3743,7 +3743,7 @@ pvr/Timer.png $VAR[DiffusePosterNF] [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 24 @@ -3751,7 +3751,7 @@ pvr/Reminder.png $VAR[DiffusePosterNF] [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 24 @@ -3816,21 +3816,21 @@ 108 pvr/Recording.png ListItem.IsRecording - Conditional + Conditional 24 108 pvr/Timer.png [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 24 108 pvr/Reminder.png [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 24 @@ -3894,7 +3894,7 @@ pvr/Recording.png $VAR[DiffusePosterNF] ListItem.IsRecording - Conditional + Conditional 24 @@ -3902,7 +3902,7 @@ pvr/Timer.png $VAR[DiffusePosterNF] [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 24 @@ -3910,7 +3910,7 @@ pvr/Reminder.png $VAR[DiffusePosterNF] [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 24 @@ -3976,7 +3976,7 @@ pvr/Recording.png $VAR[DiffusePosterNF] ListItem.IsRecording - Conditional + Conditional 24 @@ -3984,7 +3984,7 @@ pvr/Timer.png $VAR[DiffusePosterNF] [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 24 @@ -3992,7 +3992,7 @@ pvr/Reminder.png $VAR[DiffusePosterNF] [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 24 @@ -4090,7 +4090,7 @@ pvr/Recording.png $VAR[DiffusePosterNF] ListItem.IsRecording - Conditional + Conditional 24 @@ -4098,7 +4098,7 @@ pvr/Timer.png $VAR[DiffusePosterNF] [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 24 @@ -4106,7 +4106,7 @@ pvr/Reminder.png $VAR[DiffusePosterNF] [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 24 @@ -4171,21 +4171,21 @@ 108 pvr/Recording.png ListItem.IsRecording - Conditional + Conditional 24 108 pvr/Timer.png [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 24 108 pvr/Reminder.png [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 24 @@ -4249,7 +4249,7 @@ pvr/Recording.png $VAR[DiffusePosterNF] ListItem.IsRecording - Conditional + Conditional 24 @@ -4257,7 +4257,7 @@ pvr/Timer.png $VAR[DiffusePosterNF] [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 24 @@ -4265,7 +4265,7 @@ pvr/Reminder.png $VAR[DiffusePosterNF] [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 24 @@ -4331,7 +4331,7 @@ pvr/Recording.png $VAR[DiffusePosterNF] ListItem.IsRecording - Conditional + Conditional 24 @@ -4339,7 +4339,7 @@ pvr/Timer.png $VAR[DiffusePosterNF] [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 24 @@ -4347,7 +4347,7 @@ pvr/Reminder.png $VAR[DiffusePosterNF] [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 24 @@ -4646,7 +4646,7 @@ pvr/Recording.png $VAR[DiffusePosterNF] ListItem.IsRecording - Conditional + Conditional 32 @@ -4654,7 +4654,7 @@ pvr/Timer.png $VAR[DiffusePosterNF] [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 32 @@ -4662,7 +4662,7 @@ pvr/Reminder.png $VAR[DiffusePosterNF] [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 32 @@ -4727,21 +4727,21 @@ 144 pvr/Recording.png ListItem.IsRecording - Conditional + Conditional 32 144 pvr/Timer.png [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 32 144 pvr/Reminder.png [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 32 @@ -4805,7 +4805,7 @@ pvr/Recording.png $VAR[DiffusePosterNF] ListItem.IsRecording - Conditional + Conditional 32 @@ -4813,7 +4813,7 @@ pvr/Timer.png $VAR[DiffusePosterNF] [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 32 @@ -4821,7 +4821,7 @@ pvr/Reminder.png $VAR[DiffusePosterNF] [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 32 @@ -4887,7 +4887,7 @@ pvr/Recording.png $VAR[DiffusePosterNF] ListItem.IsRecording - Conditional + Conditional 32 @@ -4895,7 +4895,7 @@ pvr/Timer.png $VAR[DiffusePosterNF] [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 32 @@ -4903,7 +4903,7 @@ pvr/Reminder.png $VAR[DiffusePosterNF] [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 32 @@ -5001,7 +5001,7 @@ pvr/Recording.png $VAR[DiffusePosterNF] ListItem.IsRecording - Conditional + Conditional 32 @@ -5009,7 +5009,7 @@ pvr/Timer.png $VAR[DiffusePosterNF] [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 32 @@ -5017,7 +5017,7 @@ pvr/Reminder.png $VAR[DiffusePosterNF] [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 32 @@ -5082,21 +5082,21 @@ 144 pvr/Recording.png ListItem.IsRecording - Conditional + Conditional 32 144 pvr/Timer.png [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 32 144 pvr/Reminder.png [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 32 @@ -5160,7 +5160,7 @@ pvr/Recording.png $VAR[DiffusePosterNF] ListItem.IsRecording - Conditional + Conditional 32 @@ -5168,7 +5168,7 @@ pvr/Timer.png $VAR[DiffusePosterNF] [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 32 @@ -5176,7 +5176,7 @@ pvr/Reminder.png $VAR[DiffusePosterNF] [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 32 @@ -5242,7 +5242,7 @@ pvr/Recording.png $VAR[DiffusePosterNF] ListItem.IsRecording - Conditional + Conditional 32 @@ -5250,7 +5250,7 @@ pvr/Timer.png $VAR[DiffusePosterNF] [ListItem.HasTimer | ListItem.HasTimerSchedule] + !ListItem.IsRecording + !ListItem.HasReminder + !ListItem.HasReminderRule - Conditional + Conditional 32 @@ -5258,7 +5258,7 @@ pvr/Reminder.png $VAR[DiffusePosterNF] [ListItem.HasReminder | ListItem.HasReminderRule] + !ListItem.IsRecording - Conditional + Conditional 32