From 5124d59e6dd7f54b4a30d016df8b3499072ca1bc Mon Sep 17 00:00:00 2001 From: DiMartinoXBMC Date: Thu, 3 Mar 2016 20:07:49 +0300 Subject: [PATCH] skin by joyrider for Aeon Nox --- .idea/workspace.xml | 812 ++++++++++++++----------- Anteoloader.py | 1 + addon.xml | 1 + functions.py | 7 +- resources/language/English/strings.xml | 1 + resources/language/Russian/strings.xml | 1 + resources/settings.xml | 2 +- 7 files changed, 452 insertions(+), 373 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f60878e..7977d23 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,9 +3,8 @@ - + - @@ -97,8 +96,8 @@ - - + + @@ -127,134 +126,152 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -336,7 +353,7 @@ - + @@ -354,16 +371,6 @@ - - - - - - - - - - @@ -465,18 +472,56 @@ - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -563,18 +608,18 @@ @@ -705,8 +750,8 @@ - + @@ -888,12 +933,6 @@ @@ -1223,7 +1268,6 @@ - @@ -1248,7 +1292,8 @@ - @@ -1257,20 +1302,6 @@ - - - - - - - - - - - - - - @@ -1522,7 +1553,6 @@ - @@ -1534,45 +1564,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1655,26 +1646,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -1750,148 +1721,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1943,18 +1772,261 @@ - + - - - + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Anteoloader.py b/Anteoloader.py index 0f27282..c6eed1a 100644 --- a/Anteoloader.py +++ b/Anteoloader.py @@ -41,6 +41,7 @@ from contextlib import contextmanager, closing, nested from functions import foldername, showMessage, clearStorage, WatchedHistoryDB, get_ids_video, log, debug, ensure_str from torrent2http import State, Engine, MediaType +#from pyrrent2http import State, Engine, MediaType ROOT = sys.modules["__main__"].__root__ RESOURCES_PATH = os.path.join(ROOT, 'resources') diff --git a/addon.xml b/addon.xml index d697a6f..c39c21a 100644 --- a/addon.xml +++ b/addon.xml @@ -6,6 +6,7 @@ + video diff --git a/functions.py b/functions.py index ed2753a..de48248 100644 --- a/functions.py +++ b/functions.py @@ -564,7 +564,7 @@ def jstr(s): def view_style(func): styles = {} - num_skin, style = 0, 'info' + num_skin = 0 view_style = int(__settings__.getSetting("skin_optimization")) if view_style in [3, 2]: styles['searchOption'] = styles['History'] = styles['List'] = 'info' @@ -593,6 +593,8 @@ def view_style(func): num_skin = 0 elif view_style == 2: num_skin = 1 + elif view_style == 6: + num_skin = 2 style = styles.get(func) # debug('[view_style]: lock '+str(style)) @@ -603,7 +605,8 @@ def lockView(viewId='info', num_skin=0): xbmcplugin.setContent(int(sys.argv[1]), 'movies') skinOptimizations = ( {'list': 50, 'info': 50, 'wide': 51, 'icons': 500, 'info3': 515, }, # Confluence - {'list': 50, 'info': 51, 'wide': 52, 'icons': 53, } # Transperency! + {'list': 50, 'info': 51, 'wide': 52, 'icons': 53, }, # Transperency! + {'list': 55, 'info': 55, 'wide': 55, 'icons': 55, 'info3': 55, }, # Aeon Nox ) try: xbmc.executebuiltin("Container.SetViewMode(%s)" % str(skinOptimizations[num_skin][viewId])) diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml index 5f701af..6b573d6 100644 --- a/resources/language/English/strings.xml +++ b/resources/language/English/strings.xml @@ -64,6 +64,7 @@ by Name Do not add to Watched History if played more (%) Confluence (by safonov_ivan) + Aeon Nox (by joyrider) Interface P2P Network Advanced diff --git a/resources/language/Russian/strings.xml b/resources/language/Russian/strings.xml index 8b6209a..0055e9c 100644 --- a/resources/language/Russian/strings.xml +++ b/resources/language/Russian/strings.xml @@ -64,6 +64,7 @@ по Имени Не добавлять в История Просмотров если больше (%) Confluence (от safonov_ivan) + Aeon Nox (от joyrider) Интерфейс P2P Сеть Дополнительные diff --git a/resources/settings.xml b/resources/settings.xml index 476de05..1e8df80 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -4,7 +4,7 @@ - +