Skip to content

Commit 0ccc368

Browse files
jbleyeljbleyel
committed
revert MetrixHDServiceInfo2 for some screens
1 parent 64d6576 commit 0ccc368

3 files changed

Lines changed: 108 additions & 9 deletions

File tree

‎usr/share/enigma2/MetrixHD/skinfiles/skin_emc.xml‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,33 @@
149149
<convert type="ServiceInfo">IsWidescreen</convert>
150150
<convert type="ConditionalShowHide" />
151151
</widget>
152-
153-
<widget alphatest="blend" pixmaps="icons/ico_hd_off.png,icons/ico_hd_on.png,icons/ico_uhd_on.png,icons/ico_hd_hdr_on.png,icons/ico_hdr_on.png,icons/ico_hdr10_on.png,icons/ico_hlg_on.png" position="1109,616" render="Pixmap" size="49,24" source="session.CurrentService" zPosition="2">
154-
<convert type="MetrixHDServiceInfo2">VideoInfo</convert>
152+
<widget source="session.CurrentService" render="Pixmap" pixmap="icons/ico_hd_off.png" position="1109,616" size="49,24" zPosition="2" alphatest="blend">
153+
<convert type="ServiceInfo">IsSD</convert>
154+
<convert type="ConditionalShowHide"/>
155+
</widget>
156+
<widget source="session.CurrentService" render="Pixmap" pixmap="icons/ico_hd_on.png" position="1109,616" size="49,24" zPosition="2" alphatest="blend">
157+
<convert type="ServiceInfo">IsHD</convert>
158+
<convert type="ConditionalShowHide"/>
159+
</widget>
160+
<widget source="session.CurrentService" render="Pixmap" pixmap="icons/ico_uhd_on.png" position="1109,616" size="49,24" zPosition="2" alphatest="blend">
161+
<convert type="ServiceInfo">Is4K</convert>
162+
<convert type="ConditionalShowHide"/>
163+
</widget>
164+
<widget source="session.CurrentService" render="Pixmap" pixmap="icons/ico_hd_hdr_on.png" position="1109,616" size="49,24" zPosition="2" alphatest="blend">
165+
<convert type="ServiceInfo">IsHDHDR</convert>
166+
<convert type="ConditionalShowHide"/>
167+
</widget>
168+
<widget source="session.CurrentService" render="Pixmap" pixmap="icons/ico_hdr_on.png" position="1109,616" size="49,24" zPosition="2" alphatest="blend">
169+
<convert type="ServiceInfo">IsHDR</convert>
170+
<convert type="ConditionalShowHide"/>
171+
</widget>
172+
<widget source="session.CurrentService" render="Pixmap" pixmap="icons/ico_hdr10_on.png" position="1109,616" size="49,24" zPosition="2" alphatest="blend">
173+
<convert type="ServiceInfo">IsHDR10</convert>
174+
<convert type="ConditionalShowHide"/>
175+
</widget>
176+
<widget source="session.CurrentService" render="Pixmap" pixmap="icons/ico_hlg_on.png" position="1109,616" size="49,24" zPosition="2" alphatest="blend">
177+
<convert type="ServiceInfo">IsHLG</convert>
178+
<convert type="ConditionalShowHide"/>
155179
</widget>
156180
<widget source="session.CurrentService" render="Label" font="infobar_text;19" position="1070,580" size="55,25" halign="right" foregroundColor="infobaraccent1" backgroundColor="infobarbackground" transparent="1">
157181
<convert type="ServiceInfo">VideoWidth</convert>

