Skip to content

Commit

Permalink
15.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
dream-alpha committed Aug 4, 2023
1 parent a915d60 commit 5b448b9
Show file tree
Hide file tree
Showing 67 changed files with 1,805 additions and 28 deletions.
2 changes: 1 addition & 1 deletion CONTROL/control
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Description: MediaCockpit
Maintainer: dream-alpha
Package: enigma2-plugin-extensions-mediacockpit
Version: 15.1.5
Version: 15.2.0
Architecture: all
Depends: python-imaging, python-twisted, python-mutagen, ffmpeg, python-merlinpictureviewer, python-merlinmusicplayer, enigma2-plugin-systemplugins-mountcockpit, enigma2-plugin-systemplugins-componentscockpit
2 changes: 1 addition & 1 deletion src/Version.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@

PLUGIN = "MediaCockpit"
ID = "MDC"
VERSION = "15.1.5"
VERSION = "15.2.0"
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."
11 changes: 11 additions & 0 deletions src/skin/CockpitDisplaySummary.xmlinc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<screen id="3" name="%ID%CockpitDisplaySummary" position="0,0"
size="400,240">
<ePixmap position="0,0" size="400,240"
pixmap="skin_default/display_bg.png" zPosition="-1" />
<widget source="parent.lcd_title" render="Label"
position="0,10" size="400,75" font="Display;75" halign="center"
valign="top" transparent="1" />
<widget source="parent.lcd_info" render="Label"
position="0,100" size="400,125" font="Display;60" halign="center"
valign="center" transparent="1" />
</screen>
22 changes: 22 additions & 0 deletions src/skin/CockpitMusicPlayerSummary.xmlinc
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<screen id="3" name="%ID%CockpitMusicPlayerSummary"
position="0,0" size="400,240">
<ePixmap position="0,0" size="400,240"
pixmap="skin_default/display_bg.png" zPosition="-1" />
<widget name="title" font="Display;60" halign="center"
position="5,5" size="390,120" valign="center" transparent="1" />
<widget position="center,140" render="Progress" size="380,15"
borderWidth="1" source="Service" zPosition="2" transparent="1"
pixmap="Default-FHD/MediaCockpit/skin/images/progress_lcd.png">
<convert type="COCServicePosition">Position</convert>
</widget>
<widget font="Display;75" valign="center" position="5,160"
render="Label" size="200,80" source="global.CurrentTime"
transparent="1">
<convert type="ClockToText">Default</convert>
</widget>
<widget font="Display;75" valign="center" halign="right"
position="200,160" render="Label" size="195,80" source="Service"
transparent="1">
<convert type="COCServicePosition">Remaining</convert>
</widget>
</screen>
8 changes: 8 additions & 0 deletions src/skin/Default-FHD/CockpitContextMenu.xmlinc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<screen name="MDCCockpitContextMenu" position="center,center"
size="840,730" title="">
<widget enableWrapAround="1" position="10,10" render="Listbox"
itemHeight="45" scrollbarMode="showOnDemand" size="820,680"
source="menu">
<convert type="StringList" />
</widget>
</screen>
110 changes: 110 additions & 0 deletions src/skin/Default-FHD/CockpitPlayer.xmlinc
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
<screen name="MDCCockpitPlayer" flags="wfNoBorder"
position="0,825" size="1920,225">
<ePixmap alphatest="off" pixmap="skin_default/infobar.png"
position="0,0" size="1920,225" zPosition="-1" />
<widget render="Label" font="Regular;40" position="230,13"
size="1100,45" noWrap="1" transparent="1" source="Service">
<convert type="COCEventName">Name</convert>
</widget>
<ePixmap pixmap="skin_default/icons/ico_dolby_off.png"
position="1460,40" size="74,35" />
<widget pixmap="skin_default/icons/ico_dolby_on.png"
position="1460,40" render="Pixmap" size="74,35"
source="Service" zPosition="1">
<convert type="ServiceInfo">IsMultichannel</convert>
<convert type="ConditionalShowHide" />
</widget>
<ePixmap pixmap="skin_default/icons/ico_format_off.png"
position="1550,40" size="74,35" />
<widget pixmap="skin_default/icons/ico_format_on.png"
position="1550,40" render="Pixmap" size="74,35"
source="Service" zPosition="1">
<convert type="ServiceInfo">IsWidescreen</convert>
<convert type="ConditionalShowHide" />
</widget>
<widget pixmap="skin_default/icons/ico_hd_off.png"
position="1640,40" render="Pixmap" size="74,35"
source="Service">
<convert type="ServiceInfo">VideoWidth</convert>
<convert type="ValueRange">0,720</convert>
<convert type="ConditionalShowHide" />
</widget>
<widget pixmap="skin_default/icons/ico_hd_on.png"
position="1640,40" render="Pixmap" size="74,35"
source="Service" zPosition="1">
<convert type="ServiceInfo">VideoWidth</convert>
<convert type="ValueRange">721,1980</convert>
<convert type="ConditionalShowHide" />
</widget>
<widget pixmap="Default-FHD/skin_default/icons/uhd.svg"
position="1640,40" render="Pixmap" size="74,35"
source="Service" zPosition="1">
<convert type="ServiceInfo">VideoWidth</convert>
<convert type="ValueRange">2160,3840</convert>
<convert type="ConditionalShowHide" />
</widget>
<widget pixmap="Default-FHD/skin_default/icons/hdr.svg"
position="1730,40" render="Pixmap" size="74,35"
source="Service" zPosition="1">
<convert type="ServiceInfo">IsHdr</convert>
<convert type="ConditionalShowHide" />
</widget>
<widget pixmap="skin_default/icons/icon_rec.png"
position="1820,40" render="Pixmap" size="74,35"
source="session.RecordState">
<convert type="ConditionalShowHide">Blink</convert>
</widget>

