Skip to content

Commit

Permalink
Update all display
Browse files Browse the repository at this point in the history
  • Loading branch information
gimsy committed Nov 8, 2024
1 parent a28c346 commit 060018e
Show file tree
Hide file tree
Showing 429 changed files with 5,600 additions and 24,863 deletions.
11 changes: 11 additions & 0 deletions .project
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>enigma2</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>
80 changes: 48 additions & 32 deletions data/7segment/skin_display.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,13 @@ and the display skin will not be displayed
[ E ] gui/ewindowstyle.cpp:35 getStyle [eWindowStyleManager] getStyle(style_id=1): NOT FOUND -->

<windowstyle id="1" type="skinned">
<color color="#000000" name="Background"/>
<color color="#ffffff" name="LabelForeground"/>
<color color="#000000" name="ListboxBackground"/>
<color color="#ffffff" name="ListboxForeground"/>
<color color="#000000" name="ListboxSelectedBackground"/>
<color color="#ffffff" name="ListboxSelectedForeground"/>
<color color="#000000" name="ListboxMarkedBackground"/>
<color color="#ffffff" name="ListboxMarkedForeground"/>
<color color="#000000" name="ListboxMarkedAndSelectedBackground"/>
<color color="#ffffff" name="ListboxMarkedAndSelectedForeground"/>
<color color="#ffffff" name="WindowTitleForeground"/>
<color color="#000000" name="WindowTitleBackground"/>
<color name="Background" color="#0060eb"/>
<color name="LabelForeground" color="#ffffff"/>
</windowstyle>

<!-- ####################################################################################################### -->

<!-- MyClockPanel -->
<!-- MyClockPanel -->
<screen name="MyClockPanel">
<widget source="session.CurrentService" render="Label" position="0,0" size="1,1">
<convert type="VfdDisplay"></convert>
Expand Down Expand Up @@ -56,26 +46,41 @@ and the display skin will not be displayed

<!-- movieplayer-->
<screen name="InfoBarMoviePlayerSummary" position="0,0" size="1,1">
<panel name="MyClockPanel" />
<panel name="MyRecPanel" />
<widget source="session.CurrentService" render="Label" position="0,0" size="1,1">
<convert type="ServicePosition">Remaining,7segment</convert>
</widget>
</screen>

<!-- menus-->
<screen name="MenuSummary" position="0,0" size="1,1">
<panel name="MyClockPanel" />
<panel name="MyRecPanel" />
</screen>
<screen name="GeneralMenuSummary" position="0,0" size="1,1">
<panel name="MyClockPanel" />
<panel name="MyRecPanel" />
</screen>
<screen name="QuickMenuSummary" position="0,0" size="1,1">
<panel name="MyClockPanel" />
<panel name="MyRecPanel" />
</screen>

<!-- Numberzap -->
<screen name="NumberZapSummary" position="0,0" size="1,1">
<widget source="parent.number_summary" render="Label" position="0,0" size="1,1" />
<!-- setup -->
<screen name="SetupSummary" position="0,0" size="1,1">
<panel name="MyClockPanel" />
<panel name="MyRecPanel" />
</screen>

<!-- Numberzap -->
<screen name="NumberZapSummary" position="0,0" size="1,1">
<widget source="parent.number_summary" render="Label" position="0,0" size="1,1">
<convert type="VfdDisplay">Number;nozero</convert>
</widget>
</screen>
<screen name="NumberZapPiconSummary" position="0,0" size="1,1">
<widget source="parent.number_summary" render="Label" position="0,0" size="1,1" />
<widget source="parent.number_summary" render="Label" position="0,0" size="1,1">
<convert type="VfdDisplay">Number;nozero</convert>
</widget>
</screen>

<!-- misc-->
Expand All @@ -96,25 +101,29 @@ and the display skin will not be displayed
<panel name="MyRecPanel" />
</screen>
<screen name="MessageBoxSimpleSummary" position="0,0" size="1,1">
<panel name="MessageBoxSummary" />
</screen>
<screen name="PluginBrowserSummary" position="0,0" size="1,1">
<panel name="MyClockPanel" />
<panel name="MyRecPanel" />
</screen>
<screen name="JobViewSummary" position="0,0" size="1,1">
<widget source="parent.summary_job_progress" render="Label" position="0,0" size="1,1" >
<convert type="ProgressToText">InPercent</convert>
</widget>
<screen name="TaskViewSummary" position="0,0" size="1,1">
<panel name="MyClockPanel" />
<panel name="MyRecPanel" />
</screen>

<!-- DVD -->
<screen name="DVDSummary" position="0,0" size="1,1">
<panel name="MyClockPanel" />
<panel name="MyRecPanel" />
<widget source="session.CurrentService" render="Label" position="0,0" size="1,1">
<convert type="ServicePosition">Remaining,7segment</convert>
</widget>
</screen>

