From 2ef64728ccd390c58ab52c90e1343735f983cbe8 Mon Sep 17 00:00:00 2001 From: Chris Bevan Date: Wed, 1 Apr 2015 20:11:01 +0100 Subject: [PATCH] Various --- 1080i/Defaults.xml | 10 +- 1080i/DialogButtonMenu.xml | 38 ++++--- 1080i/DialogContextMenu.xml | 9 +- 1080i/DialogVideoInfo.xml | 38 +++---- 1080i/DialogYesNo.xml | 32 ++---- 1080i/Font.xml | 10 +- 1080i/Home.xml | 29 +---- 1080i/Includes.xml | 11 +- 1080i/Includes_animations.xml | 4 +- 1080i/Includes_hubMenu.xml | 22 +--- 1080i/Includes_recentItems.xml | 132 ++++++++++------------ 1080i/Includes_variables.xml | 14 ++- 1080i/MyVideoNav.xml | 74 +++++++++++-- 1080i/View_Episodes.xml | 141 +++++++++--------------- 1080i/View_Movies.xml | 54 ++++----- 1080i/View_Seasons.xml | 70 ++++++------ 1080i/View_TVShows.xml | 1 - 1080i/custom_menuItemTypeSelector.xml | 10 -- 1080i/custom_recentItemTypeSelector.xml | 9 -- addon.xml | 2 + colors/defaults.xml | 6 +- language/English/strings.po | 10 +- 22 files changed, 347 insertions(+), 379 deletions(-) diff --git a/1080i/Defaults.xml b/1080i/Defaults.xml index f02e1f0..25fd0a6 100644 --- a/1080i/Defaults.xml +++ b/1080i/Defaults.xml @@ -73,7 +73,7 @@ - - - itemTitle + buttonTitle unselected selected textDisabled @@ -89,7 +89,7 @@ center 24 0 - menuButton + buttonTitle textActive black @@ -113,7 +113,7 @@ left center 24 - menuButton + buttonTitle textActive black @@ -136,7 +136,7 @@ left center 24 - menuButton + buttonTitle textActive black @@ -157,7 +157,7 @@ 0 - 2-row - menuButton + buttonTitle 24 0 textActive diff --git a/1080i/DialogButtonMenu.xml b/1080i/DialogButtonMenu.xml index 1f43a6f..19074de 100644 --- a/1080i/DialogButtonMenu.xml +++ b/1080i/DialogButtonMenu.xml @@ -7,36 +7,48 @@ modalDialog - col-1-begin + col-10-begin 7-row modalDialogInOutVertical - -15 + 0 0 6-col - 6-row + 8-row 0 - + - 15 + 12 0 - 6-col - left + 6-col-gutter + 2-row + center itemTitle - unselected + textActive - - - -1 + + + 0 0 6-col - left + 2-row + scale + colors/white.png + 0 + 500 + + + 12 + 0 + 6-col-gutter + 2-row + center itemTitle textActive - + diff --git a/1080i/DialogContextMenu.xml b/1080i/DialogContextMenu.xml index 5d47724..2d433e3 100644 --- a/1080i/DialogContextMenu.xml +++ b/1080i/DialogContextMenu.xml @@ -12,12 +12,9 @@ Buttons - 5-col - unselected - selected - itemTitle - 12 - UIControls/textButtonFO.png + colors/white.png + textActive + 6-col DebugGrid diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml index 98bc4e7..7434290 100644 --- a/1080i/DialogVideoInfo.xml +++ b/1080i/DialogVideoInfo.xml @@ -46,7 +46,7 @@ !Substring(Container.folderpath,plugin) + !container.content(episodes) - col-17-begin + col-15-begin 0 @@ -59,7 +59,7 @@ 0 0 - 8-col + 10-col fullscreenHeight colors/black.png cc111111 @@ -68,7 +68,7 @@ 0 0 - 8-col + 10-col row-6-begin colors/white.png 500 @@ -77,7 +77,7 @@ 0 row-6-begin - 8-col + 10-col 1-row colors/white.png stretch @@ -89,7 +89,7 @@ 0 0 - 8-col-gutter + 10-col-gutter left 4-row center @@ -102,7 +102,7 @@ 0 5-row - 8-col-gutter + 10-col-gutter left itemSubTitle black @@ -114,11 +114,11 @@ 0 7-row textbox - 8-col-gutter + 10-col-gutter left textActive 9-row - + - @@ -127,10 +127,10 @@ 0 18-row - 8-col + 10-col 6-row false - + 12 0 @@ -150,7 +150,7 @@ - - + @@ -183,11 +183,11 @@ 0 23-row - 8-col + 10-col 6-row 3 vertical - + 0 0 @@ -203,16 +203,16 @@ 1-col-indent 0 - 3-col-gutter + 4-col-gutter 2-row center - menuTitle + buttonTitle textActive - - + 0 0 @@ -226,7 +226,7 @@ 1-col 0 - 3-col + 4-col 2-row stretch colors/white.png @@ -246,10 +246,10 @@ 1-col-indent 0 - 3-col-gutter + 4-col-gutter 2-row center - menuTitle + buttonTitle black - diff --git a/1080i/DialogYesNo.xml b/1080i/DialogYesNo.xml index ecd4f0c..f2cb307 100644 --- a/1080i/DialogYesNo.xml +++ b/1080i/DialogYesNo.xml @@ -7,27 +7,27 @@ modalDialog 0 - 368 + row-10-begin modalDialogInOut col-9-begin - 24 + 0 heading 0 0 9-col - pageTitle + dialogTitle textActive 0 - 1-row + 68 8-col - 128 - regular + 2-row + textbox textActive @@ -37,7 +37,7 @@ col-9-begin 4-row 8-col - 1-row + 2-row 0 50 50 @@ -47,25 +47,15 @@ No + colors/white.png + textActive - menuTitle - left - 24 - black - textActive - colors/white.png - colors/black.png Yes + colors/white.png + textActive - menuTitle - left - 24 - black - textActive - colors/white.png - colors/black.png diff --git a/1080i/Font.xml b/1080i/Font.xml index a1dd788..11afcc3 100644 --- a/1080i/Font.xml +++ b/1080i/Font.xml @@ -45,6 +45,12 @@ 48 0.9 + + mediumLight + roboto/light.ttf + 48 + 0.9 + regular roboto/regular.ttf @@ -110,7 +116,7 @@ pageSubTitle roboto/medium.ttf - 36 + 30 1.0 @@ -156,7 +162,7 @@ buttonTitle roboto/regular.ttf - 30 + 28 1.0 diff --git a/1080i/Home.xml b/1080i/Home.xml index 0f2f28a..896f732 100644 --- a/1080i/Home.xml +++ b/1080i/Home.xml @@ -10,18 +10,12 @@ globalBackground - - 0 - 0 + dimensionsFullscreen - $INFO[Skin.String(videoFanartLocation)] - 25000 - 1000 - 10000 - true - stretch - 11ffffff - kenBurnsey + scale + $INFO[skin.string(globalBackground)] + 0 + ffffffff dimensionsFullscreen @@ -29,17 +23,6 @@ ffffffff stretch - - - - col-1-begin - row-27-begin - 24-col - left - smallMedium - textActive - - 0 @@ -208,7 +191,7 @@ right Large selected - + 8-col diff --git a/1080i/Includes.xml b/1080i/Includes.xml index 49e40ee..a4e8ae1 100644 --- a/1080i/Includes.xml +++ b/1080i/Includes.xml @@ -29,7 +29,7 @@ dimensionsFullscreen - backgrounds/vignette.png + vignette.png ffffffff stretch @@ -42,13 +42,18 @@ background stretch + + dimensionsFullscreen + vignette.png + ffffffff + stretch + col-24-begin row-1-begin - 1-col 0 @@ -60,7 +65,7 @@ 1-col - 48 + 40 12-col right pageSubTitle diff --git a/1080i/Includes_animations.xml b/1080i/Includes_animations.xml index 5d9c99b..ebc1432 100644 --- a/1080i/Includes_animations.xml +++ b/1080i/Includes_animations.xml @@ -34,7 +34,6 @@ - @@ -63,7 +62,8 @@ - + + diff --git a/1080i/Includes_hubMenu.xml b/1080i/Includes_hubMenu.xml index d8891a3..60cde55 100644 --- a/1080i/Includes_hubMenu.xml +++ b/1080i/Includes_hubMenu.xml @@ -20,18 +20,9 @@ 500 stretch - - 0 - 0 - col-7-begin - row-5-begin - colors/black.png - overlay - stretch - 0 - row-5-begin + row-4-begin 8-col 24-row vertical @@ -96,19 +87,10 @@ 500 stretch - - 0 - 0 - col-7-begin - row-5-begin - colors/black.png - overlay - stretch - 0 - row-5-begin + row-4-begin col-7-begin 27-row 0 diff --git a/1080i/Includes_recentItems.xml b/1080i/Includes_recentItems.xml index d5ab10c..1638827 100644 --- a/1080i/Includes_recentItems.xml +++ b/1080i/Includes_recentItems.xml @@ -2,20 +2,10 @@ - - col-1-begin - 5-row - 24-col - 4-row - - veryLarge - textActive - - !stringcompare(Window(Home).Property(Movies.UnWatched),0) col-1-begin - row-9-begin + 0 24-col 11-row 9000 @@ -44,39 +34,41 @@ - - 0 - 0 - 4-col-gutter - 396 - stretch - $INFO[ListItem.Art(poster)] - colors/white.png - 3 - ffFFFFFF - spinFocusPoster - - fadeIn - 0 - 0 + spinFocusPoster 0 0 - 1-col + 4-col-gutter 396 stretch - colors/white.png + $INFO[ListItem.Art(poster)] + colors/white.png + 3 + ffFFFFFF - - 34 - 10-row - 9-row - left - 90 - itemTitle - black - + + 0 + 0 + + 0 + 0 + 1-col + 396 + stretch + colors/white.png + 500 + + + 34 + 10-row + 9-row + left + 90 + itemTitle + white + + @@ -84,20 +76,10 @@ - - col-1-begin - 23-row - 24-col - 4-row - - veryLarge - textActive - - !stringcompare(Window(Home).Property(Episodes.UnWatched),0) col-1-begin - row-27-begin + 0 24-col 9000 control.setfocus(9998,$INFO[Container(9997).Position]) @@ -125,39 +107,41 @@ - - 0 - 0 - 4-col-gutter - 396 - stretch - $INFO[ListItem.property(season_poster)] - colors/white.png - 3 - ffffffff - spinFocusPoster - - fadeIn - 0 - 0 + spinFocusPoster 0 0 - 1-col + 4-col-gutter 396 stretch - colors/white.png + $INFO[ListItem.property(season_poster)] + colors/white.png + 3 + ffffffff - - 34 - 10-row - 9-row - left - 90 - itemTitle - black - + + 0 + 0 + + 0 + 0 + 1-col + 396 + stretch + colors/white.png + 500 + + + 34 + 10-row + 9-row + left + 90 + itemTitle + white + + diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml index d534a1b..976c158 100644 --- a/1080i/Includes_variables.xml +++ b/1080i/Includes_variables.xml @@ -42,15 +42,17 @@ $LOCALIZE[14022] - $LOCALIZE[31176] - $LOCALIZE[31177] - $LOCALIZE[31178] - $LOCALIZE[31179] $INFO[container.Numitems,, $LOCALIZE[31014]] - $LOCALIZE[31013] - $LOCALIZE[31015] + $INFO[container.Numitems,, $LOCALIZE[31014]] $INFO[container.Numitems,, $LOCALIZE[31014]] + + + + $LOCALIZE[31013] + $LOCALIZE[31013] + + $INFO[Listitem.duration,, $LOCALIZE[31018]] diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml index 30cda17..2c67de1 100644 --- a/1080i/MyVideoNav.xml +++ b/1080i/MyVideoNav.xml @@ -25,8 +25,61 @@ SubString(skin.string(showRecentVideoItems),true) | isEmpty(container.foldername) 9000 - movieRecentItems - tvRecentItems + + SubString(skin.string(videoHomeItemsMoviesSource),recentmovies) + col-1-begin + row-5-begin + 24-col + 1-row + + pageTitle + textActive + + + + SubString(skin.string(videoHomeItemsMoviesSource),randommovies) + col-1-begin + row-5-begin + 24-col + 1-row + + pageTitle + textActive + + + + 0 + row-7-begin + movieRecentItems + + + SubString(skin.string(videoHomeItemsEpisodesSource),recentepisodes) + col-1-begin + row-19-begin + 24-col + 1-row + + pageTitle + textActive + + + + SubString(skin.string(videoHomeItemsEpisodesSource),randomepisodes) + col-1-begin + row-19-begin + 24-col + 1-row + + pageTitle + textActive + + + + 0 + row-21-begin + tvRecentItems + + @@ -54,15 +107,15 @@ - col-1-begin - row-1-begin + 0 + 0 - 0 - 0 + col-1-begin + row-1-begin 14-col pageTitle @@ -70,17 +123,16 @@ - 0 - 48 + col-1-begin + 96 auto pageSubTitle textActive + + dateTime - - - dateTime hubMenu diff --git a/1080i/View_Episodes.xml b/1080i/View_Episodes.xml index 447222b..b8a7d95 100644 --- a/1080i/View_Episodes.xml +++ b/1080i/View_Episodes.xml @@ -4,8 +4,8 @@ - container.content(episodes) - -692 + container.content(episodes) + !Substring(Container.folderpath,plugin) + -696 dimensionsFullscreen stretch @@ -19,26 +19,26 @@ col-1-begin - row-1-begin - container.content(episodes) + row-5-begin + container.content(episodes) + !Substring(Container.folderpath,plugin) - -96 - 5-row + -97 + 3-row fullscreenWidth - 148 + 2-row stretch colors/black.png overlay 0 - 5-row + 3-row 24-col - 4-row + 2-row - veryLarge + medium ccf1f1f1 - + @@ -53,23 +53,11 @@ 473 scale $INFO[listitem.thumb] - colors/white.png - 6 - 200 - - - Substring(Container.folderpath,plugin) - col-13-begin - row-5-begin - 7-col - - - keep - $INFO[ListItem.thumb] - colors/white.png + colors/white.png 3 - 200 + 600 + ffffffff - container.content(episodes) + !Substring(Container.folderpath,plugin) @@ -206,93 +194,74 @@ Substring(Container.folderpath,plugin) - 0 + col-1-begin row-5-begin - 12-col - 12-row + 24-col + 22-row 9000 60 + 50 + 50 60 - + 0 - 2 - 11-col - 53 - stretch - UIControls/listitemNF.png - 0 - 99FFFFFF + 0 + 1-col-textbox + 2-row + scale + $INFO[Listitem.thumb] - 3 - 4 - 48 - 48 - scale - $INFO[Listitem.icon] + 1-col + 0 + 23-col + 2-row + stretch + colors/black.png + textboxInactive - 60 + 1-col-indent 0 - 9-col + 23-col-gutter + 2-row + center itemTitle textActive - - false - - - !isempty(ListItem.playcount) - 36r - 1 - 40 - symbol - textActive - - - - + 0 - 2 - 11-col - 53 - stretch - UIControls/listitemFO.png - 0 - FFFFFFFF + 0 + 1-col-textbox + 2-row + scale + $INFO[Listitem.thumb] + spinFocusIcon - 3 - 4 - 48 - 48 - scale - $INFO[Listitem.icon] + 1-col + 0 + 23-col + 2-row + stretch + colors/white.png + 500 - 60 + 1-col-indent 0 - 9-col + 23-col-gutter + 2-row + center itemTitle - black - black + textActive - - false - - - !isempty(ListItem.playcount) - 36r - 1 - 40 - symbol - black - black - - - diff --git a/1080i/View_Movies.xml b/1080i/View_Movies.xml index 7a70944..1823a8a 100644 --- a/1080i/View_Movies.xml +++ b/1080i/View_Movies.xml @@ -45,39 +45,41 @@ - - 0 - 0 - 4-col-gutter - 396 - stretch - $INFO[ListItem.Art(poster)] - colors/white.png - 3 - ffFFFFFF - spinFocusPoster - - fadeIn - 0 - 0 + spinFocusPoster 0 0 - 1-col + 4-col-gutter 396 stretch - colors/white.png + $INFO[ListItem.Art(poster)] + colors/white.png + 3 + ffFFFFFF - - 34 - 10-row - 9-row - left - 90 - itemTitle - black - + + 0 + 0 + + 0 + 0 + 1-col + 396 + stretch + colors/white.png + 500 + + + 34 + 10-row + 9-row + left + 90 + itemTitle + white + + diff --git a/1080i/View_Seasons.xml b/1080i/View_Seasons.xml index 46433f4..2a42ff0 100644 --- a/1080i/View_Seasons.xml +++ b/1080i/View_Seasons.xml @@ -6,7 +6,7 @@ - -512 + -516 dimensionsFullscreen stretch @@ -20,22 +20,22 @@ col-1-begin - row-1-begin + row-2-begin -96 - 10-row + 11-row fullscreenWidth - 148 + 2-row stretch colors/black.png overlay 0 - 10-row + 11-row 24-col - 4-row - veryLarge + 2-row + medium textActive @@ -68,39 +68,41 @@ - - 0 - 0 - 4-col-gutter - 396 - scale - $INFO[ListItem.thumb] - colors/white.png - 3 - ffFFFFFF - spinFocusPoster - - fadeIn - 0 - 0 + spinFocusPoster 0 0 - 1-col + 4-col-gutter 396 - stretch - colors/white.png + scale + $INFO[ListItem.thumb] + colors/white.png + 3 + ffFFFFFF - - 34 - 10-row - 10-row - left - 90 - itemTitle - black - + + 0 + 0 + + 0 + 0 + 1-col + 396 + stretch + colors/white.png + 500 + + + 34 + 10-row + 10-row + left + 90 + itemTitle + white + + diff --git a/1080i/View_TVShows.xml b/1080i/View_TVShows.xml index 6dd60f5..78efb99 100644 --- a/1080i/View_TVShows.xml +++ b/1080i/View_TVShows.xml @@ -166,7 +166,6 @@ - - diff --git a/1080i/custom_menuItemTypeSelector.xml b/1080i/custom_menuItemTypeSelector.xml index 130bdc3..f6e7003 100644 --- a/1080i/custom_menuItemTypeSelector.xml +++ b/1080i/custom_menuItemTypeSelector.xml @@ -26,16 +26,6 @@ 500 stretch - - 0 - 0 - col-7-begin - row-5-begin - colors/black.png - overlay - stretch - - diff --git a/1080i/custom_recentItemTypeSelector.xml b/1080i/custom_recentItemTypeSelector.xml index 152b200..8b6cd7b 100644 --- a/1080i/custom_recentItemTypeSelector.xml +++ b/1080i/custom_recentItemTypeSelector.xml @@ -21,15 +21,6 @@ 500 stretch - - 0 - 0 - col-7-begin - row-5-begin - colors/black.png - overlay - stretch - diff --git a/addon.xml b/addon.xml index 5f935f1..5f65672 100644 --- a/addon.xml +++ b/addon.xml @@ -3,6 +3,8 @@ + + diff --git a/colors/defaults.xml b/colors/defaults.xml index 65aa60c..c981686 100644 --- a/colors/defaults.xml +++ b/colors/defaults.xml @@ -7,15 +7,15 @@ ffa1a1a1 - ff424242 + ff222222 44ffffff fff0f0f0 ff757575 ffEF9A9A 99FFFFFF - FFF44336 + FFE91E63 - FFF44336 + ffE91E63 ffFFEBEE \ No newline at end of file diff --git a/language/English/strings.po b/language/English/strings.po index 9769130..552b44a 100644 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -74,7 +74,7 @@ msgid "Season" msgstr "" msgctxt "#31012" -msgid "Movies and TVShows" +msgid "Video Library" msgstr "" msgctxt "#31013" @@ -646,17 +646,17 @@ msgid "Set Latest Content" msgstr "" msgctxt "#31176" -msgid "Recent Movies / Recent TVshows" +msgid "Recent Movies" msgstr "" msgctxt "#31177" -msgid "Recent Movies / Random TVshows" +msgid "Random Movies" msgstr "" msgctxt "#31178" -msgid "Random Movies / Recent TVshows" +msgid "Recent TV Shows" msgstr "" msgctxt "#31179" -msgid "Random Movies / Random TVshows" +msgid "Random TV Shows" msgstr "" \ No newline at end of file