‎usr/share/enigma2/MetrixHD/skinfiles/skin_movieplayer.xml‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,33 @@
1515
<convert type="ServiceInfo">IsWidescreen</convert>
1616
<convert type="ConditionalShowHide" />
1717
</widget>
18-
<widget alphatest="blend" pixmaps="icons/ico_hd_off.png,icons/ico_hd_on.png,icons/ico_uhd_on.png,icons/ico_hd_hdr_on.png,icons/ico_hdr_on.png,icons/ico_hdr10_on.png,icons/ico_hlg_on.png" position="1109,616" render="Pixmap" size="49,24" source="session.CurrentService" zPosition="2">
19-
<convert type="MetrixHDServiceInfo2">VideoInfo</convert>
18+
<widget source="session.CurrentService" render="Pixmap" pixmap="icons/ico_hd_off.png" position="1109,616" size="49,24" zPosition="2" alphatest="blend">
19+
<convert type="ServiceInfo">IsSD</convert>
20+
<convert type="ConditionalShowHide"/>
21+
</widget>
22+
<widget source="session.CurrentService" render="Pixmap" pixmap="icons/ico_hd_on.png" position="1109,616" size="49,24" zPosition="2" alphatest="blend">
23+
<convert type="ServiceInfo">IsHD</convert>
24+
<convert type="ConditionalShowHide"/>
25+
</widget>
26+
<widget source="session.CurrentService" render="Pixmap" pixmap="icons/ico_uhd_on.png" position="1109,616" size="49,24" zPosition="2" alphatest="blend">
27+
<convert type="ServiceInfo">Is4K</convert>
28+
<convert type="ConditionalShowHide"/>
29+
</widget>
30+
<widget source="session.CurrentService" render="Pixmap" pixmap="icons/ico_hd_hdr_on.png" position="1109,616" size="49,24" zPosition="2" alphatest="blend">
31+
<convert type="ServiceInfo">IsHDHDR</convert>
32+
<convert type="ConditionalShowHide"/>
33+
</widget>
34+
<widget source="session.CurrentService" render="Pixmap" pixmap="icons/ico_hdr_on.png" position="1109,616" size="49,24" zPosition="2" alphatest="blend">
35+
<convert type="ServiceInfo">IsHDR</convert>
36+
<convert type="ConditionalShowHide"/>
37+
</widget>
38+
<widget source="session.CurrentService" render="Pixmap" pixmap="icons/ico_hdr10_on.png" position="1109,616" size="49,24" zPosition="2" alphatest="blend">
39+
<convert type="ServiceInfo">IsHDR10</convert>
40+
<convert type="ConditionalShowHide"/>
41+
</widget>
42+
<widget source="session.CurrentService" render="Pixmap" pixmap="icons/ico_hlg_on.png" position="1109,616" size="49,24" zPosition="2" alphatest="blend">
43+
<convert type="ServiceInfo">IsHLG</convert>
44+
<convert type="ConditionalShowHide"/>
2045
</widget>
2146
<widget source="session.CurrentService" render="Label" font="infobar_text;18" position="1070,580" size="55,25" halign="right" foregroundColor="infobaraccent1" backgroundColor="infobarbackground" transparent="1">
2247
<convert type="ServiceInfo">VideoWidth</convert>

‎usr/share/enigma2/MetrixHD/skinfiles/skin_openatv.xml‎

