Skip to content

Commit

Permalink
Merge branch 'master' into 7.3
Browse files Browse the repository at this point in the history 
* master: (102 commits)
  translation update
  cherry pick OpenPLi/enigma2@660ee59
  remove old files #3022
  [eListboxPythonServiceContent] * add missing setHideNumberMarker
  [eListboxPythonServiceContent] * add isFolder flag to setBuildArgs
  [InfoBarStreamRelay] * use toCompareString for serviceref compare * add sanitizer (idea taken from openVix) * make some functions/ivars private
  [InfoBarAutoCam] * use toCompareString for serviceref compare
  [AutocamSetup,StreamRelaySetup] * show orbital position (idea taken from openVix) * sort channels  (taken from openVix)
  pot update
  [FlasManager/MultiBootManager/ImageBackup] * show multiboot type
  [Information/About] * show VU+ Multiboot if active
  [ImageBackup] * reset config.usage.shutdownOK for image backup
  [MessageBox] * small embedded skin correction
  fix #3156 Hide the menu items for "Fade the InfoBar" on "OSD Settings" if not available. - Enable InfoBar fade-out - InfoBar fade-out speed
  Workaround for #3006 (pressing `0` no longer goes to first channel in Multi-channel EPG) (#3175)
  [InfoBarInstantRecord] * fix typo in last commit
  [ChannelSelection] * move call setHideNumberMarker to ServiceList
  [InfoBarInstantRecord] * rename callback functions * fix empty duration crash * correction of margin for duration change
  [keymap.xml] Add new PreviousNext action map
  [SoftwareUpdate] * use new ampel
  ...
  • Loading branch information
@jbleyel
jbleyel committed Dec 7, 2023
2 parents f6b5b11 + f2a28d3 commit 22968c0
Show file tree
Hide file tree
Showing 252 changed files with 24,425 additions and 18,061 deletions.
7 changes: 0 additions & 7 deletions Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,4 @@ ACLOCAL_AMFLAGS = -I m4
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = enigma2.pc

metadir = $(datadir)/meta
meta_DATA = index-enigma2.xml
CLEANFILES = index-enigma2.xml

EXTRA_DIST = lamedb

