1.8.1

dream-alpha · Aug 22, 2024 · db90efe · db90efe
1 parent 11086a6
commit db90efe
Show file tree

Hide file tree

Showing 292 changed files with 13 additions and 38 deletions.
diff --git a/CONTROL/control b/CONTROL/control
@@ -1,6 +1,6 @@
 Description: TVMagazineCockpit
 Maintainer: dream-alpha
 Package: enigma2-plugin-extensions-tvmagazinecockpit
-Version: 1.7.10
+Version: 1.8.1
 Architecture: all
 Depends: enigma2-plugin-skincomponents-extmultilistselection
diff --git a/Makefile.am b/Makefile.am
@@ -1 +1 @@
-SUBDIRS = po src channels logos
+SUBDIRS = po src channels
diff --git a/logos/123TV.png b/logos/123TV.png
diff --git a/logos/13TH.png b/logos/13TH.png
diff --git a/logos/2NEO.png b/logos/2NEO.png
diff --git a/logos/3PLUS.png b/logos/3PLUS.png
diff --git a/logos/3SAT.png b/logos/3SAT.png
diff --git a/logos/ADULT.png b/logos/ADULT.png
diff --git a/logos/AETV.png b/logos/AETV.png
diff --git a/logos/ALJAZ.png b/logos/ALJAZ.png
diff --git a/logos/ALPHA.png b/logos/ALPHA.png
diff --git a/logos/AMS.png b/logos/AMS.png
diff --git a/logos/ANIXE.png b/logos/ANIXE.png
diff --git a/logos/APLAN.png b/logos/APLAN.png
diff --git a/logos/ARD.png b/logos/ARD.png
diff --git a/logos/ARTE.png b/logos/ARTE.png
diff --git a/logos/ARTS.png b/logos/ARTS.png
diff --git a/logos/ATV-A.png b/logos/ATV-A.png
diff --git a/logos/ATV.png b/logos/ATV.png
diff --git a/logos/ATV2.png b/logos/ATV2.png
diff --git a/logos/AXN.png b/logos/AXN.png
diff --git a/logos/BBC-E.png b/logos/BBC-E.png
diff --git a/logos/BBC-N.png b/logos/BBC-N.png
diff --git a/logos/BBC.png b/logos/BBC.png
diff --git a/logos/BBC1.png b/logos/BBC1.png
diff --git a/logos/BBC2.png b/logos/BBC2.png
diff --git a/logos/BBC4.png b/logos/BBC4.png
diff --git a/logos/BE1.png b/logos/BE1.png
diff --git a/logos/BERG.png b/logos/BERG.png
diff --git a/logos/BIBEL.png b/logos/BIBEL.png
diff --git a/logos/BILD.png b/logos/BILD.png
diff --git a/logos/BLIZZ.png b/logos/BLIZZ.png
diff --git a/logos/BLM.png b/logos/BLM.png
diff --git a/logos/BLUM.png b/logos/BLUM.png
diff --git a/logos/BLUM2.png b/logos/BLUM2.png
diff --git a/logos/BLUM3.png b/logos/BLUM3.png
diff --git a/logos/BOOM.png b/logos/BOOM.png
diff --git a/logos/BR-N.png b/logos/BR-N.png
diff --git a/logos/BR-S.png b/logos/BR-S.png
diff --git a/logos/BR.png b/logos/BR.png
diff --git a/logos/BULI.png b/logos/BULI.png
diff --git a/logos/BUTV.png b/logos/BUTV.png
diff --git a/logos/C-NET.png b/logos/C-NET.png
diff --git a/logos/C5.png b/logos/C5.png
diff --git a/logos/CC.png b/logos/CC.png
diff --git a/logos/CENTE.png b/logos/CENTE.png
diff --git a/logos/CH21.png b/logos/CH21.png
diff --git a/logos/CIN.png b/logos/CIN.png
diff --git a/logos/CIN1.png b/logos/CIN1.png
diff --git a/logos/CIN24.png b/logos/CIN24.png
diff --git a/logos/CLASS.png b/logos/CLASS.png
diff --git a/logos/CNBC.png b/logos/CNBC.png
diff --git a/logos/CNN-M.png b/logos/CNN-M.png
diff --git a/logos/CNN-T.png b/logos/CNN-T.png
diff --git a/logos/CNN.png b/logos/CNN.png
diff --git a/logos/CPLUS.png b/logos/CPLUS.png
diff --git a/logos/CPLUSC.png b/logos/CPLUSC.png
diff --git a/logos/CPLUSD.png b/logos/CPLUSD.png
diff --git a/logos/CPLUSS.png b/logos/CPLUSS.png
diff --git a/logos/CRIN.png b/logos/CRIN.png
diff --git a/logos/DATV.png b/logos/DATV.png
diff --git a/logos/DAZN.png b/logos/DAZN.png
diff --git a/logos/DCM.png b/logos/DCM.png
diff --git a/logos/DISNE.png b/logos/DISNE.png
diff --git a/logos/DJUN.png b/logos/DJUN.png
diff --git a/logos/DMAX.png b/logos/DMAX.png
diff --git a/logos/DMC.png b/logos/DMC.png
diff --git a/logos/DMF.png b/logos/DMF.png
diff --git a/logos/DR1.png b/logos/DR1.png
diff --git a/logos/DR2.png b/logos/DR2.png
diff --git a/logos/DRTV.png b/logos/DRTV.png
diff --git a/logos/DWF.png b/logos/DWF.png
diff --git a/logos/DWTV.png b/logos/DWTV.png
diff --git a/logos/DXD.png b/logos/DXD.png
diff --git a/logos/E!.png b/logos/E!.png
diff --git a/logos/ENGB.png b/logos/ENGB.png
diff --git a/logos/EOTV.png b/logos/EOTV.png
diff --git a/logos/ES1.png b/logos/ES1.png
diff --git a/logos/EURO-D.png b/logos/EURO-D.png
diff --git a/logos/EURO-S.png b/logos/EURO-S.png
diff --git a/logos/EURO.png b/logos/EURO.png
diff --git a/logos/EURO2.png b/logos/EURO2.png
diff --git a/logos/EURON.png b/logos/EURON.png
diff --git a/logos/EX-SP.png b/logos/EX-SP.png
diff --git a/logos/FAMTV.png b/logos/FAMTV.png
diff --git a/logos/FATV.png b/logos/FATV.png
diff --git a/logos/FES.png b/logos/FES.png
diff --git a/logos/FFTV.png b/logos/FFTV.png
diff --git a/logos/FLN.png b/logos/FLN.png
diff --git a/logos/FOOD.png b/logos/FOOD.png
diff --git a/logos/FOX.png b/logos/FOX.png
diff --git a/logos/FR24E.png b/logos/FR24E.png
diff --git a/logos/FR24F.png b/logos/FR24F.png
diff --git a/logos/FRA2.png b/logos/FRA2.png
diff --git a/logos/FRA3.png b/logos/FRA3.png
diff --git a/logos/FRA4.png b/logos/FRA4.png
diff --git a/logos/FRA5.png b/logos/FRA5.png
diff --git a/logos/FRAO.png b/logos/FRAO.png
diff --git a/logos/FREESHOP.png b/logos/FREESHOP.png
diff --git a/logos/GEO.png b/logos/GEO.png
diff --git a/logos/GOLD.png b/logos/GOLD.png
diff --git a/logos/GUSTO.png b/logos/GUSTO.png
diff --git a/logos/HDDIS.png b/logos/HDDIS.png
diff --git a/logos/HDSPO.png b/logos/HDSPO.png
diff --git a/logos/HEALTH.png b/logos/HEALTH.png
diff --git a/logos/HEIMA.png b/logos/HEIMA.png
diff --git a/logos/HGTV.png b/logos/HGTV.png
diff --git a/logos/HH1.png b/logos/HH1.png
diff --git a/logos/HISHD.png b/logos/HISHD.png
diff --git a/logos/HR.png b/logos/HR.png
diff --git a/logos/HSE.png b/logos/HSE.png
diff --git a/logos/JUKE.png b/logos/JUKE.png
diff --git a/logos/JUNIO.png b/logos/JUNIO.png
diff --git a/logos/K1.png b/logos/K1.png
diff --git a/logos/K1CLA.png b/logos/K1CLA.png
diff --git a/logos/K1DOKU.png b/logos/K1DOKU.png
diff --git a/logos/KIKA.png b/logos/KIKA.png
diff --git a/logos/KINOW.png b/logos/KINOW.png
diff --git a/logos/KTV.png b/logos/KTV.png
diff --git a/logos/LAUNE.png b/logos/LAUNE.png
diff --git a/logos/LEITV.png b/logos/LEITV.png
diff --git a/logos/LUSTP.png b/logos/LUSTP.png
diff --git a/logos/MAPO.png b/logos/MAPO.png
diff --git a/logos/MASPO.png b/logos/MASPO.png
diff --git a/logos/MDR-SN.png b/logos/MDR-SN.png
diff --git a/logos/MDR-ST.png b/logos/MDR-ST.png
diff --git a/logos/MDR-TH.png b/logos/MDR-TH.png
diff --git a/logos/MDR.png b/logos/MDR.png
diff --git a/logos/MELODIETV.png b/logos/MELODIETV.png
diff --git a/logos/MEZZO.png b/logos/MEZZO.png
diff --git a/logos/MFTV1.png b/logos/MFTV1.png
diff --git a/logos/MOTOR.png b/logos/MOTOR.png
diff --git a/logos/MOVTV.png b/logos/MOVTV.png
diff --git a/logos/MTV-B.png b/logos/MTV-B.png
diff --git a/logos/MTV-D.png b/logos/MTV-D.png
diff --git a/logos/MTV-H.png b/logos/MTV-H.png
diff --git a/logos/MTV-L.png b/logos/MTV-L.png
diff --git a/logos/MTV.png b/logos/MTV.png
diff --git a/logos/MUE2.png b/logos/MUE2.png
diff --git a/logos/Makefile.am b/logos/Makefile.am
diff --git a/logos/N-GHD.png b/logos/N-GHD.png
diff --git a/logos/N-GW.png b/logos/N-GW.png
diff --git a/logos/N24DOKU.png b/logos/N24DOKU.png
diff --git a/logos/N3.png b/logos/N3.png
diff --git a/logos/NAUCH.png b/logos/NAUCH.png
diff --git a/logos/NDR-HH.png b/logos/NDR-HH.png
diff --git a/logos/NDR-MV.png b/logos/NDR-MV.png
diff --git a/logos/NDR-NI.png b/logos/NDR-NI.png
diff --git a/logos/NDR-SH.png b/logos/NDR-SH.png
diff --git a/logos/NDR.png b/logos/NDR.png
diff --git a/logos/NHK.png b/logos/NHK.png
diff --git a/logos/NICK.png b/logos/NICK.png
diff --git a/logos/NICKJ.png b/logos/NICKJ.png
diff --git a/logos/NICKT.png b/logos/NICKT.png
diff --git a/logos/NL1.png b/logos/NL1.png
diff --git a/logos/NL2.png b/logos/NL2.png
diff --git a/logos/NL3.png b/logos/NL3.png
diff --git a/logos/NOWUS.png b/logos/NOWUS.png
diff --git a/logos/NTV.png b/logos/NTV.png
diff --git a/logos/OE24TV.png b/logos/OE24TV.png
diff --git a/logos/ORF1.png b/logos/ORF1.png
diff --git a/logos/ORF2.png b/logos/ORF2.png
diff --git a/logos/ORF3.png b/logos/ORF3.png
diff --git a/logos/ORFSP.png b/logos/ORFSP.png
diff --git a/logos/PASS.png b/logos/PASS.png
diff --git a/logos/PBOY.png b/logos/PBOY.png
diff --git a/logos/PHOEN.png b/logos/PHOEN.png
diff --git a/logos/PLANE.png b/logos/PLANE.png
diff --git a/logos/PRO7.png b/logos/PRO7.png
diff --git a/logos/PRO7F.png b/logos/PRO7F.png
diff --git a/logos/PRO7M.png b/logos/PRO7M.png
diff --git a/logos/PULS4.png b/logos/PULS4.png
diff --git a/logos/PULS8.png b/logos/PULS8.png
diff --git a/logos/QVC.png b/logos/QVC.png
diff --git a/logos/QVCBS.png b/logos/QVCBS.png
diff --git a/logos/QVCP.png b/logos/QVCP.png
diff --git a/logos/RB-TV.png b/logos/RB-TV.png
diff --git a/logos/RBB-B.png b/logos/RBB-B.png
diff --git a/logos/RBB-BB.png b/logos/RBB-BB.png
diff --git a/logos/RBB.png b/logos/RBB.png
diff --git a/logos/RBTV.png b/logos/RBTV.png
diff --git a/logos/RCK.png b/logos/RCK.png
diff --git a/logos/REGBS.png b/logos/REGBS.png
diff --git a/logos/REGIO.png b/logos/REGIO.png
diff --git a/logos/RIC.png b/logos/RIC.png
diff --git a/logos/RMTV.png b/logos/RMTV.png
diff --git a/logos/RNF.png b/logos/RNF.png
diff --git a/logos/ROM.png b/logos/ROM.png
diff --git a/logos/RTL-C.png b/logos/RTL-C.png
diff --git a/logos/RTL-L.png b/logos/RTL-L.png
diff --git a/logos/RTL-N.png b/logos/RTL-N.png
diff --git a/logos/RTL.png b/logos/RTL.png
diff --git a/logos/RTL2.png b/logos/RTL2.png
diff --git a/logos/RTLPL.png b/logos/RTLPL.png
diff --git a/logos/S1PLU.png b/logos/S1PLU.png
diff --git a/logos/SACH.png b/logos/SACH.png
diff --git a/logos/SAT1.png b/logos/SAT1.png
diff --git a/logos/SAT1E.png b/logos/SAT1E.png
diff --git a/logos/SAT1G.png b/logos/SAT1G.png
diff --git a/logos/SCIFI.png b/logos/SCIFI.png
diff --git a/logos/SERVU.png b/logos/SERVU.png
diff --git a/logos/SERVUSA.png b/logos/SERVUSA.png
diff --git a/logos/SF1.png b/logos/SF1.png
diff --git a/logos/SF2.png b/logos/SF2.png
diff --git a/logos/SHD2.png b/logos/SHD2.png
diff --git a/logos/SHOT.png b/logos/SHOT.png
diff --git a/logos/SILVE.png b/logos/SILVE.png
diff --git a/logos/SIXX.png b/logos/SIXX.png
diff --git a/logos/SKLAR.png b/logos/SKLAR.png
diff --git a/logos/SKY-A.png b/logos/SKY-A.png
diff --git a/logos/SKY-C.png b/logos/SKY-C.png
diff --git a/logos/SKY-CO.png b/logos/SKY-CO.png
diff --git a/logos/SKY-CR.png b/logos/SKY-CR.png
diff --git a/logos/SKY-D.png b/logos/SKY-D.png
diff --git a/logos/SKY-E.png b/logos/SKY-E.png
diff --git a/logos/SKY-F.png b/logos/SKY-F.png
diff --git a/logos/SKY-H.png b/logos/SKY-H.png
diff --git a/logos/SKY-K.png b/logos/SKY-K.png
diff --git a/logos/SKY-N.png b/logos/SKY-N.png
diff --git a/logos/SKY-NA.png b/logos/SKY-NA.png
diff --git a/logos/SKY-S.png b/logos/SKY-S.png
diff --git a/logos/SKY1.png b/logos/SKY1.png
diff --git a/logos/SKYAT.png b/logos/SKYAT.png
diff --git a/logos/SKYCS.png b/logos/SKYCS.png
diff --git a/logos/SKYF1.png b/logos/SKYF1.png
diff --git a/logos/SKYRP.png b/logos/SKYRP.png
diff --git a/logos/SKYSG.png b/logos/SKYSG.png
diff --git a/logos/SKYSH.png b/logos/SKYSH.png
diff --git a/logos/SKYSM.png b/logos/SKYSM.png
diff --git a/logos/SKYSPL.png b/logos/SKYSPL.png
diff --git a/logos/SKYST.png b/logos/SKYST.png
diff --git a/logos/SKYSTE.png b/logos/SKYSTE.png
diff --git a/logos/SKYTH.png b/logos/SKYTH.png
diff --git a/logos/SNHD.png b/logos/SNHD.png
diff --git a/logos/SONY.png b/logos/SONY.png
diff --git a/logos/SP-GE.png b/logos/SP-GE.png
diff --git a/logos/SP1US.png b/logos/SP1US.png
diff --git a/logos/SPO-A.png b/logos/SPO-A.png
diff --git a/logos/SPO-D.png b/logos/SPO-D.png
diff --git a/logos/SPORT.png b/logos/SPORT.png
diff --git a/logos/SPTVW.png b/logos/SPTVW.png
diff --git a/logos/SPUHD.png b/logos/SPUHD.png
diff --git a/logos/SR.png b/logos/SR.png
diff --git a/logos/STTV.png b/logos/STTV.png
diff --git a/logos/SUPER.png b/logos/SUPER.png
diff --git a/logos/SWR.png b/logos/SWR.png
diff --git a/logos/SWRBW.png b/logos/SWRBW.png
diff --git a/logos/SWRRP.png b/logos/SWRRP.png
diff --git a/logos/TAG24.png b/logos/TAG24.png
diff --git a/logos/TELE5.png b/logos/TELE5.png
diff --git a/logos/TLC.png b/logos/TLC.png
diff --git a/logos/TMAX.png b/logos/TMAX.png
diff --git a/logos/TNT-C.png b/logos/TNT-C.png
diff --git a/logos/TNT-F.png b/logos/TNT-F.png
diff --git a/logos/TNT-S.png b/logos/TNT-S.png
diff --git a/logos/TOGGO.png b/logos/TOGGO.png
diff --git a/logos/TRACE.png b/logos/TRACE.png
diff --git a/logos/TRAVELXP.png b/logos/TRAVELXP.png
diff --git a/logos/TRCH.png b/logos/TRCH.png
diff --git a/logos/TV2.png b/logos/TV2.png
diff --git a/logos/TV5.png b/logos/TV5.png
diff --git a/logos/TVB.png b/logos/TVB.png
diff --git a/logos/TVM.png b/logos/TVM.png
diff --git a/logos/UHD1.png b/logos/UHD1.png
diff --git a/logos/UNIVE.png b/logos/UNIVE.png
diff --git a/logos/VH1.png b/logos/VH1.png
diff --git a/logos/VIVA.png b/logos/VIVA.png
diff --git a/logos/VOX.png b/logos/VOX.png
diff --git a/logos/VOXUP.png b/logos/VOXUP.png
diff --git a/logos/WDR-AC.png b/logos/WDR-AC.png
diff --git a/logos/WDR-BI.png b/logos/WDR-BI.png
diff --git a/logos/WDR-BN.png b/logos/WDR-BN.png
diff --git a/logos/WDR-D.png b/logos/WDR-D.png
diff --git a/logos/WDR-DO.png b/logos/WDR-DO.png
diff --git a/logos/WDR-DU.png b/logos/WDR-DU.png
diff --git a/logos/WDR-E.png b/logos/WDR-E.png
diff --git a/logos/WDR-K.png b/logos/WDR-K.png
diff --git a/logos/WDR-MS.png b/logos/WDR-MS.png
diff --git a/logos/WDR-SI.png b/logos/WDR-SI.png
diff --git a/logos/WDR-W.png b/logos/WDR-W.png
diff --git a/logos/WDR.png b/logos/WDR.png
diff --git a/logos/WDWTV.png b/logos/WDWTV.png
diff --git a/logos/WELT.png b/logos/WELT.png
diff --git a/logos/ZDF.png b/logos/ZDF.png
diff --git a/logos/ZEE-1.png b/logos/ZEE-1.png
diff --git a/logos/ZINFO.png b/logos/ZINFO.png
diff --git a/src/ConfigInit.py b/src/ConfigInit.py
@@ -18,7 +18,7 @@
 # For more information on the GNU General Public License see:
 # <http://www.gnu.org/licenses/>.
 