<xmlinc name="CockpitPlayerIcon" />

<widget backgroundColor="background" font="Regular;34"
position="230,88" size="140,40" render="Label" source="Service"
transparent="1">
<convert type="COCServicePosition">Position</convert>
</widget>

<eLabel backgroundColor="grey" position="370,143" size="1330,4" />

<widget
pointer="/usr/lib/enigma2/python/Plugins/Extensions/MediaCockpit/skin/Default-FHD/images/progress.png:1330,0"
position="370,140" render="PositionGauge" size="1330,10"
source="Service" transparent="1" zPosition="2">
<convert type="COCServicePosition">Gauge</convert>
</widget>
<widget
pointer="/usr/lib/enigma2/python/Plugins/Extensions/MediaCockpit/skin/Default-FHD/images/progress_before.png:1330,0"
position="370,140" render="PositionGauge" size="1330,10"
source="Service" transparent="1" zPosition="3">
<convert type="COCBeforeTSPosition">Gauge</convert>
</widget>
<widget
pointer="/usr/lib/enigma2/python/Plugins/Extensions/MediaCockpit/skin/Default-FHD/images/progress_rec.png:1330,0"
position="370,140" render="PositionGauge" size="1330,10"
source="Service" transparent="1" zPosition="1">
<convert type="COCRecordPosition">Gauge</convert>
</widget>

<widget backgroundColor="background" font="Regular;34"
halign="right" position="1740,88" render="Label" size="140,40"
source="Service" transparent="1">
<convert type="COCServicePosition">Remaining</convert>
</widget>
<widget render="Label" font="Regular;36" foregroundColor="yellow"
position="975,166" size="300,40" transparent="1" source="Service">
<convert type="COCMovieInfo">MovieDuration</convert>
<convert type="COCClockToText">InMinutes</convert>
</widget>
<widget backgroundColor="background" font="Regular;34"
position="230,166" render="Label" size="120,40"
source="global.CurrentTime" transparent="1">
<convert type="ClockToText">Default</convert>
</widget>

<widget backgroundColor="background" font="Regular;34"
halign="right" position="1740,166" render="Label" size="140,40"
source="Service" transparent="1">
<convert type="COCServicePosition">EndTime,ShowNoSeconds</convert>
</widget>
</screen>