index-enigma2.xml: $(top_srcdir)/tools/genmetaindex.py $(top_srcdir)/lib/python/Plugins/*/*/meta/plugin_*.xml
$(AM_V_GEN)$(PYTHON) $^ > $@
24 changes: 0 additions & 24 deletions configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -877,25 +877,17 @@ lib/python/Plugins/Extensions/Makefile
lib/python/Plugins/Extensions/AtileHD/Makefile
lib/python/Plugins/Extensions/AtileHD/pic/Makefile
lib/python/Plugins/Extensions/CutListEditor/Makefile
lib/python/Plugins/Extensions/CutListEditor/meta/Makefile
lib/python/Plugins/Extensions/DVDBurn/Makefile
lib/python/Plugins/Extensions/DVDBurn/meta/Makefile
lib/python/Plugins/Extensions/DVDPlayer/Makefile
lib/python/Plugins/Extensions/DVDPlayer/meta/Makefile
lib/python/Plugins/Extensions/FileCommander/Makefile
lib/python/Plugins/Extensions/MediaPlayer/Makefile
lib/python/Plugins/Extensions/MediaPlayer/meta/Makefile
lib/python/Plugins/Extensions/MediaScanner/Makefile
lib/python/Plugins/Extensions/MediaScanner/meta/Makefile
lib/python/Plugins/Extensions/MiniTV/Makefile
lib/python/Plugins/Extensions/PicturePlayer/Makefile
lib/python/Plugins/Extensions/PicturePlayer/meta/Makefile
lib/python/Plugins/Extensions/ProgrammlistenUpdater/Makefile
lib/python/Plugins/Extensions/SocketMMI/Makefile
lib/python/Plugins/Extensions/SocketMMI/meta/Makefile
lib/python/Plugins/Extensions/SocketMMI/src/Makefile
lib/python/Plugins/Extensions/TuxboxPlugins/Makefile
lib/python/Plugins/Extensions/TuxboxPlugins/meta/Makefile
lib/python/Plugins/Extensions/QuadPip/Makefile
lib/python/Plugins/Extensions/StreamlinkWrapper/Makefile
lib/python/Plugins/Extensions/YTDLWrapper/Makefile
Expand All @@ -905,43 +897,27 @@ lib/python/Plugins/SystemPlugins/AnimationSetup/Makefile
lib/python/Plugins/SystemPlugins/AmlFRQ/Makefile
lib/python/Plugins/SystemPlugins/CableScan/Makefile
lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/Makefile
lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/meta/Makefile
lib/python/Plugins/SystemPlugins/DefaultServicesScanner/Makefile
lib/python/Plugins/SystemPlugins/DefaultServicesScanner/meta/Makefile
lib/python/Plugins/SystemPlugins/DiseqcTester/Makefile
lib/python/Plugins/SystemPlugins/DiseqcTester/meta/Makefile
lib/python/Plugins/SystemPlugins/FastChannelChange/Makefile
lib/python/Plugins/SystemPlugins/FastChannelChange/meta/Makefile
lib/python/Plugins/SystemPlugins/FastScan/Makefile
lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/Makefile
lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/meta/Makefile
lib/python/Plugins/SystemPlugins/FSBLUpdater/Makefile
lib/python/Plugins/SystemPlugins/Hotplug/Makefile
lib/python/Plugins/SystemPlugins/Hotplug/meta/Makefile
lib/python/Plugins/SystemPlugins/IceTV/Makefile
lib/python/Plugins/SystemPlugins/LCNScanner/Makefile
lib/python/Plugins/SystemPlugins/NetworkWizard/Makefile
lib/python/Plugins/SystemPlugins/NetworkWizard/meta/Makefile
lib/python/Plugins/SystemPlugins/PositionerSetup/Makefile
lib/python/Plugins/SystemPlugins/PositionerSetup/meta/Makefile
lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/Makefile
lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/meta/Makefile
lib/python/Plugins/SystemPlugins/Satfinder/Makefile
lib/python/Plugins/SystemPlugins/Satfinder/meta/Makefile
lib/python/Plugins/SystemPlugins/SoftwareManager/Makefile
lib/python/Plugins/SystemPlugins/SoftwareManager/meta/Makefile
lib/python/Plugins/SystemPlugins/VideoClippingSetup/Makefile
lib/python/Plugins/SystemPlugins/VideoEnhancement/Makefile
lib/python/Plugins/SystemPlugins/VideoEnhancement/meta/Makefile
lib/python/Plugins/SystemPlugins/VideoEnhancementAML/Makefile
lib/python/Plugins/SystemPlugins/VideoTune/Makefile
lib/python/Plugins/SystemPlugins/VideoTune/meta/Makefile
lib/python/Plugins/SystemPlugins/WirelessLan/Makefile
lib/python/Plugins/SystemPlugins/WirelessLan/meta/Makefile
lib/python/Plugins/SystemPlugins/SkinSelector/Makefile
lib/python/Plugins/SystemPlugins/SkinSelector/meta/Makefile
lib/python/Plugins/SystemPlugins/vps/Makefile
lib/python/Plugins/SystemPlugins/vps/meta/Makefile
lib/python/Plugins/SystemPlugins/vps/src_cc/Makefile
lib/python/Plugins/SystemPlugins/vps/src_py/Makefile
lib/python/Tools/Makefile
Expand Down
14 changes: 7 additions & 7 deletions data/7segment/skin_display.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ and the display skin will not be displayed
<panel name="MyClockPanel" />
<panel name="MyRecPanel" />
</screen>
<screen name="QuickMenu_summary" position="0,0" size="1,1">
<screen name="QuickMenuSummary" position="0,0" size="1,1">
<panel name="MyClockPanel" />
<panel name="MyRecPanel" />
</screen>
Expand All @@ -72,12 +72,12 @@ and the display skin will not be displayed
</screen>

<!-- Numberzap -->
<screen name="NumberZap_summary" position="0,0" size="1,1">
<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="NumberZapPicon_summary" position="0,0" size="1,1">
<screen name="NumberZapPiconSummary" 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>
Expand All @@ -88,11 +88,11 @@ and the display skin will not be displayed
<panel name="MyClockPanel" />
<panel name="MyRecPanel" />
</screen>
<screen name="SimpleSummary" position="0,0" size="1,1">
<screen name="ScreenSummary" position="0,0" size="1,1">
<panel name="MyClockPanel" />
<panel name="MyRecPanel" />
</screen>
<screen name="ChoiceBox_summary" position="0,0" size="1,1">
<screen name="ChoiceBoxSummary" position="0,0" size="1,1">
<panel name="MyClockPanel" />
<panel name="MyRecPanel" />
</screen>
Expand All @@ -107,7 +107,7 @@ and the display skin will not be displayed
<panel name="MyClockPanel" />
<panel name="MyRecPanel" />
</screen>
<screen name="JobView_summary" position="0,0" size="1,1">
<screen name="TaskViewSummary" position="0,0" size="1,1">
<panel name="MyClockPanel" />
<panel name="MyRecPanel" />
</screen>
Expand All @@ -133,7 +133,7 @@ and the display skin will not be displayed
</screen>

