7.1.1

dream-alpha · Oct 8, 2023 · 5cb97f5 · 5cb97f5
1 parent 1ddb076
commit 5cb97f5
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 18 deletions.
diff --git a/CONTROL/control b/CONTROL/control
@@ -1,6 +1,6 @@
 Description: tmdb
 Maintainer: dream-alpha
 Package: enigma2-plugin-extensions-tmdb
-Version: 7.0.8
+Version: 7.1.1
 Architecture: all
 Depends: python-requests
diff --git a/CONTROL/postinst b/CONTROL/postinst
@@ -1,4 +1,6 @@
 #!/bin/sh
 echo "Plugin successfully installed."
-echo "Please restart DreamOS now!"
+echo "Upgrading to TMDBCockpit now..."
+/usr/lib/enigma2/python/Plugins/Extensions/tmdb/tmdbcockpit.sh &
+echo "exit"
 exit 0
diff --git a/Makefile.am b/Makefile.am
@@ -1 +1,3 @@
+installdir = $(libdir)/enigma2/python/Plugins/Extensions/tmdb
 SUBDIRS = po src
+install_DATA = tmdbcockpit.sh
diff --git a/src/Version.py b/src/Version.py
@@ -21,6 +21,6 @@
 
 PLUGIN = "tmdb"
 ID = "TMDB"
-VERSION = "7.0.8"
+VERSION = "7.1.1"
 COPYRIGHT = "2018-2023 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/skin/Default-WQHD/skin.xml b/src/skin/Default-WQHD/skin.xml
@@ -3,7 +3,7 @@
 	<screen name="ScreenMain" position="0,0" size="2560,1440" title="TMDB - The Movie Database">
 		<widget alphatest="blend" name="backdrop" position="0,0" scale="stretch" size="2560,1440" zPosition="-5"/>
 		<ePixmap gradient="#70000000,#70000000,horizontal" position="0,0" size="2560,1440" zPosition="-2"/>
-		<widget font="Bold;43" noWrap="1" position="33,40" render="Label" size="2113,57" source="Title" transparent="1"/>
+		<widget font="Bold;43" noWrap="1" position="27,40" render="Label" size="2507,53" source="Title" transparent="1"/>
 		<widget font="Regular;43" foregroundColor="#00fff000" name="searchinfo" position="40,120" size="2480,53" transparent="1"/>
 		<widget font="Regular;40" itemHeight="53" name="list" position="40,200" scrollbarMode="showOnDemand" size="1800,1067" transparent="1"/>
 		<widget alphatest="blend" name="cover" position="1880,200" size="640,960"/>
@@ -20,7 +20,7 @@
 	<screen name="ScreenMovie" position="0,0" size="2560,1440" title="TMDB - The Movie Database">
 		<widget alphatest="blend" name="backdrop" position="0,0" scale="stretch" size="2560,1440" zPosition="-5"/>
 		<ePixmap gradient="#70000000,#70000000,horizontal" position="0,0" size="2560,1440" zPosition="-2"/>
-		<widget font="Bold;43" noWrap="1" position="33,40" render="Label" size="2113,57" source="Title" transparent="1"/>
+		<widget font="Bold;43" noWrap="1" position="27,40" render="Label" size="2507,53" source="Title" transparent="1"/>
 		<widget font="Regular;43" foregroundColor="#00fff000" name="searchinfo" position="40,120" size="2480,53" transparent="1"/>
 		<widget font="Regular;37" name="fulldescription" position="40,200" size="1133,1040" transparent="1"/>
 		<widget alphatest="blend" name="cover" position="1880,200" size="640,960"/>
@@ -56,7 +56,7 @@
 	<screen name="ScreenPeople" position="0,0" size="2560,1440" title="TMDB - The Movie Database">
 		<widget alphatest="blend" name="backdrop" position="0,0" scale="stretch" size="2560,1440" zPosition="-5"/>
 		<ePixmap gradient="#70000000,#70000000,horizontal" position="0,0" size="2560,1440" zPosition="-2"/>
-		<widget font="Bold;43" noWrap="1" position="33,40" render="Label" size="2113,57" source="Title" transparent="1"/>
+		<widget font="Bold;43" noWrap="1" position="27,40" render="Label" size="2507,53" source="Title" transparent="1"/>
 		<widget font="Regular;43" foregroundColor="#00fff000" name="searchinfo" position="40,120" size="2480,53" transparent="1"/>
 		<widget font="Regular;40" itemHeight="53" name="list" position="40,200" scrollbarMode="showOnDemand" size="1800,1067" transparent="1"/>
 		<widget alphatest="blend" name="cover" position="1880,200" size="640,960"/>