<!-- MediaPlayer -->
<screen name="MediaPlayerLCDScreen" position="0,0" size="1,1">
<panel name="MyClockPanel" />
<panel name="MyRecPanel" />
<widget source="session.CurrentService" render="Label" position="0,0" size="1,1">
<convert type="ServicePosition">Remaining,7segment</convert>
</widget>
</screen>

<!-- AutoTimer -->
Expand All @@ -133,18 +142,19 @@ and the display skin will not be displayed
<panel name="MyRecPanel" />
</screen>
<screen name="EMCMoviePlayerSummary" position="0,0" size="1,1">
<panel name="MyClockPanel" />
<panel name="MyRecPanel" />
<widget source="session.CurrentService" render="Label" position="0,0" size="1,1">
<convert type="ServicePosition">Remaining,7segment</convert>
</widget>
</screen>

<!-- standby -->
<screen name="StandbySummary" position="0,0" size="1,1">
<widget source="session.CurrentService" render="Label" position="0,0" size="1,1">
<convert type="ConfigEntryTest">config.usage.show_in_standby,time,CheckSourceBoolean</convert>
<convert type="ConfigEntryTest">config.usage.show_in_standby,time</convert>
<convert type="VfdDisplay">Clock</convert>
</widget>
<widget source="session.CurrentService" render="FixedLabel" position="0,0" size="1,1" text=" ">
<convert type="ConfigEntryTest">config.usage.show_in_standby,nothing,CheckSourceBoolean</convert>
<convert type="ConfigEntryTest">config.usage.show_in_standby,nothing</convert>
<convert type="ConditionalShowHide" />
</widget>
<widget source="session.RecordState" render="FixedLabel" position="0,0" size="1,1" text="REC ">
Expand All @@ -155,7 +165,7 @@ and the display skin will not be displayed
<convert type="ConfigEntryTest">config.usage.blinking_display_clock_during_recording,Rec,CheckSourceBoolean</convert>
<convert type="ConditionalShowHide" />
</widget>
<widget source="session.CurrentService" render="FixedLabel" position="0,0" size="1,1" text=" ">
<widget source="session.RecordState" render="FixedLabel" position="0,0" size="1,1" text=" ">
<convert type="ConfigEntryTest">config.usage.blinking_display_clock_during_recording,Nothing,CheckSourceBoolean</convert>
<convert type="ConditionalShowHide" />
</widget>
Expand All @@ -166,4 +176,10 @@ and the display skin will not be displayed
<panel name="MyClockPanel" />
<panel name="MyRecPanel" />
</screen>

<!-- IMdb -->
<screen name="IMDbLCDScreen" position="0,0" size="1,1">
<panel name="MyClockPanel" />
<panel name="MyRecPanel" />
</screen>
</skin>
4 changes: 2 additions & 2 deletions data/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ dist_pkgdata_DATA = \
keymap.xml \
keymap.ntr \
keymap.u80 \
keytranslation.xml \
menu.xml \
black.mvi \
rcpositions.xml \
Expand All @@ -14,11 +13,12 @@ dist_pkgdata_DATA = \
startwizard.xml \
userinterfacepositionerwizard.xml \
videowizard.xml \
wizardlanguage.xml \
freesat.t1 \
freesat.t2 \
unicable.xml \
hd-testcard.mvi \
distro-logo.png
distro-logo.png

if HAVE_7SEGMENT
SUBDIRS += 7segment
Expand Down
52 changes: 23 additions & 29 deletions data/display128/skin_display.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@


<!-- channelselection-->
<screen name="ChannelSelection_summary" position="fill">
<screen name="ChannelSelectionSummary" position="fill">
<widget source="parent.ServiceEvent" render="Label" position="top" size="*,21" font="FdLcD;20" noWrap="1">
<convert type="ServiceName">Name</convert>
</widget>
Expand All @@ -72,10 +72,8 @@

<!-- menus-->
<screen name="MenuSummary" position="fill">
<widget source="parent.title" render="Label" position="top" size="*,16" font="FdLcD;14" halign="center" valign="top" noWrap="1" />
<widget source="parent.menu" render="Label" position="top" size="*,48" font="FdLcD;16" valign="top">
<convert type="StringListSelection" />
</widget>
<widget source="Title" render="Label" position="top" size="*,16" font="FdLcD;14" halign="center" valign="top" noWrap="1" />
<widget source="entry" render="Label" position="top" size="*,48" font="FdLcD;16" valign="top"/>
</screen>

<!-- movieplayer-->
Expand Down Expand Up @@ -134,14 +132,14 @@

<!-- setup-->
<screen name="SetupSummary" position="fill">
<widget source="SetupTitle" render="Label" position="top" size="*,12" font="FdLcD;12" halign="left" />
<widget source="SetupEntry" render="Label" position="top" size="*,40" font="FdLcD;12" halign="left" />
<widget source="SetupValue" render="Label" position="top" size="*,12" font="FdLcD;12" halign="left" />
<widget source="Title" render="Label" position="top" size="*,12" font="FdLcD;12" halign="left" />
<widget source="entry" render="Label" position="top" size="*,40" font="FdLcD;12" halign="left" />
<widget source="value" render="Label" position="top" size="*,12" font="FdLcD;12" halign="left" />
</screen>