<!-- EMC -->
<screen name="EMCSelection_summary" position="0,0" size="1,1">
<screen name="EMCSelectionSummary" position="0,0" size="1,1">
<panel name="MyClockPanel" />
<panel name="MyRecPanel" />
</screen>
Expand Down
18 changes: 9 additions & 9 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 Down Expand Up @@ -138,8 +138,8 @@
</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 All @@ -166,21 +166,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 @@ -189,7 +189,7 @@
</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>

Expand All @@ -203,7 +203,7 @@
</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="MovieInfo">RecordServiceName</convert>
Expand Down
18 changes: 9 additions & 9 deletions data/display128dm/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="2,0" size="128,64">
<screen name="ChannelSelectionSummary" position="2,0" size="128,64">
<widget source="parent.ServiceEvent" render="Label" position="top" size="*,21" font="FdLcD;20" noWrap="1">
<convert type="ServiceName">Name</convert>
</widget>
Expand Down Expand Up @@ -138,8 +138,8 @@
</screen>

<!-- misc-->
<screen name="SimpleSummary" position="2,0" size="128,64">
<widget source="parent.Title" render="Label" position="top" size="*,40" font="FdLcD;16" halign="center" valign="center" />
<screen name="ScreenSummary" position="2,0" size="128,64">
<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 All @@ -166,21 +166,21 @@
</screen>

<!-- Numberzap -->
<screen name="NumberZap_summary" position="2,0" size="128,64">
<screen name="NumberZapSummary" position="2,0" size="128,64">
<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="2,0" size="128,64">
<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="2,0" size="128,64">
<screen name="TaskViewSummary" position="2,0" size="128,64">
<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 @@ -189,7 +189,7 @@
</widget>
</screen>

<screen name="ChoiceBox_summary" position="2,0" size="128,64">
<screen name="ChoiceBoxSummary" position="2,0" size="128,64">
<widget source="parent.summary_list" render="Label" position="fill" font="FdLcD;11" />
</screen>

Expand All @@ -203,7 +203,7 @@
</screen>

<!-- EMC -->
<screen name="EMCSelection_summary" position="3,0" size="128,64">
<screen name="EMCSelectionSummary" position="3,0" size="128,64">
<!-- Channel name -->
<widget source="parent.Service" render="Label" position="top" size="*,16" font="FdLcD;16" halign="center" noWrap="1">
<convert type="MovieInfo">RecordServiceName</convert>
Expand Down
14 changes: 7 additions & 7 deletions data/display128dm/skin_display_picon.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="2,0" size="128,64">
<screen name="ChannelSelectionSummary" position="2,0" size="128,64">
<widget source="parent.ServiceEvent" render="Label" position="top" size="100,21" font="FdLcD;20" noWrap="1" >
<convert type="ServiceName">Name</convert>
</widget>
Expand Down Expand Up @@ -138,8 +138,8 @@
</screen>

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

Expand All @@ -166,13 +166,13 @@
</screen>
<!-- Plugin browser -->
<screen name="PluginBrowserSummary" position="2,0" size="128,64">
<widget source="parent.Title" render="Label" position="top" size="100,16" font="FdLcD;12" noWrap="1" />
<widget source="Title" render="Label" position="top" size="100,16" font="FdLcD;12" noWrap="1" />
<widget source="entry" render="Label" position="top" size="100,20" font="FdLcD;18" noWrap="1" />
<widget source="desc" render="Label" position="2,0" size="128,64" font="FdLcD;12" valign="top" />
<widget source="value" render="Label" position="2,0" size="128,64" font="FdLcD;12" valign="top" />
</screen>

<!-- JobView Summary -->
<screen name="JobView_summary" position="2,0" size="128,64">
<screen name="TaskViewSummary" position="2,0" size="128,64">
<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 @@ -181,7 +181,7 @@
</widget>
</screen>

<screen name="ChoiceBox_summary" position="2,0" size="128,64">
<screen name="ChoiceBoxSummary" position="2,0" size="128,64">
<widget source="parent.summary_list" render="Label" position="2,0" size="128,64" font="FdLcD;11" />
</screen>

Expand Down
Loading

1 comment on commit 22968c0

@jeepcook
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very big merge. I've compiled an image for my SF8008. Everything seems to be ok. Thanks

Please sign in to comment.