-from Components.config import config, ConfigSelection, ConfigYesNo, ConfigSubsection, ConfigNothing, NoSave
+from Components.config import config, ConfigSelection, ConfigSubsection, ConfigNothing, NoSave
 from Tools.Directories import resolveFilename, SCOPE_PLUGINS
 from .Debug import logger, log_levels, initLogging
 from .__init__ import _
@@ -40,6 +40,5 @@ def __init__(self):
 		config.plugins.tvmagazinecockpit = ConfigSubsection()
 		config.plugins.tvmagazinecockpit.fake_entry = NoSave(ConfigNothing())
 		config.plugins.tvmagazinecockpit.debug_log_level = ConfigSelection(default="DEBUG", choices=list(log_levels.keys()))
-		config.plugins.tvmagazinecockpit.use_picons = ConfigYesNo(default=True)
 		config.plugins.tvmagazinecockpit.bouquet = ConfigSelection(default="default", choices=bouquet_choices)
 		initLogging()
diff --git a/src/ConfigScreenInit.py b/src/ConfigScreenInit.py
@@ -47,7 +47,6 @@ def __init__(self, _csel, session):
 			(self.section                                       , _("COCKPIT")                                                  , None                  , None                  , 0     , []          , ""),
 			(_("Default bouquet")                               , config.plugins.tvmagazinecockpit.bouquet                      , None                  , None                  , 0     , []          , _("Select the default bouquet.")),
 			(_("Picon directory")                               , config.usage.configselection_piconspath                       , self.validatePath     , None                  , 0     , []          , _("Select the directory the picons are stored in.")),
