diff --git a/core/support.py b/core/support.py index 16587dd1..c303551c 100755 --- a/core/support.py +++ b/core/support.py @@ -742,6 +742,12 @@ def typo(string, typography=''): VLT = False # Otherwise it uses the typographical attributes of the string # else: + if 'capitalize' in string.lower(): + string = re.sub(r'\s*capitalize','',string).capitalize() + if 'uppercase' in string.lower(): + string = re.sub(r'\s*uppercase','',string).upper() + if 'lowercase' in string.lower(): + string = re.sub(r'\s*lowercase','',string).lower() if '[]' in string: string = '[' + re.sub(r'\s*\[\]','',string) + ']' if '()' in string: @@ -768,12 +774,6 @@ def typo(string, typography=''): 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(): - string = re.sub(r'\s*uppercase','',string).upper() - if 'lowercase' in string.lower(): - string = re.sub(r'\s*lowercase','',string).lower() if '{}' in string: string = re.sub(r'\s*\{\}','',string) diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po index 6c4b4e4f..f086a5ac 100644 --- a/resources/language/English/strings.po +++ b/resources/language/English/strings.po @@ -325,6 +325,14 @@ msgctxt "#30140" msgid "Seasons" msgstr "" +msgctxt "#30141" +msgid "Skin not supported" +msgstr "" + +msgctxt "#30142" +msgid "Skin %s is not currently supported" +msgstr "" + msgctxt "#30151" msgid "Watch the video" msgstr "" diff --git a/resources/language/Italian/strings.po b/resources/language/Italian/strings.po index 46819fb4..a78c9bb6 100644 --- a/resources/language/Italian/strings.po +++ b/resources/language/Italian/strings.po @@ -325,6 +325,14 @@ msgctxt "#30140" msgid "Seasons" msgstr "Stagioni" +msgctxt "#30141" +msgid "Skin not supported" +msgstr "Skin non supportata" + +msgctxt "#30142" +msgid "Skin %s is not currently supported" +msgstr "La skin %s non è attualmente supportata" + msgctxt "#30151" msgid "Watch the video" msgstr "Guarda il video" diff --git a/resources/views/skin.eminence.2.json b/resources/views/skin.eminence.2.json new file mode 100644 index 00000000..f2a5267e --- /dev/null +++ b/resources/views/skin.eminence.2.json @@ -0,0 +1,92 @@ +{ + "all":{ + "Plain List": 552, + "Poster List": 550, + "Big List": 510, + "Media Info": 51, + "Media Info 2": 57, + "Media Info 3": 577, + "Info List": 53, + "Info List 2": 553, + "Fanart List": 54, + "Gallery": 58, + "Big Icons": 52, + "Mediun Icons": 525, + "Showcase": 535, + "Icons": 500, + "Info Icons": 59, + "Wide": 55, + "Fanart": 56 + }, + "movie":{ + "Plain List": 552, + "Poster List": 550, + "Big List": 510, + "Media Info": 51, + "Media Info 2": 57, + "Media Info 3": 577, + "Info List": 53, + "Info List 2": 553, + "Fanart List": 54, + "Gallery": 58, + "Big Icons": 52, + "Mediun Icons": 525, + "Showcase": 535, + "Icons": 500, + "Info Icons": 59, + "Wide": 55, + "Fanart": 56 + }, + "tvshow":{ + "Plain List": 552, + "Poster List": 550, + "Big List": 510, + "Media Info": 51, + "Media Info 2": 57, + "Media Info 3": 577, + "Info List": 53, + "Info List 2": 553, + "Fanart List": 54, + "Gallery": 58, + "Big Icons": 52, + "Mediun Icons": 525, + "Showcase": 535, + "Icons": 500, + "Info Icons": 59, + "Wide": 55, + "Fanart": 56 + }, + "season":{ + "Plain List": 552, + "Poster List": 550, + "Media Info": 51, + "Media Info 2": 57, + "Info List": 53, + "Fanart List": 54, + "Gallery": 58, + "Big Icons": 52, + "Mediun Icons": 525, + "Showcase": 535, + "Icons": 500, + "Info Icons": 59 + }, + "episode":{ + "Plain List": 552, + "Poster List": 550, + "Media Info": 51, + "Media Info 2": 57, + "Info List": 53, + "Info List 2": 553, + "Fanart List": 54, + "Gallery": 58, + "Icons": 500, + "Fanart": 56 + }, + "addon":{ + "Plain List": 552, + "Poster List": 550, + "Big List": 510, + "Icons": 500, + "Info Icons": 59 + } +} \ No newline at end of file diff --git a/resources/views/skin.quartz.json b/resources/views/skin.quartz.json new file mode 100644 index 00000000..8b352603 --- /dev/null +++ b/resources/views/skin.quartz.json @@ -0,0 +1,66 @@ +{ + "all":{ + "List": 50, + "Big List": 51, + "Media Info": 52, + "Media Info 2": 54, + "Icons": 53, + "Big Icons": 501, + "Panel": 501, + "Wide": 55, + "Fanart 1": 57, + "Fanart 2": 59, + "Fanart 3": 500 + }, + "movie":{ + "List": 50, + "Big List": 51, + "Media Info": 52, + "Media Info 2": 54, + "Icons": 53, + "Big Icons": 501, + "Panel": 501, + "Fanart 1": 57, + "Fanart 2": 59, + "Fanart 3": 500 + }, + "tvshow":{ + "List": 50, + "Big List": 51, + "Media Info": 52, + "Media Info 2": 54, + "Icons": 53, + "Big Icons": 501, + "Panel": 501, + "Wide": 55, + "Fanart 1": 57, + "Fanart 2": 59, + "Fanart 3": 500 + }, + "season":{ + "List": 50, + "Big List": 51, + "Media Info": 52, + "Media Info 2": 54, + "Icons": 53, + "Big Icons": 501, + "Panel": 501, + "Fanart 1": 57, + "Fanart 2": 59, + "Fanart 3": 500 + }, + "episode":{ + "List": 50, + "Big List": 51, + "Media Info": 52, + "Media Info 2": 54, + "Icons": 53, + "Panel": 501, + "Fanart 3": 500 + }, + "addon":{ + "List": 50, + "Big List": 51, + "Icons": 53 + } +} \ No newline at end of file diff --git a/resources/views/skin.rapier.json b/resources/views/skin.rapier.json new file mode 100644 index 00000000..edcd77b6 --- /dev/null +++ b/resources/views/skin.rapier.json @@ -0,0 +1,51 @@ +{ + "all":{ + + }, + "movie":{ + "Icon": 50, + "List": 52, + "List Info": 58, + "List Info 2": 66, + "List Info 3": 95, + "Thumbs Info": 97, + "Wrap Info": 53, + "3D Wrap": 588, + "Fanart": 583, + "Wall": 69 + }, + "tvshow":{ + "Icon": 50, + "List": 52, + "List Info": 61, + "List Info 2": 65, + "List Info 3": 589, + "Thumbs Info": 100, + "Wrap Info": 577, + "3D Wrap": 588, + "Fanart": 583, + "Wall": 586 + }, + "season":{ + "Icon": 50, + "List": 52, + "List Info": 61, + "List Info 2": 65, + "List Info 3": 589, + "Wall": 586, + "Extended": 585 + }, + "episode":{ + "Icon": 50, + "List": 52, + "List Info": 73, + "List Info 2": 68, + "List Info 3": 94 + }, + "addon":{ + "Icon": 50, + "List": 52, + "List Info": 91, + "Wrap Info": 93 + } +} \ No newline at end of file diff --git a/resources/views/skin.revolve.json b/resources/views/skin.revolve.json new file mode 100644 index 00000000..b6343245 --- /dev/null +++ b/resources/views/skin.revolve.json @@ -0,0 +1,68 @@ +{ + "all":{ + "Circle List": 52, + "Thumbnails List": 55, + "Drop List": 51, + "Landscape List": 53, + "Revolve List": 54, + "Panels List": 56, + "Gallery List": 57, + "Rotate List": 58, + "Banners List": 59 + }, + "movie":{ + "Circle List": 52, + "Thumbnails List": 55, + "Drop List": 51, + "Landscape List": 53, + "Revolve List": 54, + "Panels List": 56, + "Gallery List": 57, + "Rotate List": 58, + "Banners List": 59 + }, + "tvshow":{ + "Circle List": 52, + "Thumbnails List": 55, + "Drop List": 51, + "Landscape List": 53, + "Revolve List": 54, + "Panels List": 56, + "Gallery List": 57, + "Rotate List": 58, + "Banners List": 59 + }, + "season":{ + "Circle List": 52, + "Thumbnails List": 55, + "Drop List": 51, + "Landscape List": 53, + "Revolve List": 54, + "Panels List": 56, + "Gallery List": 57, + "Rotate List": 58, + "Banners List": 59 + }, + "episode":{ + "Circle List": 52, + "Thumbnails List": 55, + "Drop List": 51, + "Landscape List": 53, + "Revolve List": 54, + "Panels List": 56, + "Gallery List": 57, + "Rotate List": 58, + "Banners List": 59 + }, + "addon":{ + "Circle List": 52, + "Thumbnails List": 55, + "Drop List": 51, + "Landscape List": 53, + "Revolve List": 54, + "Panels List": 56, + "Gallery List": 57, + "Rotate List": 58, + "Banners List": 59 + } +} \ No newline at end of file diff --git a/resources/views/skin.unity.json b/resources/views/skin.unity.json new file mode 100644 index 00000000..9f17aa28 --- /dev/null +++ b/resources/views/skin.unity.json @@ -0,0 +1,61 @@ +{ + "all":{ + "List": 50, + "Big List": 51, + "Thumbnail": 500, + "Poster Wrap": 501, + "Fanart": 508, + "Media Info": 505, + "Media Info 2": 504, + "Media Info 3": 503, + "Media Info 4": 515, + "Wide": 505, + "Info": 550, + "Info 2": 551 + }, + "movie":{ + "List": 50, + "Big List": 51, + "Thumbnail": 500, + "Poster Wrap": 501, + "Fanart": 508, + "Media Info": 505, + "Media Info 2": 504, + "Media Info 3": 503 + }, + "tvshow":{ + "List": 50, + "Big List": 51, + "Thumbnail": 500, + "Poster Wrap": 501, + "Fanart": 508, + "Media Info": 505, + "Media Info 2": 504, + "Media Info 3": 503, + "Wide": 505 + }, + "season":{ + "List": 50, + "Big List": 51, + "Thumbnail": 500, + "Poster Wrap": 501, + "Media Info": 505, + "Media Info 2": 504, + "Media Info 3": 503 + }, + "episode":{ + "List": 50, + "Big List": 51, + "Thumbnail": 500, + "Media Info": 505, + "Media Info 2": 504, + "Media Info 3": 503 + }, + "addon":{ + "List": 50, + "Big List": 51, + "Thumbnail": 500, + "Info": 550, + "Info 2": 551 + } +} \ No newline at end of file diff --git a/specials/shortcuts.py b/specials/shortcuts.py index e161dc88..b43b6478 100644 --- a/specials/shortcuts.py +++ b/specials/shortcuts.py @@ -32,7 +32,8 @@ def settings_menu(item): def view_mode(item): logger.info(str(item)) import xbmc - from core import filetools, jsontools, support + from core import filetools, jsontools + from core.support import typo from platformcode import config, platformtools skin_name = xbmc.getSkinDir() @@ -55,6 +56,8 @@ def view_mode(item): select = platformtools.dialog_select(config.get_localized_string(70754), list_type) value = list_type[select] + ' , ' + str(skin[list_type[select]] if list_type[select] in skin else 0) config.set_setting('view_mode_%s' % item.type, value) + else: + platformtools.dialog_ok(config.get_localized_string(30141), config.get_localized_string(30142) % typo(skin_name.replace('skin.','').replace('.',' '), 'capitalize bold')) def servers_menu(item): # from core.support import dbg; dbg()