Skip to content

Commit

Permalink
Merge branch 'master' into eAVControl
Browse files Browse the repository at this point in the history 
* master: (84 commits)
  [EPGSelection] * add TMDB Search
  small text corrections
  translation update
  [Wizard] (#2972)
  add og2s4k
  pot update
  tiny text changes
  üöugombrowser enable translation plugin action log title
  Update Digital Platform 42°E (#2969)
  [PluginComponent.py] Use consistent error variable name
  [FileList.py] Update extension lists (#2967)
  translation update
  pot update
  plugin browser fix small typo for translation
  [PluginBrowser.py] (#2966)
  [PluginComponent] * silence old WebInterface error in log * fix some sonar warnings
  MoviewList update extentions
  translation update
  [PluginAction] * Add skin template item index 11 for name + version in one string.
  [PluginBrowser] * fix commit 5cf1d60
  ...
  • Loading branch information
@jbleyel
jbleyel committed Jul 11, 2023
2 parents 110f7f0 + 75cb612 commit 64eda3d
Show file tree
Hide file tree
Showing 218 changed files with 31,029 additions and 55,775 deletions.
1 change: 1 addition & 0 deletions .github/workflows/SonarCloud.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ jobs:
sudo apt-get install libavahi-client-dev
sudo apt-get install libjpeg-turbo8-dev
sudo apt-get install libgif-dev
sudo apt-get install libcurl4-openssl-dev
- uses: actions/checkout@v3
with:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/enigma2.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ jobs:
sudo apt-get install libavahi-client-dev
sudo apt-get install libjpeg-turbo8-dev
sudo apt-get install libgif-dev
sudo apt-get install libcurl4-openssl-dev
- uses: actions/checkout@v3

Expand Down
8 changes: 4 additions & 4 deletions configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ AC_SYS_LARGEFILE

AC_PROG_CC
AC_PROG_CXX
AX_CXX_COMPILE_STDCXX_11
AX_CXX_COMPILE_STDCXX_17
m4_ifdef([LT_INIT], [LT_INIT], [AC_PROG_LIBTOOL])
AC_CONFIG_MACRO_DIR([m4])
AC_OPENMP()
Expand Down Expand Up @@ -42,7 +42,7 @@ AC_ARG_WITH(gstversion,

PKG_CHECK_MODULES(TUXTXT, tuxbox-tuxtxt)
PKG_CHECK_MODULES(GSTREAMER, gstreamer-$GST_MAJORMINOR gstreamer-pbutils-$GST_MAJORMINOR)
PKG_CHECK_MODULES(BASE, [freetype2 fribidi gstreamer-$GST_MAJORMINOR gstreamer-pbutils-$GST_MAJORMINOR libdvbsi++ libpng libxml-2.0 sigc++-2.0 libssl libcrypto])
PKG_CHECK_MODULES(BASE, [freetype2 fribidi gstreamer-$GST_MAJORMINOR gstreamer-pbutils-$GST_MAJORMINOR libdvbsi++ libpng libxml-2.0 sigc++-2.0 libssl libcrypto libcurl])
PKG_CHECK_MODULES(LIBDDVD, libdreamdvd, HAVE_LIBDDVD="yes", HAVE_LIBDDVD="no")
AM_CONDITIONAL(HAVE_LIBDDVD, test "$HAVE_LIBDDVD" = "yes")
PKG_CHECK_MODULES(AVAHI, avahi-client)
Expand Down Expand Up @@ -564,7 +564,7 @@ if test "$BOXTYPE" == "dm7080" -o "$BOXTYPE" == "dm820" -o "$BOXTYPE" == "dm900
AC_DEFINE(CONFIG_ION, 1,[define BOX use ION Allocator])
fi

if test "$BOXTYPE" == "vusolo4k" -o "$BOXTYPE" == "vuuno4k" -o "$BOXTYPE" == "vuuno4kse" -o "$BOXTYPE" == "vuultimo4k" -o "$BOXTYPE" == "vuzero4k" -o "$BOXTYPE" == "vuduo4k" -o "$BOXTYPE" == "vuduo4kse" -o "$BOXTYPE" == "sf8008" -o "$BOXTYPE" == "sf8008m" -o "$BOXTYPE" == "sx988" -o "$BOXTYPE" == "ip8" -o "$BOXTYPE" == "ustym4kpro" -o "$BOXTYPE" == "ustym4kottpremium" -o "$BOXTYPE" == "ustym4ks2ottx" -o "$BOXTYPE" == "gbmv200" -o "$BOXTYPE" == "beyonwizv2" -o "$BOXTYPE" == "viper4k" -o "$BOXTYPE" == "dagsmv200" -o "$BOXTYPE" == "og2ott4k" -o "$BOXTYPE" == "sfx6008" -o "$BOXTYPE" == "sx88v2"; then
if test "$BOXTYPE" == "vusolo4k" -o "$BOXTYPE" == "vuuno4k" -o "$BOXTYPE" == "vuuno4kse" -o "$BOXTYPE" == "vuultimo4k" -o "$BOXTYPE" == "vuzero4k" -o "$BOXTYPE" == "vuduo4k" -o "$BOXTYPE" == "vuduo4kse" -o "$BOXTYPE" == "sf8008" -o "$BOXTYPE" == "sf8008m" -o "$BOXTYPE" == "sx988" -o "$BOXTYPE" == "ip8" -o "$BOXTYPE" == "ustym4kpro" -o "$BOXTYPE" == "ustym4kottpremium" -o "$BOXTYPE" == "ustym4ks2ottx" -o "$BOXTYPE" == "gbmv200" -o "$BOXTYPE" == "beyonwizv2" -o "$BOXTYPE" == "viper4k" -o "$BOXTYPE" == "dagsmv200" -o "$BOXTYPE" == "og2ott4k" -o "$BOXTYPE" == "og2s4k" -o "$BOXTYPE" == "sfx6008" -o "$BOXTYPE" == "sx88v2"; then
AC_DEFINE(VMSG_TYPE2, 1,[define vtuner_message type 2])
fi

Expand All @@ -583,7 +583,7 @@ if test "$BOXTYPE" == "u53" -o "$BOXTYPE" == "u532" -o "$BOXTYPE" == "u533"; the
AC_DEFINE(KEY_HELP_TO_KEY_AUDIO, 1,[define when rc SETTINGS key sends a KEY_HELP event for its KEY_AUDIO key])
fi

if test "$BOXTYPE" == "sf8008" -o "$BOXTYPE" == "sf8008m" -o "$BOXTYPE" == "sx988" -o "$BOXTYPE" == "ip8" -o "$BOXTYPE" == "ustym4kpro" -o "$BOXTYPE" == "ustym4kottpremium" -o "$BOXTYPE" == "ustym4ks2ottx" -o "$BOXTYPE" == "gbmv200" -o "$BOXTYPE" == "beyonwizv2" -o "$BOXTYPE" == "viper4k" -o "$BOXTYPE" == "dagsmv200" -o "$BOXTYPE" == "og2ott4k" -o "$BOXTYPE" == "sfx6008" -o "$BOXTYPE" == "sx88v2"; then
if test "$BOXTYPE" == "sf8008" -o "$BOXTYPE" == "sf8008m" -o "$BOXTYPE" == "sx988" -o "$BOXTYPE" == "ip8" -o "$BOXTYPE" == "ustym4kpro" -o "$BOXTYPE" == "ustym4kottpremium" -o "$BOXTYPE" == "ustym4ks2ottx" -o "$BOXTYPE" == "gbmv200" -o "$BOXTYPE" == "beyonwizv2" -o "$BOXTYPE" == "viper4k" -o "$BOXTYPE" == "dagsmv200" -o "$BOXTYPE" == "og2ott4k" -o "$BOXTYPE" == "og2s4k" -o "$BOXTYPE" == "sfx6008" -o "$BOXTYPE" == "sx88v2"; then
AC_DEFINE(HAVE_HISILICON, 1,[define add HISILICON chip])
AC_DEFINE(CONFIG_HISILICON_FB, 1,[define add HISILICON framebuffer blit])
AC_DEFINE(FORCE_ALPHABLENDING_ACCELERATION, 1,[define when the framebuffer acceleration has alphablending support, but detection slow down all])
Expand Down
1 change: 1 addition & 0 deletions data/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ dist_pkgdata_DATA = \
startwizard.xml \
userinterfacepositionerwizard.xml \
videowizard.xml \
wizardlanguage.xml \
freesat.t1 \
freesat.t2 \
unicable.xml \
Expand Down
2 changes: 1 addition & 1 deletion data/display240/skin_display.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@
<panel name="SummaryClockPanel" />
</screen>
<screen name="IMDbLCDScreen" position="0,0" size="240,80">
<eLabel text="IMDB Search" position="0,0" foregroundColor="#FFFF00" size="240,60" font="FdLcD;20" halign="center" valign="center" />
<eLabel text="IMDb Search" position="0,0" foregroundColor="#FFFF00" size="240,60" font="FdLcD;20" halign="center" valign="center" />
<panel name="SummaryClockPanel" />
</screen>
<screen name="GraphicalInfoBarEPG_summary" position="0,0" size="240,80">
Expand Down
2 changes: 1 addition & 1 deletion data/display240/skin_display_picon.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
<panel name="SummaryClockPanel" />
</screen>
<screen name="IMDbLCDScreen" position="0,0" size="220,176">
<eLabel text="IMDB Search" position="0,0" foregroundColor="#FFFF00" size="220,135" font="FdLcD;26" halign="center" valign="center" />
<eLabel text="IMDb Search" position="0,0" foregroundColor="#FFFF00" size="220,135" font="FdLcD;26" halign="center" valign="center" />
<panel name="SummaryClockPanel" />
</screen>
<screen name="GraphicalInfoBarEPG_summary" position="0,0" size="220,176">
Expand Down
2 changes: 1 addition & 1 deletion data/display390/skin_display_picon.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
<panel name="SummaryClockPanel" />
<panel name="MeinTunerInfoPanel" />
</screen>
<!-- Movieplayer auch MediaPortal-->
<!-- Movieplayer-->
<screen name="InfoBarMoviePlayerSummary" position="0,0" size="390,240">
<widget source="session.CurrentService" render="Label" position="0,0" size="390,133" font="FdLcD;38" halign="center" valign="center" transparent="1" zPosition="2">
<convert type="ServiceName">Name</convert>
Expand Down
2 changes: 1 addition & 1 deletion data/display400/skin_display_picon.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
<panel name="SummaryClockPanel" />
<panel name="MeinTunerInfoPanel" />
</screen>
<!-- Movieplayer auch MediaPortal-->
<!-- Movieplayer-->
<screen name="InfoBarMoviePlayerSummary" position="0,0" size="400,240">
<widget source="session.CurrentService" render="Label" position="0,0" size="400,133" font="FdLcD;38" halign="center" valign="center" transparent="1" zPosition="2">
<convert type="ServiceName">Name</convert>
Expand Down
2 changes: 1 addition & 1 deletion data/display480/skin_display_picon.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
<panel name="SummaryClockPanel" />
<panel name="MeinTunerInfoPanel" />
</screen>
<!-- Movieplayer auch MediaPortal-->
<!-- Movieplayer-->
<screen name="InfoBarMoviePlayerSummary" position="5,0" size="471,320">
<widget source="session.CurrentService" render="Label" position="0,0" size="471,177" font="FdLcD;38" halign="center" valign="center" transparent="1" zPosition="2">
<convert type="ServiceName">Name</convert>
Expand Down
1 change: 1 addition & 0 deletions data/encoding.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ pes UTF-8
41301 42 ISO8859-9 # Digital Platform 42°E - 12.213 V
41401 42 ISO8859-9 # Digital Platform 42°E - 12.209 H
41501 42 ISO8859-9 # Digital Platform 42°E - 12.265 V
41702 42 ISO8859-9 # Digital Platform 42°E - 12.298 V
41703 42 ISO8859-9 # Digital Platform 42°E - 12.310 V
41901 42 ISO8859-9 # Digital Platform 42°E - 12.344 V
41902 42 ISO8859-9 # Digital Platform 42°E - 12.380 V
Expand Down
5 changes: 2 additions & 3 deletions data/menu.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,15 +151,14 @@ self.session.openWithCallback(msgClosed, EpgDeleteMsg)
<menu key="cam" level="1" text="Decryption &amp; Parental Control" weight="30">
<item key="softcam_settings" level="0" text="Softcam Settings" weight="50" requires="HAVEINITCAM"><screen module="SoftcamSetup" screen="SoftcamSetup" /></item>
<item key="oscam_info" level="0" text="OScam Information" weight="60" requires="ShowOscamInfo"><screen module="OScamInfo" screen="OscamInfoMenu" /></item>
<item key="cccam_info" level="0" text="CCCam Information" weight="70" requires="ShowCCCamInfo"><screen module="CCcamInfo" screen="CCcamInfoMain" /></item>
<item key="ci_settings" level="1" text="CI Basic Settings" weight="80" requires="CommonInterface"><setup setupKey="CISettings" /></item>
<item key="cccam_info" level="0" text="CCcam Information" weight="70" requires="ShowCCCamInfo"><screen module="CCcamInfo" screen="CCcamInfoMain" /></item>
<item key="ci_setup" level="1" text="CI Helper Settings" weight="90" requires="CIHelper"><screen module="Ci" screen="CIHelper" /></item>
<item key="ci_selection" level="1" text="Common Interface Settings" weight="100" requires="CommonInterface"><screen module="Ci" screen="CiSelection" /></item>
<item key="parental_setup" level="0" text="Parental Control Settings" weight="200"><screen module="ParentalControlSetup" screen="ParentalControlSetup" /></item>
</menu>
<!-- Menu / Setup / Software Management -->
<menu key="software_manager" level="0" text="Software Management" description="This menu offers options related managing the software on the %s %s." weight="50">
<item key="manage_extensions" level="0" text="Manage Extensions" description="Browse, install or remove extensions / plugins." weight="10"><screen module="PluginBrowser" screen="PluginDownloadManager"/></item>
<item key="manage_plugins" level="0" text="Manage Plugins" description="Browse, install or remove plugins on a one by one basis." weight="10"><screen module="PluginBrowser" screen="PluginAction">3</screen></item>
<item key="software_update" level="0" text="Software Update" description="Online update of your %s %s software." weight="11"><screen module="SoftwareUpdate" screen="SoftwareUpdate" /></item>
<item key="software_restore" level="0" text="Software Restore" description="Restore your %s %s with a new firmware." weight="12"><plugin system="SoftwareManager" screen="ImageWizard" /></item>
<item key="flash_online" level="0" text="Flash Online" description="Download and flash images on your %s %s." weight="13"><screen module="FlashManager" screen="FlashManager" /></item>
Expand Down
Loading

0 comments on commit 64eda3d

Please sign in to comment.