Skip to content

Commit

Permalink
Merge branch 'master' into 7.3
Browse files Browse the repository at this point in the history 
* master: (94 commits)
  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
  [PluginBrowser] * remove old PluginDownloadBrowser skin for PluginAction
  ...
  • Loading branch information
@jbleyel
jbleyel committed Jul 11, 2023
2 parents 5f5167d + 11bbe0f commit d68abcf
Show file tree
Hide file tree
Showing 205 changed files with 29,577 additions and 14,707 deletions.
6 changes: 3 additions & 3 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 @@ -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
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
54 changes: 24 additions & 30 deletions data/setup.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,6 @@
<item level="2" text="Number of digits in channel number" description="This allows you to set the number of digits to 5, if you have more than 9999 channels.">config.usage.maxchannelnumlen</item>
<item level="0" text="Set action for 'Info' key" description="Here you can set what is called when pressing the 'Info' key.">config.usage.servicelist_infokey</item>
</setup>
<setup key="CISettings" title="CI Basic Settings" requires="CommonInterface" showOpenWebif="1">
<item level="1" text="DVB CI Delay" description="Choose dvb wait delay for ci response." requires="CommonInterfaceCIDelay">config.cimisc.dvbCiDelay</item>
<if requires="HaveCISSL">
<item level="1" text="CI Operation Mode" description="Choose the CI protocol operation mode for standard ci or ciplus.">config.cimisc.civersion</item>
<else />
<item level="1" text="CI Operation Mode" description="Your Hardware can detect ci mode self or work only in legacy mode.">config.cimisc.civersion</item>
</if>
</setup>
<setup key="Display" title="Display Settings" requires="FrontpanelDisplay" showOpenWebif="1">
<item level="0" text="Clone TV screen to LCD" description="Shows live tv or informations on LCD." requires="FBLCDDisplay">config.lcd.fblcddisplay</item>
<item level="0" text="Brightness (Normal)" description="Configure the brightness level of the front panel display for normal operation.">config.lcd.bright</item>
Expand Down Expand Up @@ -528,28 +520,29 @@
<item level="2" text="Background delete option" description="Configure on which devices the background delete option should be used.">config.misc.erase_flags</item>
<item level="2" text="Background delete speed" description="Configure the speed of the background deletion process. Lower speed will consume less hard disk drive performance.">config.misc.erase_speed</item>
</setup>
<setup key="PluginBrowser" title="Plugin Browser Settings" level="2" showOpenWebif="1">
<item level="2" text="Show translation packages" description="Select 'Yes' to display language/locale '.po' packages in the 'Plugin Browser' screen.">config.pluginbrowser.po</item>
<item level="2" text="Show source packages" description="Select 'Yes' to display source '.src' packages in the 'Plugin Browser' screen.">config.pluginbrowser.src</item>
</setup>
<setup key="PluginFilter" title="Plugin Filter Settings" showOpenWebif="1">
<item level="0" text="Show development packages in opkg" description="When enabled, you will see dev, staticdev, dbg, doc, src and po packages in opkg list.">config.misc.extraopkgpackages</item>
<item level="0" text="OPKG clean mode" description="When enabled, before opkg update there will be opkg clean to make sure nothing ruins the update but only enable this when you can not update online.">config.misc.opkgcleanmode</item>
<item level="0" text="Drivers" description="This allows you to show drivers modules in downloads">config.pluginfilter.drivers</item>
<item level="0" text="Extensions" description="This allows you to show extensions modules in downloads">config.pluginfilter.extensions</item>
<item level="0" text="System Plugins" description="This allows you to show system plugin modules in downloads">config.pluginfilter.systemplugins</item>
<item level="0" text="Softcams" description="This allows you to show softcams modules in downloads" requires="SoftCam">config.pluginfilter.softcams</item>
<item level="0" text="Skin" description="This allows you to show skin modules in downloads">config.pluginfilter.skin</item>
<item level="0" text="Display" description="This allows you to show lcd skins in downloads">config.pluginfilter.display</item>
<item level="0" text="Picons" description="This allows you to show picons modules in downloads">config.pluginfilter.picons</item>
<item level="0" text="Settings" description="This allows you to show settings modules in downloads">config.pluginfilter.settings</item>
<item level="0" text="M2k" description="This allows you to show m2k modules in downloads">config.pluginfilter.m2k</item>
<item level="0" text="Web Links" description="This allows you to show weblinks modules in downloads">config.pluginfilter.weblinks</item>
<item level="0" text="OpenPLi" description="This allows you to show OpenPLi modules in downloads">config.pluginfilter.pli</item>
<item level="0" text="OpenViX" description="This allows you to show OpenViX modules in downloads">config.pluginfilter.vix</item>
<item level="0" text="Security" description="This allows you to show security modules in downloads">config.pluginfilter.security</item>
<item level="0" text="Kernel Modules" description="This allows you to show kernel modules in downloads">config.pluginfilter.kernel</item>
<item level="0" text="User Feed URL" description="Please enter your personal feed URL">config.pluginfilter.userfeed</item>
<setup key="PluginBrowser" title="Plugin Browser Settings" showOpenWebif="1">
<item level="0" text="Plugin Browser layout" description="Select the layout of the installed plugins in the Plugin Browser screen. NOTE: The change is not immediate but will be seen when Plugin Browser is restarted!">config.usage.pluginListLayout</item>
<item level="0" text="Sort Plugin Browser entries" description="Select the sort order of the Plugin Browser menu entries. User defined also allows the plugin entries to be hidden.">config.usage.plugins_sort_mode</item>
<item level="0" text="Force OPKG clean mode" description="Select 'Enable' to force a package clean before a package update. This is helpful to make sure the package list is up-to-date and can avoid/solve issues during the update. Only enable this when you can not update on-line.">config.misc.opkgcleanmode</item>
<item level="0" text="Show Driver packages" description="Select 'Yes' to show driver packages in the Download Plugins screen.">config.pluginfilter.drivers</item>
<item level="0" text="Show Extension packages" description="Select 'Yes' to show extensions packages in the Download Plugins screen.">config.pluginfilter.extensions</item>
<item level="0" text="Show System Plugin packages" description="Select 'Yes' to show system plugin packages in the Download Plugins screen.">config.pluginfilter.systemplugins</item>
<item level="0" text="Show Softcam packages" description="Select 'Yes' to show softcam packages in the Download Plugins screen." requires="SoftCam">config.pluginfilter.softcams</item>
<item level="0" text="Show Skin packages" description="Select 'Yes' to show skin packages in the Download Plugins screen.">config.pluginfilter.skins</item>
<item level="0" text="Show Skin Component packages" description="Select 'Yes' to show skin component packages in the Download Plugins screen.">config.pluginfilter.skincomponents</item>
<item level="0" text="Show Plugin Skin packages" description="Select 'Yes' to show plugin skin packages in the Download Plugins screen.">config.pluginfilter.skinpacks</item>
<item level="0" text="Show Display packages" description="Select 'Yes' to show LCD skin packages in the Download Plugins screen.">config.pluginfilter.display</item>
<item level="0" text="Show Picon packages" description="Select 'Yes' to show picon packages in the Download Plugins screen.">config.pluginfilter.picons</item>
<item level="0" text="Show Setting packages" description="Select 'Yes' to show settings packages in the Download Plugins screen.">config.pluginfilter.settings</item>
<item level="0" text="Show M2k packages" description="Select 'Yes' to show m2k packages in the Download Plugins screen.">config.pluginfilter.m2k</item>
<item level="0" text="Show Web Link packages" description="Select 'Yes' to show web link packages in the Download Plugins screen.">config.pluginfilter.weblinks</item>
<item level="0" text="Show OpenPLi packages" description="Select 'Yes' to show OpenPLi packages in the Download Plugins screen.">config.pluginfilter.pli</item>
<item level="0" text="Show OpenViX packages" description="Select 'Yes' to show OpenViX packages in the Download Plugins screen.">config.pluginfilter.vix</item>
<item level="0" text="Show Security packages" description="Select 'Yes' to show security packages in the Download Plugins screen.">config.pluginfilter.security</item>
<item level="0" text="Show Kernel packages" description="Select 'Yes' to show kernel packages in the Download Plugins screen.">config.pluginfilter.kernel</item>
<item level="2" text="Show Source packages" description="Select 'Yes' to show source 'src' packages in the Download Plugins screen.">config.pluginfilter.src</item>
<item level="2" text="Show Development packages" description="Select 'Yes' to show 'dev', 'staticdev', 'dbg' and 'doc' packages in the Download Plugins screen.">config.pluginfilter.extraopkgpackages</item>
<item level="0" text="User Feed URL" description="Enter your personal feed URL to allow you to select packages from your personal feed.">config.pluginfilter.userfeed</item>
</setup>
<setup key="PowerTimer" title="PowerTimer Settings">
<item level="0" text="Timer type" description="Select the type of this timer.">self.timerType</item>
Expand Down Expand Up @@ -887,6 +880,7 @@
<item level="0" text="Show transponder remaining/elapsed as" description="This option allows you choose how to display the remaining/elapsed time for live tv.">config.usage.swap_time_display_on_osd</item>
<item level="0" text="Media playback Remaining/Elapsed as" description="This option allows you choose how to display the remaining/elapsed time for media playback.">config.usage.swap_media_time_display_on_osd</item>
<item level="2" text="Hide zap errors" description="Hide any zap error messages.">config.usage.hide_zap_errors</item>
<item level="2" text="Hide CI messages" description="Hide error messages from the Common Interface module.">config.usage.hide_ci_messages</item>
<item level="2" text="Show crypto info in InfoBar" description="Show encryption information in the InfoBar (when supported by the skin).">config.usage.show_cryptoinfo</item>
<item level="2" text="InfoBar front end data source" description="Configure the source of the frontend data as shown on the infobars. 'Settings' is as stored on the settings. 'Tuner' is as reported by the tuner.">config.usage.infobar_frontend_source</item>
<item level="2" text="Swap SNR in '&#37;' with SNR in 'db'" description="This option allows you to the SNR as a percentage (not all receivers support this).">config.usage.swap_snr_on_osd</item>
Expand Down
Loading

0 comments on commit d68abcf

Please sign in to comment.