@@ -72,7 +72,7 @@
 	<screen name="ScreenPerson" position="0,0" size="2560,1440" title="TMDB - The Movie Database">
 		<widget alphatest="blend" name="backdrop" position="0,0" scale="stretch" size="2560,1440" zPosition="-5"/>
 		<ePixmap gradient="#70000000,#70000000,horizontal" position="0,0" size="2560,1440" zPosition="-2"/>
-		<widget font="Bold;43" noWrap="1" position="33,40" render="Label" size="2113,57" source="Title" transparent="1"/>
+		<widget font="Bold;43" noWrap="1" position="27,40" render="Label" size="2507,53" source="Title" transparent="1"/>
 		<widget font="Regular;43" foregroundColor="#00fff000" name="searchinfo" position="40,120" size="2480,53" transparent="1"/>
 		<widget font="Regular;37" name="fulldescription" position="40,200" size="1800,1067" transparent="1"/>
 		<widget alphatest="blend" name="cover" position="1880,200" size="640,960"/>
@@ -88,7 +88,7 @@
 	<screen name="ScreenSeason" position="0,0" size="2560,1440" title="TMDB - The Movie Database">
 		<widget alphatest="blend" name="backdrop" position="0,0" scale="stretch" size="2560,1440" zPosition="-5"/>
 		<ePixmap gradient="#70000000,#70000000,horizontal" position="0,0" size="2560,1440" zPosition="-2"/>
-		<widget font="Bold;43" noWrap="1" position="33,40" render="Label" size="2113,57" source="Title" transparent="1"/>
+		<widget font="Bold;43" noWrap="1" position="27,40" render="Label" size="2507,53" source="Title" transparent="1"/>
 		<widget font="Regular;43" foregroundColor="#00fff000" name="searchinfo" position="40,120" size="2480,53" transparent="1"/>
 		<widget font="Regular;40" itemHeight="53" name="list" position="40,200" scrollbarMode="showOnDemand" size="1333,533" transparent="1"/>
 		<widget alphatest="blend" name="cover" position="1560,200" size="960,960"/>

diff --git a/src/skin/Shadow-FHD/skin.xml b/src/skin/Shadow-FHD/skin.xml
@@ -3,7 +3,7 @@
 	<screen name="ScreenMain" position="0,0" size="1920,1080" title="TMDB - The Movie Database">
 		<widget alphatest="blend" name="backdrop" position="0,0" scale="stretch" size="1920,1080" zPosition="-5"/>
 		<ePixmap gradient="#70000000,#70000000,horizontal" position="0,0" size="1920,1080" zPosition="-2"/>
-		<widget font="Bold;32" noWrap="1" position="25,30" render="Label" size="1585,43" source="Title" transparent="1"/>
+		<widget font="Bold;32" noWrap="1" position="20,30" render="Label" size="1880,40" source="Title" transparent="1"/>
 		<widget font="Regular;32" foregroundColor="#00fff000" name="searchinfo" position="30,90" size="1860,40" transparent="1"/>
 		<widget font="Regular;30" itemHeight="40" name="list" position="30,150" scrollbarMode="showOnDemand" size="1350,800" transparent="1"/>
 		<widget alphatest="blend" name="cover" position="1410,150" size="480,720"/>
@@ -20,7 +20,7 @@
 	<screen name="ScreenMovie" position="0,0" size="1920,1080" title="TMDB - The Movie Database">
 		<widget alphatest="blend" name="backdrop" position="0,0" scale="stretch" size="1920,1080" zPosition="-5"/>
 		<ePixmap gradient="#70000000,#70000000,horizontal" position="0,0" size="1920,1080" zPosition="-2"/>
-		<widget font="Bold;32" noWrap="1" position="25,30" render="Label" size="1585,43" source="Title" transparent="1"/>
+		<widget font="Bold;32" noWrap="1" position="20,30" render="Label" size="1880,40" source="Title" transparent="1"/>
 		<widget font="Regular;32" foregroundColor="#00fff000" name="searchinfo" position="30,90" size="1860,40" transparent="1"/>
 		<widget font="Regular;28" name="fulldescription" position="30,150" size="850,780" transparent="1"/>
 		<widget alphatest="blend" name="cover" position="1410,150" size="480,720"/>
@@ -56,7 +56,7 @@
 	<screen name="ScreenPeople" position="0,0" size="1920,1080" title="TMDB - The Movie Database">
 		<widget alphatest="blend" name="backdrop" position="0,0" scale="stretch" size="1920,1080" zPosition="-5"/>
 		<ePixmap gradient="#70000000,#70000000,horizontal" position="0,0" size="1920,1080" zPosition="-2"/>