<xmlinc name="CockpitPlayerSummary" />
2 changes: 2 additions & 0 deletions src/skin/Default-FHD/CockpitPlayerIcon.xmlinc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<ePixmap pixmap="Default-FHD/menu/mediacenter.svg"
position="50,80" size="132,132" zPosition="2" />
36 changes: 36 additions & 0 deletions src/skin/Default-FHD/CockpitPlayerSummary.xmlinc
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<screen id="3" name="MDCCockpitPlayerSummary" position="0,0" size="400,240">
<ePixmap position="0,0" size="400,240"
pixmap="skin_default/display_bg.png" zPosition="-1" />
<widget source="parent.Service" render="Label" font="Display;60"
halign="center" position="5,5" size="390,125"
valign="center" transparent="1">
<convert type="COCEventName">Name</convert>
</widget>
<widget source="parent.Service" render="Progress"
position="center,140" size="380,15" borderWidth="1" zPosition="2"
pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaCockpit/skin/images/progress_rec_lcd.png"
transparent="1">
<convert type="COCRecordPosition">Position</convert>
</widget>
<widget source="parent.Service" render="Progress"
position="center,140" size="380,15" borderWidth="1" zPosition="3"
pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaCockpit/skin/images/progress_before_lcd.png"
transparent="1">
<convert type="COCBeforeTSPosition">Position</convert>
</widget>
<widget position="center,140" render="Progress" size="380,15"
borderWidth="1" source="parent.Service" zPosition="2" transparent="1"
pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaCockpit/skin/images/progress_lcd.png">
<convert type="COCServicePosition">Position</convert>
</widget>
<widget font="Display;75" valign="center" halign="left"
position="5,160" render="Label" size="235,80" source="parent.Service"
transparent="1">
<convert type="COCServicePosition">EndTime,ShowNoSeconds</convert>
</widget>
<widget font="Display;75" valign="center" halign="right"
position="240,160" render="Label" size="155,80" source="parent.Service"
transparent="1">
<convert type="COCServicePosition">Remaining,ShowNoSeconds</convert>
</widget>
</screen>
6 changes: 6 additions & 0 deletions src/skin/Default-FHD/ColorButtons.xmlinc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<layout name="MDCColor_Buttons">
<ePixmap pixmap="Default-FHD/skin_default/buttons/red.svg" position="10,0" size="300,70" />
<ePixmap pixmap="Default-FHD/skin_default/buttons/green.svg" position="310,0" size="300,70" />
<ePixmap pixmap="Default-FHD/skin_default/buttons/yellow.svg" position="610,0" size="300,70" />
<ePixmap pixmap="Default-FHD/skin_default/buttons/blue.svg" position="910,0" size="300,70" />
</layout>
18 changes: 18 additions & 0 deletions src/skin/Default-FHD/ColorButtonsLabels.xmlinc
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<layout name="MDCColor_Buttons_Labels">
<widget font="Regular;30" halign="center" name="key_red"
position="10,0" foregroundColor="white" backgroundColor="#9f1313" shadowColor="black"
shadowOffset="-2,-2" size="300,70" transparent="1" valign="center"
zPosition="1" />
<widget font="Regular;30" halign="center" name="key_green"
position="310,0" foregroundColor="white" backgroundColor="#1f771f" shadowColor="black"
shadowOffset="-2,-2" size="300,70" transparent="1" valign="center"
zPosition="1" />
<widget font="Regular;30" halign="center" name="key_yellow"
position="610,0" foregroundColor="white" backgroundColor="#a08500" shadowColor="black"
shadowOffset="-2,-2" size="300,70" transparent="1" valign="center"
zPosition="1" />
<widget font="Regular;30" halign="center" name="key_blue"
position="910,0" foregroundColor="white" backgroundColor="#18188b" shadowColor="black"
shadowOffset="-2,-2" size="300,70" transparent="1" valign="center"
zPosition="1" />
</layout>
13 changes: 13 additions & 0 deletions src/skin/Default-FHD/ConfigScreen.xmlinc
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<screen name="MDCConfigScreen" position="center,110"
size="1800,930" title="">
<layout name="MDCColor_Buttons"/>
<layout name="MDCColor_Buttons_Labels"/>
<layout name="MDCDate"/>
<layout name="MDCTime"/>
<eLabel backgroundColor="grey" position="10,80" size="1780,1"/>
<widget enableWrapAround="1" name="config" itemHeight="45"
position="10,90" scrollbarMode="showOnDemand" size="1780,630"/>
<eLabel backgroundColor="grey" position="10,730" size="1780,1"/>
<widget font="Regular;32" halign="center" position="10,740"
render="Label" size="1780,180" source="help" valign="center"/>
</screen>
14 changes: 14 additions & 0 deletions src/skin/Default-FHD/DateTime.xmlinc
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<layout name="MDCDate">
<widget font="Regular;34" halign="right" valign="center"
position="1240,0" render="Label" size="400,70"
source="global.CurrentTime">
<convert type="ClockToText">Date</convert>
</widget>
</layout>
<layout name="MDCTime">
<widget font="Regular;34" halign="right" valign="center"
position="1650,0" render="Label" size="120,70"
source="global.CurrentTime">
<convert type="ClockToText">Default</convert>
</widget>
</layout>
6 changes: 6 additions & 0 deletions src/skin/Default-FHD/ScreenPVRState.xmlinc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<screen name="ScreenPVRState" position="910,490" size="100,160" backgroundColor="transparent"
flags="wfNoBorder" zPosition="1000">
<widget name="state_pic" position="0,0" size="100,100" transparent="1" />
<widget backgroundColor="background" name="state" position="0,110" size="100,50"
font="Regular;40" halign="center" valign="center" transparent="1" />
</screen>
4 changes: 4 additions & 0 deletions src/skin/Default-FHD/listboxcontent.xmlinc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<listboxcontent>
<config onPixmap="skin_default/switch_on.svg"
offPixmap="skin_default/switch_off.svg" size="60,32" />
</listboxcontent>
Empty file modified src/skin/Default-FHD/skin.xml
100755 → 100644
Empty file.
Loading

0 comments on commit 5b448b9

Please sign in to comment.