From c3cac513e4a6a8d5a9aad9e17f953253387dc772 Mon Sep 17 00:00:00 2001 From: dream-alpha Date: Wed, 17 Jan 2024 15:37:14 +0100 Subject: [PATCH] 8.1.5 --- CONTROL/control | 8 +- CONTROL/postrm | 6 +- README.md | 7 +- tmdb.png => TMDBCockpit.png | Bin docs/index.html | 6 +- docs/{tmdb.sh => tmdbcockpit.sh} | 2 +- po/Makefile.am | 2 +- po/{tmdb.pot => TMDBCockpit.pot} | 57 ++++++--- po/de.po | 61 ++++++---- src/ConfigInit.py | 3 +- src/Debug.py | 2 +- src/DelayTimer.py | 2 +- src/EpgSelection.py | 2 +- src/FileUtils.py | 4 +- src/Json.py | 2 +- src/List.py | 2 +- src/Makefile.am | 2 +- src/MoreOptions.py | 2 +- src/Parsers.py | 8 +- src/Picture.py | 2 +- src/ScreenConfig.py | 3 +- src/ScreenMain.py | 2 +- src/ScreenMovie.py | 13 +- src/ScreenPeople.py | 2 +- src/ScreenPerson.py | 6 +- src/ScreenSeason.py | 2 +- src/ScreenTMDB.py | 2 +- src/SearchMain.py | 2 +- src/SearchMovie.py | 2 +- src/SearchPeople.py | 2 +- src/SearchPerson.py | 2 +- src/SearchSeason.py | 2 +- src/SearchTMDB.py | 2 +- src/SkinUtils.py | 2 +- src/Utils.py | 4 +- src/Version.py | 8 +- src/WebRequests.py | 2 +- src/__init__.py | 5 +- .../LC_MESSAGES/{tmdb.mo => TMDBCockpit.mo} | Bin src/locale/de/LC_MESSAGES/TMDBCockpit.mo | Bin 0 -> 6609 bytes src/locale/de/LC_MESSAGES/tmdb.mo | Bin 6447 -> 0 bytes .../LC_MESSAGES/{tmdb.mo => TMDBCockpit.mo} | Bin .../LC_MESSAGES/{tmdb.mo => TMDBCockpit.mo} | Bin .../LC_MESSAGES/{tmdb.mo => TMDBCockpit.mo} | Bin .../LC_MESSAGES/{tmdb.mo => TMDBCockpit.mo} | Bin .../LC_MESSAGES/{tmdb.mo => TMDBCockpit.mo} | Bin src/plugin.py | 2 +- src/skin/Default-FHD/Makefile.am | 2 +- src/skin/Default-FHD/skin.xml | 12 +- src/skin/Default-HD/Makefile.am | 2 +- src/skin/Default-HD/skin.xml | 12 +- src/skin/Default-WQHD/Makefile.am | 2 +- src/skin/Default-WQHD/colors.xmlinc | 12 +- .../Default-WQHD/screen_ScreenConfig.xmlinc | 10 +- .../Default-WQHD/screen_ScreenMain.xmlinc | 4 +- .../Default-WQHD/screen_ScreenMovie.xmlinc | 2 +- .../Default-WQHD/screen_ScreenPeople.xmlinc | 2 +- .../Default-WQHD/screen_ScreenPerson.xmlinc | 2 +- .../Default-WQHD/screen_ScreenSeason.xmlinc | 4 +- .../Default-WQHD/screenpart_2Buttons.xmlinc | 4 - .../screenpart_4ButtonsLarge.xmlinc | 8 -- .../Default-WQHD/screenpart_MovieInfo.xmlinc | 2 +- src/skin/Default-WQHD/skin.xml | 114 +++++++++--------- src/skin/Other-WQHD/Makefile.am | 2 +- src/skin/Other-WQHD/skin.xml | 12 +- src/skin/Shadow-FHD/Makefile.am | 2 +- src/skin/Shadow-FHD/colors.xmlinc | 9 +- src/skin/Shadow-FHD/screen_ScreenMain.xmlinc | 2 +- src/skin/Shadow-FHD/skin.xml | 14 +-- src/skin/images/Makefile.am | 2 +- src/skin/screen_ScreenMain.xmlinc | 4 +- src/skin/screen_ScreenMovie.xmlinc | 2 +- src/skin/screen_ScreenPeople.xmlinc | 2 +- src/skin/screen_ScreenPerson.xmlinc | 2 +- src/skin/screen_ScreenSeason.xmlinc | 2 +- src/skin/screenpart_4Buttons_icon.xmlinc | 8 +- src/skin/screenpart_4Buttons_name.xmlinc | 8 +- src/skin/screenpart_TitleOnly.xmlinc | 5 +- src/tmdbsimple/Makefile.am | 2 +- src/tmdbsimple/Version.py | 2 +- 80 files changed, 288 insertions(+), 231 deletions(-) rename tmdb.png => TMDBCockpit.png (100%) rename docs/{tmdb.sh => tmdbcockpit.sh} (81%) rename po/{tmdb.pot => TMDBCockpit.pot} (90%) rename src/locale/ar/LC_MESSAGES/{tmdb.mo => TMDBCockpit.mo} (100%) create mode 100644 src/locale/de/LC_MESSAGES/TMDBCockpit.mo delete mode 100644 src/locale/de/LC_MESSAGES/tmdb.mo rename src/locale/es/LC_MESSAGES/{tmdb.mo => TMDBCockpit.mo} (100%) rename src/locale/it/LC_MESSAGES/{tmdb.mo => TMDBCockpit.mo} (100%) rename src/locale/nl/LC_MESSAGES/{tmdb.mo => TMDBCockpit.mo} (100%) rename src/locale/ru/LC_MESSAGES/{tmdb.mo => TMDBCockpit.mo} (100%) rename src/locale/tr/LC_MESSAGES/{tmdb.mo => TMDBCockpit.mo} (100%) delete mode 100644 src/skin/Default-WQHD/screenpart_2Buttons.xmlinc delete mode 100644 src/skin/Default-WQHD/screenpart_4ButtonsLarge.xmlinc diff --git a/CONTROL/control b/CONTROL/control index 2a9c5b4..4a32198 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,6 +1,8 @@ -Description: tmdb +Description: TMDBCockpit Maintainer: dream-alpha -Package: enigma2-plugin-extensions-tmdb -Version: 7.0.8 +Package: enigma2-plugin-extensions-tmdbcockpit +Version: 8.1.5 Architecture: all Depends: python-requests +Conflicts: enigma2-plugin-extensions-tmdb +Replaces: enigma2-plugin-extensions-tmdb diff --git a/CONTROL/postrm b/CONTROL/postrm index 07c3382..f615d1a 100755 --- a/CONTROL/postrm +++ b/CONTROL/postrm @@ -1,8 +1,8 @@ #!/bin/sh if [ "$1" = "remove" ]; then - rm -rf /usr/lib/enigma2/python/Plugins/Extensions/tmdb > /dev/null 2>&1 - echo "tmdb plugin removed successfully." + rm -rf /usr/lib/enigma2/python/Plugins/Extensions/TMDBCockpit > /dev/null 2>&1 + echo "TMDBCockpit plugin removed successfully." else - find /usr/lib/enigma2/python/Plugins/Extensions/tmdb -type f -name "*.pyo" -exec rm -f {} \; > /dev/null 2>&1 + find /usr/lib/enigma2/python/Plugins/Extensions/TMDBCockpit -type f -name "*.pyo" -exec rm -f {} \; > /dev/null 2>&1 fi exit 0 diff --git a/README.md b/README.md index aeb2dc5..5a7681e 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,21 @@ -[![Codacy Badge](https://app.codacy.com/project/badge/Grade/495cf6fc5be8434ca7b493ff88724433)](https://www.codacy.com/gh/dream-alpha/TMDBCockpit/dashboard?utm_source=github.com&utm_medium=referral&utm_content=dream-alpha/tmdb&utm_campaign=Badge_Grade) +[![Codacy Badge](https://app.codacy.com/project/badge/Grade/495cf6fc5be8434ca7b493ff88724433)](https://www.codacy.com/gh/dream-alpha/TMDBCockpit/dashboard?utm_source=github.com&utm_medium=referral&utm_content=dream-alpha/TMDBCockpit&utm_campaign=Badge_Grade) [![Gemfury](https://badge.fury.io/fp/gemfury.svg)](https://gemfury.com/f/partner) # The Movie Database plugin TMDBCockpit -![Screenshot](tmdb.png) +![Screenshot](TMDBCockpit.png) ## Features - Shows detailed movie/tv show information provided by TMDB. - Can be invoked thru movie lists (standard, EMC, etc.) or thru yellow key in the EPG list. - Provides an interface for other plugins to access TMDB data without opening TMDBCockpit screens. - Allows to save movie as well as series episode covers and descriptions and backdrops. - Allows unique tmdb api key in /etc/enigma2/tmdb_key.txt +- Allows playback of trailer with either MediaPortal or MyTube - Supports HD, FHD, and WQHD skin resolutions. ## Installation To install the TMDBCockpit plugin execute the following command in a console on your dreambox: - apt-get install wget (required the first time only) -- wget https://dream-alpha.github.io/TMDBCockpit/tmdb.sh -O - | /bin/sh +- wget https://dream-alpha.github.io/TMDBCockpit/tmdbcockpit.sh -O - | /bin/sh The installation script will also install a feed source that enables a convenient upgrade to the latest version with the following commands or automatically as part of a DreamOS upgrade: - apt-get update diff --git a/tmdb.png b/TMDBCockpit.png similarity index 100% rename from tmdb.png rename to TMDBCockpit.png diff --git a/docs/index.html b/docs/index.html index b6538ff..406b53d 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1,8 +1,8 @@ -