-			(_("Use picons")                                    , config.plugins.tvmagazinecockpit.use_picons                    , None                  , None                  , 0     , []          , _("Should channel picons be used instead of channel logos?")),
 			(self.section                                       , _("DEBUG")                                                    , None                  , None                  , 2     , []          , ""),
 			(_("Log level")                                     , config.plugins.piconcockpit.debug_log_level                   , self.setLogLevel      , None                  , 2     , []          , _("Select the debug log level.")),
 		]

diff --git a/src/PictureUtils.py b/src/PictureUtils.py
@@ -21,18 +21,15 @@
 
 from Components.config import config
 from Tools.LoadPixmap import LoadPixmap
-from .ConfigInit import plugindir
 from .Debug import logger
 
 
 def getPicon(channel_id, service=""):
 	logger.info("channel_id: %s, service: %s", channel_id, service)
 	pixmap_ptr = None
-	if service and config.plugins.tvmagazinecockpit.use_picons.value:
+	if service:
 		picons_dir = config.usage.configselection_piconspath.value
 		pixmap_ptr = LoadPixmap("%s/%s.png" % (picons_dir, service[:-1].replace(":", "_")))
-	if not pixmap_ptr:
-		pixmap_ptr = LoadPixmap("%slogos/%s.png" % (plugindir, channel_id))
 	return pixmap_ptr
 
 