<!-- misc-->
<screen name="SimpleSummary" position="fill">
<widget source="parent.Title" render="Label" position="top" size="*,40" font="FdLcD;16" halign="center" valign="center" />
<screen name="ScreenSummary" position="fill">
<widget source="Title" render="Label" position="top" size="*,40" font="FdLcD;16" halign="center" valign="center" />
<panel position="bottom" size="*,24" name="SummaryClockPanel" />
</screen>

Expand Down Expand Up @@ -175,21 +173,21 @@
</screen>

<!-- Numberzap -->
<screen name="NumberZap_summary" position="fill">
<screen name="NumberZapSummary" position="fill">
<widget source="parent.number_summary" render="Label" position="top" size="*,25" font="FdLcD;20" halign="center" valign="center" />
<widget source="parent.service_summary" render="Label" position="top" size="*,16" foregroundColor="#FFFF00" font="FdLcD;16" halign="center" valign="top" />
<panel name="SummaryClockPanel" />
</screen>

<!-- Plugin browser -->
<screen name="PluginBrowserSummary" position="fill">
<widget source="parent.Title" render="Label" position="top" size="*,16" font="FdLcD;12" noWrap="1" />
<widget source="Title" render="Label" position="top" size="*,16" font="FdLcD;12" noWrap="1" />
<widget source="entry" render="Label" position="top" size="*,20" font="FdLcD;18" noWrap="1" />
<widget source="desc" render="Label" position="fill" font="FdLcD;12" valign="top" />
<widget source="value" render="Label" position="fill" font="FdLcD;12" valign="top" />
</screen>

<!-- JobView Summary -->
<screen name="JobView_summary" position="fill">
<screen name="TaskViewSummary" position="fill">
<widget source="parent.summary_job_name" render="Label" position="6,4" size="120,42" font="FdLcD;16" />
<widget source="parent.summary_job_task" render="Label" position="6,22" size="120,26" font="FdLcD;12" />
<widget source="parent.summary_job_progress" render="Progress" position="6,50" size="60,12" borderWidth="1" zPosition="1" />
Expand All @@ -198,44 +196,40 @@
</widget>
</screen>

<screen name="ChoiceBox_summary" position="fill">
<screen name="ChoiceBoxSummary" position="fill">
<widget source="parent.summary_list" render="Label" position="fill" font="FdLcD;11" />
</screen>

<screen name="MessageBox_summary" position="fill">
<widget source="parent.Text" render="Label" position="top" size="*,52" font="FdLcD;11" halign="center" valign="center" />
<widget source="parent.selectedChoice" render="Label" position="bottom" size="*,14" font="FdLcD;14" halign="center" valign="center" />
<screen name="MessageBoxSummary" position="fill">
<widget source="text" render="Label" position="top" size="*,52" font="FdLcD;11" halign="center" valign="center" />
<widget source="option" render="Label" position="bottom" size="*,14" font="FdLcD;14" halign="center" valign="center" />
</screen>

<screen name="MessageBoxSimple_summary" position="fill">
<widget source="parent.Text" render="Label" position="top" size="*,52" font="FdLcD;11" halign="center" valign="center" />
<widget source="parent.selectedChoice" render="Label" position="bottom" size="*,14" font="FdLcD;14" halign="center" valign="center" />
<screen name="MessageBoxSimpleSummary" position="fill">
<panel name="MessageBoxSummary" />
</screen>

<!-- EMC -->
<screen name="EMCSelection_summary" position="fill">
<screen name="EMCSelectionSummary" position="fill">
<!-- Channel name -->
<widget source="parent.Service" render="Label" position="top" size="*,16" font="FdLcD;16" halign="center" noWrap="1">
<convert type="EMCMovieInfo">RecordServiceName</convert>
<convert type="MovieInfo">RecordServiceName</convert>
</widget>
<!-- Movie name -->
<widget source="parent.Service" render="Label" position="top" size="*,30" font="FdLcD;14" halign="center" valign="center">
<convert type="EMCEventName">Name</convert>
<convert type="EventName">Name</convert>
</widget>
<!-- Movie info -->
<panel position="bottom" size="*,16">
<widget source="parent.Service" render="Label" position="right" size="49,*" font="FdLcD;14" halign="right" noWrap="1">
<convert type="EMCMovieInfo">FileSize</convert>
<convert type="MovieInfo">FileSize</convert>
</widget>
<widget source="parent.Service" render="Label" position="fill" font="FdLcD;14" halign="left" transparent="1">
<convert type="EMCServiceTime">Duration</convert>
<convert type="ServiceTime">Duration</convert>
<convert type="EMCClockToText">InMinutes</convert>
</widget>
</panel>
</screen>
<screen name="EMCSelectionSummary" position="fill">
<panel name="EMCSelection_summary" />
</screen>

<screen name="EMCMoviePlayerSummary" position="fill">
<!-- Movie name -->
Expand Down
Loading

0 comments on commit 060018e

Please sign in to comment.