From 0564b104c8ea044be82f7a81894c36e2aa6d6641 Mon Sep 17 00:00:00 2001 From: Alhaziel01 Date: Sat, 4 Apr 2020 13:13:12 +0200 Subject: [PATCH] Supporto per le skin: - Ace - Aeon Nox Silvo - Aeon Tajo - Aeon MQ 8 - Amber - Aura - Bello 7 - Box - Confluence --- core/support.py | 15 +++- platformcode/platformtools.py | 1 + resources/views/skin.ace2.json | 44 +++++++++ resources/views/skin.aeon.nox.silvo.json | 109 +++++++++++++++++++++++ resources/views/skin.aeon.tajo.json | 50 +++++++++++ resources/views/skin.aeonmq8.json | 96 ++++++++++++++++++++ resources/views/skin.amber.json | 62 +++++++++++++ resources/views/skin.apptv.json | 45 ++++++++++ resources/views/skin.aura.json | 2 +- resources/views/skin.bello.7.json | 76 ++++++++++++++++ resources/views/skin.box.json | 46 ++++++++++ resources/views/skin.confluence.json | 55 ++++++++++++ 12 files changed, 597 insertions(+), 4 deletions(-) create mode 100644 resources/views/skin.ace2.json create mode 100644 resources/views/skin.aeon.nox.silvo.json create mode 100644 resources/views/skin.aeon.tajo.json create mode 100644 resources/views/skin.aeonmq8.json create mode 100644 resources/views/skin.amber.json create mode 100644 resources/views/skin.apptv.json create mode 100644 resources/views/skin.bello.7.json create mode 100644 resources/views/skin.box.json create mode 100644 resources/views/skin.confluence.json diff --git a/core/support.py b/core/support.py index 108fb4b5..16587dd1 100755 --- a/core/support.py +++ b/core/support.py @@ -736,7 +736,10 @@ def typo(string, typography=''): # If there are no attributes, it applies the default ones attribute = ['[]','()','submenu','color','bold','italic','_','--','[B]','[I]','[COLOR]'] - + if int(config.get_setting('view_mode_channel').split(',')[-1]) in [0, 50, 55]: + VLT = True + else: + VLT = False # Otherwise it uses the typographical attributes of the string # else: if '[]' in string: @@ -744,7 +747,10 @@ def typo(string, typography=''): if '()' in string: string = '(' + re.sub(r'\s*\(\)','',string) + ')' if 'submenu' in string: - string = "•• " + re.sub(r'\s*submenu','',string) + if VLT: + string = "•• " + re.sub(r'\s*submenu','',string) + else: + re.sub(r'\s*submenu','',string) if 'color' in string: color = scrapertools.find_single_match(string, 'color ([a-z]+)') if color == 'kod' or '': color = kod_color @@ -758,7 +764,10 @@ def typo(string, typography=''): if '--' in string: string = ' - ' + re.sub(r'\s*--','',string) if 'bullet' in string: - string = '[B]' + "•" + '[/B] ' + re.sub(r'\s*bullet','',string) + if VLT: + string = '[B]' + "•" + '[/B] ' + re.sub(r'\s*bullet','',string) + else: + string = re.sub(r'\s*bullet','',string) if 'capitalize' in string.lower(): string = re.sub(r'\s*capitalize','',string).capitalize() if 'uppercase' in string.lower(): diff --git a/platformcode/platformtools.py b/platformcode/platformtools.py index 6bc2f740..27b9d210 100644 --- a/platformcode/platformtools.py +++ b/platformcode/platformtools.py @@ -237,6 +237,7 @@ def set_view_mode(item, parent_item): def reset_view_mode(): for mode in ['addon','channel','movie','tvshow','season','episode','server']: + config.set_setting('skin_name', xbmc.getSkinDir()) config.set_setting('view_mode_%s' % mode, config.get_localized_string(70003) + ' , 0') if xbmc.getSkinDir() != config.get_setting('skin_name') or not config.get_setting('skin_name'): diff --git a/resources/views/skin.ace2.json b/resources/views/skin.ace2.json new file mode 100644 index 00000000..088ebcac --- /dev/null +++ b/resources/views/skin.ace2.json @@ -0,0 +1,44 @@ +{ + "all":{ + "Right List": 50, + "Frame": 51, + "Wall": 56, + "Tech": 68, + "Sets Plus": 74 + }, + "movie":{ + "Right List": 50, + "Frame": 51, + "Wall": 56, + "Tech": 68, + "Sets Plus": 74 + }, + "tvshow":{ + "Right List": 50, + "Frame": 51, + "Wall": 56, + "Tech": 68, + "Sets Plus": 74 + }, + "season":{ + "Right List": 50, + "Frame": 51, + "Wall": 56, + "Tech": 68, + "Sets Plus": 74 + }, + "episode":{ + "Right List": 50, + "Frame": 51, + "Wall": 56, + "Tech": 68, + "Sets Plus": 74 + }, + "addon":{ + "Right List": 50, + "Frame": 51, + "Wall": 56, + "Tech": 68, + "Sets Plus": 74 + } +} \ No newline at end of file diff --git a/resources/views/skin.aeon.nox.silvo.json b/resources/views/skin.aeon.nox.silvo.json new file mode 100644 index 00000000..3e777a57 --- /dev/null +++ b/resources/views/skin.aeon.nox.silvo.json @@ -0,0 +1,109 @@ +{ + "all":{ + "List": 50, + "RightList": 506, + "FanartList": 602, + "LowList": 501, + "BigList": 507, + "Logo": 59, + "Showcase": 53, + "Shift": 57, + "Posters": 56, + "MyFlix": 509, + "TriPanel": 55, + "Icons": 500, + "Small Icons": 499, + "Wall": 503, + "Fullscreen Wall": 609, + "infoWall": 51, + "BannerWall": 58, + "BannerPlex": 601, + "Landscape": 52, + "BigFan": 591, + "Gallery": 504, + "Panel": 505, + "Episode": 502 + }, + "movie":{ + "List": 50, + "RightList": 506, + "FanartList": 602, + "LowList": 501, + "BigList": 507, + "Logo": 59, + "Showcase": 53, + "Shift": 57, + "Posters": 56, + "MyFlix": 509, + "TriPanel": 55, + "Icons": 500, + "Small Icons": 499, + "Wall": 503, + "Fullscreen Wall": 609, + "infoWall": 51, + "BannerWall": 58, + "BannerPlex": 601, + "Landscape": 52, + "BigFan": 591, + "Gallery": 504, + "Panel": 505 + }, + "tvshow":{ + "List": 50, + "RightList": 506, + "FanartList": 602, + "LowList": 501, + "BigList": 507, + "Logo": 59, + "Showcase": 53, + "Shift": 57, + "Posters": 56, + "MyFlix": 509, + "TriPanel": 55, + "Icons": 500, + "Small Icons": 499, + "Wall": 503, + "Fullscreen Wall": 609, + "infoWall": 51, + "BannerWall": 58, + "BannerPlex": 601, + "Landscape": 52, + "BigFan": 591, + "Gallery": 504, + "Panel": 505, + "Episode": 502 + }, + "season":{ + "List": 50, + "RightList": 506, + "FanartList": 602, + "LowList": 501, + "Showcase": 53, + "Shift": 57, + "Posters": 56, + "TriPanel": 55, + "Icons": 500, + "Small Icons": 499, + "Wall": 503, + "BigFan": 591 + }, + "episode":{ + "List": 50, + "RightList": 506, + "FanartList": 602, + "LowList": 501, + "BigList": 507, + "Episode": 502, + "MyFlix": 509, + "TriPanel": 55, + "Icons": 500, + "Landscape": 52, + "Panel": 505 + }, + "addon":{ + "List": 50, + "Shift": 57, + "Icons": 500, + "Wall": 503 + } +} \ No newline at end of file diff --git a/resources/views/skin.aeon.tajo.json b/resources/views/skin.aeon.tajo.json new file mode 100644 index 00000000..ad06eaaf --- /dev/null +++ b/resources/views/skin.aeon.tajo.json @@ -0,0 +1,50 @@ +{ + "all":{ + "List": 50, + "MultiSort": 589, + "MultiWall": 587, + "Shelf 3D": 595, + "List 3D": 596, + "Fanart 3D": 593, + "Triple 3D": 590, + "Wall 3D": 586, + "Banner 3D": 594, + "MultiWall 3D": 587 + }, + "movie":{ + "List": 50, + "MultiSort": 589, + "MultiWall": 587, + "Shelf 3D": 595, + "List 3D": 596, + "Fanart 3D": 593, + "Triple 3D": 590, + "Wall 3D": 586, + "Banner 3D": 594, + "MultiWall 3D": 587 + }, + "tvshow":{ + "List": 50, + "MultiWall": 587, + "Shelf 3D": 595, + "List 3D": 596, + "Fanart 3D": 593, + "Triple 3D": 590, + "Wall 3D": 586, + "Banner 3D": 594, + "MultiWall 3D": 587 + }, + "season":{ + "List": 50, + "Shelf 3D": 595, + "List 3D": 596, + "Wall 3D": 586 + }, + "episode":{ + "List": 50, + "List 3D": 596 + }, + "addon":{ + "List": 50 + } +} \ No newline at end of file diff --git a/resources/views/skin.aeonmq8.json b/resources/views/skin.aeonmq8.json new file mode 100644 index 00000000..e0ce9573 --- /dev/null +++ b/resources/views/skin.aeonmq8.json @@ -0,0 +1,96 @@ +{ + "all":{ + "Right List": 51, + "Banner": 52, + "Banner Info": 53, + "Poster": 54, + "Low List": 55, + "Wall": 56, + "Glass List": 57, + "Coverflow": 58, + "Wide": 59, + "Showart": 60, + "Multiplex": 61, + "Panel": 62, + "Shelf": 63, + "Sets": 65, + "Showcase": 66, + "Wall 3D": 67, + "Posterlite": 80, + "Poster List": 70, + "Total Art": 71 + }, + "movie":{ + "Right List": 51, + "Banner": 52, + "Banner Info": 53, + "Poster": 54, + "Low List": 55, + "Wall": 56, + "Glass List": 57, + "Coverflow": 58, + "Wide": 59, + "Showart": 60, + "Multiplex": 61, + "Panel": 62, + "Shelf": 63, + "Sets": 65, + "Showcase": 66, + "Wall 3D": 67, + "Posterlite": 80, + "Poster List": 70, + "Total Art": 71 + }, + "tvshow":{ + "Right List": 51, + "Banner": 52, + "Banner Info": 53, + "Poster": 54, + "Low List": 55, + "Wall": 56, + "Glass List": 57, + "Coverflow": 58, + "Wide": 59, + "Showart": 60, + "Multiplex": 61, + "Panel": 62, + "Shelf": 63, + "Showcase": 66, + "Wall 3D": 67, + "Posterlite": 80 + }, + "season":{ + "Right List": 51, + "Banner": 52, + "Banner Info": 53, + "Poster": 54, + "Low List": 55, + "Wall": 56, + "Glass List": 57, + "Coverflow": 58, + "Wide": 59, + "Showart": 60, + "Multiplex": 61, + "Panel": 62, + "Shelf": 63, + "Showcase": 66, + "Wall 3D": 67, + "Posterlite": 80 + }, + "episode":{ + "Right List": 51, + "Poster": 54, + "Low List": 55, + "Wall": 56, + "Glass List": 57, + "Wide": 59, + "Showart": 60, + "Multiplex": 61, + "Panel": 62, + "Wall 3D": 67, + "Posterlite": 80 + }, + "addon":{ + "Right List": 51 + } +} \ No newline at end of file diff --git a/resources/views/skin.amber.json b/resources/views/skin.amber.json new file mode 100644 index 00000000..dafb4913 --- /dev/null +++ b/resources/views/skin.amber.json @@ -0,0 +1,62 @@ +{ + "all":{ + "List": 50, + "Low List": 54, + "Big List": 52, + "Tall List": 501, + "Panel": 51, + "Big Panel": 55, + "Icons": 53, + "Fanart": 56 + }, + "movie":{ + "List": 50, + "Low List": 54, + "Big List": 52, + "Tall List": 501, + "Panel": 51, + "Big Panel": 55, + "Icons": 53, + "Fanart": 56 + }, + "tvshow":{ + "List": 50, + "Low List": 54, + "Big List": 52, + "Tall List": 501, + "Panel": 51, + "Big Panel": 55, + "Icons": 53, + "Fanart": 56 + }, + "season":{ + "List": 50, + "Low List": 54, + "Big List": 52, + "Tall List": 501, + "Panel": 51, + "Big Panel": 55, + "Icons": 53, + "Fanart": 56 + }, + "episode":{ + "List": 50, + "Low List": 54, + "Big List": 52, + "Tall List": 501, + "Panel": 51, + "Big Panel": 55, + "Icons": 53, + "Fanart": 56 + }, + "addon":{ + "List": 50, + "Low List": 54, + "Big List": 52, + "Tall List": 501, + "Panel": 51, + "Big Panel": 55, + "Icons": 53, + "Fanart": 56 + } +} \ No newline at end of file diff --git a/resources/views/skin.apptv.json b/resources/views/skin.apptv.json new file mode 100644 index 00000000..a7e8373a --- /dev/null +++ b/resources/views/skin.apptv.json @@ -0,0 +1,45 @@ +{ + "all":{ + "List": 50, + "Icons": 52, + "Banner": 53, + "Wrap": 54, + "Coverflow": 57, + "Wall": 58 + }, + "movie":{ + "List": 50, + "Icons": 52, + "Wrap": 54, + "Coverflow": 57, + "Wall": 58 + }, + "tvshow":{ + "List": 50, + "Icons": 52, + "Banner": 53, + "Wrap": 54, + "Coverflow": 57, + "Wall": 58 + }, + "season":{ + "List": 50, + "Icons": 52, + "Wrap": 54, + "Coverflow": 57, + "Wall": 58 + }, + "episode":{ + "List": 50, + "Icons": 52, + "Wrap": 54, + "Coverflow": 57 + }, + "addon":{ + "List": 50, + "Icons": 52, + "Wrap": 54, + "Coverflow": 57, + "Wall": 58 + } +} \ No newline at end of file diff --git a/resources/views/skin.aura.json b/resources/views/skin.aura.json index 83f8dc08..b106fe37 100644 --- a/resources/views/skin.aura.json +++ b/resources/views/skin.aura.json @@ -1,4 +1,4 @@ -{ +{ "all":{ "List": 50, "Poster Wall": 51, diff --git a/resources/views/skin.bello.7.json b/resources/views/skin.bello.7.json new file mode 100644 index 00000000..992a8ffc --- /dev/null +++ b/resources/views/skin.bello.7.json @@ -0,0 +1,76 @@ +{ + "all":{ + "List": 50, + "Bello": 66, + "Slide": 51, + "Gallery": 52, + "Tiles": 562, + "Thumbnails": 560, + "Posters": 561, + "Posters 2": 64, + "Banner List": 57, + "3D Wall": 53, + "Wall": 54, + "List Wall": 58, + "VideoWall": 580, + "Showtime": 65, + "Netflix": 59 + }, + "movie":{ + "List": 50, + "Bello": 66, + "Slide": 51, + "Gallery": 52, + "Tiles": 562, + "Thumbnails": 560, + "Posters": 561, + "Posters 2": 64, + "Banner List": 57, + "3D Wall": 53, + "Wall": 54, + "List Wall": 58, + "VideoWall": 580, + "Showtime": 65, + "Netflix": 59 + }, + "tvshow":{ + "List": 50, + "Bello": 66, + "Slide": 51, + "Gallery": 52, + "Tiles": 562, + "Thumbnails": 560, + "Posters 2": 64, + "Banner List": 57, + "3D Wall": 53, + "Wall": 54, + "List Wall": 58, + "VideoWall": 580, + "Showtime": 65, + "Netflix": 59 + }, + "season":{ + "List": 50, + "Bello": 66, + "Slide": 51, + "Gallery": 52, + "Tiles": 562, + "Thumbnails": 560, + "Banner List": 57, + "Netflix": 59 + }, + "episode":{ + "List": 50, + "Bello": 66, + "Gallery": 52, + "Tiles": 562, + "Thumbnails": 560, + "Banner List": 57, + "Netflix": 59 + }, + "addon":{ + "List": 50, + "Bello": 66, + "Thumbnails": 560 + } +} \ No newline at end of file diff --git a/resources/views/skin.box.json b/resources/views/skin.box.json new file mode 100644 index 00000000..e602ab5c --- /dev/null +++ b/resources/views/skin.box.json @@ -0,0 +1,46 @@ +{ + "all":{ + "List": 50, + "Thumbs": 52, + "Fanart": 527, + "Poster": 532, + "Banner": 50, + "Banner List": 536, + "Fanart Logo": 539, + "List Info": 5231, + "Thumb Info": 533 + }, + "movie":{ + "List": 50, + "Thumbs": 52, + "Fanart": 527, + "Poster": 532, + "Fanart Logo": 539, + "List Info": 5231, + "Thumb Info": 533 + }, + "tvshow":{ + "List": 50, + "Thumbs": 52, + "Fanart": 527, + "Poster": 532, + "Banner": 50, + "Banner List": 536, + "Fanart Logo": 539, + "List Info": 5231, + "Thumb Info": 533 + }, + "season":{ + "List": 50, + "Poster": 532 + }, + "episode":{ + "List": 50, + "Thumbs": 52, + "List Info": 5231, + "Thumb Info": 533 + }, + "addon":{ + "List": 50 + } +} \ No newline at end of file diff --git a/resources/views/skin.confluence.json b/resources/views/skin.confluence.json new file mode 100644 index 00000000..f0348dd8 --- /dev/null +++ b/resources/views/skin.confluence.json @@ -0,0 +1,55 @@ +{ + "all":{ + "List": 50, + "Big List": 55, + "Thumbnail": 500, + "Poster Wrap": 501, + "Fanart": 508, + "Media Info": 503, + "Media Info 2": 504, + "Media Info 3": 504, + "Wide": 505 + }, + "movie":{ + "List": 50, + "Big List": 55, + "Thumbnail": 500, + "Poster Wrap": 501, + "Fanart": 508, + "Media Info": 503, + "Media Info 2": 504, + "Media Info 3": 504 + }, + "tvshow":{ + "List": 50, + "Big List": 55, + "Thumbnail": 500, + "Poster Wrap": 501, + "Fanart": 508, + "Media Info": 503, + "Media Info 2": 504, + "Media Info 3": 504, + "Wide": 505 + }, + "season":{ + "List": 50, + "Big List": 55, + "Thumbnail": 500, + "Poster Wrap": 501, + "Media Info 2": 504, + "Media Info 3": 504 + }, + "episode":{ + "List": 50, + "Big List": 55, + "Thumbnail": 500, + "Media Info": 503, + "Media Info 2": 504, + "Media Info 3": 504 + }, + "addon":{ + "List": 50, + "Big List": 55, + "Thumbnail": 500 + } +} \ No newline at end of file