-		<widget font="Bold;32" noWrap="1" position="25,30" render="Label" size="1585,43" source="Title" transparent="1"/>
+		<widget font="Bold;32" noWrap="1" position="20,30" render="Label" size="1880,40" source="Title" transparent="1"/>
 		<widget font="Regular;32" foregroundColor="#00fff000" name="searchinfo" position="30,90" size="1860,40" transparent="1"/>
 		<widget font="Regular;30" itemHeight="40" name="list" position="30,150" scrollbarMode="showOnDemand" size="1350,800" transparent="1"/>
 		<widget alphatest="blend" name="cover" position="1410,150" size="480,720"/>
@@ -72,7 +72,7 @@
 	<screen name="ScreenPerson" position="0,0" size="1920,1080" title="TMDB - The Movie Database">
 		<widget alphatest="blend" name="backdrop" position="0,0" scale="stretch" size="1920,1080" zPosition="-5"/>
 		<ePixmap gradient="#70000000,#70000000,horizontal" position="0,0" size="1920,1080" zPosition="-2"/>
-		<widget font="Bold;32" noWrap="1" position="25,30" render="Label" size="1585,43" source="Title" transparent="1"/>
+		<widget font="Bold;32" noWrap="1" position="20,30" render="Label" size="1880,40" source="Title" transparent="1"/>
 		<widget font="Regular;32" foregroundColor="#00fff000" name="searchinfo" position="30,90" size="1860,40" transparent="1"/>
 		<widget font="Regular;28" name="fulldescription" position="30,150" size="1350,800" transparent="1"/>
 		<widget alphatest="blend" name="cover" position="1410,150" size="480,720"/>
@@ -88,7 +88,7 @@
 	<screen name="ScreenSeason" position="0,0" size="1920,1080" title="TMDB - The Movie Database">
 		<widget alphatest="blend" name="backdrop" position="0,0" scale="stretch" size="1920,1080" zPosition="-5"/>
 		<ePixmap gradient="#70000000,#70000000,horizontal" position="0,0" size="1920,1080" zPosition="-2"/>
-		<widget font="Bold;32" noWrap="1" position="25,30" render="Label" size="1585,43" source="Title" transparent="1"/>
+		<widget font="Bold;32" noWrap="1" position="20,30" render="Label" size="1880,40" source="Title" transparent="1"/>
 		<widget font="Regular;32" foregroundColor="#00fff000" name="searchinfo" position="30,90" size="1860,40" transparent="1"/>
 		<widget font="Regular;30" itemHeight="40" name="list" position="30,150" scrollbarMode="showOnDemand" size="1000,400" transparent="1"/>
 		<widget alphatest="blend" name="cover" position="1170,150" size="720,720"/>
@@ -106,7 +106,7 @@
 		<ePixmap gradient="#ff000000,#131a1d,vertical" position="0,0" size="1200,486" zPosition="-1"/>
 		<eLabel backgroundColor="#131a1d" position="0,486" size="1200,108" zPosition="-1"/>
 		<ePixmap gradient="#131a1d,#ff000000,vertical" position="0,594" size="1200,486" zPosition="-1"/>
-		<widget font="Bold;32" noWrap="1" position="25,30" render="Label" size="865,43" source="Title" transparent="1"/>
+		<widget font="Bold;32" noWrap="1" position="20,30" render="Label" size="1160,40" source="Title" transparent="1"/>
 		<widget enableWrapAround="1" name="config" position="20,120" scrollbarMode="showOnDemand" size="1160,500" transparent="1"/>
 		<widget font="Regular;26" halign="center" name="key_red" position="0,1030" size="300,35" transparent="1"/>
 		<widget font="Regular;26" halign="center" name="key_green" position="300,1030" size="300,35" transparent="1"/>

diff --git a/src/skin/screenpart_TitleOnly.xmlinc b/src/skin/screenpart_TitleOnly.xmlinc
@@ -1,4 +1 @@
-	<widget font="Bold;32" noWrap="1" position="25,30" render="Label" size="eval($screen_width-335),43" source="$source" transparent="1"/>
-	<!--widget font="Bold;30" halign="right" position="eval($screen_width-330),30" render="Label" size="300,43" source="global.CurrentTime" transparent="1" valign="center">
-		<convert type="ClockToText">Format:%a %d.%m. %H:%M</convert>
-	</widget-->
+	<widget font="Bold;32" noWrap="1" position="20,30" render="Label" size="eval($screen_width-40),40" source="$source" transparent="1"/>
diff --git a/tmdbcockpit.sh b/tmdbcockpit.sh
@@ -0,0 +1,2 @@
+#/bin/sh
+apt-get install -y enigma2-plugin-extensions-tmdbcockpit