From 2543096a7854c093ca7db35ff1b911cb48827e2f Mon Sep 17 00:00:00 2001 From: theDeadMan Date: Thu, 21 Dec 2017 14:16:56 +0000 Subject: [PATCH] Basic functionality --- 1080i/AddonBrowser.xml | 5 +- 1080i/DialogButtonMenu.xml | 2 +- 1080i/DialogExtendedProgressBar.xml | 4 +- 1080i/DialogFavourites.xml | 2 +- 1080i/DialogKeyboard.xml | 2 +- 1080i/DialogNotification.xml | 4 +- 1080i/DialogPVRChannelManager.xml | 8 +-- 1080i/DialogPVRGroupManager.xml | 16 ++++-- 1080i/DialogSeekBar.xml | 8 +-- 1080i/DialogSelect.xml | 2 +- 1080i/DialogVideoInfo.xml | 12 ++-- 1080i/FileBrowser.xml | 6 +- 1080i/Includes.xml | 38 ++++++------ 1080i/Includes_hubMenu.xml | 5 +- 1080i/Includes_hubOptionsItems.xml | 12 ++-- 1080i/Includes_mediaShowcase.xml | 80 +++++++++++++------------- 1080i/Includes_variables.xml | 55 +++++++++--------- 1080i/MyMusicNav.xml | 1 + 1080i/MyPVRChannels.xml | 1 + 1080i/MyPVRGuide.xml | 2 +- 1080i/MyPVRRecordings.xml | 7 ++- 1080i/MyPVRTimers.xml | 4 +- 1080i/MyPics.xml | 1 + 1080i/MyVideoNav.xml | 1 + 1080i/MyWeather.xml | 6 +- 1080i/SettingsSystemInfo.xml | 2 +- 1080i/VideoOSD.xml | 2 +- 1080i/View_AddonPosters.xml | 6 +- 1080i/View_Albums.xml | 6 +- 1080i/View_ArtistAlbums.xml | 6 +- 1080i/View_Artists.xml | 2 +- 1080i/View_Episodes.xml | 22 +++---- 1080i/View_Movies.xml | 12 ++-- 1080i/View_MusicGenres.xml | 2 +- 1080i/View_Seasons.xml | 8 +-- 1080i/View_Songs.xml | 2 +- 1080i/View_TVShows.xml | 6 +- 1080i/View_VideoFiles.xml | 6 +- 1080i/custom_menuSelector.xml | 2 +- 1080i/custom_musicPlayerFullscreen.xml | 6 +- changelog.txt | 10 +++- shortcuts/mainmenu.DATA.xml | 6 +- 42 files changed, 204 insertions(+), 186 deletions(-) diff --git a/1080i/AddonBrowser.xml b/1080i/AddonBrowser.xml index e4258ff..a9fd74f 100644 --- a/1080i/AddonBrowser.xml +++ b/1080i/AddonBrowser.xml @@ -1,6 +1,7 @@ 50 + 50,51 globalBackground @@ -174,7 +175,7 @@ overlay stretch - + !String.IsEqual(container.folderpath,addons://) 0 73 @@ -299,7 +300,7 @@ - !isempty(ListItem.AddonSummary) + !String.IsEmpty(ListItem.AddonSummary) 0 577 8-col diff --git a/1080i/DialogButtonMenu.xml b/1080i/DialogButtonMenu.xml index fe0247c..9b6e780 100644 --- a/1080i/DialogButtonMenu.xml +++ b/1080i/DialogButtonMenu.xml @@ -83,7 +83,7 @@ - System.HasLoginScreen | IntegerGreaterThan(System.ProfileCount,1) + System.HasLoginScreen | Integer.IsGreater(System.ProfileCount,1) System.Loggedon dialog.close(all,true) diff --git a/1080i/DialogExtendedProgressBar.xml b/1080i/DialogExtendedProgressBar.xml index b3ef439..036238b 100644 --- a/1080i/DialogExtendedProgressBar.xml +++ b/1080i/DialogExtendedProgressBar.xml @@ -26,7 +26,7 @@ 6,0,0,0 - !StringCompare(control.getlabel(30),control.getlabel(31)) + !String.IsEqual(control.getlabel(30),control.getlabel(31)) heading 24 0 @@ -43,7 +43,7 @@ - StringCompare(control.getlabel(30),control.getlabel(31)) + String.IsEqual(control.getlabel(30),control.getlabel(31)) heading 24 0 diff --git a/1080i/DialogFavourites.xml b/1080i/DialogFavourites.xml index 63db456..25c0ff4 100644 --- a/1080i/DialogFavourites.xml +++ b/1080i/DialogFavourites.xml @@ -30,7 +30,7 @@ - !IntegerGreaterThan(Container(450).NumItems,0) + !Integer.IsGreater(Container(450).NumItems,0) 0 45 8-col diff --git a/1080i/DialogKeyboard.xml b/1080i/DialogKeyboard.xml index 01a55b8..be666a5 100644 --- a/1080i/DialogKeyboard.xml +++ b/1080i/DialogKeyboard.xml @@ -51,7 +51,7 @@ col-1-begin 0 - String.IsEmpty(Container(5000).ListItem.Label) | String.IsEmpty(Control.GetLabel(312).index(1)) + String.String.IsEmpty(Container(5000).ListItem.Label) | String.String.IsEmpty(Control.GetLabel(312).index(1)) header label 0 -18 diff --git a/1080i/DialogNotification.xml b/1080i/DialogNotification.xml index 64bfe17..e1220c3 100644 --- a/1080i/DialogNotification.xml +++ b/1080i/DialogNotification.xml @@ -28,7 +28,7 @@ heading - !StringCompare(control.getlabel(401),control.getlabel(402)) + !String.IsEqual(control.getlabel(401),control.getlabel(402)) 24 0 itemSubTitle @@ -44,7 +44,7 @@ - StringCompare(control.getlabel(401),control.getlabel(402)) + String.IsEqual(control.getlabel(401),control.getlabel(402)) 24 0 itemSubTitle diff --git a/1080i/DialogPVRChannelManager.xml b/1080i/DialogPVRChannelManager.xml index 757e35e..74962a8 100644 --- a/1080i/DialogPVRChannelManager.xml +++ b/1080i/DialogPVRChannelManager.xml @@ -39,7 +39,7 @@ stretch - IsEmpty(Window.Property(IsRadio)) + String.IsEmpty(Window.Property(IsRadio)) 24 0 16-col @@ -51,7 +51,7 @@ - !IsEmpty(Window.Property(IsRadio)) + !String.IsEmpty(Window.Property(IsRadio)) 24 0 16-col @@ -266,7 +266,7 @@ 34 - IsEmpty(Window.Property(IsRadio)) + String.IsEmpty(Window.Property(IsRadio)) TV/Radio Button 0 14-row @@ -278,7 +278,7 @@ 31 - !IsEmpty(Window.Property(IsRadio)) + !String.IsEmpty(Window.Property(IsRadio)) TV/Radio Button 0 14-row diff --git a/1080i/DialogPVRGroupManager.xml b/1080i/DialogPVRGroupManager.xml index 7d756b4..12fa877 100644 --- a/1080i/DialogPVRGroupManager.xml +++ b/1080i/DialogPVRGroupManager.xml @@ -194,7 +194,9 @@ buttonTitle textActive - + @@ -230,7 +232,9 @@ black black - + @@ -285,7 +289,9 @@ buttonTitle textActive - + @@ -321,7 +327,9 @@ black black - + diff --git a/1080i/DialogSeekBar.xml b/1080i/DialogSeekBar.xml index 7d58144..164343f 100644 --- a/1080i/DialogSeekBar.xml +++ b/1080i/DialogSeekBar.xml @@ -1,6 +1,6 @@ - !window.isactive(videoosd) + !window.isactive(osdvideosettings) + !window.isactive(osdaudiosettings) + !Window.IsActive(DialogSubtitles.xml) + !Window.IsVisible(fullscreeninfo) + [VideoPlayer.IsFullscreen + !Window.IsVisible(visualisation)] + [!IsEmpty(Player.SeekNumeric) | Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding] + !window.isactive(videoosd) + !window.isactive(osdvideosettings) + !window.isactive(osdaudiosettings) + !Window.IsActive(DialogSubtitles.xml) + !Window.IsVisible(fullscreeninfo) + [VideoPlayer.IsFullscreen + !Window.IsVisible(visualisation)] + [!String.IsEmpty(Player.SeekNumeric) | Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding] dimensionsFullscreen @@ -12,7 +12,7 @@ col-1-begin row-20-begin - !IsEmpty(Player.SeekNumeric) + !String.IsEmpty(Player.SeekNumeric) 0 12 24-col @@ -80,7 +80,7 @@ horizontal - stringcompare(VideoPlayer.TVShowTitle,Player.title) + String.IsEqual(VideoPlayer.TVShowTitle,Player.title) 0 1-row 18-col @@ -91,7 +91,7 @@ - !stringcompare(VideoPlayer.TVShowTitle,Player.title) + !String.IsEqual(VideoPlayer.TVShowTitle,Player.title) 0 1-row 18-col diff --git a/1080i/DialogSelect.xml b/1080i/DialogSelect.xml index 7615c32..e7a5132 100644 --- a/1080i/DialogSelect.xml +++ b/1080i/DialogSelect.xml @@ -1,7 +1,7 @@ 9000 - control.SetFocus(9999) + control.SetFocus(9999) globalBackground diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml index a914fa8..aab7374 100644 --- a/1080i/DialogVideoInfo.xml +++ b/1080i/DialogVideoInfo.xml @@ -7,7 +7,7 @@ - !Substring(Container.folderpath,plugin) + !container.content(episodes) + !String.Contains(Container.folderpath,plugin) + !container.content(episodes) 0 0 dimensionsFullscreen @@ -16,7 +16,7 @@ stretch - Substring(Container.folderpath,plugin) | container.content(episodes) + String.Contains(Container.folderpath,plugin) | container.content(episodes) 0 0 dimensionsFullscreen @@ -26,7 +26,7 @@ - itemShowcase + itemShowcase container.content(musicvideos) @@ -77,7 +77,7 @@ - !Substring(Container.folderpath,plugin) + !container.content(episodes) + !String.Contains(Container.folderpath,plugin) + !container.content(episodes) 1200 0 @@ -342,7 +342,7 @@ - Substring(Container.folderpath,plugin) | container.content(episodes) + String.Contains(Container.folderpath,plugin) | container.content(episodes) modalDialogInOut @@ -513,7 +513,7 @@ sendclick(2003,8) - !Substring(Container.folderpath,plugin) + !String.Contains(Container.folderpath,plugin) diff --git a/1080i/FileBrowser.xml b/1080i/FileBrowser.xml index 9dfd5c0..c8f5042 100644 --- a/1080i/FileBrowser.xml +++ b/1080i/FileBrowser.xml @@ -9,7 +9,7 @@ - SubString(ListItem.label,fanart) + String.Contains(ListItem.label,fanart) dimensionsFullscreen $INFO[listitem.thumb] 6affffff @@ -17,7 +17,7 @@ 400 - !SubString(ListItem.label,fanart) + !String.Contains(ListItem.label,fanart) dimensionsFullscreen $INFO[listitem.FileNameAndPath] ffffffff @@ -27,7 +27,7 @@ - SubString(ListItem.label,remote art) + String.Contains(ListItem.label,remote art) dimensionsFullscreen $INFO[listitem.thumb] 6affffff diff --git a/1080i/Includes.xml b/1080i/Includes.xml index 85ce566..da3e90a 100644 --- a/1080i/Includes.xml +++ b/1080i/Includes.xml @@ -26,25 +26,25 @@ - !Substring(container.folderpath,special://profile/playlists/video) + !Substring(container.folderpath,videodb://) + !Substring(container.folderpath,plugin://) |container.content(files) | isempty(container.content) | container.content(playlists) | container.content(addons) - container.content(movies) + [Substring(container.folderpath,videodb://) | Substring(container.folderpath,special://profile/playlists/video)] - !Substring(container.folderpath,videodb://) + Substring(container.folderpath,plugin://) + [container.content(movies) | container.content(tvshows)] + !String.Contains(container.folderpath,special://profile/playlists/video) + !String.Contains(container.folderpath,videodb://) + !String.Contains(container.folderpath,plugin://) |container.content(files) | String.IsEmpty(container.content) | container.content(playlists) | container.content(addons) + container.content(movies) + [String.Contains(container.folderpath,videodb://) | String.Contains(container.folderpath,special://profile/playlists/video)] + !String.Contains(container.folderpath,videodb://) + String.Contains(container.folderpath,plugin://) + [container.content(movies) | container.content(tvshows)] - container.content(tvshows) + [Substring(container.folderpath,videodb://) | Substring(container.folderpath,special://profile/playlists/video)] - container.content(seasons) + Substring(container.folderpath,videodb://) - container.content(episodes) + !Substring(Container.folderpath,plugin) - container.content(musicvideos) + !Substring(Container.folderpath,plugin) + container.content(tvshows) + [String.Contains(container.folderpath,videodb://) | String.Contains(container.folderpath,special://profile/playlists/video)] + container.content(seasons) + String.Contains(container.folderpath,videodb://) + container.content(episodes) + !String.Contains(Container.folderpath,plugin) + container.content(musicvideos) + !String.Contains(Container.folderpath,plugin) - !Substring(container.folderpath,musicdb://) | Substring(container.foldername,Files) | container.content(files) | container.content(addons) | [container.content(playlists) + !Substring(Container.folderpath,special://profile/playlists)] | Substring(Container.folderpath,plugin://) - container.content(artists) + [Substring(container.folderpath,musicdb://) | Substring(Container.folderpath,special://profile/playlists)] - container.content(albums) + Substring(container.folderpath,albumartistsonly) - container.content(albums) + [Substring(container.folderpath,musicdb://) | Substring(Container.folderpath,special://profile/playlists)] - container.content(genres) + Substring(container.folderpath,musicdb://) - container.content(songs) + Substring(Container.folderpath,musicdb://) - container.content(songs) + [Substring(Container.folderpath,.xsp) | Substring(Container.foldername,PartyMode) | Substring(Container.folderpath,playlistmusic://)] + !String.Contains(container.folderpath,musicdb://) | String.Contains(container.foldername,Files) | container.content(files) | container.content(addons) | [container.content(playlists) + !String.Contains(Container.folderpath,special://profile/playlists)] | String.Contains(Container.folderpath,plugin://) + container.content(artists) + [String.Contains(container.folderpath,musicdb://) | String.Contains(Container.folderpath,special://profile/playlists)] + container.content(albums) + String.Contains(container.folderpath,albumartistsonly) + container.content(albums) + [String.Contains(container.folderpath,musicdb://) | String.Contains(Container.folderpath,special://profile/playlists)] + container.content(genres) + String.Contains(container.folderpath,musicdb://) + container.content(songs) + String.Contains(Container.folderpath,musicdb://) + container.content(songs) + [String.Contains(Container.folderpath,.xsp) | String.Contains(Container.foldername,PartyMode) | String.Contains(Container.folderpath,playlistmusic://)] - !isempty(Window(Weather).Property(WeatherProvider)) + !String.isempty(weather.temperature) + !String.isempty(weather.conditions) + !String.IsEmpty(Window(Weather).Property(WeatherProvider)) + !String.String.IsEmpty(weather.temperature) + !String.String.IsEmpty(weather.conditions) @@ -85,12 +85,12 @@ - !String.IsEmpty(Control.GetLabel(312).index(1)) + !Control.IsVisible(313) + !String.String.IsEmpty(Control.GetLabel(312).index(1)) + !Control.IsVisible(313) 0 0 - Conditional - Conditional + Conditional + Conditional col-5-begin @@ -218,7 +218,7 @@ - !Window.IsActive(startup) + !isempty(container.foldername) + !IntegerGreaterThan(container.numitems,0) + !ListItem.IsParentFolder | window.isactive(busydialog) + !Window.IsActive(startup) + !String.IsEmpty(container.foldername) + !Integer.IsGreater(container.numitems,0) + !ListItem.IsParentFolder | window.isactive(busydialog) colors/black.png dimensionsFullscreen diff --git a/1080i/Includes_hubMenu.xml b/1080i/Includes_hubMenu.xml index bb96aac..ae27a3f 100644 --- a/1080i/Includes_hubMenu.xml +++ b/1080i/Includes_hubMenu.xml @@ -40,12 +40,11 @@ col-1-begin row-1-begin - 1-col - 1-col + 73 + 73 symbolVeryLarge center textActive - diff --git a/1080i/Includes_hubOptionsItems.xml b/1080i/Includes_hubOptionsItems.xml index c307f27..3f23b77 100644 --- a/1080i/Includes_hubOptionsItems.xml +++ b/1080i/Includes_hubOptionsItems.xml @@ -13,7 +13,7 @@ RunScript(script.globalsearch,movies=true&tvshows=true&episodes=true) - !isempty(Container.SortMethod) + !String.IsEmpty(Container.SortMethod) Sort by colors/white.png textActive @@ -22,7 +22,7 @@ sendclick(videos,3) - !isempty(Container.SortMethod) + !String.IsEmpty(Container.SortMethod) Sort direction colors/white.png colors/white.png @@ -100,7 +100,7 @@ RunScript(script.globalsearch,artists=true&albums=true) - !isempty(Container.SortMethod) + !String.IsEmpty(Container.SortMethod) Sort by 6-col textActive @@ -109,7 +109,7 @@ sendclick(music,3) - !isempty(Container.SortMethod) + !String.IsEmpty(Container.SortMethod) Sort direction 31110 @@ -164,7 +164,7 @@ - !isempty(Container.SortMethod) + !String.IsEmpty(Container.SortMethod) Sort by 6-col textActive @@ -173,7 +173,7 @@ sendclick(pictures,3) - !isempty(Container.SortMethod) + !String.IsEmpty(Container.SortMethod) Sort direction 31110 diff --git a/1080i/Includes_mediaShowcase.xml b/1080i/Includes_mediaShowcase.xml index 98de1c9..ee2dd6c 100644 --- a/1080i/Includes_mediaShowcase.xml +++ b/1080i/Includes_mediaShowcase.xml @@ -28,35 +28,35 @@ condition - condition - condition - condition - condition - condition - condition - condition - condition - condition - condition - condition - condition - condition - condition - condition - condition - condition - condition - condition - condition - condition - condition - condition - condition - condition - condition + condition + condition + condition + condition + condition + condition + condition + condition + condition + condition + condition + condition + condition + condition + condition + condition + condition + condition + condition + condition + condition + condition + condition + condition + condition + condition - !isempty(listitem.tagline) + !String.IsEmpty(listitem.tagline) col-1-begin 0 756 @@ -69,7 +69,7 @@ 2-col - !isempty(ListItem.art(poster)) + !String.IsEmpty(ListItem.art(poster)) 0 504 756 @@ -81,7 +81,7 @@ 2-col - !isempty(ListItem.art(fanart)) + !String.IsEmpty(ListItem.art(fanart)) 1344 756 $INFO[listitem.art(fanart)] @@ -134,7 +134,7 @@ 2-col - !isempty(container(99999).ListItemNoWrap(0).filenameandpath) + !Skin.HasSetting(disableExtendedFanart) + !String.IsEmpty(container(99999).ListItemNoWrap(0).filenameandpath) + !Skin.HasSetting(disableExtendedFanart) 1344 756 $INFO[container(99999).ListItemNoWrap(0).filenameandpath,,] @@ -145,7 +145,7 @@ 2-col - !isempty(listitem.art(discart)) + !String.IsEmpty(listitem.art(discart)) 756 756 $INFO[listitem.art(discart)] @@ -154,7 +154,7 @@ 2-col - !isempty(container(99999).ListItemNoWrap(1).filenameandpath) + !Skin.HasSetting(disableExtendedFanart) + !String.IsEmpty(container(99999).ListItemNoWrap(1).filenameandpath) + !Skin.HasSetting(disableExtendedFanart) 1344 756 $INFO[container(99999).ListItemNoWrap(1).filenameandpath,,] @@ -165,7 +165,7 @@ 2-col - !isempty(container(99999).ListItemNoWrap(2).filenameandpath) + !Skin.HasSetting(disableExtendedFanart) + !String.IsEmpty(container(99999).ListItemNoWrap(2).filenameandpath) + !Skin.HasSetting(disableExtendedFanart) 1344 756 $INFO[container(99999).ListItemNoWrap(2).filenameandpath,,] @@ -176,7 +176,7 @@ 2-col - !isempty(container(99999).ListItemNoWrap(3).filenameandpath) + !Skin.HasSetting(disableExtendedFanart) + !String.IsEmpty(container(99999).ListItemNoWrap(3).filenameandpath) + !Skin.HasSetting(disableExtendedFanart) 1344 756 $INFO[container(99999).ListItemNoWrap(3).filenameandpath,,] @@ -187,7 +187,7 @@ 2-col - !isempty(container(99999).ListItemNoWrap(4).filenameandpath) + !Skin.HasSetting(disableExtendedFanart) + !String.IsEmpty(container(99999).ListItemNoWrap(4).filenameandpath) + !Skin.HasSetting(disableExtendedFanart) 1344 756 $INFO[container(99999).ListItemNoWrap(4).filenameandpath,,] @@ -229,35 +229,35 @@ 8000 - !isempty(container(99999).ListItemNoWrap(0).filenameandpath) + !Skin.HasSetting(disableExtendedFanart) + !String.IsEmpty(container(99999).ListItemNoWrap(0).filenameandpath) + !Skin.HasSetting(disableExtendedFanart) 1-col 12 colors/white.png 8000 - !isempty(container(99999).ListItemNoWrap(0).filenameandpath) + !Skin.HasSetting(disableExtendedFanart) + !String.IsEmpty(container(99999).ListItemNoWrap(0).filenameandpath) + !Skin.HasSetting(disableExtendedFanart) 1-col 12 colors/white.png 8000 - !isempty(container(99999).ListItemNoWrap(0).filenameandpath) + !Skin.HasSetting(disableExtendedFanart) + !String.IsEmpty(container(99999).ListItemNoWrap(0).filenameandpath) + !Skin.HasSetting(disableExtendedFanart) 1-col 12 colors/white.png 8000 - !isempty(container(99999).ListItemNoWrap(0).filenameandpath) + !Skin.HasSetting(disableExtendedFanart) + !String.IsEmpty(container(99999).ListItemNoWrap(0).filenameandpath) + !Skin.HasSetting(disableExtendedFanart) 1-col 12 colors/white.png 8000 - !isempty(container(99999).ListItemNoWrap(0).filenameandpath) + !Skin.HasSetting(disableExtendedFanart) + !String.IsEmpty(container(99999).ListItemNoWrap(0).filenameandpath) + !Skin.HasSetting(disableExtendedFanart) 1-col 12 colors/white.png diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml index 267f1e2..08186e6 100644 --- a/1080i/Includes_variables.xml +++ b/1080i/Includes_variables.xml @@ -4,31 +4,30 @@ $LOCALIZE[20389] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE] - [CAPITALIZE]$INFO[container.foldername][/CAPITALIZE] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE] - $INFO[container.foldername] $INFO[ListItem.TVShowTitle,- ,] $INFO[ListItem.season,$LOCALIZE[31011] ,] + [CAPITALIZE]$INFO[container.foldername][/CAPITALIZE] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE] + $INFO[container.foldername] $INFO[ListItem.TVShowTitle,- ,] $INFO[ListItem.season,$LOCALIZE[31011] ,] $LOCALIZE[20342] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE] $LOCALIZE[31216] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE] $LOCALIZE[20343] - $INFO[container.foldername] - $LOCALIZE[31012] - [CAPITALIZE]$INFO[container.foldername][/CAPITALIZE] - [CAPITALIZE]$INFO[container.foldername][/CAPITALIZE] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE] - $LOCALIZE[31058] - $INFO[container.foldername] + $INFO[container.foldername] + $LOCALIZE[31012] + [CAPITALIZE]$INFO[container.foldername][/CAPITALIZE] + [CAPITALIZE]$INFO[container.foldername][/CAPITALIZE] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE] + $LOCALIZE[31058] + $INFO[container.foldername] $LOCALIZE[31038] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE] $LOCALIZE[31024] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE] $LOCALIZE[31182] - $LOCALIZE[31199] [COLOR highlight]$INFO[container.foldername][/COLOR] - $INFO[container.foldername] - $LOCALIZE[31053] + $LOCALIZE[31199] [COLOR highlight]$INFO[container.foldername][/COLOR] + $INFO[container.foldername] + $LOCALIZE[31053] $LOCALIZE[31197] $LOCALIZE[31006] [COLOR highlight]$LOCALIZE[31078][/COLOR] $LOCALIZE[31164] [COLOR highlight]$LOCALIZE[31078][/COLOR] $LOCALIZE[31006] [COLOR highlight]$LOCALIZE[31165][/COLOR] $LOCALIZE[10506] $LOCALIZE[31123] - $LOCALIZE[31056] - + $LOCALIZE[31056] $INFO[container.Numitems,, $LOCALIZE[31014]] $VAR[unwatchedOnly] @@ -38,13 +37,13 @@ $INFO[container.numitems] $LOCALIZE[31165] $INFO[container.Numitems,, $LOCALIZE[31145]] $INFO[container.Numitems,, $LOCALIZE[31014]] - $INFO[container.Numitems,, $LOCALIZE[31038]] - $INFO[container.foldername,,] $INFO[container.Numitems,(, $LOCALIZE[31050])] + $INFO[container.Numitems,, $LOCALIZE[31038]] + $INFO[container.foldername,,] $INFO[container.Numitems,(, $LOCALIZE[31050])] $INFO[Listitem.duration,, $LOCALIZE[31018]] - [B]$INFO[ListItem.Property(TotalSeasons)][/B] $LOCALIZE[31188] • [B]$INFO[ListItem.Property(NumEpisodes)][/B] $LOCALIZE[31189] + [B]$INFO[ListItem.Property(TotalSeasons)][/B] $LOCALIZE[31188] • [B]$INFO[ListItem.Property(NumEpisodes)][/B] $LOCALIZE[31189] $INFO[ListItem.Property(TotalEpisodes)] $LOCALIZE[31189] $INFO[ListItem.Property(Artist_Genre)] @@ -79,26 +78,26 @@ -  -  -  -  -  -  -  -  -  -  +  +  +  +  +  +  +  +  +  +   - $INFO[Skin.String(homeBackground)] + $INFO[Skin.String(homeBackground)] special://skin/extras/homeBackgrounds - + diff --git a/1080i/MyMusicNav.xml b/1080i/MyMusicNav.xml index 6345221..a69428c 100644 --- a/1080i/MyMusicNav.xml +++ b/1080i/MyMusicNav.xml @@ -3,6 +3,7 @@ 9999 fadeInOut Skin.SetString(recentitems,music) + 50,51,52,53,54,55 globalBackground diff --git a/1080i/MyPVRChannels.xml b/1080i/MyPVRChannels.xml index 2ee2838..e1c2296 100644 --- a/1080i/MyPVRChannels.xml +++ b/1080i/MyPVRChannels.xml @@ -7,6 +7,7 @@ + 50 globalBackground diff --git a/1080i/MyPVRGuide.xml b/1080i/MyPVRGuide.xml index 9d27d46..12a2a84 100644 --- a/1080i/MyPVRGuide.xml +++ b/1080i/MyPVRGuide.xml @@ -29,7 +29,7 @@ 9000 - SubString(ListItem.Label,:) + String.Contains(ListItem.Label,:) 0 12 216 diff --git a/1080i/MyPVRRecordings.xml b/1080i/MyPVRRecordings.xml index 8b98e15..a7b321b 100644 --- a/1080i/MyPVRRecordings.xml +++ b/1080i/MyPVRRecordings.xml @@ -6,6 +6,7 @@ + 50 globalBackground @@ -49,7 +50,7 @@ $INFO[Listitem.thumb] - !isempty(ListItem.playcount) + !ListItem.IsResumable + !String.IsEmpty(ListItem.playcount) + !ListItem.IsResumable 16 2 66 @@ -107,7 +108,7 @@ $INFO[Listitem.thumb] - !isempty(ListItem.playcount) + !ListItem.IsResumable + !String.IsEmpty(ListItem.playcount) + !ListItem.IsResumable 16 2 66 @@ -156,7 +157,7 @@ 1-row colors/black.png colors/white.png - PVR.backenddiskspaceprogr!IntegerGreaterThan(PVR.backenddiskspaceprogr,100) + PVR.backenddiskspaceprogr!Integer.IsGreater(PVR.backenddiskspaceprogr,100) 0 diff --git a/1080i/MyPVRTimers.xml b/1080i/MyPVRTimers.xml index c85189b..591d7fe 100644 --- a/1080i/MyPVRTimers.xml +++ b/1080i/MyPVRTimers.xml @@ -106,7 +106,7 @@ colors/offblack.png - !isempty(ListItem.playcount) + !ListItem.IsResumable + !String.IsEmpty(ListItem.playcount) + !ListItem.IsResumable 16 2 66 @@ -164,7 +164,7 @@ 48 colors/black.png colors/white.png - PVR.backenddiskspaceprogr!IntegerGreaterThan(PVR.backenddiskspaceprogr,100) + PVR.backenddiskspaceprogr!Integer.IsGreater(PVR.backenddiskspaceprogr,100) 0 diff --git a/1080i/MyPics.xml b/1080i/MyPics.xml index 4eba136..5b8b079 100644 --- a/1080i/MyPics.xml +++ b/1080i/MyPics.xml @@ -3,6 +3,7 @@ 9999 PlayerControl(stop) fadeInOut + 50 globalBackground diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml index 469466f..52c6415 100644 --- a/1080i/MyVideoNav.xml +++ b/1080i/MyVideoNav.xml @@ -4,6 +4,7 @@ PlayerControl(stop) Skin.SetString(recentitems,video) fadeInOut + 50,51,52,53,54,58 globalBackground diff --git a/1080i/MyWeather.xml b/1080i/MyWeather.xml index 59d0ba5..88c7725 100644 --- a/1080i/MyWeather.xml +++ b/1080i/MyWeather.xml @@ -39,13 +39,13 @@ textActive - + - + @@ -102,7 +102,7 @@ - + diff --git a/1080i/SettingsSystemInfo.xml b/1080i/SettingsSystemInfo.xml index b82ff37..c4aff09 100644 --- a/1080i/SettingsSystemInfo.xml +++ b/1080i/SettingsSystemInfo.xml @@ -9,7 +9,7 @@ col-1-begin row-1-begin - + diff --git a/1080i/VideoOSD.xml b/1080i/VideoOSD.xml index c78a1c2..0ebc19e 100644 --- a/1080i/VideoOSD.xml +++ b/1080i/VideoOSD.xml @@ -236,7 +236,7 @@ PlayerControl(next) - System.GetBool(pvrmanager.enabled) + Player.CanRecord + System.GetBool(pvrmanager.enabled) + PVR.CanRecordPlayingChannel PlayerControl(record) diff --git a/1080i/View_AddonPosters.xml b/1080i/View_AddonPosters.xml index 8870c44..2fa6f28 100644 --- a/1080i/View_AddonPosters.xml +++ b/1080i/View_AddonPosters.xml @@ -2,7 +2,7 @@ - + $EXP[isAddonMovieOrTVshow] 90 row-5-begin @@ -37,7 +37,7 @@ ffffffff - isempty(listitem.title) + String.IsEmpty(listitem.title) 24 3-row 228 @@ -94,7 +94,7 @@ 6 - isempty(listitem.title) + String.IsEmpty(listitem.title) 24 3-row 228 diff --git a/1080i/View_Albums.xml b/1080i/View_Albums.xml index 8b36ca0..a81303e 100644 --- a/1080i/View_Albums.xml +++ b/1080i/View_Albums.xml @@ -172,7 +172,7 @@ textActive - + $EXP[isMusicAlbum] col-1-begin row-21-begin @@ -208,7 +208,7 @@ ffFFFFFF - isempty(listitem.title) + String.IsEmpty(listitem.title) 24 3-row 228 @@ -254,7 +254,7 @@ 6 - isempty(listitem.title) + String.IsEmpty(listitem.title) 24 3-row 228 diff --git a/1080i/View_ArtistAlbums.xml b/1080i/View_ArtistAlbums.xml index 26d9a4c..ea49e33 100644 --- a/1080i/View_ArtistAlbums.xml +++ b/1080i/View_ArtistAlbums.xml @@ -38,7 +38,7 @@ - + $EXP[isMusicArtistCatalogue] col-1-begin row-11-begin @@ -72,7 +72,7 @@ ffFFFFFF - isempty(listitem.title) + String.IsEmpty(listitem.title) 24 3-row 228 @@ -129,7 +129,7 @@ 6 - isempty(listitem.title) + String.IsEmpty(listitem.title) 24 3-row 228 diff --git a/1080i/View_Artists.xml b/1080i/View_Artists.xml index 185a063..fae9cb1 100644 --- a/1080i/View_Artists.xml +++ b/1080i/View_Artists.xml @@ -4,7 +4,7 @@ - + $EXP[isMusicArtist] col-1-begin row-5-begin diff --git a/1080i/View_Episodes.xml b/1080i/View_Episodes.xml index ff7e93a..c64accc 100644 --- a/1080i/View_Episodes.xml +++ b/1080i/View_Episodes.xml @@ -3,11 +3,11 @@ - Substring(container.folderpath,videodb://) + !isempty(container.folderpath) + container.content(episodes) + !Substring(Container.folderpath,plugin) + String.Contains(container.folderpath,videodb://) + !String.IsEmpty(container.folderpath) + container.content(episodes) + !String.Contains(Container.folderpath,plugin) 0 0 - !isempty(container.art(season.poster)) + !String.IsEmpty(container.art(season.poster)) 0 0 960 @@ -22,7 +22,7 @@ - isempty(container.art(season.poster)) + String.IsEmpty(container.art(season.poster)) -966 0 1920 @@ -54,7 +54,7 @@ - Substring(container.folderpath,videodb://) + !isempty(container.folderpath) + container.content(episodes) + !Substring(Container.folderpath,plugin) + String.Contains(container.folderpath,videodb://) + !String.IsEmpty(container.folderpath) + container.content(episodes) + !String.Contains(Container.folderpath,plugin) 949 0 @@ -78,7 +78,7 @@ col-13-begin row-5-begin - Substring(container.folderpath,videodb://) + !isempty(container.folderpath) + container.content(episodes) + !Substring(Container.folderpath,plugin) + String.Contains(container.folderpath,videodb://) + !String.IsEmpty(container.folderpath) + container.content(episodes) + !String.Contains(Container.folderpath,plugin) 24 0 @@ -93,7 +93,7 @@ - + $EXP[isEpisode] 954 row-8-begin @@ -162,7 +162,7 @@ false - !isempty(ListItem.playcount) + !String.IsEmpty(ListItem.playcount) 11-col 0 1-col @@ -236,7 +236,7 @@ false - !isempty(ListItem.playcount) + !String.IsEmpty(ListItem.playcount) 11-col 0 1-col @@ -252,7 +252,7 @@ - Substring(Container.folderpath,plugin) + String.Contains(Container.folderpath,plugin) col-1-begin row-5-begin 24-col @@ -292,7 +292,7 @@ - !isempty(ListItem.playcount) + !String.IsEmpty(ListItem.playcount) 23-col 0 1-col @@ -339,7 +339,7 @@ - !isempty(ListItem.playcount) + !String.IsEmpty(ListItem.playcount) 23-col 0 1-col diff --git a/1080i/View_Movies.xml b/1080i/View_Movies.xml index d825eeb..9e4e661 100644 --- a/1080i/View_Movies.xml +++ b/1080i/View_Movies.xml @@ -56,12 +56,10 @@ 31176 - 31132 - @@ -188,7 +186,7 @@ textActive - + $EXP[isMovie] 90 row-21-begin @@ -224,7 +222,7 @@ ffffffff - isempty(listitem.title) + String.IsEmpty(listitem.title) 24 3-row 228 @@ -257,7 +255,7 @@ - String.IsEmpty(ListItem.PlayCount) + String.String.IsEmpty(ListItem.PlayCount) 166 6 @@ -305,7 +303,7 @@ 6 - isempty(listitem.title) + String.IsEmpty(listitem.title) 24 3-row 228 @@ -336,7 +334,7 @@ - String.IsEmpty(ListItem.PlayCount) + String.String.IsEmpty(ListItem.PlayCount) 166 6 diff --git a/1080i/View_MusicGenres.xml b/1080i/View_MusicGenres.xml index 276f235..c3587a8 100644 --- a/1080i/View_MusicGenres.xml +++ b/1080i/View_MusicGenres.xml @@ -2,7 +2,7 @@ - + $EXP[isMusicGenre] col-1-begin row-5-begin diff --git a/1080i/View_Seasons.xml b/1080i/View_Seasons.xml index b55d54b..9d86276 100644 --- a/1080i/View_Seasons.xml +++ b/1080i/View_Seasons.xml @@ -2,10 +2,10 @@ - !isempty(container.folderpath) + container.content(seasons) + !container.content(episodes) + !String.IsEmpty(container.folderpath) + container.content(seasons) + !container.content(episodes) - !Substring(Container.folderpath,plugin) + !String.Contains(Container.folderpath,plugin) -100 itemFanart @@ -21,7 +21,7 @@ - !Substring(Container.folderpath,plugin) + !String.Contains(Container.folderpath,plugin) col-1-begin row-4-begin @@ -49,7 +49,7 @@ - !Substring(Container.folderpath,plugin) + !String.Contains(Container.folderpath,plugin) row-15-begin 0 globalBackground diff --git a/1080i/View_Songs.xml b/1080i/View_Songs.xml index 6858cc2..374669f 100644 --- a/1080i/View_Songs.xml +++ b/1080i/View_Songs.xml @@ -48,7 +48,7 @@ - + $EXP[isMusicSong] col-10-begin row-9-begin diff --git a/1080i/View_TVShows.xml b/1080i/View_TVShows.xml index 05dfa6d..9800cff 100644 --- a/1080i/View_TVShows.xml +++ b/1080i/View_TVShows.xml @@ -189,7 +189,7 @@ textActive - + $EXP[isTVShow] + !$EXP[isMovie] 90 row-21-begin @@ -225,7 +225,7 @@ ffffffff - isempty(listitem.title) + String.IsEmpty(listitem.title) 24 3-row 228 @@ -317,7 +317,7 @@ 6 - isempty(listitem.title) + String.IsEmpty(listitem.title) 24 3-row 228 diff --git a/1080i/View_VideoFiles.xml b/1080i/View_VideoFiles.xml index bbbd09c..bd1e97b 100644 --- a/1080i/View_VideoFiles.xml +++ b/1080i/View_VideoFiles.xml @@ -3,7 +3,7 @@ - Substring(Container.folderpath,plugin) + !$EXP[isAddonMovieOrTVshow] + String.Contains(Container.folderpath,plugin) + !$EXP[isAddonMovieOrTVshow] dimensionsFullscreen stretch @@ -54,7 +54,7 @@ - !isempty(ListItem.playcount) + !String.IsEmpty(ListItem.playcount) 23-col-gutter 0 1-col @@ -101,7 +101,7 @@ - !isempty(ListItem.playcount) + !String.IsEmpty(ListItem.playcount) 23-col-gutter 0 1-col diff --git a/1080i/custom_menuSelector.xml b/1080i/custom_menuSelector.xml index 39c3e28..389e23b 100644 --- a/1080i/custom_menuSelector.xml +++ b/1080i/custom_menuSelector.xml @@ -2,6 +2,6 @@ Dialog.Close(all,true) control.setfocus(9000) - [Window.IsActive(videos) | window.IsActive(music)] + isempty(container.folderpath) + [Window.IsActive(videos) | window.IsActive(music)] + String.IsEmpty(container.folderpath) \ No newline at end of file diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml index 3a21c51..be82b02 100644 --- a/1080i/custom_musicPlayerFullscreen.xml +++ b/1080i/custom_musicPlayerFullscreen.xml @@ -10,7 +10,7 @@ - isempty(Window(Visualisation).Property(ArtistSlideshow)) + String.IsEmpty(Window(Visualisation).Property(ArtistSlideshow)) 0 0 dimensionsFullscreen @@ -21,7 +21,7 @@ - !isempty(Window(Visualisation).Property(ArtistSlideshow)) + !String.IsEmpty(Window(Visualisation).Property(ArtistSlideshow)) dimensionsFullscreen scale 15000 @@ -46,7 +46,7 @@ col-1-begin row-23-begin - + diff --git a/changelog.txt b/changelog.txt index 631778c..bc765ea 100644 --- a/changelog.txt +++ b/changelog.txt @@ -4,11 +4,19 @@ - Preparing for Leia compatibility - [COMPLETE] xbmc.gui bump to 5.13.0 -- [COMPLETE] deprecated infolabel System.HasModalDialog +- [COMPLETE] removal of deprecated infolabel System.HasModalDialog - [COMPLETE] MyPVRGuide.xml: Removed view id's 11,12 and 13 - [COMPLETE] Removed hyphen as none value - [COMPLETE] Rename DialogPVRGuideOSD.xml --> DialogPVRChannelGuide - [COMPLETE] Remove instances of noop +- [COMPLETE] Removal of deprecated 'stringcompare()' +- [COMPLETE] Removal of deprecated 'substring()' +- [COMPLETE] Removal of deprecated 'IntegerGreaterThan()' +- [COMPLETE] Player.CanRecord -> PVR.CanRecordPlayingChannel +- [COMPLETE] ListItem.ChannelNumber -> ListItem.ChannelNumberLabel +- [COMPLETE] isempty() -> string.isempty() + + - new window: MyGames.xml diff --git a/shortcuts/mainmenu.DATA.xml b/shortcuts/mainmenu.DATA.xml index 8373546..5e19f9a 100644 --- a/shortcuts/mainmenu.DATA.xml +++ b/shortcuts/mainmenu.DATA.xml @@ -57,7 +57,7 @@ !Library.HasContent(Video) - + 32034 DefaultAddon.png @@ -65,7 +65,7 @@ Library.HasContent(Music) - + 32034 DefaultAddon.png @@ -73,7 +73,7 @@ !Library.HasContent(Music) - + 32034 DefaultAddon.png