mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-26 15:02:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

- channellist: allow epgtext alignment

Browse Source 
Conflicts:
	src/neutrino.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2022-05-06 23:41:05 +02:00
committed by Thilo Graf
parent 2cdbdb5ce4
commit 0f3dee2e57
11 changed files with 86 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
data/locale/deutsch.locale
View File

@@ -271,8 +271,10 @@ channellist.edit Bearbeiten
channellist.enablesdt_off aus
channellist.enablesdt_on ein
channellist.enablesdt_on_extended ein (mit PMT)
channellist.epgtext_align_left links
channellist.epgtext_align_right rechts
channellist.epgtext_align_left_bottom links unten
channellist.epgtext_align_left_middle links zentriert
channellist.epgtext_align_right_bottom rechts unten
channellist.epgtext_align_right_middle rechts zentiert
channellist.extended Sendungsfortschritt anzeigen
channellist.favs Favoriten
channellist.foot Kanalinformationen
@@ -1817,7 +1819,7 @@ messagebox.ok OK
messagebox.yes Ja
miscsettings.channellist Kanalliste
miscsettings.channellist_enablesdt Transponder Hintergrundaktualisierung
miscsettings.channellist_epgtext_align Event-Text ausrichten
miscsettings.channellist_epgtext_alignment Event-Text ausrichten
miscsettings.channellogos Senderlogos
miscsettings.colored_events Sendung hervorheben
miscsettings.colored_events_0 keine
@@ -2631,8 +2633,10 @@ settings.noconffile Die Einstellungen wurden nicht\ngefunden. Es werden Standard
settings.pos_bottom_center unten zentriert
settings.pos_bottom_left unten links
settings.pos_bottom_right unten rechts
settings.pos_default_center zentriert
settings.pos_center zentriert
settings.pos_higher_center höher zentriert
settings.pos_left links
settings.pos_right rechts
settings.pos_top_center oben zentriert
settings.pos_top_left oben links
settings.pos_top_right oben rechts

12
data/locale/english.locale
View File

@@ -271,8 +271,10 @@ channellist.edit Edit
channellist.enablesdt_off off
channellist.enablesdt_on on
channellist.enablesdt_on_extended on (with PMT)
channellist.epgtext_align_left left
channellist.epgtext_align_right right
channellist.epgtext_align_left_bottom left bottom
channellist.epgtext_align_left_middle left middle
channellist.epgtext_align_right_bottom right bottom
channellist.epgtext_align_right_middle right middle
channellist.extended Show event progress
channellist.favs Favorites
channellist.foot Channel Information
@@ -1817,7 +1819,7 @@ messagebox.ok Ok
messagebox.yes Yes
miscsettings.channellist Channellist
miscsettings.channellist_enablesdt Transponder background update
miscsettings.channellist_epgtext_align Programtext Align
miscsettings.channellist_epgtext_alignment Programtext alignment
miscsettings.channellogos Channel logos
miscsettings.colored_events Program colored
miscsettings.colored_events_0 none
@@ -2631,8 +2633,10 @@ settings.noconffile No settings found.\nUsing defaults.
settings.pos_bottom_center bottom center
settings.pos_bottom_left bottom left
settings.pos_bottom_right bottom right
settings.pos_default_center center
settings.pos_center center
settings.pos_higher_center higher center
settings.pos_left left
settings.pos_right richt
settings.pos_top_center top center
settings.pos_top_left top left
settings.pos_top_right top right

9
data/y-web/Y_neutrino_Blocks.txt
View File

@@ -616,8 +616,9 @@ start-block~neutrino_form-data_diverse
<tr title="programtext position: left/right">
<td>Ausrichtung Programmtext</td>
<td>
<input type="radio" name="epgtext_align_right" value="false"/>links&nbsp;
<input type="radio" name="epgtext_align_right" value="true"/>rechts
<!-- FIXME -->
<input type="radio" name="channellist_epgtext_alignment" value="false"/>links&nbsp;
<input type="radio" name="channellist_epgtext_alignment" value="true"/>rechts
</td>
</tr>
<tr title="extended channellist: on/off">
@@ -729,7 +730,7 @@ function form_init()
document.f.infobar_show.selectedIndex = val;
obj_set_radio_value('radiotext', "{=ini-get:%(CONFIGDIR)/neutrino.conf;radiotext_enable;false~cache=}");
obj_set_radio_value('epgtext_align_right', "{=ini-get:%(CONFIGDIR)/neutrino.conf;channellist_epgtext_align_right;false~cache=}");
obj_set_radio_value('channellist_epgtext_alignment', "{=ini-get:%(CONFIGDIR)/neutrino.conf;channellist_epgtext_alignment;false~cache=}");
obj_set_radio_value('channellist_extended', "{=ini-get:%(CONFIGDIR)/neutrino.conf;channellist_extended;false~cache=}");
val = "{=ini-get:%(CONFIGDIR)/neutrino.conf;standby_off_with;0=}";
@@ -761,7 +762,7 @@ end-block~neutrino_form-data_diverse
# ------- yWeb save Settings
start-block~neutrino_diverse_save_settings
{=ini-set:%(CONFIGDIR)/neutrino.conf;channellist_epgtext_align_right;{=epgtext_align_right=}~open=}
{=ini-set:%(CONFIGDIR)/neutrino.conf;channellist_epgtext_alignment;{=channellist_epgtext_alignment=}~open=}
{=ini-set:%(CONFIGDIR)/neutrino.conf;channellist_extended;{=channellist_extended=}~cache=}
{=ini-set:%(CONFIGDIR)/neutrino.conf;filebrowser_showrights;{=filebrowser_showrights=}~cache=}
{=ini-set:%(CONFIGDIR)/neutrino.conf;filebrowser_denydirectoryleave;{=filebrowser_denydirectoryleave=}~cache=}