diff --git a/src/Version.py b/src/Version.py
@@ -21,6 +21,6 @@
 
 PLUGIN = "TVMagazineCockpit"
 ID = "TVC"
-VERSION = "1.7.10"
+VERSION = "1.8.1"
 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/skin/Default-WQHD/screen_EventDetails.xmlinc b/src/skin/Default-WQHD/screen_EventDetails.xmlinc
@@ -2,9 +2,9 @@
 		<xmlinc file="screenpart_TitleOnly" source="Title"/>
 		<xmlinc file="screenpart_Background"/>
 		<widget name="channelpix" position="27,160" size="133,133"/>
-		<widget font="Regular;43" name="title" position="200,160" size="1467,60" transparent="1" valign="center" zPosition="1"/>
-		<widget font="Regular;37" name="episodetitle" position="200,233" size="1467,60" transparent="1" valign="center" zPosition="1"/>
-		<widget font="Regular;37" name="timeduration" position="200,293" size="400,60" transparent="1" valign="center" zPosition="1"/>
-		<widget font="Regular;35" name="description" position="27,373" size="1640,933" transparent="1"/>
+		<widget font="Regular;43" name="title" position="200,160" size="1467,57" transparent="1" valign="center" zPosition="1"/>
+		<widget font="Regular;37" name="episodetitle" position="200,233" size="1467,49" transparent="1" valign="center" zPosition="1"/>
+		<widget font="Regular;37" name="timeduration" position="200,293" size="400,49" transparent="1" valign="center" zPosition="1"/>
+		<widget font="Regular;35" name="description" position="27,373" size="1640,720" transparent="1"/>
 		<xmlinc file="screenpart_EventDetailsPics" position="1693,160"/>
 	</screen>