tmdb Installation

- To install tmdb execute the following command in a telnet console on your dreambox: +

TMDBCockpit Installation

+ To install TMDBCockpit execute the following command in a telnet console on your dreambox:

- wget https://dream-alpha.github.io/TMDBCockpit/tmdb.sh -O - | /bin/sh + wget https://dream-alpha.github.io/TMDBCockpit/tmdbcockpit.sh -O - | /bin/sh diff --git a/docs/tmdb.sh b/docs/tmdbcockpit.sh similarity index 81% rename from docs/tmdb.sh rename to docs/tmdbcockpit.sh index 2e30e38..c3e464f 100755 --- a/docs/tmdb.sh +++ b/docs/tmdbcockpit.sh @@ -4,5 +4,5 @@ apt-get update apt-get install -y apt-transport-https echo deb [trusted=yes] https://apt.fury.io/dream-alpha ./ > /etc/apt/sources.list.d/cockpit.list apt-get update -apt-get install -y enigma2-plugin-extensions-tmdb +apt-get install -y enigma2-plugin-extensions-tmdbcockpit systemctl restart enigma2 diff --git a/po/Makefile.am b/po/Makefile.am index ef99eda..c03e7b1 100644 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -5,7 +5,7 @@ # the directory name of the plugin. # -DOMAIN = tmdb +DOMAIN = TMDBCockpit installdir = $(libdir)/enigma2/python/Plugins/Extensions/$(DOMAIN) #GETTEXT=./pygettext.py GETTEXT=xgettext diff --git a/po/tmdb.pot b/po/TMDBCockpit.pot similarity index 90% rename from po/tmdb.pot rename to po/TMDBCockpit.pot index a7e3ff7..a8d773d 100644 --- a/po/tmdb.pot +++ b/po/TMDBCockpit.pot @@ -2,7 +2,7 @@ msgid "" msgstr "" "#-#-#-#-# de.po #-#-#-#-#\n" "Project-Id-Version: \n" -"POT-Creation-Date: \n" +"POT-Creation-Date: 2024-01-06 11:48+0100\n" "PO-Revision-Date: \n" "Last-Translator: dream-alpha\n" "Language-Team: \n" @@ -10,11 +10,13 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 3.1\n" +"X-Generator: Poedit 3.4.1\n" +"X-Poedit-Basepath: ../src\n" +"X-Poedit-SearchPath-0: .\n" "#-#-#-#-# de.po (tmdb) #-#-#-#-#\n" "Project-Id-Version: tmdb\n" -"POT-Creation-Date: 2023-08-27 11:26+0200\n" -"PO-Revision-Date: 2023-08-27 11:27+0200\n" +"POT-Creation-Date: 2024-01-04 15:14+0100\n" +"PO-Revision-Date: 2024-01-04 15:14+0100\n" "Last-Translator: dream-alpha\n" "Language-Team: \n" "Language: de\n" @@ -22,7 +24,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 3.3.2\n" +"X-Generator: Poedit 3.4.1\n" "X-Poedit-KeywordsList: _;gettext;gettext_noop\n" "X-Poedit-Basepath: ../src\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -43,21 +45,12 @@ msgstr "" msgid "End" msgstr "" -msgid "Stop playback" -msgstr "" - msgid "Skip forward" msgstr "" msgid "Skip backward" msgstr "" -msgid "EPG Info" -msgstr "" - -msgid "Do you want to resume playback at position: %d:%02d:%02d?" -msgstr "" - msgid "Cancel" msgstr "" @@ -67,10 +60,10 @@ msgstr "" msgid "Defaults" msgstr "" -msgid "Really close without saving settings?" +msgid "Setup" msgstr "" -msgid "Setup" +msgid "Really close without saving settings?" msgstr "" msgid "Loading default settings will overwrite all settings, really load them?" @@ -91,6 +84,27 @@ msgstr "" msgid "Path does not exist" msgstr "" +msgid "File Task" +msgstr "" + +msgid "None" +msgstr "" + +msgid "Loading" +msgstr "" + +msgid "Deleting" +msgstr "" + +msgid "Moving" +msgstr "" + +msgid "Copying" +msgstr "" + +msgid "FSTrim" +msgstr "" + msgid "Close" msgstr "" @@ -115,9 +129,6 @@ msgstr "" msgid "Please wait" msgstr "" -msgid "min" -msgstr "" - msgid "TMDB Infos ..." msgstr "" @@ -181,7 +192,7 @@ msgstr "" msgid "divers" msgstr "" -msgid "None" +msgid "not specified" msgstr "" msgid "OK" @@ -202,6 +213,9 @@ msgstr "" msgid "Backdrop resolution:" msgstr "" +msgid "Player for trailers:" +msgstr "" + msgid "Overview" msgstr "" @@ -340,6 +354,9 @@ msgstr "" msgid "Person" msgstr "" +msgid "min" +msgstr "" + msgid "TMDBCockpit" msgstr "" diff --git a/po/de.po b/po/de.po index 4bfe26b..340aff2 100755 --- a/po/de.po +++ b/po/de.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "#-#-#-#-# de.po #-#-#-#-#\n" "Project-Id-Version: \n" -"POT-Creation-Date: \n" +"POT-Creation-Date: 2024-01-06 11:48+0100\n" "PO-Revision-Date: \n" "Last-Translator: dream-alpha\n" "Language-Team: \n" @@ -10,11 +10,13 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 3.1\n" +"X-Generator: Poedit 3.4.1\n" +"X-Poedit-Basepath: ../src\n" +"X-Poedit-SearchPath-0: .\n" "#-#-#-#-# de.po (tmdb) #-#-#-#-#\n" "Project-Id-Version: tmdb\n" -"POT-Creation-Date: 2023-08-27 11:26+0200\n" -"PO-Revision-Date: 2023-08-27 11:27+0200\n" +"POT-Creation-Date: 2024-01-04 15:14+0100\n" +"PO-Revision-Date: 2024-01-04 15:14+0100\n" "Last-Translator: dream-alpha\n" "Language-Team: \n" "Language: de\n" @@ -22,7 +24,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 3.3.2\n" +"X-Generator: Poedit 3.4.1\n" "X-Poedit-KeywordsList: _;gettext;gettext_noop\n" "X-Poedit-Basepath: ../src\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -43,21 +45,12 @@ msgstr "Lizenz" msgid "End" msgstr "Ende" -msgid "Stop playback" -msgstr "Stoppe Wiedergabe" - msgid "Skip forward" msgstr "Springe vorwärts" msgid "Skip backward" msgstr "Springe zurück" -msgid "EPG Info" -msgstr "EPG Info" - -msgid "Do you want to resume playback at position: %d:%02d:%02d?" -msgstr "Soll die Wiedergabe an Position: %d:%02d:%02d fortgesetzt werden?" - msgid "Cancel" msgstr "Abbruch" @@ -67,12 +60,12 @@ msgstr "Speichern" msgid "Defaults" msgstr "Standard" -msgid "Really close without saving settings?" -msgstr "Fortfahren ohne Speichern der Einstellungen?" - msgid "Setup" msgstr "Einstellungen" +msgid "Really close without saving settings?" +msgstr "Fortfahren ohne Speichern der Einstellungen?" + msgid "Loading default settings will overwrite all settings, really load them?" msgstr "" "Das Laden der Standardeinstellungen überschreibt alle aktuellen " @@ -94,6 +87,27 @@ msgstr "Verzeichnis-Auswahl" msgid "Path does not exist" msgstr "Verzeichnis existiert nicht" +msgid "File Task" +msgstr "Datei-Operation" + +msgid "None" +msgstr "Nichts" + +msgid "Loading" +msgstr "Laden" + +msgid "Deleting" +msgstr "Löschen" + +msgid "Moving" +msgstr "Verschieben" + +msgid "Copying" +msgstr "Kopieren" + +msgid "FSTrim" +msgstr "FSTrimmen" + msgid "Close" msgstr "Schliessen" @@ -118,9 +132,6 @@ msgstr "Abgebrochen" msgid "Please wait" msgstr "Bitte warten" -msgid "min" -msgstr "Min" - msgid "TMDB Infos ..." msgstr "TMDB Infos " @@ -184,8 +195,8 @@ msgstr "männlich" msgid "divers" msgstr "divers" -msgid "None" -msgstr "N/A" +msgid "not specified" +msgstr "undefiniert" msgid "OK" msgstr "Ok" @@ -205,6 +216,9 @@ msgstr "Cover Auflösung:" msgid "Backdrop resolution:" msgstr "Backdrop Auflösung:" +msgid "Player for trailers:" +msgstr "Player für Trailer:" + msgid "Overview" msgstr "Überblick" @@ -343,6 +357,9 @@ msgstr "Serie" msgid "Person" msgstr "Person" +msgid "min" +msgstr "Min" + msgid "TMDBCockpit" msgstr "TMDBCockpit" diff --git a/src/ConfigInit.py b/src/ConfigInit.py index 2d5b417..97eadb2 100644 --- a/src/ConfigInit.py +++ b/src/ConfigInit.py @@ -1,7 +1,7 @@ #!/usr/bin/python # coding=utf-8 # -# Copyright (C) 2018-2023 by dream-alpha +# Copyright (C) 2018-2024 by dream-alpha # # In case of reuse of this source code please do not remove this copyright. # @@ -35,4 +35,5 @@ def __init__(self): config.plugins.tmdb.skip_to_movie = ConfigYesNo(default=True) config.plugins.tmdb.key_yellow = ConfigYesNo(default=True) + config.plugins.tmdb.trailer_player = ConfigSelection(default="MediaPortal", choices=["MediaPortal", "MyTube"]) setLogLevel(log_levels[config.plugins.tmdb.debug_log_level.value]) diff --git a/src/Debug.py b/src/Debug.py index c5fcde7..fbcfb9e 100644 --- a/src/Debug.py +++ b/src/Debug.py @@ -1,7 +1,7 @@ #!/usr/bin/python # coding=utf-8 # -# Copyright (C) 2018-2023 by dream-alpha +# Copyright (C) 2018-2024 by dream-alpha # # In case of reuse of this source code please do not remove this copyright. # diff --git a/src/DelayTimer.py b/src/DelayTimer.py index 058b31a..7cee7f7 100644 --- a/src/DelayTimer.py +++ b/src/DelayTimer.py @@ -1,7 +1,7 @@ #!/usr/bin/python # coding=utf-8 # -# Copyright (C) 2018-2023 by dream-alpha +# Copyright (C) 2018-2024 by dream-alpha # # In case of reuse of this source code please do not remove this copyright. # diff --git a/src/EpgSelection.py b/src/EpgSelection.py index 9a49117..c5ed342 100644 --- a/src/EpgSelection.py +++ b/src/EpgSelection.py @@ -1,7 +1,7 @@ #!/usr/bin/python # coding=utf-8 # -# Copyright (C) 2018-2023 by dream-alpha +# Copyright (C) 2018-2024 by dream-alpha # # In case of reuse of this source code please do not remove this copyright. # diff --git a/src/FileUtils.py b/src/FileUtils.py index 8f2d275..71cdf07 100644 --- a/src/FileUtils.py +++ b/src/FileUtils.py @@ -1,7 +1,7 @@ #!/usr/bin/python # coding=utf-8 # -# Copyright (C) 2018-2023 by dream-alpha +# Copyright (C) 2018-2024 by dream-alpha # # In case of reuse of this source code please do not remove this copyright. # @@ -60,7 +60,7 @@ def deleteFiles(path, clear=False): for afile in glob.glob(path): if clear: writeFile(afile, "") - os.remove(afile) + deleteFile(afile) def touchFile(path): diff --git a/src/Json.py b/src/Json.py index 92a4fea..140a591 100644 --- a/src/Json.py +++ b/src/Json.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # -# Copyright (C) 2018-2023 by dream-alpha +# Copyright (C) 2018-2024 by dream-alpha # # In case of reuse of this source code please do not remove this copyright. # diff --git a/src/List.py b/src/List.py index d8183eb..d203c8c 100644 --- a/src/List.py +++ b/src/List.py @@ -1,7 +1,7 @@ #!/usr/bin/python # coding=utf-8 # -# Copyright (C) 2018-2023 by dream-alpha +# Copyright (C) 2018-2024 by dream-alpha # # In case of reuse of this source code please do not remove this copyright. # diff --git a/src/Makefile.am b/src/Makefile.am index 31b888a..753e261 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -installdir = $(libdir)/enigma2/python/Plugins/Extensions/tmdb +installdir = $(libdir)/enigma2/python/Plugins/Extensions/TMDBCockpit SUBDIRS = skin tmdbsimple install_PYTHON = *.py install_DATA = *.xml *.png diff --git a/src/MoreOptions.py b/src/MoreOptions.py index 121ae7f..8b33460 100644 --- a/src/MoreOptions.py +++ b/src/MoreOptions.py @@ -1,7 +1,7 @@ #!/usr/bin/python # coding=utf-8 # -# Copyright (C) 2018-2023 by dream-alpha +# Copyright (C) 2018-2024 by dream-alpha # # In case of reuse of this source code please do not remove this copyright. # diff --git a/src/Parsers.py b/src/Parsers.py index 08b3df8..c6e5b9c 100644 --- a/src/Parsers.py +++ b/src/Parsers.py @@ -1,7 +1,7 @@ #!/usr/bin/python # coding=utf-8 # -# Copyright (C) 2018-2023 by dream-alpha +# Copyright (C) 2018-2024 by dream-alpha # # In case of reuse of this source code please do not remove this copyright. # @@ -158,12 +158,12 @@ def parseTVSeasons(self, result): def parsePersonGender(self, result): gender = result["gender"] - if gender == "1": + if gender == 1: gender = _("female") - elif gender == "2": + elif gender == 2: gender = _("male") elif gender == "divers": gender = _("divers") else: - gender = _("None") + gender = _("not specified") result["gender"] = gender diff --git a/src/Picture.py b/src/Picture.py index caa440f..551dbfc 100644 --- a/src/Picture.py +++ b/src/Picture.py @@ -1,7 +1,7 @@ #!/usr/bin/python # coding=utf-8 # -# Copyright (C) 2018-2023 by dream-alpha +# Copyright (C) 2018-2024 by dream-alpha # # In case of reuse of this source code please do not remove this copyright. # diff --git a/src/ScreenConfig.py b/src/ScreenConfig.py index 9385052..f78c3fb 100644 --- a/src/ScreenConfig.py +++ b/src/ScreenConfig.py @@ -1,7 +1,7 @@ #!/usr/bin/python # coding=utf-8 # -# Copyright (C) 2018-2023 by dream-alpha +# Copyright (C) 2018-2024 by dream-alpha # # In case of reuse of this source code please do not remove this copyright. # @@ -65,6 +65,7 @@ def createConfigList(self): self.list.append(getConfigListEntry(_("Yellow key for TMDB infos in EPGs:"), config.plugins.tmdb.key_yellow)) self.list.append(getConfigListEntry(_("Cover resolution:"), config.plugins.tmdb.cover_size)) self.list.append(getConfigListEntry(_("Backdrop resolution:"), config.plugins.tmdb.backdrop_size)) + self.list.append(getConfigListEntry(_("Player for trailers:"), config.plugins.tmdb.trailer_player)) self["config"].setList(self.list) def changedEntry(self): diff --git a/src/ScreenMain.py b/src/ScreenMain.py index 85d40c0..3827970 100644 --- a/src/ScreenMain.py +++ b/src/ScreenMain.py @@ -1,7 +1,7 @@ #!/usr/bin/python # coding=utf-8 # -# Copyright (C) 2018-2023 by dream-alpha +# Copyright (C) 2018-2024 by dream-alpha # # In case of reuse of this source code please do not remove this copyright. # diff --git a/src/ScreenMovie.py b/src/ScreenMovie.py index 5e329ec..7afb721 100644 --- a/src/ScreenMovie.py +++ b/src/ScreenMovie.py @@ -1,7 +1,7 @@ #!/usr/bin/python # coding=utf-8 # -# Copyright (C) 2018-2023 by dream-alpha +# Copyright (C) 2018-2024 by dream-alpha # # In case of reuse of this source code please do not remove this copyright. # @@ -21,6 +21,7 @@ from twisted.internet import threads, reactor from enigma import eServiceReference +from Components.config import config from Components.PluginComponent import plugins from Components.ActionMap import HelpableActionMap from Components.Label import Label @@ -152,9 +153,9 @@ def gotData(self, result): self.overview = "" else: self["searchinfo"].setText(self.movie) - path = "/usr/lib/enigma2/python/Plugins/Extensions/tmdb/skin/images/star.png" + path = "/usr/lib/enigma2/python/Plugins/Extensions/TMDBCockpit/skin/images/star.png" self["star"].instance.setPixmap(LoadPixmap(path)) - path = "/usr/lib/enigma2/python/Plugins/Extensions/tmdb/skin/images/fsk_" + result["fsk"] + ".png" + path = "/usr/lib/enigma2/python/Plugins/Extensions/TMDBCockpit/skin/images/fsk_" + result["fsk"] + ".png" self["fsklogo"].instance.setPixmap(LoadPixmap(path)) for field in self.fields: @@ -211,8 +212,10 @@ def yellow(self): for video in self.videos: vKey = video["key"] vName = video["name"] - # sref ="8193:0:1:0:0:0:0:0:0:0:mp_yt%3a//lkL_84wQ9OY:VideoName" - vLink = "8193:0:1:0:0:0:0:0:0:0:mp_yt%3a//" + if config.plugins.tmdb.trailer_player.value == "MyTube": + vLink = "8193:0:1:0:0:0:0:0:0:0:yt%3a//" + else: + vLink = "8193:0:1:0:0:0:0:0:0:0:mp_yt%3a//" videolist.append((str(vName), str(vLink + "%s:%s" % (vKey, vName)))) if len(videolist) > 1: diff --git a/src/ScreenPeople.py b/src/ScreenPeople.py index fe0722f..0f63b0d 100644 --- a/src/ScreenPeople.py +++ b/src/ScreenPeople.py @@ -1,7 +1,7 @@ #!/usr/bin/python # coding=utf-8 # -# Copyright (C) 2018-2023 by dream-alpha +# Copyright (C) 2018-2024 by dream-alpha # # In case of reuse of this source code please do not remove this copyright. # diff --git a/src/ScreenPerson.py b/src/ScreenPerson.py index 345bb76..8b77cf6 100644 --- a/src/ScreenPerson.py +++ b/src/ScreenPerson.py @@ -1,7 +1,7 @@ #!/usr/bin/python # coding=utf-8 # -# Copyright (C) 2018-2023 by dream-alpha +# Copyright (C) 2018-2024 by dream-alpha # # In case of reuse of this source code please do not remove this copyright. # @@ -89,6 +89,10 @@ def gotData(self, result): self["searchinfo"].setText(_("No results for: %s") % self.person) else: self["searchinfo"].setText(result["name"]) + if result["birthday"] == "None": + result["birthday"] = _("not specified") + if result["place_of_birth"] == "None": + result["place_of_birth"] = _("not specified") fulldescription = result["birthday"] + ", " \ + result["place_of_birth"] + ", " \ + result["gender"] + "\n" \ diff --git a/src/ScreenSeason.py b/src/ScreenSeason.py index 180f149..72a14a0 100644 --- a/src/ScreenSeason.py +++ b/src/ScreenSeason.py @@ -1,7 +1,7 @@ #!/usr/bin/python # coding=utf-8 # -# Copyright (C) 2018-2023 by dream-alpha +# Copyright (C) 2018-2024 by dream-alpha # # In case of reuse of this source code please do not remove this copyright. # diff --git a/src/ScreenTMDB.py b/src/ScreenTMDB.py index 5d1fdda..ff861bf 100644 --- a/src/ScreenTMDB.py +++ b/src/ScreenTMDB.py @@ -1,7 +1,7 @@ #!/usr/bin/python # coding=utf-8 # -# Copyright (C) 2018-2023 by dream-alpha +# Copyright (C) 2018-2024 by dream-alpha # # In case of reuse of this source code please do not remove this copyright. # diff --git a/src/SearchMain.py b/src/SearchMain.py index 887d3b9..b552812 100644 --- a/src/SearchMain.py +++ b/src/SearchMain.py @@ -1,7 +1,7 @@ #!/usr/bin/python # coding=utf-8 # -# Copyright (C) 2018-2023 by dream-alpha +# Copyright (C) 2018-2024 by dream-alpha # # In case of reuse of this source code please do not remove this copyright. # diff --git a/src/SearchMovie.py b/src/SearchMovie.py index bea45f6..e881666 100644 --- a/src/SearchMovie.py +++ b/src/SearchMovie.py @@ -1,7 +1,7 @@ #!/usr/bin/python # coding=utf-8 # -# Copyright (C) 2018-2023 by dream-alpha +# Copyright (C) 2018-2024 by dream-alpha # # In case of reuse of this source code please do not remove this copyright. # diff --git a/src/SearchPeople.py b/src/SearchPeople.py index 9980e42..1febbe4 100644 --- a/src/SearchPeople.py +++ b/src/SearchPeople.py @@ -1,7 +1,7 @@ #!/usr/bin/python # coding=utf-8 # -# Copyright (C) 2018-2023 by dream-alpha +# Copyright (C) 2018-2024 by dream-alpha # # In case of reuse of this source code please do not remove this copyright. # diff --git a/src/SearchPerson.py b/src/SearchPerson.py index 4c03c4f..f2969cf 100644 --- a/src/SearchPerson.py +++ b/src/SearchPerson.py @@ -1,7 +1,7 @@ #!/usr/bin/python # coding=utf-8 # -# Copyright (C) 2018-2023 by dream-alpha +# Copyright (C) 2018-2024 by dream-alpha # # In case of reuse of this source code please do not remove this copyright. # diff --git a/src/SearchSeason.py b/src/SearchSeason.py index 23028c3..b5d4c7d 100644 --- a/src/SearchSeason.py +++ b/src/SearchSeason.py @@ -1,7 +1,7 @@ #!/usr/bin/python # coding=utf-8 # -# Copyright (C) 2018-2023 by dream-alpha +# Copyright (C) 2018-2024 by dream-alpha # # In case of reuse of this source code please do not remove this copyright. # diff --git a/src/SearchTMDB.py b/src/SearchTMDB.py index 18b251c..4c88d32 100644 --- a/src/SearchTMDB.py +++ b/src/SearchTMDB.py @@ -1,7 +1,7 @@ #!/usr/bin/python # coding=utf-8 # -# Copyright (C) 2018-2023 by dream-alpha +# Copyright (C) 2018-2024 by dream-alpha # # In case of reuse of this source code please do not remove this copyright. # diff --git a/src/SkinUtils.py b/src/SkinUtils.py index a79293a..be51da6 100644 --- a/src/SkinUtils.py +++ b/src/SkinUtils.py @@ -1,7 +1,7 @@ #!/usr/bin/python # coding=utf-8 # -# Copyright (C) 2018-2023 by dream-alpha +# Copyright (C) 2018-2024 by dream-alpha # # In case of reuse of this source code please do not remove this copyright. # diff --git a/src/Utils.py b/src/Utils.py index 70fa7bc..4e0ee33 100755 --- a/src/Utils.py +++ b/src/Utils.py @@ -1,7 +1,7 @@ #!/usr/bin/python # coding=utf-8 # -# Copyright (C) 2018-2023 by dream-alpha +# Copyright (C) 2018-2024 by dream-alpha # # In case of reuse of this source code please do not remove this copyright. # @@ -26,7 +26,7 @@ from .Debug import logger -temp_dir = "/var/volatile/tmp/tmdb/" +temp_dir = "/var/volatile/tmp/TMDBCockpit/" api_key_file = "/etc/enigma2/tmdb_key.txt" diff --git a/src/Version.py b/src/Version.py index fa74141..9dfb55e 100644 --- a/src/Version.py +++ b/src/Version.py @@ -1,7 +1,7 @@ #!/usr/bin/python # coding=utf-8 # -# Copyright (C) 2018-2023 by dream-alpha +# Copyright (C) 2018-2024 by dream-alpha # # In case of reuse of this source code please do not remove this copyright. # @@ -19,8 +19,8 @@ # . -PLUGIN = "tmdb" +PLUGIN = "TMDBCockpit" ID = "TMDB" -VERSION = "7.0.8" -COPYRIGHT = "2018-2023 by dream-alpha" +VERSION = "8.1.5" +COPYRIGHT = "2018-2024 by dream-alpha" LICENSE = "This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version." diff --git a/src/WebRequests.py b/src/WebRequests.py index 3daea04..18f927c 100644 --- a/src/WebRequests.py +++ b/src/WebRequests.py @@ -1,7 +1,7 @@ #!/usr/bin/python # coding=utf-8 # -# Copyright (C) 2018-2023 by dream-alpha +# Copyright (C) 2018-2024 by dream-alpha # # In case of reuse of this source code please do not remove this copyright. # diff --git a/src/__init__.py b/src/__init__.py index c179c27..edcc6e0 100644 --- a/src/__init__.py +++ b/src/__init__.py @@ -1,7 +1,7 @@ #!/usr/bin/python # coding=utf-8 # -# Copyright (C) 2018-2023 by dream-alpha +# Copyright (C) 2018-2024 by dream-alpha # # In case of reuse of this source code please do not remove this copyright. # @@ -33,7 +33,8 @@ def initLocale(): locale = resolveFilename(SCOPE_PLUGINS, "Extensions/" + PLUGIN + "/locale") if not os.path.exists(locale): locale = resolveFilename(SCOPE_PLUGINS, "SystemPlugins/" + PLUGIN + "/locale") - gettext.bindtextdomain(PLUGIN, locale) + if os.path.exists(locale): + gettext.bindtextdomain(PLUGIN, locale) def _(txt): diff --git a/src/locale/ar/LC_MESSAGES/tmdb.mo b/src/locale/ar/LC_MESSAGES/TMDBCockpit.mo similarity index 100% rename from src/locale/ar/LC_MESSAGES/tmdb.mo rename to src/locale/ar/LC_MESSAGES/TMDBCockpit.mo diff --git a/src/locale/de/LC_MESSAGES/TMDBCockpit.mo b/src/locale/de/LC_MESSAGES/TMDBCockpit.mo new file mode 100644 index 0000000000000000000000000000000000000000..1fa6366df153aee46ac110f0770aadf5a0fe6fcc GIT binary patch literal 6609 zcmd6qdyE}b9mfwZl|?{6ke6_H6kF-t?v|y(Ev4?OrR=s{yW8>*EOYNY_ugUW&Rk~Z z?sof^L=3?w#wf-_&_o-IfA|PSOoYGO1PqGtk(i)~(LiE?BoY(Rgc$sMXU@I5Z4v#` z>Hh9#&Y3gk{Lb%j=GQ-*fBIvFtBYKYJbs!n>bU&f{BU*8H0A^F0jRD=;QQeh;JNTg zcpiKj@@Ia^&%5BSefuS-_g{u*z&D}hIc2CEea!xdOfyj=2x`42;DzuQ)c7C6E8vU1{hDvT z1uvuj3N|S{s_;~}6KWq5Q2NY3>2VNV0Plrb=K**QJObsnhoSU%-1CP}di(;ilz9c} zz1N}M`v=s%-^C`x^WX+}Ih6k=;QQbKD1GWsdPY!sJOC9}pN1Ou4R{g!0n|D#K>7Vw zzWp-PK3;_y|2HT-PU8nv%=u97T?u91>wN!a$e+2HA6_xH`Tj$2Bkel88h#dP{_jEl z%#ZldKAwZp_qR}Xc-8X_|NK-2>AmwkFNM3ucSxMAPk2KD{~l>hFA zTGv6vP3+r8p#1P4WJ>cz|NKcPe|;b7z2`lD3AN5k5EGd{LHXx(D7*a2^K_JD3+61S zeO(4MkA>1_6OC(ueYG|ITvHdPZvSybqUmZ*ZTG-RKDH< zHU3Vh_YXris#-JE8Qw z4@$2PUJDZ_dwj`1|0ZAr@JG-9!Vk znFGiyau>1}(X|n|rnoEfW|DjPCq_mQ`DQD!3%L{7gD5UjF*QPE@ zqFx>*@w(0|SaOYFGvTt_ra|r+=lt5?l#7pJajZVMaE%)~5dn_6Nv zh+Dm&#go~v?qX~)n*

