Skip to content

Commit

Permalink
Merge branch 'master' into Janitor
Browse files Browse the repository at this point in the history 
* master: (51 commits)
  [ChannelSelection.py] Correct legacy bouquet navigation
  pot update
  translation update
  ChannelSelection Updates (#3390)
  [ServiceName2] * remove config.usage.numberMode check for NUMBER
  [ImportChannels] * complete rework
  [ChannelSelection] * force legacy mode for PiPZapSelection and ChannelSelectionRadio
  [db.cpp] * cleanup and correct debug text output
  [ServiceName2.py] Clean up and improve the code
  [ServiceList] * remove config.channelSelection.showLCN
  [eDVBDB] * fix LCN channel numbering debug
  [Setup] * introduce new config.usage.numberMode setting as an replacement for config.usage.alternative_number_mode
  add gbquad4kpro
  pot update
  translation update
  [ConfigFloat] * fix ValueError: Unknown format code 'd' for object of type 'float'
  [eListboxPythonServiceContent] * improve spacer navigation
  [eListboxServiceContent] * improve move mode for spacers
  [eListboxPythonServiceContent] * fix number marker handling
  [skin] * fix TemplateParser autoGrow
  ...
  • Loading branch information
@jbleyel
jbleyel committed Jul 30, 2024
2 parents 69b73d2 + 8d63fa4 commit 3401652
Show file tree
Hide file tree
Showing 85 changed files with 6,312 additions and 3,213 deletions.
1 change: 1 addition & 0 deletions configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ AS_IF([test "$BOXTYPE" == "dm500hdv2"],[AC_DEFINE(HWDM500HDV2, 1,[dm500hdv2])])
AS_IF([test "$BOXTYPE" == "vusolo4k"],[AC_DEFINE(HWVUSOLO4K, 1,[vusolo4k])])
AS_IF([test "$BOXTYPE" == "vuultimo4k"],[AC_DEFINE(HWULTIMO4K, 1,[vuultimo4k])])
AS_IF([test "$BOXTYPE" == "h7"],[AC_DEFINE(HWH7, 1,[h7])])
AS_IF([test "$BOXTYPE" == "h17"],[AC_DEFINE(HWH7, 1,[h17])])
AS_IF([test "$BOXTYPE" == "pulse4k"],[AC_DEFINE(HWPULSE4K, 1,[pulse4k])])
AS_IF([test "$BOXTYPE" == "pulse4kmini"],[AC_DEFINE(HWPULSE4KMINI, 1,[pulse4kmini])])
AS_IF([test "$MACHINEBUILD" == "gbue4k"],[AC_DEFINE(HWGBUE4K, 1,[gbue4k])])
Expand Down
10 changes: 5 additions & 5 deletions data/setup.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
</setup>
<setup key="ChannelSelection" title="Channel Selection Settings" showOpenWebif="1">
<item level="0" text="Include CI assignment" description="Set CI assignment for detection of available services.">config.misc.use_ci_assignment</item>
<item level="1" text="Alternative numbering mode" description="When enabled, channel numbering will start at '1' for each bouquet.">config.usage.alternative_number_mode</item>
<item level="1" text="Numbering mode" description="Select 'Unique numbering' to assign unique numbers for every service in every bouquet. Use 'Bouquets start at 1' to start numbering each bouquet from 1. Use 'LCN numbering' to use consistent service LCNs where ever that service is used.">config.usage.numberMode</item>
<item level="1" text="Always show bouquets" description="Select 'Yes' to always show the bouquet screen first when opening the channel list. Select 'No' to open the channel list using the current bouquet.">config.usage.show_bouquetalways</item>
<item level="1" text="Change bouquets in quickzap" description="When enabled, continue to the next bouquet when the last channel of the current bouquet is reached while changing channels.">config.usage.quickzap_bouquet_change</item>
<item level="1" text="Channel list preview" description="Select 'Yes' to enable preview of channels while in the EPG list. Press 'OK' to preview the currently selected channel. Press 'OK' again to exit the EPG and zap to the selected channel. Press 'EXIT' to exit the EPG and return to the previously selected channel.">config.usage.servicelistpreview_mode</item>
Expand All @@ -91,11 +91,11 @@
<item level="1" text="Hide number markers" description="When enabled, number markers will be hidden.">config.usage.hide_number_markers</item>
<item level="1" text="Enable panic button" description="When enabled, pressing '0' will zap you to the first channel in your first bouquet and delete your zap-history.">config.usage.panicbutton</item>
<item level="1" text="Panic channel" description="Pressing the panic button will zap you to this channel number in your first bouquet.">config.usage.panicchannel</item>
<item level="2" text="show picons in quickzap" description="Configure if service picons will be shown in quickzap.">config.usage.numzappicon</item>
<item level="2" text="Show picons in quickzap" description="Configure if service picons will be shown in quickzap.">config.usage.numzappicon</item>
<item level="1" text="Jump first press in channel selection" description="This option allows you to choose what the first button press jumps to in channel list screen, (so pressing '2' jumps to 'A' or '2' first), when 'Quick Actions' preset actions are performed. ">config.usage.show_channel_jump_in_servicelist</item>
<if conditional="config.channelSelection.screenStyle.value == ''">
<item level="0" text="Show channel numbers in channel selection" description="When enabled, show channel numbers in the channel selection screen.">config.usage.show_channel_numbers_in_servicelist</item>
<item level="1" text="show picons in service list" description="Configure if service picons will be shown in the service list.">config.usage.service_icon_enable</item>
<item level="1" text="Show picons in service list" description="Configure if service picons will be shown in the service list.">config.usage.service_icon_enable</item>
<item level="1" text="Service picons aspect ratio" description="Set the aspect ratio of the service picons." requires="config.usage.service_icon_enable">config.usage.servicelist_picon_ratio</item>
<item level="1" text="Service picons downsize" description="Reduce the size of the service picons for more line spacing between them." requires="config.usage.service_icon_enable">config.usage.servicelist_picon_downsize</item>
<item level="1" text="Show service type icons" description="Configure if and how service type icons will be shown.">config.usage.servicetype_icon_mode</item>
Expand All @@ -115,8 +115,8 @@
<item level="1" text="Progress info font size" description="This allows you change the font size relative to skin size, so 1 increases by 1 point size, and -1 decreases by 1 point size.">config.usage.progressinfo_fontsize</item>
<else />
<item level="0" text="Show channel numbers in channel selection" description="When enabled, show channel numbers in the channel selection screen.">config.channelSelection.showNumber</item>
<item level="1" text="Show LCN in channel selection" description="When enabled, show LCN in the channel selection screen.">config.channelSelection.showLCN</item>
<item level="1" text="show picons in service list" description="Configure if service picons will be shown in the service list.">config.channelSelection.showPicon</item>
<item level="1" text="Show picons in service list" description="Configure if service picons will be shown in the service list.">config.channelSelection.showPicon</item>
<item level="1" text="Service picons aspect ratio" description="Set the aspect ratio of the service picons." requires="config.channelSelection.showPicon">config.channelSelection.piconRatio</item>
<item level="1" text="Show service type icons" description="Configure if service type icons will be shown.">config.channelSelection.showServiceTypeIcon</item>
<item level="1" text="Show crypto icons" description="Configure if crypto icons will be shown in the channel selection list.">config.channelSelection.showCryptoIcon</item>
<item level="1" text="Show record indicator" description="Configure if and how the record indicator will be shown in the channel selection list.">config.channelSelection.recordIndicatorMode</item>
Expand Down
5 changes: 5 additions & 0 deletions include/hardwaredb.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,11 @@ static std::unordered_map<std::string, std::string> HardwareDB{
{"/devices/platform/f0470500.ehci/usb2/2-1/2-1:1.0/host2/target2:0:0/2:0:0:0", "Back USB 3.0"},
{"/devices/platform/f0470300.ehci/usb1/1-1/1-1.2/1-1.2:1.0/host3/target3:0:0/3:0:0:0", "Back, lower USB 2.0"},
{"/devices/platform/f0470300.ehci/usb1/1-1/1-1.1/1-1.1:1.0/host2/target2:0:0/2:0:0:0", "Back, upper USB 2.0"}
#elif HWH17
{"/devices/platform/rdb/f045a000.sata/ata1/host0/target0:0:0/0:0:0:0", "SATA"},
{"/devices/platform/f0470500.ehci/usb2/2-1/2-1:1.0/host2/target2:0:0/2:0:0:0", "Back USB 3.0"},
{"/devices/platform/f0470300.ehci/usb1/1-1/1-1.2/1-1.2:1.0/host3/target3:0:0/3:0:0:0", "Back, lower USB 2.0"},
{"/devices/platform/f0470300.ehci/usb1/1-1/1-1.1/1-1.1:1.0/host2/target2:0:0/2:0:0:0", "Back, upper USB 2.0"}
#elif HWGBUE4K
{"/devices/platform/rdb/f045a000.sata/ata2/host1/target1:0:0/1:0:0:0", "SATA"},
{"/devices/platform/rdb/f0470300.ehci_v2/usb3/3-1/3-1.1/3-1.1:1.0/host2/target2:0:0/2:0:0:0", "Front USB"},
Expand Down
Loading

0 comments on commit 3401652

Please sign in to comment.