diff --git a/src/skin/Default-WQHD/skin.xml b/src/skin/Default-WQHD/skin.xml
@@ -57,10 +57,10 @@
 		<eLabel backgroundColor="#131a1d" position="0,558" size="2400,124" zPosition="-1"/>
 		<ePixmap gradient="#131a1d,#ff000000,vertical" position="0,682" size="2400,558" zPosition="-1"/>
 		<widget name="channelpix" position="27,160" size="133,133"/>
-		<widget font="Regular;43" name="title" position="200,160" size="1467,60" transparent="1" valign="center" zPosition="1"/>
-		<widget font="Regular;37" name="episodetitle" position="200,233" size="1467,60" transparent="1" valign="center" zPosition="1"/>
-		<widget font="Regular;37" name="timeduration" position="200,293" size="400,60" transparent="1" valign="center" zPosition="1"/>
-		<widget font="Regular;35" name="description" position="27,373" size="1640,933" transparent="1"/>
+		<widget font="Regular;43" name="title" position="200,160" size="1467,57" transparent="1" valign="center" zPosition="1"/>
+		<widget font="Regular;37" name="episodetitle" position="200,233" size="1467,49" transparent="1" valign="center" zPosition="1"/>
+		<widget font="Regular;37" name="timeduration" position="200,293" size="400,49" transparent="1" valign="center" zPosition="1"/>
+		<widget font="Regular;35" name="description" position="27,373" size="1640,720" transparent="1"/>
 		<widget name="programpix" position="1693,160" size="667,500"/>
 		<widget name="videopix" position="1693,693" size="667,400"/>
 	</screen>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		SUBDIRS = po src channels logos
		SUBDIRS = po src channels