Lines changed: 54 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2328,8 +2328,33 @@ if len(listitems.list) &gt; 2:
23282328
<convert type="ServiceInfo">IsMultichannel</convert>
23292329
<convert type="ConditionalShowHide"/>
23302330
</widget>
2331-
<widget alphatest="blend" pixmaps="icons/ico_hd_off.png,icons/ico_hd_on.png,icons/ico_uhd_on.png,icons/ico_hd_hdr_on.png,icons/ico_hdr_on.png,icons/ico_hdr10_on.png,icons/ico_hlg_on.png" position="1047,490" render="Pixmap" size="49,24" source="session.CurrentService" zPosition="2">
2332-
<convert type="MetrixHDServiceInfo2">VideoInfo</convert>
2331+
<widget alphatest="blend" pixmap="icons/ico_hd_off.png" position="1047,490" render="Pixmap" size="49,24" source="session.CurrentService" zPosition="2">
2332+
<convert type="ServiceInfo">IsSD</convert>
2333+
<convert type="ConditionalShowHide"/>
2334+
</widget>
2335+
<widget alphatest="blend" pixmap="icons/ico_hd_on.png" position="1047,490" render="Pixmap" size="49,24" source="session.CurrentService" zPosition="2">
2336+
<convert type="ServiceInfo">IsHD</convert>
2337+
<convert type="ConditionalShowHide"/>
2338+
</widget>
2339+
<widget alphatest="blend" pixmap="icons/ico_uhd_on.png" position="1047,490" render="Pixmap" size="49,24" source="session.CurrentService" zPosition="2">
2340+
<convert type="ServiceInfo">Is4K</convert>
2341+
<convert type="ConditionalShowHide"/>
2342+
</widget>
2343+
<widget alphatest="blend" pixmap="icons/ico_hd_hdr_on.png" position="1047,490" render="Pixmap" size="49,24" source="session.CurrentService" zPosition="2">
2344+
<convert type="ServiceInfo">IsHDHDR</convert>
2345+
<convert type="ConditionalShowHide"/>
2346+
</widget>
2347+
<widget alphatest="blend" pixmap="icons/ico_hdr_on.png" position="1047,490" render="Pixmap" size="49,24" source="session.CurrentService" zPosition="2">
2348+
<convert type="ServiceInfo">IsHDR</convert>
2349+
<convert type="ConditionalShowHide"/>
2350+
</widget>
2351+
<widget alphatest="blend" pixmap="icons/ico_hdr10_on.png" position="1047,490" render="Pixmap" size="49,24" source="session.CurrentService" zPosition="2">
2352+
<convert type="ServiceInfo">IsHDR10</convert>
2353+
<convert type="ConditionalShowHide"/>
2354+
</widget>
2355+
<widget alphatest="blend" pixmap="icons/ico_hlg_on.png" position="1047,490" render="Pixmap" size="49,24" source="session.CurrentService" zPosition="2">
2356+
<convert type="ServiceInfo">IsHLG</convert>
2357+
<convert type="ConditionalShowHide"/>
23332358
</widget>
23342359
<ePixmap alphatest="blend" pixmap="icons/ico_format_off.png" position="1108,490" size="43,23" zPosition="1"/>
23352360
<widget alphatest="blend" pixmap="icons/ico_format_on.png" position="1108,490" render="Pixmap" size="43,23" source="session.CurrentService" zPosition="2">
@@ -2376,8 +2401,33 @@ if len(listitems.list) &gt; 2:
23762401
<convert type="ServiceInfo">IsMultichannel</convert>
23772402
<convert type="ConditionalShowHide"/>
23782403
</widget>
2379-
<widget alphatest="blend" pixmaps="icons/ico_hd_off.png,icons/ico_hd_on.png,icons/ico_uhd_on.png,icons/ico_hd_hdr_on.png,icons/ico_hdr_on.png,icons/ico_hdr10_on.png,icons/ico_hlg_on.png" position="992,490" render="Pixmap" size="49,24" source="session.CurrentService" zPosition="2">
2380-
<convert type="MetrixHDServiceInfo2">VideoInfo</convert>
2404+
<widget alphatest="blend" pixmap="icons/ico_hd_off.png" position="992,490" render="Pixmap" size="49,24" source="session.CurrentService" zPosition="2">
2405+
<convert type="ServiceInfo">IsSD</convert>
2406+
<convert type="ConditionalShowHide"/>
2407+
</widget>
2408+
<widget alphatest="blend" pixmap="icons/ico_hd_on.png" position="992,490" render="Pixmap" size="49,24" source="session.CurrentService" zPosition="2">
2409+
<convert type="ServiceInfo">IsHD</convert>
2410+
<convert type="ConditionalShowHide"/>
2411+
</widget>
2412+
<widget alphatest="blend" pixmap="icons/ico_uhd_on.png" position="992,490" render="Pixmap" size="49,24" source="session.CurrentService" zPosition="2">
2413+
<convert type="ServiceInfo">Is4K</convert>
2414+
<convert type="ConditionalShowHide"/>
2415+
</widget>
2416+
<widget alphatest="blend" pixmap="icons/ico_hd_hdr_on.png" position="992,490" render="Pixmap" size="49,24" source="session.CurrentService" zPosition="2">
2417+
<convert type="ServiceInfo">IsHDHDR</convert>
2418+
<convert type="ConditionalShowHide"/>
2419+
</widget>
2420+
<widget alphatest="blend" pixmap="icons/ico_hdr_on.png" position="992,490" render="Pixmap" size="49,24" source="session.CurrentService" zPosition="2">
2421+
<convert type="ServiceInfo">IsHDR</convert>
2422+
<convert type="ConditionalShowHide"/>
2423+
</widget>
2424+
<widget alphatest="blend" pixmap="icons/ico_hdr10_on.png" position="992,490" render="Pixmap" size="49,24" source="session.CurrentService" zPosition="2">
2425+
<convert type="ServiceInfo">IsHDR10</convert>
2426+
<convert type="ConditionalShowHide"/>
2427+
</widget>
2428+
<widget alphatest="blend" pixmap="icons/ico_hlg_on.png" position="992,490" render="Pixmap" size="49,24" source="session.CurrentService" zPosition="2">
2429+
<convert type="ServiceInfo">IsHLG</convert>
2430+
<convert type="ConditionalShowHide"/>
23812431
</widget>
23822432
<ePixmap alphatest="blend" pixmap="icons/ico_format_off.png" position="1059,490" size="43,23" zPosition="1"/>
23832433
<widget alphatest="blend" pixmap="icons/ico_format_on.png" position="1059,490" render="Pixmap" size="43,23" source="session.CurrentService" zPosition="2">

0 commit comments

Comments
 (0)