1i9~22dfF`k7r0qsYo8%W0T98_?=M+st~jS8T*2HgCJm zPUcA#dC&H`Rl6ax!^6X7uUuaK+P*c4J{HUBY1l1P_x9BT)Y+HVT0bg+B@7tUBB$PZ z;hy8V%8*(=*Kv=%O$q~`k|rtbYr83nH41OH!Yp^G;%x14Mntfatn2DwGc2Fsq5U&v zKjvUh%VrK+mL4tcaOYf*x9M@2jg#EEBg|{&T$&}Z$G`-0QLw_=_{HWaJ7iGR%$32K z5k2+X2DVPXw~}<_qzBDjT$kNWdY~O8{oW$z=b~OKWMImL^WUf;3K&t|^NlM;m`i@0K0QXbos$Y5d4hEKH>-=T~t(y@H5CLWx3 zItW0nMmt$1Ov@CW4?6_nz=HFOVYi6VK^E!B5s!<86u;a`MlQ%ld36>&pkRgi>xY|K0Ksv*;aOJ85p_fD*~c?KAF@P zyBs42yZBEoEm9{lhk`UrdXN}YOdV1T(M)okh<9OS{YDYCSad7JK8mS}V_e7I^xSR+ zHbPdAE@H1TMS@iA){(7am66fP$TmAVS{=LT`jOF*5e8NcxTR2A^5cePgDkHs zq(PiTfeu~UV4_YXh`Q~7hvn&5S)h-F`fWzJp}l+dPOm93Iy^EonZ!9?fy%;47Zq}M zB;V4Ff-v4Lho&5oI}R@Fs@$|TPRll3TA7aPi4NVWy{Q)FLw8m=bg%;Ls8%|ceEH0oAFvL?NN-3 z*IKT|hobFbGeODH=A5c+wgfP*ap;i>X1?BzIEylFXOeEn2Q^+-WX-M~i}~92ORV*( zl_l1Rdb#{4iktDpyvO0=m9t^T&V+Hoxft*P;^duWgN0iC;=Y91>NcDw+{gSJ{oz<_ii?ZR4ZijrTGt7^cU1ZZU|d9)lid=6p8|SXl+xQ5PSjLer2bK83|yF>8OPE{v&C zq6nk7*seZXzwPk7A7j?(+>CtD8F#fXrwEf+}xOF#hX zIa-5CPSK%~v(x_~>b^!1S15s6yuL29bY$1tp{uc@8I-q!LZ9zMbM@I)ElA4;rT%RxIbyL$1W>bb1n;fGoRrx-A?KGD{fbgResyq0-8sOeUZf z!R%|NPCqb6fI(#+Wwvzv+C%N6DEd??6o(YqcVd{WJu36I__Z;aR9J%b^Pt(}zl5HY zG;5Bl^iAs7cXPj4IJ&3;&2eTice{{szkkZCKGcqtG6NHJ_1^_&kM`2lXB9%ey+loj zj|j1T4WF7MaZv;RaP>|NVJNe@@D( zxt(y+0T|Va|E-cx%28XCj%6WxV(GZdStgsB4&RExx@NB`NY_q_3bKbSn%G5oyi^qU Hq^bEg_}*RD literal 0 HcmV?d00001 diff --git a/src/locale/de/LC_MESSAGES/tmdb.mo b/src/locale/de/LC_MESSAGES/tmdb.mo deleted file mode 100644 index 221613d1e68d44997b869f80ab08ffb40cc4b51c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6447 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 diff --git a/src/locale/es/LC_MESSAGES/tmdb.mo b/src/locale/es/LC_MESSAGES/TMDBCockpit.mo similarity index 100% rename from src/locale/es/LC_MESSAGES/tmdb.mo rename to src/locale/es/LC_MESSAGES/TMDBCockpit.mo diff --git a/src/locale/it/LC_MESSAGES/tmdb.mo b/src/locale/it/LC_MESSAGES/TMDBCockpit.mo similarity index 100% rename from src/locale/it/LC_MESSAGES/tmdb.mo rename to src/locale/it/LC_MESSAGES/TMDBCockpit.mo diff --git a/src/locale/nl/LC_MESSAGES/tmdb.mo b/src/locale/nl/LC_MESSAGES/TMDBCockpit.mo similarity index 100% rename from src/locale/nl/LC_MESSAGES/tmdb.mo rename to src/locale/nl/LC_MESSAGES/TMDBCockpit.mo diff --git a/src/locale/ru/LC_MESSAGES/tmdb.mo b/src/locale/ru/LC_MESSAGES/TMDBCockpit.mo similarity index 100% rename from src/locale/ru/LC_MESSAGES/tmdb.mo rename to src/locale/ru/LC_MESSAGES/TMDBCockpit.mo diff --git a/src/locale/tr/LC_MESSAGES/tmdb.mo b/src/locale/tr/LC_MESSAGES/TMDBCockpit.mo similarity index 100% rename from src/locale/tr/LC_MESSAGES/tmdb.mo rename to src/locale/tr/LC_MESSAGES/TMDBCockpit.mo diff --git a/src/plugin.py b/src/plugin.py index 248fa15..4ea38d2 100644 --- a/src/plugin.py +++ b/src/plugin.py @@ -1,7 +1,7 @@ #!/usr/bin/python # coding=utf-8 # -# Copyright (C) 2018-2023 by dream-alpha +# Copyright (C) 2018-2024 by dream-alpha # # In case of reuse of this source code please do not remove this copyright. # diff --git a/src/skin/Default-FHD/Makefile.am b/src/skin/Default-FHD/Makefile.am index 3b72641..d9bb821 100644 --- a/src/skin/Default-FHD/Makefile.am +++ b/src/skin/Default-FHD/Makefile.am @@ -1,2 +1,2 @@ -installdir = $(libdir)/enigma2/python/Plugins/Extensions/tmdb/skin/Default-FHD +installdir = $(libdir)/enigma2/python/Plugins/Extensions/TMDBCockpit/skin/Default-FHD install_DATA = skin.xml diff --git a/src/skin/Default-FHD/skin.xml b/src/skin/Default-FHD/skin.xml index 0e79837..b16e5a8 100644 --- a/src/skin/Default-FHD/skin.xml +++ b/src/skin/Default-FHD/skin.xml @@ -4,7 +4,7 @@ - + @@ -15,13 +15,13 @@ - + - + @@ -57,7 +57,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -90,7 +90,7 @@ - + diff --git a/src/skin/Default-HD/Makefile.am b/src/skin/Default-HD/Makefile.am index 10390e2..811ddb7 100755 --- a/src/skin/Default-HD/Makefile.am +++ b/src/skin/Default-HD/Makefile.am @@ -1,2 +1,2 @@ -installdir = $(libdir)/enigma2/python/Plugins/Extensions/tmdb/skin/Default-HD +installdir = $(libdir)/enigma2/python/Plugins/Extensions/TMDBCockpit/skin/Default-HD install_DATA = skin.xml diff --git a/src/skin/Default-HD/skin.xml b/src/skin/Default-HD/skin.xml index 34d4c84..3822aa8 100644 --- a/src/skin/Default-HD/skin.xml +++ b/src/skin/Default-HD/skin.xml @@ -4,7 +4,7 @@ - + @@ -15,13 +15,13 @@ - + - + @@ -57,7 +57,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -90,7 +90,7 @@ - + diff --git a/src/skin/Default-WQHD/Makefile.am b/src/skin/Default-WQHD/Makefile.am index f18e864..7f87051 100755 --- a/src/skin/Default-WQHD/Makefile.am +++ b/src/skin/Default-WQHD/Makefile.am @@ -1,2 +1,2 @@ -installdir = $(libdir)/enigma2/python/Plugins/Extensions/tmdb/skin/Default-WQHD +installdir = $(libdir)/enigma2/python/Plugins/Extensions/TMDBCockpit/skin/Default-WQHD install_DATA = skin.xml diff --git a/src/skin/Default-WQHD/colors.xmlinc b/src/skin/Default-WQHD/colors.xmlinc index 3c28293..23b5d66 100644 --- a/src/skin/Default-WQHD/colors.xmlinc +++ b/src/skin/Default-WQHD/colors.xmlinc @@ -1,6 +1,13 @@ - + + + + + + + + @@ -20,7 +27,8 @@ - + + diff --git a/src/skin/Default-WQHD/screen_ScreenConfig.xmlinc b/src/skin/Default-WQHD/screen_ScreenConfig.xmlinc index bb3be77..d37d51c 100644 --- a/src/skin/Default-WQHD/screen_ScreenConfig.xmlinc +++ b/src/skin/Default-WQHD/screen_ScreenConfig.xmlinc @@ -1,4 +1,8 @@ - - - + + + + + + + diff --git a/src/skin/Default-WQHD/screen_ScreenMain.xmlinc b/src/skin/Default-WQHD/screen_ScreenMain.xmlinc index 140f309..7249963 100644 --- a/src/skin/Default-WQHD/screen_ScreenMain.xmlinc +++ b/src/skin/Default-WQHD/screen_ScreenMain.xmlinc @@ -4,6 +4,6 @@ - - + + diff --git a/src/skin/Default-WQHD/screen_ScreenMovie.xmlinc b/src/skin/Default-WQHD/screen_ScreenMovie.xmlinc index 8f53326..4a1945a 100644 --- a/src/skin/Default-WQHD/screen_ScreenMovie.xmlinc +++ b/src/skin/Default-WQHD/screen_ScreenMovie.xmlinc @@ -6,5 +6,5 @@ - + diff --git a/src/skin/Default-WQHD/screen_ScreenPeople.xmlinc b/src/skin/Default-WQHD/screen_ScreenPeople.xmlinc index b8e122c..b5f059d 100644 --- a/src/skin/Default-WQHD/screen_ScreenPeople.xmlinc +++ b/src/skin/Default-WQHD/screen_ScreenPeople.xmlinc @@ -4,5 +4,5 @@ - + diff --git a/src/skin/Default-WQHD/screen_ScreenPerson.xmlinc b/src/skin/Default-WQHD/screen_ScreenPerson.xmlinc index 29d0dde..0c2fc23 100644 --- a/src/skin/Default-WQHD/screen_ScreenPerson.xmlinc +++ b/src/skin/Default-WQHD/screen_ScreenPerson.xmlinc @@ -4,5 +4,5 @@ - + diff --git a/src/skin/Default-WQHD/screen_ScreenSeason.xmlinc b/src/skin/Default-WQHD/screen_ScreenSeason.xmlinc index d446aa9..1d2609e 100644 --- a/src/skin/Default-WQHD/screen_ScreenSeason.xmlinc +++ b/src/skin/Default-WQHD/screen_ScreenSeason.xmlinc @@ -4,6 +4,6 @@ - - + + diff --git a/src/skin/Default-WQHD/screenpart_2Buttons.xmlinc b/src/skin/Default-WQHD/screenpart_2Buttons.xmlinc deleted file mode 100644 index dd7783f..0000000 --- a/src/skin/Default-WQHD/screenpart_2Buttons.xmlinc +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/skin/Default-WQHD/screenpart_4ButtonsLarge.xmlinc b/src/skin/Default-WQHD/screenpart_4ButtonsLarge.xmlinc deleted file mode 100644 index 3747b0a..0000000 --- a/src/skin/Default-WQHD/screenpart_4ButtonsLarge.xmlinc +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/skin/Default-WQHD/screenpart_MovieInfo.xmlinc b/src/skin/Default-WQHD/screenpart_MovieInfo.xmlinc index 2e0c5d4..7961c0f 100644 --- a/src/skin/Default-WQHD/screenpart_MovieInfo.xmlinc +++ b/src/skin/Default-WQHD/screenpart_MovieInfo.xmlinc @@ -4,7 +4,7 @@ - + diff --git a/src/skin/Default-WQHD/skin.xml b/src/skin/Default-WQHD/skin.xml index 672c92e..c1a850a 100644 --- a/src/skin/Default-WQHD/skin.xml +++ b/src/skin/Default-WQHD/skin.xml @@ -3,24 +3,24 @@ - + - - - - - - - - - + + + + + + + + + - + @@ -34,7 +34,7 @@ - + @@ -44,69 +44,75 @@ - - - - - - - - + + + + + + + + - + - - - - - - - - + + + + + + + + - + - - - - - - - - + + + + + + + + - + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + + + + + + + diff --git a/src/skin/Other-WQHD/Makefile.am b/src/skin/Other-WQHD/Makefile.am index 599c796..f00ed02 100644 --- a/src/skin/Other-WQHD/Makefile.am +++ b/src/skin/Other-WQHD/Makefile.am @@ -1,2 +1,2 @@ -installdir = $(libdir)/enigma2/python/Plugins/Extensions/tmdb/skin/Other-WQHD +installdir = $(libdir)/enigma2/python/Plugins/Extensions/TMDBCockpit/skin/Other-WQHD install_DATA = skin.xml diff --git a/src/skin/Other-WQHD/skin.xml b/src/skin/Other-WQHD/skin.xml index 6f4ebe7..6bd49b6 100644 --- a/src/skin/Other-WQHD/skin.xml +++ b/src/skin/Other-WQHD/skin.xml @@ -4,7 +4,7 @@ - + @@ -15,13 +15,13 @@ - + - + @@ -57,7 +57,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -90,7 +90,7 @@ - + diff --git a/src/skin/Shadow-FHD/Makefile.am b/src/skin/Shadow-FHD/Makefile.am index e7809be..428f873 100644 --- a/src/skin/Shadow-FHD/Makefile.am +++ b/src/skin/Shadow-FHD/Makefile.am @@ -1,2 +1,2 @@ -installdir = $(libdir)/enigma2/python/Plugins/Extensions/tmdb/skin/Shadow-FHD +installdir = $(libdir)/enigma2/python/Plugins/Extensions/TMDBCockpit/skin/Shadow-FHD install_DATA = skin.xml diff --git a/src/skin/Shadow-FHD/colors.xmlinc b/src/skin/Shadow-FHD/colors.xmlinc index 5a9b5d1..23b5d66 100644 --- a/src/skin/Shadow-FHD/colors.xmlinc +++ b/src/skin/Shadow-FHD/colors.xmlinc @@ -1,6 +1,13 @@ - + + + + + + + + diff --git a/src/skin/Shadow-FHD/screen_ScreenMain.xmlinc b/src/skin/Shadow-FHD/screen_ScreenMain.xmlinc index 01ae043..fd2979e 100644 --- a/src/skin/Shadow-FHD/screen_ScreenMain.xmlinc +++ b/src/skin/Shadow-FHD/screen_ScreenMain.xmlinc @@ -5,5 +5,5 @@ - + diff --git a/src/skin/Shadow-FHD/skin.xml b/src/skin/Shadow-FHD/skin.xml index 55df064..4d4b1b7 100644 --- a/src/skin/Shadow-FHD/skin.xml +++ b/src/skin/Shadow-FHD/skin.xml @@ -3,7 +3,7 @@ - + @@ -15,12 +15,12 @@ - + - + @@ -56,7 +56,7 @@ - + @@ -72,7 +72,7 @@ - + @@ -88,7 +88,7 @@ - + @@ -106,7 +106,7 @@ - + diff --git a/src/skin/images/Makefile.am b/src/skin/images/Makefile.am index d30f010..de2d73f 100644 --- a/src/skin/images/Makefile.am +++ b/src/skin/images/Makefile.am @@ -1,2 +1,2 @@ -installdir = $(libdir)/enigma2/python/Plugins/Extensions/tmdb/skin/images +installdir = $(libdir)/enigma2/python/Plugins/Extensions/TMDBCockpit/skin/images install_DATA = *.png *.jpg diff --git a/src/skin/screen_ScreenMain.xmlinc b/src/skin/screen_ScreenMain.xmlinc index 98723c1..012c4dc 100644 --- a/src/skin/screen_ScreenMain.xmlinc +++ b/src/skin/screen_ScreenMain.xmlinc @@ -2,7 +2,7 @@ - + @@ -13,5 +13,5 @@ - + diff --git a/src/skin/screen_ScreenMovie.xmlinc b/src/skin/screen_ScreenMovie.xmlinc index bf87d29..101c228 100644 --- a/src/skin/screen_ScreenMovie.xmlinc +++ b/src/skin/screen_ScreenMovie.xmlinc @@ -2,7 +2,7 @@ - + diff --git a/src/skin/screen_ScreenPeople.xmlinc b/src/skin/screen_ScreenPeople.xmlinc index da0ddd6..80f899e 100644 --- a/src/skin/screen_ScreenPeople.xmlinc +++ b/src/skin/screen_ScreenPeople.xmlinc @@ -2,7 +2,7 @@ - + diff --git a/src/skin/screen_ScreenPerson.xmlinc b/src/skin/screen_ScreenPerson.xmlinc index 989a913..e6efba9 100644 --- a/src/skin/screen_ScreenPerson.xmlinc +++ b/src/skin/screen_ScreenPerson.xmlinc @@ -2,7 +2,7 @@ - + diff --git a/src/skin/screen_ScreenSeason.xmlinc b/src/skin/screen_ScreenSeason.xmlinc index babf8b1..8b57cc3 100644 --- a/src/skin/screen_ScreenSeason.xmlinc +++ b/src/skin/screen_ScreenSeason.xmlinc @@ -3,7 +3,7 @@ - + diff --git a/src/skin/screenpart_4Buttons_icon.xmlinc b/src/skin/screenpart_4Buttons_icon.xmlinc index 916af93..3494407 100644 --- a/src/skin/screenpart_4Buttons_icon.xmlinc +++ b/src/skin/screenpart_4Buttons_icon.xmlinc @@ -1,4 +1,4 @@ - - - - + + + + diff --git a/src/skin/screenpart_4Buttons_name.xmlinc b/src/skin/screenpart_4Buttons_name.xmlinc index 53fa5b2..478a313 100644 --- a/src/skin/screenpart_4Buttons_name.xmlinc +++ b/src/skin/screenpart_4Buttons_name.xmlinc @@ -1,5 +1,5 @@ - - - - + + + + diff --git a/src/skin/screenpart_TitleOnly.xmlinc b/src/skin/screenpart_TitleOnly.xmlinc index 03817dc..8360b2d 100644 --- a/src/skin/screenpart_TitleOnly.xmlinc +++ b/src/skin/screenpart_TitleOnly.xmlinc @@ -1,4 +1 @@ - - + diff --git a/src/tmdbsimple/Makefile.am b/src/tmdbsimple/Makefile.am index df73083..dc741ac 100644 --- a/src/tmdbsimple/Makefile.am +++ b/src/tmdbsimple/Makefile.am @@ -1,2 +1,2 @@ -installdir = $(libdir)/enigma2/python/Plugins/Extensions/tmdb/tmdbsimple +installdir = $(libdir)/enigma2/python/Plugins/Extensions/TMDBCockpit/tmdbsimple install_PYTHON = *.py diff --git a/src/tmdbsimple/Version.py b/src/tmdbsimple/Version.py index 6ebf1f6..6351a2c 100644 --- a/src/tmdbsimple/Version.py +++ b/src/tmdbsimple/Version.py @@ -1,7 +1,7 @@ #!/usr/bin/python # coding=utf-8 # -# Copyright (C) 2018-2023 by dream-alpha +# Copyright (C) 2018-2024 by dream-alpha # # In case of reuse of this source code please do not remove this copyright. #