diff --git a/1080i/AddonBrowser.xml b/1080i/AddonBrowser.xml index 2a22248..4edc50c 100644 --- a/1080i/AddonBrowser.xml +++ b/1080i/AddonBrowser.xml @@ -1,7 +1,7 @@ 50 - + fadeInOut @@ -52,7 +52,7 @@ 0 - 2-row + 13-row 6-col vertical diff --git a/1080i/DialogPVRGuideInfo.xml b/1080i/DialogPVRGuideInfo.xml deleted file mode 100644 index 9240e52..0000000 --- a/1080i/DialogPVRGuideInfo.xml +++ /dev/null @@ -1,217 +0,0 @@ - - - 9000 - - - - fadeInOut - - dimensionsFullscreen - colors/black.png - eeFFFFFF - stretch - - - - col-7-begin - row-5-begin - modalDialogInOut - - - Programme title - 0 - -56 - 12-col - 2-row - left - center - mediumStrong - highlight - - true - - - 0 - 54 - 12-col - horizontal - - 1-col-gutter - 2-row - center - symbolLarge - textActive - - - - 2-col - 2-row - center - regularStrong - textActive - - - - 1-col-gutter - 2-row - center - symbolLarge - textActive - - - - 2-col - 2-row - center - regularStrong - textActive - - - - 1-col-gutter - 2-row - center - symbolLarge - textActive - - - - auto - 2-row - center - regularStrong - textActive - - - - - - - 0 - 4-row - textbox - 12-col - left - textActive - 340 - - - - - - 0 - 18-row - 12-col - 2-row - 3 - 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(5) - - - - - - - SendClick(6) - - - - - - - false - - Switch to Channel - - - Record - - - - DebugGrid - - WindowID - - - - diff --git a/1080i/DialogPVRRecordingInfo.xml b/1080i/DialogPVRInfo.xml similarity index 82% rename from 1080i/DialogPVRRecordingInfo.xml rename to 1080i/DialogPVRInfo.xml index 472822e..49c0aa5 100644 --- a/1080i/DialogPVRRecordingInfo.xml +++ b/1080i/DialogPVRInfo.xml @@ -29,9 +29,9 @@ left center mediumStrong - highlight + textActive - - + true @@ -44,13 +44,25 @@ itemTitle textActive - - + 0 5-row - 6-col-gutter + 12-col-gutter + left + center + itemTitle + textActive + - + + + + + 0 + 6-row + 12-col-gutter left center itemTitle @@ -62,7 +74,7 @@ 0 - 7-row + 8-row textbox 12-col left @@ -76,7 +88,7 @@ 0 - 15-row + 16-row 12-col 2-row horizontal @@ -163,6 +175,13 @@ - sendclick(2003,10) + + + + + - + SendClick(2003,6) + @@ -170,6 +189,25 @@ false + + Find similar + + + + + Switch to Channel + + + + + Record + + + + Play recording + + + Play @@ -178,7 +216,7 @@ DebugGrid WindowID - + diff --git a/1080i/DialogTextViewer.xml b/1080i/DialogTextViewer.xml index 8407516..8f74451 100644 --- a/1080i/DialogTextViewer.xml +++ b/1080i/DialogTextViewer.xml @@ -30,7 +30,7 @@ 12 0 - 8-col + 16-col-gutter 2-row center dialogTitle diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml index f224523..42b571f 100644 --- a/1080i/DialogVideoInfo.xml +++ b/1080i/DialogVideoInfo.xml @@ -43,6 +43,16 @@ stretch + + + 1-col + row-27-begin + 2-col + 1-col + resource://resource.images.studios.white/$INFO[ListItem.Studio,,.png] + scale + + @@ -115,7 +125,7 @@ - $INFO[ListItem.year] $INFO[ListItem.dbid] + $INFO[ListItem.year] - noop diff --git a/1080i/Font.xml b/1080i/Font.xml index 4565e9d..b988bf2 100644 --- a/1080i/Font.xml +++ b/1080i/Font.xml @@ -198,7 +198,7 @@ symbolWeather weather.ttf - 60 + 80 diff --git a/1080i/Includes.xml b/1080i/Includes.xml index 8c4c553..44356e7 100644 --- a/1080i/Includes.xml +++ b/1080i/Includes.xml @@ -71,7 +71,7 @@ 12-col right pageSubTitle - + textActive diff --git a/1080i/MyWeather.xml b/1080i/MyWeather.xml index 121e2a9..539ecbd 100644 --- a/1080i/MyWeather.xml +++ b/1080i/MyWeather.xml @@ -1,7 +1,7 @@ 3 - + fadeInOut @@ -67,9 +67,10 @@ 24-row - 32 - 6 + 4 + -28 2-col-gutter + 4-row symbolWeather textActive diff --git a/1080i/View_ArtistAlbums.xml b/1080i/View_ArtistAlbums.xml index 6bc4459..f37897c 100644 --- a/1080i/View_ArtistAlbums.xml +++ b/1080i/View_ArtistAlbums.xml @@ -23,136 +23,158 @@ ffffffff stretch - - 0 - row-20-begin - fullscreenWidth - 15-row - stretch - colors/black.png - ccffffff - - - !controlgroup(9000).hasfocus - col-1-begin - row-6-begin + + + + + 0 + row-20-begin + fullscreenWidth + 15-row + stretch + colors/black.png + ccffffff + + + 0 + row-20-begin + fullscreenWidth + 6 + stretch + colors/white.png + highlight + - - 24-col - 0 - 24-col - 8-row - right - veryLargeLight - 66ffffff - - - true - + + + col-1-begin + row-6-begin + + 24-col + 0 + 24-col + 8-row + right + veryLargeLight + 66ffffff + - + true + + + + 0 + 12-row + 24-col + 2-row + largeStrong + textActive + + + + + + container.content(albums) + !container.content(songs) + SubString(container.folderpath,musicdb://artists) + 72 + row-21-begin + 1800 + 9-row + 9000 + 60 + 50 + 50 + 60 + + + 0 + 0 + 4-col-gutter + 4-col-gutter + stretch + colors/black.png + colors/white.png + 3 + textboxInactive + + + !controlgroup(9000).hasfocus + 12 + 2-row + 240 + 2-row + center + center + regularStrong + disabled + + + + !controlgroup(9000).hasfocus + 12 + 3-row + 240 + 2-row + center + center + buttonTitle + disabled + + + + 0 + 0 + 4-col-gutter + 4-col-gutter + stretch + $INFO[Listitem.thumb] + colors/white.png + 3 + ffFFFFFF + + + + + + + + + + + 0 + 0 + 4-col-gutter + 4-col-gutter + stretch + colors/offblack.png + colors/white.png + 3 + ffFFFFFF + + + 3 + 3 + 258 + 258 + stretch + colors/black.png + ccFFFFFF + + + 0 + 0 + 4-col-gutter + 4-col-gutter + stretch + $INFO[ListItem.Art(thumb)] + colors/white.png + 3 + ffffffff + + + - - - container.content(albums) + !container.content(songs) + SubString(container.folderpath,musicdb://artists) - 72 - row-21-begin - 1800 - 9-row - 9000 - 60 - 50 - 50 - 60 - - - 0 - 0 - 4-col-gutter - 4-col-gutter - stretch - colors/black.png - colors/white.png - 3 - textboxInactive - - - !controlgroup(9000).hasfocus - 12 - 2-row - 240 - 2-row - center - center - regularStrong - disabled - - - - !controlgroup(9000).hasfocus - 12 - 3-row - 240 - 2-row - center - center - buttonTitle - disabled - - - - 0 - 0 - 4-col-gutter - 4-col-gutter - stretch - $INFO[Listitem.thumb] - colors/white.png - 3 - ffFFFFFF - - - - - - - - - - - 0 - 0 - 4-col-gutter - 4-col-gutter - stretch - colors/offblack.png - colors/white.png - 3 - ffFFFFFF - - - 3 - 3 - 258 - 258 - stretch - colors/black.png - ccFFFFFF - - - 0 - 0 - 4-col-gutter - 4-col-gutter - stretch - $INFO[ListItem.Art(thumb)] - colors/white.png - 3 - ffffffff - - - - \ No newline at end of file diff --git a/1080i/View_Episodes.xml b/1080i/View_Episodes.xml index 5a96990..528bcbb 100644 --- a/1080i/View_Episodes.xml +++ b/1080i/View_Episodes.xml @@ -10,7 +10,7 @@ dimensionsFullscreen stretch - $INFO[container.art(fanart)] + $INFO[lisitem.art(fanart)] ffffffff @@ -18,6 +18,19 @@ + + + + 966 + row-6-begin + 4-col + 4-col + stretch + $INFO[listitem.art(clearart)] + 0 + + + dimensionsFullscreen vignette.png diff --git a/1080i/View_MusicRecentItems.xml b/1080i/View_MusicRecentItems.xml index 0d40741..6a98b9e 100644 --- a/1080i/View_MusicRecentItems.xml +++ b/1080i/View_MusicRecentItems.xml @@ -25,33 +25,37 @@ - - 0 - row-20-begin - fullscreenWidth - 15-row - stretch - colors/black.png - ccffffff - - - - !controlgroup(9000).hasfocus - col-1-begin - row-6-begin + + + + + 0 + row-20-begin + fullscreenWidth + 15-row + stretch + colors/black.png + ccffffff + - - 24-col - 0 - 24-col - 8-row - right - veryLargeLight - 66ffffff - - - true - + + + col-1-begin + row-6-begin + + + 24-col + 0 + 24-col + 8-row + right + veryLargeLight + 66ffffff + - + true + + @@ -124,6 +128,9 @@ + + + 72 row-21-begin 1800 diff --git a/1080i/View_Seasons.xml b/1080i/View_Seasons.xml index 653f8d5..6c11b0d 100644 --- a/1080i/View_Seasons.xml +++ b/1080i/View_Seasons.xml @@ -27,120 +27,75 @@ - - !Substring(Container.folderpath,plugin) - col-1-begin - row-2-begin - - 0 - 11-row - 24-col - 2-row - largeStrong - textActive - + + + + + + !Substring(Container.folderpath,plugin) + col-1-begin + row-2-begin + + 0 + 11-row + 24-col + 2-row + largeStrong + textActive + + - - - - !Substring(Container.folderpath,plugin) - 0 - row-15-begin - fullscreenWidth - 15-row - stretch - colors/white.png - background - - - !Substring(Container.folderpath,plugin) - 0 - row-15-begin - fullscreenWidth - 6 - stretch - colors/white.png - highlight - + + + !Substring(Container.folderpath,plugin) + 0 + row-15-begin + fullscreenWidth + 15-row + stretch + colors/white.png + background + + + !Substring(Container.folderpath,plugin) + 0 + row-15-begin + fullscreenWidth + 6 + stretch + colors/white.png + highlight + - - - !StringCompare(container.foldername,files) + !container.content(episodes) + !Substring(Container.folderpath,plugin) + !container.content(addons) - col-1-begin - row-17-begin - 24-col - 11-row - 9000 - 60 - 50 - 50 - 60 - 2 - - - 0 - 0 - 4-col-gutter - 396 - stretch - colors/black.png - colors/white.png - 3 - textboxInactive - - - !controlgroup(9000).hasfocus - 12 - 4-row - 240 - 2-row - center - center - regularStrong - disabled - - - - !controlgroup(9000).hasfocus - 12 - 5-row - 240 - 2-row - center - center - buttonTitle - disabled - - - - 0 - 0 - 4-col-gutter - 396 - stretch - $INFO[ListItem.thumb] - colors/white.png - 3 - ffffffff - - - - - spinFocusPoster + + + !StringCompare(container.foldername,files) + !container.content(episodes) + !Substring(Container.folderpath,plugin) + !container.content(addons) + col-1-begin + row-17-begin + 24-col + 11-row + 9000 + 60 + 50 + 50 + 60 + 2 + 0 0 4-col-gutter 396 - scale - $INFO[ListItem.thumb] - colors/white.png + stretch + colors/black.png + colors/white.png 3 - ff666666 + textboxInactive + !controlgroup(9000).hasfocus 12 4-row 240 @@ -148,10 +103,11 @@ center center regularStrong - textActive + disabled + !controlgroup(9000).hasfocus 12 5-row 240 @@ -159,49 +115,98 @@ center center buttonTitle - textActive + disabled - - 42 - 9-row + + 0 + 0 4-col-gutter - horizontal - - 24 - 2-row - center - symbol - textActive - + 396 + stretch + $INFO[ListItem.thumb] + colors/white.png + 3 + ffffffff + + + + + spinFocusPoster + + 0 + 0 + 4-col-gutter + 396 + scale + $INFO[ListItem.thumb] + colors/white.png + 3 + ff666666 - 1-col + 12 + 4-row + 240 2-row + center center - smallStrong + regularStrong textActive - + - 24 + 12 + 5-row + 240 2-row + center center - symbol + buttonTitle textActive - + - - 1-col - 2-row - center - smallStrong - textActive - + + 42 + 9-row + 4-col-gutter + horizontal + + 24 + 2-row + center + symbol + textActive + + + + 1-col + 2-row + center + smallStrong + textActive + + + + 24 + 2-row + center + symbol + textActive + + + + 1-col + 2-row + center + smallStrong + textActive + + - - + + diff --git a/1080i/View_VideoRecentItems.xml b/1080i/View_VideoRecentItems.xml index 4ce8191..577337c 100644 --- a/1080i/View_VideoRecentItems.xml +++ b/1080i/View_VideoRecentItems.xml @@ -25,56 +25,60 @@ - - 0 - row-20-begin - fullscreenWidth - 15-row - stretch - colors/black.png - ccffffff - - - - + - - - - - - !controlgroup(9000).hasfocus - col-1-begin - row-12-begin - - - Container(9123).HasFocus(1) - 24-col - 0 - 24-col - 8-row - right - veryLargeLight - 66ffffff - - - true - + + 0 + row-20-begin + fullscreenWidth + 15-row + stretch + colors/black.png + ccffffff - - Container(9123).HasFocus(2) - 24-col - 0 - 24-col - 8-row - right - veryLargeLight - 66ffffff - - - true - + + + + + + + + + + + col-1-begin + row-12-begin + + + Container(9123).HasFocus(1) + 24-col + 0 + 24-col + 8-row + right + veryLargeLight + 66ffffff + - + true + + + + + Container(9123).HasFocus(2) + 24-col + 0 + 24-col + 8-row + right + veryLargeLight + 66ffffff + - + true + + @@ -144,6 +148,9 @@ + + + 72 row-21-begin 1800 diff --git a/1080i/VisualisationPresetList.xml b/1080i/VisualisationPresetList.xml deleted file mode 100644 index f191d13..0000000 --- a/1080i/VisualisationPresetList.xml +++ /dev/null @@ -1,134 +0,0 @@ - - - 2 - - - 0 - 0 - fullscreenWidth - fullscreenHeight - stretch - colors/black.png - ddFFFFFF - fadeInOut - - - col-7-begin - row-3-begin - - modalDialogInOutVertical - - -528 - 44 - fullscreenWidth - 1-row - colors/white.png - ffffffff - stretch - - - -3 - 44 - 3 - 1-row - colors/black.png - ffffffff - stretch - - - 12 - 44 - 12-col - dialogTitle - black - - - - - - 12 - 120 - 12-col - dialogTitle - black - - - - - - - 0 - 120 - 12-col - 11-row - 5 - 9001 - 6 - 6 - - - 0 - 2 - 6-col-gutter - 53 - stretch - UIControls/listitemNF.png - 0 - 99FFFFFF - - - 4 - 4 - 48 - 48 - scale - $INFO[Listitem.icon] - - - 1-col - 0 - 312 - itemTitle - textActive - - - - - - - - 0 - 2 - 6-col-gutter - 53 - stretch - UIControls/listitemFO.png - 0 - FFFFFFFF - - - 4 - 4 - 48 - 48 - scale - $INFO[Listitem.icon] - - - 1-col - 0 - 312 - itemTitle - black - black - - - - - - - - - DebugGrid - - WindowID - - - - diff --git a/addon.xml b/addon.xml index c207958..bdc67a4 100644 --- a/addon.xml +++ b/addon.xml @@ -4,6 +4,7 @@ + diff --git a/changelog.txt b/changelog.txt index a665168..74e0cda 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1,6 @@ [B]0.9.0[/B] -***Working towards Kodi Jarvis*** +***Working towards Kodi Jarvis release*** - [REMOVED DEPENDENCY] script.thedeadman.functions (Nice one team Kodi!) - [REMOVED] DialogPeripheralManager.xml @@ -13,11 +13,22 @@ - [REMOVED] musicoverlay.xml - [NEW] custom_musicOverlay.xml - [REMOVED] References to "zorder" tag +- [NEW] DialogPVRInfo.xml +- [REMOVED] DialogPVRGuideInfo.xml +- [REMOVED] DialogPVRRecordingInfo.xml +- [REMOVED] VisualisationPresetList.xml -[DONE] - DialogAddonInfo.xml - remove button id="11" -[DONE] - DialogKaiToast.xml - removed ID's 403-405 -[DONE] - DialogVideoInfo.xml - add button ID 7, replace user rating value -[DONE] - MyMusicNav.xml - remove files node button + +- [MODIFIED] DialogAddonInfo.xml - remove button id="11" +- [MODIFIED] DialogKaiToast.xml - remove ID's 403-405 +- [MODIFIED] DialogVideoInfo.xml - add button ID 7, replace user rating value +- [MODIFIED] MyMusicNav.xml - remove files node button + +***To do*** +DialogPVRinfo - button and layout update +Touchscreen controls +revise the TVShow view +Fix clearart in TVShow views diff --git a/language/English/strings.po b/language/English/strings.po index dc48813..d40cd99 100644 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -506,7 +506,7 @@ msgid "All Episodes" msgstr "" msgctxt "#31192" -msgid "Recorded" +msgid "Date" msgstr "" msgctxt "#31193" @@ -583,4 +583,8 @@ msgstr "" msgctxt "#31213" msgid "(Showing unwatched items only)" +msgstr "" + +msgctxt "#31214" +msgid "Channel" msgstr "" \ No newline at end of file