diff --git a/1080i/AddonBrowser.xml b/1080i/AddonBrowser.xml index ced7467..9737a69 100644 --- a/1080i/AddonBrowser.xml +++ b/1080i/AddonBrowser.xml @@ -183,8 +183,8 @@ 19-row activateWindow(1104) 60 - 50 - 50 + 51 + 51 60 diff --git a/1080i/DialogAudioDSPManager.xml b/1080i/DialogAudioDSPManager.xml index b4ea8ff..2ff399c 100644 --- a/1080i/DialogAudioDSPManager.xml +++ b/1080i/DialogAudioDSPManager.xml @@ -230,7 +230,7 @@ control.setfocus(20) Default RadioButton - + 5-col diff --git a/1080i/FileManager.xml b/1080i/FileManager.xml index d3bb10f..c1a2c67 100644 --- a/1080i/FileManager.xml +++ b/1080i/FileManager.xml @@ -62,7 +62,7 @@ 2-row 8-col-gutter - itemSubtitle + itemSubTitle highlight @@ -146,7 +146,7 @@ 9-col-gutter 2-row - itemSubtitle + itemSubTitle highlight diff --git a/1080i/Home.xml b/1080i/Home.xml index 36e6da6..f3943f6 100644 --- a/1080i/Home.xml +++ b/1080i/Home.xml @@ -266,7 +266,6 @@ 2-row center center - 2-row true textActive diff --git a/1080i/Includes.xml b/1080i/Includes.xml index 00125e0..868e7de 100644 --- a/1080i/Includes.xml +++ b/1080i/Includes.xml @@ -29,25 +29,15 @@ - !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(videos) | container.content(episodes) + !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(videos) 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(seasons)] + !String.Contains(container.folderpath,videodb://) + String.Contains(container.folderpath,plugin://) + [container.content(movies) | container.content(tvshows) | container.content(seasons) | container.content(episodes)] 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) - - container.content(artists) + String.Contains(container.folderpath,spotify) container.content(albums) + String.Contains(container.folderpath,spotify) @@ -96,6 +86,7 @@ 66ffffff 500 stretch + kenBurnsey !Integer.IsGreater(container(99999).numitems,0) | Skin.HasSetting(disableExtendedFanart) | ListItem.IsParentFolder @@ -105,6 +96,7 @@ $INFO[container.Art(fanart)] 66ffffff stretch + kenBurnsey diff --git a/1080i/Includes_animations.xml b/1080i/Includes_animations.xml index b179b48..6b76250 100644 --- a/1080i/Includes_animations.xml +++ b/1080i/Includes_animations.xml @@ -26,8 +26,8 @@ - - + + diff --git a/1080i/Includes_hubOptionsItems.xml b/1080i/Includes_hubOptionsItems.xml index 42ab259..1b03111 100644 --- a/1080i/Includes_hubOptionsItems.xml +++ b/1080i/Includes_hubOptionsItems.xml @@ -153,7 +153,7 @@ 6-col textActive colors/white.png - + PlayerControl(randomOn) PlayerControl(randomOff) diff --git a/1080i/MyMusicPlaylistEditor.xml b/1080i/MyMusicPlaylistEditor.xml index 6038bd5..83be6ca 100644 --- a/1080i/MyMusicPlaylistEditor.xml +++ b/1080i/MyMusicPlaylistEditor.xml @@ -1,6 +1,6 @@ - 50 + 50 50 globalBackground diff --git a/1080i/MyPrograms.xml b/1080i/MyPrograms.xml index 6f02edb..9bebab2 100644 --- a/1080i/MyPrograms.xml +++ b/1080i/MyPrograms.xml @@ -62,7 +62,7 @@ 2-row center right - itemSubtitle + itemSubTitle textActive @@ -108,7 +108,7 @@ 2-row center right - itemSubtitle + itemSubTitle textActive diff --git a/1080i/Pointer.xml b/1080i/Pointer.xml index 40177af..7a7bf44 100644 --- a/1080i/Pointer.xml +++ b/1080i/Pointer.xml @@ -17,7 +17,7 @@ Pointer Focus 45 45 - UIControls/PointerFo.png + UIControls/PointerFO.png Pointer Drag diff --git a/1080i/View_Episodes.xml b/1080i/View_Episodes.xml index 17516dc..f204a7e 100644 --- a/1080i/View_Episodes.xml +++ b/1080i/View_Episodes.xml @@ -15,6 +15,11 @@ stretch $INFO[container.art(season.poster)] ccffffff + + + + + String.IsEmpty(container.art(season.poster)) @@ -25,9 +30,9 @@ stretch $INFO[container.art(fanart)] ffffffff - + - + @@ -90,7 +95,7 @@ - $EXP[isEpisode] + $EXP[isEpisode] + !String.Contains(container.folderpath,smb://) + String.Contains(container.folderpath,videodb://) 978 row-9-begin 12-col @@ -98,7 +103,7 @@ 9000 60 60 - 53> + 53 53 4 diff --git a/1080i/View_Seasons.xml b/1080i/View_Seasons.xml index 0f40228..b1c690a 100644 --- a/1080i/View_Seasons.xml +++ b/1080i/View_Seasons.xml @@ -2,7 +2,7 @@ - !String.IsEmpty(container.folderpath) + container.content(seasons) + !container.content(episodes) + !String.IsEmpty(container.folderpath) + container.content(seasons) + !container.content(episodes) + !String.Contains(container.folderpath,smb://) + String.Contains(container.folderpath,videodb://) !String.Contains(Container.folderpath,plugin) @@ -49,7 +49,7 @@ - $EXP[isSeason] + $EXP[isSeason] + !String.Contains(container.folderpath,smb://) 84 row-16-begin 1860 @@ -92,9 +92,9 @@ String.StartsWith(ListItem.label,*) - 12 + 24 4-row - 228 + 216 4-row left center @@ -175,9 +175,9 @@ String.StartsWith(ListItem.label,*) - 12 + 24 4-row - 228 + 216 4-row left center diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml index 1304e80..adc47f5 100644 --- a/1080i/custom_musicPlayerFullscreen.xml +++ b/1080i/custom_musicPlayerFullscreen.xml @@ -15,7 +15,7 @@ !Visualisation.Enabled dimensionsFullscreen - colors/white.jpg + colors/white.png background stretch diff --git a/1080i/custom_musicPlayerOptions.xml b/1080i/custom_musicPlayerOptions.xml index d2ef33e..6debb30 100644 --- a/1080i/custom_musicPlayerOptions.xml +++ b/1080i/custom_musicPlayerOptions.xml @@ -227,24 +227,6 @@ - - go to artist - - - - InstallAddon(script.musicfinder) - Dialog.Close(all,true) - Runscript(script.musicfinder,action=artist,title=$INFO[musicplayer.artist],listid=50) - - - go to album - - - - InstallAddon(script.musicfinder) - Dialog.Close(all,true) - Runscript(script.musicfinder,action=album,title=$INFO[musicplayer.album],listid=50) - Playlist diff --git a/addon.xml b/addon.xml index 00d7860..df8bfdd 100644 --- a/addon.xml +++ b/addon.xml @@ -5,7 +5,6 @@ - diff --git a/language/English/strings.po b/language/English/strings.po index dd586bf..66ff375 100644 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -988,3 +988,7 @@ msgstr "" msgctxt "#31240" msgid "Disable recently added section for Albums" msgstr "" + +msgctxt "#31241" +msgid "Shuffle" +msgstr ""