From a55f5cd9c8310cf6b40fbc46baa0b423310547ae Mon Sep 17 00:00:00 2001 From: Chris Bevan Date: Mon, 9 Nov 2015 21:07:33 +0000 Subject: [PATCH] various --- 1080i/DialogSeekBar.xml | 4 +- 1080i/Home.xml | 14 +- 1080i/Includes_hubMenu.xml | 5 +- 1080i/Includes_hubMenuItems.xml | 4 +- 1080i/Includes_hubMenuSubItems.xml | 4 +- 1080i/Includes_variables.xml | 2 +- 1080i/MusicOSD.xml | 2 +- 1080i/MusicVisualisation.xml | 2 +- 1080i/MyVideoNav.xml | 5 +- 1080i/MyVideoPlaylist.xml | 2 +- 1080i/SkinSettings.xml | 5 +- 1080i/VideoOSD.xml | 2 +- 1080i/View_Movies.xml | 2 +- 1080i/View_TVShows.xml | 2 +- 1080i/View_VideoFiles.xml | 2 +- 1080i/View_VideoRecentItems.xml | 61 +++++- 1080i/custom_menuItemTypeSelector.xml | 6 +- 1080i/custom_musicFullscreenDisabler.xml | 4 +- 1080i/custom_musicOverlay.xml | 4 +- 1080i/custom_musicPlayerFullscreen.xml | 2 +- 1080i/custom_subtitleMenu.xml | 2 +- 1080i/custom_videoInformation.xml | 194 +------------------ 1080i/script-Rom_Collection_Browser-main.xml | 2 +- addon.xml | 2 - changelog.txt | 6 +- language/English/strings.po | 4 + 26 files changed, 111 insertions(+), 233 deletions(-) diff --git a/1080i/DialogSeekBar.xml b/1080i/DialogSeekBar.xml index b0c57f4..66bfa81 100644 --- a/1080i/DialogSeekBar.xml +++ b/1080i/DialogSeekBar.xml @@ -1,8 +1,8 @@ 901 - - !window.isactive(videoosd) + !window.isactive(123) + !window.isactive(124) + !Window.IsActive(5901) + !Window.IsActive(DialogSubtitles.xml) + !Window.IsVisible(fullscreeninfo) + [VideoPlayer.IsFullscreen + !Window.IsVisible(visualisation)] + [Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding] + + !window.isactive(videoosd) + !window.isactive(123) + !window.isactive(124) + !Window.IsActive(1104) + !Window.IsActive(DialogSubtitles.xml) + !Window.IsVisible(fullscreeninfo) + [VideoPlayer.IsFullscreen + !Window.IsVisible(visualisation)] + [Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding] dimensionsFullscreen diff --git a/1080i/Home.xml b/1080i/Home.xml index 506340a..b8575bf 100644 --- a/1080i/Home.xml +++ b/1080i/Home.xml @@ -115,8 +115,9 @@ - - ActivateWindow(musiclibrary) + ActivateWindow(Music,files) Skin.SetString(showRecentMusicItems,false) + ActivateWindow(Music,musicdb://) Skin.SetString(showRecentMusicItems,true) @@ -144,7 +145,10 @@ - - RunScript(script.globalsearch) + + RunPlugin(plugin://script.globalsearch) + + Skin.SetString(showRecentMusicItems,false) Skin.SetString(showRecentVideoItems,false) @@ -176,7 +180,7 @@ 8-col 12 - 8-col + 24-col 4-row right veryLarge @@ -186,7 +190,7 @@ 8-col 3-row - 12-col + 24-col 4-row right Large @@ -196,7 +200,7 @@ 8-col 182 - 12-col + 24-col 3-row right regular diff --git a/1080i/Includes_hubMenu.xml b/1080i/Includes_hubMenu.xml index 8933e95..beb37a4 100644 --- a/1080i/Includes_hubMenu.xml +++ b/1080i/Includes_hubMenu.xml @@ -33,7 +33,6 @@ 33ffffff stretch - @@ -76,7 +75,6 @@ - 0 row-4-begin @@ -84,7 +82,8 @@ 24-row vertical 9002 - 9999 + 9999 + 9998 activateWindow(home) diff --git a/1080i/Includes_hubMenuItems.xml b/1080i/Includes_hubMenuItems.xml index 26722c8..763bbcc 100644 --- a/1080i/Includes_hubMenuItems.xml +++ b/1080i/Includes_hubMenuItems.xml @@ -172,7 +172,7 @@ Player.HasAudio - activateWindow(5001) + activateWindow(1103) MusicPlayer.Offset(0).Exists @@ -209,7 +209,7 @@ ActivateWindow(MusicLibrary) Skin.SetString(showRecentMusicItems,true) - Control.SetFocus(9123) + Control.SetFocus(9998) diff --git a/1080i/Includes_hubMenuSubItems.xml b/1080i/Includes_hubMenuSubItems.xml index d7cd387..5e409df 100644 --- a/1080i/Includes_hubMenuSubItems.xml +++ b/1080i/Includes_hubMenuSubItems.xml @@ -45,7 +45,7 @@ col-1-begin Skin.SetString(menuItemTypeFilter,video) - ActivateWindow(5000) + ActivateWindow(1100) @@ -142,7 +142,7 @@ col-1-begin Skin.SetString(menuItemTypeFilter,audio) - ActivateWindow(5000) + ActivateWindow(1100) 2-row diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml index c034c5f..c14395b 100644 --- a/1080i/Includes_variables.xml +++ b/1080i/Includes_variables.xml @@ -40,7 +40,7 @@ $INFO[container.Numitems,, $LOCALIZE[31014]] $VAR[unwatchedOnly] $INFO[container.Numitems,, $LOCALIZE[31014]] $VAR[unwatchedOnly] - $INFO[Window(Home).Property(Music.AlbumsCount)] $LOCALIZE[31037] + $INFO[Window(Home).Property(Music.AlbumsCount)] $LOCALIZE[31038] $INFO[container.Numitems,, $LOCALIZE[31014]] diff --git a/1080i/MusicOSD.xml b/1080i/MusicOSD.xml index 372f816..89eac20 100644 --- a/1080i/MusicOSD.xml +++ b/1080i/MusicOSD.xml @@ -1,7 +1,7 @@ - back + back sendclick(10120,500) back diff --git a/1080i/MusicVisualisation.xml b/1080i/MusicVisualisation.xml index 45e4f6c..c29ad25 100644 --- a/1080i/MusicVisualisation.xml +++ b/1080i/MusicVisualisation.xml @@ -1,6 +1,6 @@ - activateWindow(5001) + activateWindow(1103) diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml index a449c37..12d6303 100644 --- a/1080i/MyVideoNav.xml +++ b/1080i/MyVideoNav.xml @@ -1,7 +1,6 @@ 9000 - PlayerControl(stop) setfocus(9000) home @@ -35,10 +34,10 @@ [SubString(skin.string(showRecentVideoItems),false) | !skin.string(showRecentVideoItems)] movies tvshows + videofiles seasons episodes videoaddons - videofiles @@ -75,7 +74,7 @@ row-1-begin 14-col pageTitle - + textActive diff --git a/1080i/MyVideoPlaylist.xml b/1080i/MyVideoPlaylist.xml index d711ebc..8645175 100644 --- a/1080i/MyVideoPlaylist.xml +++ b/1080i/MyVideoPlaylist.xml @@ -100,7 +100,7 @@ - + diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml index 748ad11..4904f69 100644 --- a/1080i/SkinSettings.xml +++ b/1080i/SkinSettings.xml @@ -1,7 +1,7 @@ 8000 - + globalBackground @@ -208,7 +208,8 @@ Enable Artist Slideshow 14-col - Skin.ToggleSetting(artistSlideshowActive) + Skin.ToggleSetting(artistSlideshowActive) + RunPlugin(plugin://script.artistslideshow) Skin.HasSetting(artistSlideshowActive) diff --git a/1080i/VideoOSD.xml b/1080i/VideoOSD.xml index 581a262..8284b91 100644 --- a/1080i/VideoOSD.xml +++ b/1080i/VideoOSD.xml @@ -132,7 +132,7 @@ - Close - activateWindow(5901) + activateWindow(1104) Audio Settings diff --git a/1080i/View_Movies.xml b/1080i/View_Movies.xml index 6a3389b..ec6b182 100644 --- a/1080i/View_Movies.xml +++ b/1080i/View_Movies.xml @@ -23,7 +23,7 @@ - !container.content(files) + !isempty(container.foldername) + !StringCompare(container.foldername,files) + !StringCompare(container.foldername,Video Playlists) + !container.content(tvshows) + !container.content(episodes) + !container.content(seasons) + !Substring(Container.folderpath,plugin) + !container.content(addons) + Library.HasContent(movies) + !container.content(files) + !isempty(container.foldername) + !StringCompare(container.foldername,files) + !StringCompare(container.foldername,Video Playlists) + !container.content(tvshows) + !container.content(episodes) + !container.content(seasons) + !Substring(Container.folderpath,plugin) + !container.content(addons) 78 row-5-begin 1800 diff --git a/1080i/View_TVShows.xml b/1080i/View_TVShows.xml index 6981c4d..3cde2f8 100644 --- a/1080i/View_TVShows.xml +++ b/1080i/View_TVShows.xml @@ -24,7 +24,7 @@ - !isempty(container.foldername) + !StringCompare(container.foldername,files) + !container.content(movies) + !container.content(episodes) + !container.content(seasons) + !Substring(Container.folderpath,plugin) + !container.content(addons) + Library.HasContent(tvshows) + !isempty(container.foldername) + !StringCompare(container.foldername,files) + !container.content(movies) + !container.content(episodes) + !container.content(seasons) + !Substring(Container.folderpath,plugin) + !container.content(addons) col-1-begin row-5-begin 1800 diff --git a/1080i/View_VideoFiles.xml b/1080i/View_VideoFiles.xml index 160a6cb..2074e07 100644 --- a/1080i/View_VideoFiles.xml +++ b/1080i/View_VideoFiles.xml @@ -2,7 +2,7 @@ - container.content(files) | StringCompare(container.foldername,files) | StringCompare(container.foldername,Video Playlists) + container.content(files) | StringCompare(container.foldername,files) | Substring(container.folderpath,special://videoplaylists) col-1-begin row-5-begin 24-col diff --git a/1080i/View_VideoRecentItems.xml b/1080i/View_VideoRecentItems.xml index 155f9fa..b404739 100644 --- a/1080i/View_VideoRecentItems.xml +++ b/1080i/View_VideoRecentItems.xml @@ -157,13 +157,14 @@ 9-row 9123 9000 - activateWindow(home) + activateWindow(home) + skin.setstring(moreinfo,false) horizontal Skin.SetString(showRecentVideoItems,false) activatewindow(Video,videodb://tvshows/titles/$INFO[listitem.dbid]/$INFO[listitem.season]) Control.SetFocus(50) $INFO[control.getlabel(9123)] - activateWindow(5824) + Skin.SetString(moreinfo,true) 0 @@ -339,5 +340,61 @@ + + + + skin.string(moreinfo,true) + + 0 + 0 + fullscreenWidth + fullscreenHeight + stretch + colors/black.png + 500 + CCffffff + + + + col-1-begin + row-6-begin + + container(9123).hasfocus(1) + 0 + 0 + 24-col + 2-row + center + center + large + textActive + + + + container(9123).hasfocus(2) + 0 + 0 + 24-col + 2-row + center + center + large + textActive + + + + 3-col + 3-row + textbox + 18-col + left + textActive + - + 12-row + + + + + \ No newline at end of file diff --git a/1080i/custom_menuItemTypeSelector.xml b/1080i/custom_menuItemTypeSelector.xml index 21022db..bb8c87a 100644 --- a/1080i/custom_menuItemTypeSelector.xml +++ b/1080i/custom_menuItemTypeSelector.xml @@ -1,5 +1,5 @@ - + 6000 Skin.Reset(menuItemType) @@ -49,7 +49,7 @@ 24-row 0 5000 - dialog.close(5000) + dialog.close(1100) stringcompare(skin.string(menuItemTypeFilter),video) @@ -137,7 +137,7 @@ 16-row vertical 6000 - dialog.close(5000) + dialog.close(1100) 60 diff --git a/1080i/custom_musicFullscreenDisabler.xml b/1080i/custom_musicFullscreenDisabler.xml index 91db327..ea4a200 100644 --- a/1080i/custom_musicFullscreenDisabler.xml +++ b/1080i/custom_musicFullscreenDisabler.xml @@ -1,6 +1,6 @@ - + Dialog.Close(all,true) - Window.IsActive(5001) + !player.hasaudio + Window.IsActive(1103) + !player.hasaudio \ No newline at end of file diff --git a/1080i/custom_musicOverlay.xml b/1080i/custom_musicOverlay.xml index 9c2711c..1d9ab43 100644 --- a/1080i/custom_musicOverlay.xml +++ b/1080i/custom_musicOverlay.xml @@ -1,11 +1,11 @@ - + player.hasaudio col-14-begin 0 - !Window.IsActive(visualisation) + !container.content(songs) + !Window.IsActive(visualisation) diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml index 6141bb9..1b121b3 100644 --- a/1080i/custom_musicPlayerFullscreen.xml +++ b/1080i/custom_musicPlayerFullscreen.xml @@ -1,5 +1,5 @@ - + 9876 RunScript(script.artistslideshow) diff --git a/1080i/custom_subtitleMenu.xml b/1080i/custom_subtitleMenu.xml index ab19339..7f22cf8 100644 --- a/1080i/custom_subtitleMenu.xml +++ b/1080i/custom_subtitleMenu.xml @@ -1,5 +1,5 @@ - + 5000 diff --git a/1080i/custom_videoInformation.xml b/1080i/custom_videoInformation.xml index e05b54e..c6b9138 100644 --- a/1080i/custom_videoInformation.xml +++ b/1080i/custom_videoInformation.xml @@ -5,10 +5,8 @@ Skin.Reset(showcast) - false - !Substring(Container.folderpath,plugin) + !container.content(episodes) 0 0 dimensionsFullscreen @@ -17,20 +15,10 @@ stretch - Substring(Container.folderpath,plugin) | container.content(episodes) 0 0 dimensionsFullscreen - colors/black.png - ddffffff - stretch - - - !Substring(Container.folderpath,plugin) + !container.content(episodes) - 0 - 0 - dimensionsFullscreen - $INFO[container(9998).listitem.art(fanart)] + $INFO[listitem.art(fanart)] ffffffff stretch kenBurnsey @@ -52,7 +40,6 @@ - !Substring(Container.folderpath,plugin) + !container.content(episodes) col-15-begin 0 @@ -329,183 +316,8 @@ - - - Substring(Container.folderpath,plugin) | container.content(episodes) - - modalDialogInOut - - - col-7-begin - row-1-begin - - 0 - 0 - 12-col - 486 - scale - $INFO[Listitem.thumb] - colors/white.png - 3 - - - - - col-7-begin - row-15-begin - - - Episode title - 0 - 2-row - 12-col-gutter - 2-row - left - center - mediumStrong - highlight - - - - true - - - 0 - -18 - 12-col - horizontal - - 1-col-gutter - 2-row - center - symbolLarge - textActive - - - - 3-col - 2-row - center - regularStrong - textActive - - - - - - - 0 - 5-row - textbox - 12-col - left - textActive - - - 160 - - - - - - 0 - 11-row - 12-col - 2-row - horizontal - - - 0 - 0 - 6-col - 2-row - stretch - colors/black.png - - - 0 - 0 - 1-col - 2-row - center - center - symbol - textActive - - - - - - 1-col-indent - 0 - 6-col - 2-row - center - buttonTitle - textActive - - - - - - - - 0 - 0 - 1-col-textbox - 2-row - stretch - colors/white.png - highlight - spinFocusIcon - - - 1-col - 0 - 5-col - 2-row - stretch - colors/white.png - - - 0 - 0 - 1-col - 2-row - center - center - symbol - textActive - - - - - - 1-col-indent - 0 - 6-col - 2-row - center - buttonTitle - black - - - - - - - - - - - - sendclick(2003,8) - - - !Substring(Container.folderpath,plugin) - - - - - SendClick(2003,6) - - - - - - + + skin.string(showcast,true) col-15-begin diff --git a/1080i/script-Rom_Collection_Browser-main.xml b/1080i/script-Rom_Collection_Browser-main.xml index 7155dc7..57c3f5f 100644 --- a/1080i/script-Rom_Collection_Browser-main.xml +++ b/1080i/script-Rom_Collection_Browser-main.xml @@ -251,7 +251,7 @@ - + diff --git a/addon.xml b/addon.xml index c207958..374b977 100644 --- a/addon.xml +++ b/addon.xml @@ -2,8 +2,6 @@ - - diff --git a/changelog.txt b/changelog.txt index ad4062b..061ded5 100644 --- a/changelog.txt +++ b/changelog.txt @@ -3,6 +3,8 @@ ***Working towards Kodi Jarvis release*** - [REMOVED DEPENDENCY] script.thedeadman.functions (Nice one team Kodi!) +- [REMOVED DEPENDENCY] script.globalsearch +- [REMOVED DEPENDENCY] script.artistslideshow - [REMOVED] DialogPeripheralManager.xml - [REMOVED] DialogKaraokeSongSelector.xml - [REMOVED] DialogKaraokeSongSelectorLarge.xml @@ -32,6 +34,8 @@ DialogPVRinfo - button update Use 'has parent' to manage back button (open side menu on no parent item) +Complete RecentItems oninfo + Radio RDS test Touchscreen controls - get Android tablet for testing @@ -42,7 +46,7 @@ CREATE A BETTER SKIN LOGO! Addons manager - clean up a bit. -Remove dependencies (ask for install - see forum) +[DONE] Remove dependencies (ask for install - see forum) diff --git a/language/English/strings.po b/language/English/strings.po index 79ebbdb..14b3688 100644 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -133,6 +133,10 @@ msgctxt "#31037" msgid "Albums by" msgstr "" +msgctxt "#31038" +msgid "Albums" +msgstr "" + msgctxt "#31041" msgid "Edit Menu Shortcuts" msgstr ""