diff --git a/1080i/AddonBrowser.xml b/1080i/AddonBrowser.xml index b8a40f7..a0a104c 100644 --- a/1080i/AddonBrowser.xml +++ b/1080i/AddonBrowser.xml @@ -6,228 +6,360 @@ globalBackground - - col-2-begin - row-1-begin - - modalDialogInOutVertical + + + + + modalDialogContentShift + + + + + + + + + + + col-1-begin + row-5-begin + 15-col + 23-row + 9000 + 60 + 50 + 50 + 60 + + + 0 + 3 + 66 + 66 + stretch + $INFO[Listitem.thumb] + + + 1-col + 0 + 12-col-textbox + 69 + stretch + colors/black.png + textboxInactive + + + 13-col + 0 + 1-col-textbox + 69 + stretch + colors/black.png + textboxInactive + + + 14-col + 0 + 1-col + 69 + stretch + colors/black.png + textboxInactive + + + 1-col-indent + 0 + 11-col-gutter + 2-row + center + itemTitle + textActive + - + + + + ListItem.AddonBroken + 12-col-gutter + 0 + 2-col + 2-row + center + right + symbolLarge + textActive + - + + + + ListItem.Property(Addon.IsInstalled) + 985 + 0 + 1-col + 2-row + center + right + symbolLarge + textActive + - + + + + + + 0 + 3 + 66 + 66 + stretch + $INFO[Listitem.thumb] + + + + + + + 1-col + 0 + 14-col + 2-row + stretch + colors/white.png + highlight + + + 1-col-indent + 0 + 11-col-gutter + 2-row + center + itemTitle + textActive + - + + + + ListItem.AddonBroken + 12-col-gutter + 0 + 2-col + 2-row + center + right + symbolLarge + textActive + - + + + + ListItem.Property(Addon.IsInstalled) + 985 + 0 + 1-col + 2-row + center + right + symbolLarge + textActive + - + + + + + + + + col-17-begin + 222 + + + + + + + + + 0 + 0 + 8-col + 8-col + stretch + $INFO[Listitem.thumb] + 200 + + + + + 13-row + + Addon Title + !isempty(ListItem.AddonCreator) + 0 + 58 + 7-col + 2-row + center + mediumLight + + + + 0 + 4-row + textbox + 7-col + 178 + + + + + + + + + Control.IsVisible(60) + conditional + + 48r + row-5-begin + 23-row + 9999 + 9999 + + + + + 0 + 0 + + + + + + col-1-begin + row-1-begin + 14-col + pageTitle + + textActive + + + + col-1-begin + 96 + auto + pageSubTitle + + textActive + + + dateTime + + + + + + + + + + + + + 0 0 - 22-col - 2-row + col-5-begin + fullscreenHeight colors/white.png highlight stretch - - - 24 - 0 - 20-col - 2-row - dialogTitle - - textActive - - - - - 0 - 2-row - 22-col - 25-row - colors/black.png - overlay - stretch - - - 0 - 2-row - 22-col - 11-row - colors/black.png - overlay - stretch - - - 6-col - 13-row - 16-col - 14-row - colors/black.png - overlay - stretch - - - - 0 - 13-row - 6-col - vertical - - 6-col - - - - - - - - - - 9999 - - - 6-col - - - - - - - - - - 9999 - - - 6-col - - - - 9999 - - - 6-col - - - - 9999 - - - + - 0 - 2-row - - 0 - 0 - 22-col - 11-row - scale - $INFO[ListItem.art(fanart)] - 22ffffff - - - 4-col - 1-row - 4-col - 4-col - keep - $INFO[Listitem.icon] - colors/white.png - 3 - 200 - - Addon Title - !isempty(ListItem.AddonCreator) - 9-col - 58 - 10-col-gutter - 2-row + col-1-begin + row-1-begin + 2-col + 1-col + symbolVeryLarge center - mediumLight - - - - 9-col - 4-row - textbox - 10-col-gutter - 160 - - + textActive + - + - - - - 6-col - 13-row - - 6 - 6 - 16-col - 492 - 9000 - 60 - 50 - 50 - 60 - - - 0 - 0 - 69 - 69 - stretch - $INFO[Listitem.thumb] - - - 1-col-indent - 0 - 7-col-gutter - 2-row - center - itemTitle - textActive - - - - - - - - 0 - 0 - 69 - 69 - stretch - $INFO[Listitem.thumb] - - - - - - - 1-col - 0 - 490 - 69 - stretch - colors/white.png - 0 - ffffffff - - - 1-col-indent - 0 - 7-col-gutter - 2-row - center - itemTitle - black - black - - - - - - - - - - Control.IsVisible(60) - conditional - - 2-col - 13-row - 14-row - 9999 - - - + + + 0 + row-4-begin + 6-col + vertical + + 2-row + col-5-begin + menuTitle + 4-col-gutter + textActive + highlight + menuDisabled + colors/white.png + - + - + - + + + 21 + + 9999 + + + 2-row + col-5-begin + menuTitle + textActive + highlight + menuDisabled + colors/white.png + - + - + - + + + col-1-begin + 4-col-gutter + + 9999 + + + 2-row + col-5-begin + menuTitle + textActive + highlight + menuDisabled + colors/white.png + - + col-1-begin + 4-col-gutter + + 9999 + + + 2-row + col-5-begin + menuTitle + textActive + highlight + menuDisabled + colors/white.png + - + col-1-begin + 4-col-gutter + + 9999 + + + DebugGrid diff --git a/1080i/Includes.xml b/1080i/Includes.xml index 465f6e4..59f635b 100644 --- a/1080i/Includes.xml +++ b/1080i/Includes.xml @@ -87,8 +87,7 @@ - - !Window.IsActive(startup) + !isempty(container.foldername) + !IntegerGreaterThan(container.numitems,0) | window.isactive(busydialog) + !Window.IsActive(startup) + !isempty(container.foldername) + !IntegerGreaterThan(container.numitems,0) + !ListItem.IsParentFolder | window.isactive(busydialog) colors/black.png dimensionsFullscreen diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml index 8316a48..eb38742 100644 --- a/1080i/Includes_variables.xml +++ b/1080i/Includes_variables.xml @@ -44,6 +44,19 @@ $LOCALIZE[191]: $LOCALIZE[16041] $LOCALIZE[191]: $LOCALIZE[16039] + + + $INFO[ListItem(1).Artist] $INFO[ListItem(1).Year,(,)] + $INFO[ListItem.Artist] $INFO[ListItem.Year,(,)] + + + $INFO[ListItem(1).Album] + $INFO[ListItem.Album] + + + $INFO[ListItem(1).art(thumb)] + $INFO[ListItem.art(thumb)] + $LOCALIZE[597] diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml index 00ff800..a51fad5 100644 --- a/1080i/MyVideoNav.xml +++ b/1080i/MyVideoNav.xml @@ -100,7 +100,7 @@ DebugGrid WindowID - + diff --git a/1080i/View_Episodes.xml b/1080i/View_Episodes.xml index ff559c2..86ef0ae 100644 --- a/1080i/View_Episodes.xml +++ b/1080i/View_Episodes.xml @@ -12,7 +12,7 @@ stretch $INFO[container.art(fanart)] ffffffff - + diff --git a/1080i/View_Seasons.xml b/1080i/View_Seasons.xml index 3aced4c..68dbcbc 100644 --- a/1080i/View_Seasons.xml +++ b/1080i/View_Seasons.xml @@ -13,7 +13,7 @@ stretch $INFO[container.art(fanart)] ffffffff - + diff --git a/1080i/View_Songs.xml b/1080i/View_Songs.xml index 865b185..39511e0 100644 --- a/1080i/View_Songs.xml +++ b/1080i/View_Songs.xml @@ -34,7 +34,7 @@ 8-col 8-col stretch - $INFO[ListItem.art(thumb)] + $VAR[songViewThumb] colors/white.png 6 500 @@ -51,7 +51,7 @@ largeLight textActive - - + col-10-begin @@ -61,7 +61,7 @@ regular textActive - - + diff --git a/changelog.txt b/changelog.txt index f397f5c..764b330 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1,6 @@ [B]1.1.1[/B] -- [NEW] RPI bugfixes from Jarvis branch +- [NEW] RPI / general bugfixes from Jarvis branch - [ADDED] Addon.xml: Assets tag - [MODIFIED] Skinwide includes name / content tagging updated - [REMOVED] Custom oninfo screen for recently added videos (nice one Team Kodi!) @@ -13,6 +13,8 @@ - [REMOVED] MyVideoPlaylist.xml - [NEW] Busy spinner (nicked from Estuary) - [NEW] DialogPlayerProcessInfo.xml +- Numerous misc tweaks and fixes +- [MODIFIED] Addon Browser design reworked [TODO] @@ -26,6 +28,7 @@ Check yes / no progress bar works ok check all active strings MyPVRTimers needs creating and testing Screenshots etc +Check if feedback notification appears when updating libraries diff --git a/media/addonDefaultBG.png b/media/addonDefaultBG.png deleted file mode 100644 index 579f6c8..0000000 Binary files a/media/addonDefaultBG.png and /dev/null differ diff --git a/media/busy.gif b/media/busy.gif deleted file mode 100644 index f856ed0..0000000 Binary files a/media/busy.gif and /dev/null differ