enigma2: update to 4.3.0r28
[opendreambox.git] / meta-opendreambox / recipes-dreambox / enigma2 / enigma2-4.3.0r28 / 0002-skins-fix-issues-caused-by-svg-transition.patch
1 From 97c471ec14ccc4cc2ead102120b621a9d8a9e355 Mon Sep 17 00:00:00 2001
2 From: reichi <reichi@opendreambox.org>
3 Date: Tue, 21 Feb 2017 19:10:39 +0100
4 Subject: [PATCH 2/2] skins: fix issues caused by svg-transition
5
6 ---
7  usr/share/enigma2/Default-HD/skin.xml                            | 1 +
8  usr/share/enigma2/skin.xml                                       | 6 +++---
9  usr/share/enigma2/skin_default.xml                               | 4 ++--
10  usr/lib/enigma2/python/Plugins/Extensions/MediaCenter/plugin.py | 4 +++-
11  4 files changed, 9 insertions(+), 6 deletions(-)
12
13 diff --git a/usr/share/enigma2/Default-HD/skin.xml b/usr/share/enigma2/Default-HD/skin.xml
14 index 532c853..95071a5 100644
15 --- a/usr/share/enigma2/Default-HD/skin.xml
16 +++ b/usr/share/enigma2/Default-HD/skin.xml
17 @@ -96,6 +96,7 @@
18         </fonts>
19         <!-- Components -->
20         <components>
21 +               <component type="MenuPixmap" itemHeight="180" itemWidth="180"/>
22                 <component type="ConfigList" seperation="400" dividerHeight="1"/>
23                 <component type="ChoiceList" itemHeight="30" textX="45" textY="0" textWidth="800" textHeight="30" pixmapWidth="35" pixmapHeight="30" fillerCount="200" />
24                 <component type="FileList" itemHeight="25" textX="35" textY="0" textWidth="1000" textHeight="25" pixmapWidth="20" pixmapHeight="20" />
25 diff --git a/usr/share/enigma2/skin.xml b/usr/share/enigma2/skin.xml
26 index 0242f20..d4b1b0e 100644
27 --- a/usr/share/enigma2/skin.xml
28 +++ b/usr/share/enigma2/skin.xml
29 @@ -417,7 +417,7 @@
30         <!-- DVD Player -->
31         <screen name="DVDPlayer" position="0,540" size="1280,150" backgroundColor="transparent" flags="wfNoBorder">
32                 <ePixmap position="0,0" pixmap="skin_default/infobar.png" size="1280,150" zPosition="-1" />
33 -               <ePixmap pixmap="menu/dvd_player.png" position="40,60" zPosition="1" size="70,70" alphatest="on"/>
34 +               <ePixmap pixmap="menu/dvd_player.svg" position="40,60" zPosition="1" size="70,70" alphatest="on"/>
35                 <ePixmap pixmap="skin_default/icons/icon_event.png" position="120,17" size="20,13" alphatest="on" />
36                 <widget source="session.CurrentService" render="Label" position="150,9" size="600,27" font="Regular;24" valign="top" noWrap="1" backgroundColor="#263c59" transparent="1">
37                         <convert type="ServiceName">Name</convert>
38 @@ -445,7 +445,7 @@
39         </screen>
40         <!-- Movieplayer infobar -->
41         <screen name="MoviePlayer" position="0,540" size="1280,150" backgroundColor="transparent" flags="wfNoBorder">
42 -               <ePixmap pixmap="menu/mediacenter.png" position="40,60" zPosition="1" size="70,70" alphatest="on"/>
43 +               <ePixmap pixmap="menu/mediacenter.svg" position="40,60" zPosition="1" size="70,70" alphatest="on"/>
44                 <!-- Background -->
45                 <ePixmap position="0,0" pixmap="skin_default/infobar.png" size="1280,150" zPosition="-1" />
46                 <!-- Servicename -->
47 @@ -918,7 +918,7 @@
48                 </widget>
49         </screen>
50         <screen name="MyTubePlayer" position="0,540" size="1280,150" backgroundColor="transparent" flags="wfNoBorder">
51 -               <ePixmap pixmap="menu/mediacenter.png" position="40,60" zPosition="1" size="70,70" alphatest="on"/>
52 +               <ePixmap pixmap="menu/mediacenter.svg" position="40,60" zPosition="1" size="70,70" alphatest="on"/>
53                 <ePixmap position="0,0" pixmap="skin_default/infobar.png" size="1280,150" zPosition="-1" />
54                 <ePixmap pixmap="skin_default/icons/icon_event.png" position="120,17" size="20,13" alphatest="on" />
55                 <widget source="session.CurrentService" render="Label" position="150,9" size="760,27" font="Regular;24" valign="top" noWrap="1" backgroundColor="#263c59" transparent="1">
56 diff --git a/usr/share/enigma2/skin_default.xml b/usr/share/enigma2/skin_default.xml
57 index 4b05833..1b1d223 100644
58 --- a/usr/share/enigma2/skin_default.xml
59 +++ b/usr/share/enigma2/skin_default.xml
60 @@ -68,7 +68,7 @@
61         <!-- About screen -->
62         <screen name="About" position="center,120" size="820,520" title="About">
63                 <ePixmap position="10,5" size="300,500" pixmap="skin_default/menu.png" zPosition="-1"/>
64 -               <ePixmap pixmap="menu/info_screen.png" position="65,50" size="192,192" alphatest="on" />
65 +               <ePixmap pixmap="menu/info_screen.svg" position="65,50" size="192,192" alphatest="on" />
66                 <ePixmap pixmap="skin_default/buttons/green.png" position="45,370" size="230,40" alphatest="on"/>
67                 <eLabel font="Regular;20" position="45,370" size="230,40" text="Translation" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" shadowColor="black" shadowOffset="-2,-2"/>
68                 <widget source="Model" render="Label" position="320,10" size="490,26" font="Regular;24" foregroundColor="grey">
69 @@ -615,7 +615,7 @@ self.instance.move(ePoint((1280-wsizex)/2,(720-wsizey)/2))
70         <!-- Language selection -->
71         <screen name="LanguageSelection" position="center,120" size="720,520" title="Language selection">
72                 <ePixmap position="10,5" size="300,500" pixmap="skin_default/menu.png" zPosition="-1"/>
73 -               <ePixmap pixmap="menu/language_setup.png" position="65,50" size="192,192" alphatest="on" />
74 +               <ePixmap pixmap="menu/language_setup.svg" position="65,50" size="192,192" alphatest="on" />
75                 <widget source="languages" render="Listbox" position="320,10" size="390,500" enableWrapAround="1" scrollbarMode="showOnDemand">
76                         <convert type="TemplatedMultiContent">
77                                 {"template": [
78 diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaCenter/plugin.py b/usr/lib/enigma2/python/Plugins/Extensions/MediaCenter/plugin.py
79 index 2b16c57..85ac49c 100644
80 --- a/usr/lib/enigma2/python/Plugins/Extensions/MediaCenter/plugin.py
81 +++ b/usr/lib/enigma2/python/Plugins/Extensions/MediaCenter/plugin.py
82 @@ -187,7 +187,9 @@ def filescan_open(type, filelist, session, **kwargs):
83         session.open(MainMenu, type, playlist)
84  
85  def getIcon(key):
86 -       filename = resolveFilename(SCOPE_CURRENT_SKIN, "menu/mc_%s.png" %key)
87 +       filename = resolveFilename(SCOPE_CURRENT_SKIN, "menu/mc_%s.svg" %key)
88 +       if not pathExists(filename):
89 +               filename = resolveFilename(SCOPE_CURRENT_SKIN, "menu/mc_%s.png" %key)
90         if pathExists(filename):
91                 return filename
92         else:
93 -- 
94 2.1.4
95