Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Origin commit data ------------------ Commit: d39dc75c6d Author: vanhofen <vanhofen@gmx.de> Date: 2016-12-29 (Thu, 29 Dec 2016)
2025-09-18 10:51:07 +02:00 · 2016-12-29 15:15:34 +01:00
parent cf7fc39a1a 6244ee0a29
commit b554e7801c
51 changed files with 509 additions and 177 deletions
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -355,6 +355,8 @@ colormenu.font_ttx Teletext Schriftart
 colormenu.hd_preset LCD
 colormenu.menucolors Farben
 colormenu.osd_preset Monitor Auswahl
+colormenu.progressbar_active Farbe des aktiven Teil
+colormenu.progressbar_passive Hintergrundfarbe
 colormenu.sd_preset CRT
 colormenu.textcolor Textfarbe
 colormenu.themeselect Theme auswählen
@@ -1420,9 +1422,11 @@ menu.hint_power_leds Konfiguriert das Verhalten der LEDs an der Power-Taste
 menu.hint_pref_lang Wählen Sie ihre bevorzugte Tonspur und EPG-Sprache,\ndie Einstellung 'none' deaktiviert diese Option
 menu.hint_pref_subs Wählen Sie ihre bevorzugte Untertitel-Sprache,\ndie Einstellung 'none' deaktiviert diese Option
 menu.hint_progressbar Wählen Sie die Optionen für die Fortschrittsbalken-Anzeige
+menu.hint_progressbar_active Ändern Sie die Farbe für den aktiven Teil der Fortschrittsbalken-Anzeige
 menu.hint_progressbar_color Erscheinungsbild der Fortschrittsbalken auswählen
 menu.hint_progressbar_gradient Fügt dem Fortschrittsbalken einen vertikalen Helligkeitsverlauf hinzu.
 menu.hint_progressbar_infobar_position Wählt die Optionen des Fortschrittsbalkens in der Infobar
+menu.hint_progressbar_passive Ändern Sie die Farbe für den Hintergrund der Fortschrittsbalken-Anzeige
 menu.hint_progressbar_preview Mit der OK-Taste können Sie den Stand des Fortschrittsbalkens ändern
 menu.hint_progressbar_timescale_green Hier können Sie den grünen Farbanteil bunter Fortschrittsbalken anpassen
 menu.hint_progressbar_timescale_invert Wählen Sie den Farbverlauf
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -355,6 +355,8 @@ colormenu.font_ttx Select Teletext font
 colormenu.hd_preset LCD
 colormenu.menucolors Colors
 colormenu.osd_preset TV preset
+colormenu.progressbar_active Aktive part color
+colormenu.progressbat_passive Background
 colormenu.sd_preset CRT
 colormenu.textcolor Text color
 colormenu.themeselect Select theme
@@ -1420,9 +1422,11 @@ menu.hint_power_leds Configure power-button LEDs behavior
 menu.hint_pref_lang Select preferred audio and EPG language\nselect 'none' to disable
 menu.hint_pref_subs Select preferred subtitle language\nselect 'none' to disable
 menu.hint_progressbar Select the options for the progressbar
+menu.hint_progressbar_active Change color of active progress bar part
 menu.hint_progressbar_color Change appearance of progress bars
 menu.hint_progressbar_gradient Add a vertical brightness gradient to progress bars
 menu.hint_progressbar_infobar_position Selects the options of progressbar in the infobar
+menu.hint_progressbar_passive Change color of passive progress bar part 
 menu.hint_progressbar_preview Use OK to change the current progressbar state
 menu.hint_progressbar_timescale_green Choose the green portion of colored progressbars
 menu.hint_progressbar_timescale_invert Select your preferred color gradient
--- a/data/themes/AdulteratedOrange.theme
+++ b/data/themes/AdulteratedOrange.theme
@@ -0,0 +1,88 @@
+clock_Digit_alpha=0
+clock_Digit_blue=100
+clock_Digit_green=100
+clock_Digit_red=100
+colored_events_alpha=0
+colored_events_blue=0
+colored_events_channellist=1
+colored_events_green=70
+colored_events_infobar=1
+colored_events_red=95
+infobar_Text_alpha=0
+infobar_Text_blue=100
+infobar_Text_green=100
+infobar_Text_red=100
+infobar_alpha=8
+infobar_blue=12
+infobar_casystem_alpha=8
+infobar_casystem_blue=12
+infobar_casystem_green=12
+infobar_casystem_red=12
+infobar_gradient_body=0
+infobar_gradient_body_direction=1
+infobar_gradient_bottom=3
+infobar_gradient_bottom_direction=1
+infobar_gradient_top=4
+infobar_gradient_top_direction=1
+infobar_green=12
+infobar_red=12
+menu_ButtonBar_gradient=3
+menu_ButtonBar_gradient_direction=1
+menu_Content_Selected_Text_alpha=0
+menu_Content_Selected_Text_blue=0
+menu_Content_Selected_Text_green=0
+menu_Content_Selected_Text_red=0
+menu_Content_Selected_alpha=8
+menu_Content_Selected_blue=0
+menu_Content_Selected_green=70
+menu_Content_Selected_red=95
+menu_Content_Text_alpha=0
+menu_Content_Text_blue=100
+menu_Content_Text_green=100
+menu_Content_Text_red=100
+menu_Content_alpha=8
+menu_Content_blue=12
+menu_Content_green=12
+menu_Content_inactive_Text_alpha=0
+menu_Content_inactive_Text_blue=50
+menu_Content_inactive_Text_green=50
+menu_Content_inactive_Text_red=50
+menu_Content_inactive_alpha=8
+menu_Content_inactive_blue=12
+menu_Content_inactive_green=12
+menu_Content_inactive_red=12
+menu_Content_red=12
+menu_Foot_Text_alpha=0
+menu_Foot_Text_blue=60
+menu_Foot_Text_green=60
+menu_Foot_Text_red=60
+menu_Foot_alpha=8
+menu_Foot_blue=18
+menu_Foot_green=18
+menu_Foot_red=18
+menu_Head_Text_alpha=0
+menu_Head_Text_blue=0
+menu_Head_Text_green=70
+menu_Head_Text_red=95
+menu_Head_alpha=8
+menu_Head_blue=0
+menu_Head_gradient=4
+menu_Head_gradient_direction=1
+menu_Head_green=0
+menu_Head_red=0
+menu_Hint_gradient=4
+menu_Hint_gradient_direction=1
+menu_Separator_gradient_enable=0
+progressbar_active_blue=0
+progressbar_active_green=70
+progressbar_active_red=95
+progressbar_design_channellist=-1
+progressbar_design=-1
+progressbar_gradient=1
+progressbar_passive_blue=50
+progressbar_passive_green=50
+progressbar_passive_red=50
+progressbar_timescale_green=100
+progressbar_timescale_invert=0
+progressbar_timescale_red=0
+progressbar_timescale_yellow=70
--- a/data/themes/DarkOrange.theme
+++ b/data/themes/DarkOrange.theme
@@ -65,3 +65,16 @@ menu_Head_red=0
 menu_Hint_gradient=4
 menu_Hint_gradient_direction=1
 menu_Separator_gradient_enable=1
+progressbar_active_blue=7
+progressbar_active_green=43
+progressbar_active_red=99
+progressbar_design_channellist=-1
+progressbar_design=-1
+progressbar_gradient=1
+progressbar_passive_blue=44
+progressbar_passive_green=44
+progressbar_passive_red=44
+progressbar_timescale_green=100
+progressbar_timescale_invert=0
+progressbar_timescale_red=0
+progressbar_timescale_yellow=70
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -1,6 +1,7 @@
 installdir = $(THEMESDIR)

 install_DATA = \
+	AdulteratedOrange.theme \
 	Bluemoon-3.0.theme \
 	Classic.theme \
 	Crema.theme \
--- a/data/themes/Material_Blue-Grey.theme
+++ b/data/themes/Material_Blue-Grey.theme
@@ -69,7 +69,7 @@ clock_Digit_green=75
 clock_Digit_blue=77
 clock_Digit_alpha=0

-#200
+# 200
 colored_events_red=69
 colored_events_green=75
 colored_events_blue=77
@@ -113,3 +113,21 @@ infobar_Text_red=93
 infobar_Text_green=94
 infobar_Text_blue=95
 infobar_Text_alpha=0
+
+progressbar_design=-1
+progressbar_design_channellist=-1
+progressbar_gradient=1
+progressbar_timescale_red=0
+progressbar_timescale_yellow=70
+progressbar_timescale_green=100
+progressbar_timescale_invert=0
+
+# 200
+progressbar_active_red=69
+progressbar_active_green=75
+progressbar_active_blue=77
+
+# 500
+progressbar_passive_red=38
+progressbar_passive_green=49
+progressbar_passive_blue=55
--- a/data/themes/Material_Grey_(Dark).theme
+++ b/data/themes/Material_Grey_(Dark).theme
@@ -113,3 +113,21 @@ infobar_Text_red=98
 infobar_Text_green=98
 infobar_Text_blue=98
 infobar_Text_alpha=0
+
+progressbar_design=-1
+progressbar_design_channellist=-1
+progressbar_gradient=1
+progressbar_timescale_red=0
+progressbar_timescale_yellow=70
+progressbar_timescale_green=100
+progressbar_timescale_invert=0
+
+# 500
+progressbar_active_red=62
+progressbar_active_green=62
+progressbar_active_blue=62
+
+# 900
+progressbar_passive_red=13
+progressbar_passive_green=13
+progressbar_passive_blue=13
--- a/data/themes/Material_Grey_(Light).theme
+++ b/data/themes/Material_Grey_(Light).theme
@@ -114,3 +114,21 @@ infobar_Text_green=96
 infobar_Text_blue=96

 infobar_Text_alpha=0
+
+progressbar_design=-1
+progressbar_design_channellist=-1
+progressbar_gradient=1
+progressbar_timescale_red=0
+progressbar_timescale_yellow=70
+progressbar_timescale_green=100
+progressbar_timescale_invert=0
+
+# 400
+progressbar_active_red=74
+progressbar_active_green=74
+progressbar_active_blue=74
+
+# 600
+progressbar_passive_red=46
+progressbar_passive_green=46
+progressbar_passive_blue=46
--- a/data/themes/Material_Grey_(Medium).theme
+++ b/data/themes/Material_Grey_(Medium).theme
@@ -113,3 +113,21 @@ infobar_Text_red=98
 infobar_Text_green=98
 infobar_Text_blue=98
 infobar_Text_alpha=0
+
+progressbar_design=-1
+progressbar_design_channellist=-1
+progressbar_gradient=1
+progressbar_timescale_red=0
+progressbar_timescale_yellow=70
+progressbar_timescale_green=100
+progressbar_timescale_invert=0
+
+# 500
+progressbar_active_red=62
+progressbar_active_green=62
+progressbar_active_blue=62
+
+# 800
+progressbar_passive_red=26
+progressbar_passive_green=26
+progressbar_passive_blue=26
--- a/data/y-web/Y_Info_Help.yhtm
+++ b/data/y-web/Y_Info_Help.yhtm
@@ -10,7 +10,7 @@
 		<li><a href="http://wiki.tuxbox.org/Neutrino:yWeb" class="exlink" title="yWeb Help from Tuxbox Wiki" target="_blank">Tuxbox-Wiki Help</a></li>
 		<li><a href="http://forum.tuxbox.org/forum" class="exlink" title="Tuxbox Dicussion Forum" target="_blank">Tuxbox Forum</a></li>
 		<li><a href="http://www.cstworld.net" class="exlink" title="CST User Forum" target="_blank">CST User Forum</a></li>
-		<li><a href="http://www.dbox2world.net/board329-development/" class="exlink" title="CST Dev Forum" target="_blank">CST Developer Forum</a></li>
+		<li><a href="https://dbox2world.net/board/329-development/" class="exlink" title="CST Dev Forum" target="_blank">CST Developer Forum</a></li>
 	</ul>
 	</div>
 </div>
--- a/data/y-web/Y_NI_About.yhtm
+++ b/data/y-web/Y_NI_About.yhtm
@@ -22,7 +22,7 @@
 <script type="text/javascript">
 //<![CDATA[
 jQuery(document).ready(function(){
-        if ("{=ani=}" == "false")
+	if ("{=ani=}" == "false")
 	{
 		jQuery('#_root_used_graph').css({ width: "{=var-get:_root_used_percent=}%"});
 		jQuery('#_var_used_graph').css({ width: "{=var-get:_var_used_percent=}%"});
@@ -52,7 +52,7 @@ jQuery(document).ready(function(){
 				</a>
 			</td>
 			<td valign="bottom" colspan="3">
-			        <span class="ni_logo">NI-Imageinfo</span>
+				<span class="ni_logo">NI-Imageinfo</span>
 			</td>
 		</tr>
 		<tr>
@@ -69,7 +69,8 @@ jQuery(document).ready(function(){
 			<td valign="top" width="10%">
 				<b>Image</b>:<br/>
 				Version:<br/>
-				Commits:<br/>
+				Branch:<br/>
+				Commit:<br/>
 				Datum:<br/>
 				Ersteller:<br/>
 			</td>
@@ -77,28 +78,31 @@ jQuery(document).ready(function(){
 				{=ini-get:/.version;imagename=}<br/>
 				<abbr class="version" title="{=L:ni.about.your_image=}">
 				<script type="text/javascript">getVersion("{=ini-get:/.version;version=}");</script><br/>
-				NI: <a href="https://bitbucket.org/neutrino-images/ni-neutrino-hd/commits/{=ini-get:/.version;origin-commit=}" class="exlink" target="_blank" title="NI-Neutrino-HD Sources">{=ini-get:/.version;origin-commit=}</a>;
-				CST: <a href="http://git.c00lstreamtech.de/?p=cst-public-gui-neutrino.git;a=commit;h={=ini-get:/.version;remote-commit=}" class="exlink" target="_blank" title="Coolstream GIT repositories">{=ini-get:/.version;remote-commit=}</a><br/>
+				{=ini-get:/.version;branch=}<br/>
+				<a href="https://bitbucket.org/neutrino-images/ni-neutrino-hd/commits/{=ini-get:/.version;commit=}" class="exlink" target="_blank" title="NI-Neutrino-HD Sources">{=ini-get:/.version;commit=}</a><br/>
 				<script type="text/javascript">getBuild("{=ini-get:/.version;version=}");</script><br/>
 				</abbr>
 				{=ini-get:/.version;creator=}<br/>
 			</td>
+			<!--
 			<td valign="top" width="38%">
-				{=if-file-exists:/tmp/NI_update.txt~
-				<script type="text/javascript">compareVersion("{=ini-get:/.version;version=}", "{=ini-get:/tmp/NI_update.txt;version=}");</script>
+				{=if-file-exists:/tmp/update.txt~
+				<script type="text/javascript">compareVersion("{=ini-get:/.version;version=}", "{=ini-get:/tmp/update.txt;version=}");</script>
 				<span class="upd_no">{=L:ni.about.image_upd_no=}</span>
 				<span class="upd_yes">{=L:ni.about.image_upd_yes=}</span>
 				<br/>
 				<abbr class="version" title="{=L:ni.about.actual_image=}">
-				<script type="text/javascript">getVersion("{=ini-get:/tmp/NI_update.txt;version=}");</script><br/>
+				<script type="text/javascript">getVersion("{=ini-get:/tmp/update.txt;version=}");</script>
 				<br/>
-				<script type="text/javascript">getBuild("{=ini-get:/tmp/NI_update.txt;version=}");</script><br/>
+				<br/>
+				<script type="text/javascript">getBuild("{=ini-get:/tmp/update.txt;version=}");</script><br/>
 				</abbr>
 				<br/>
 				~
 				<input type="button" onclick='get_update_txt();' value="{=L:info.check_for_updates=}" />
 				=}
 			</td>
+			-->
 		</tr>
 		<tr>
 			<td colspan="4">
--- a/data/y-web/scripts/Y_NI_Tools.sh
+++ b/data/y-web/scripts/Y_NI_Tools.sh
@@ -139,13 +139,14 @@ case "$action" in
 	;;
 	get_update_txt)
 		version="n/a"
-		wget -O /tmp/NI_release.txt "http://neutrino-images.de/neutrino-images/release/release.txt"
-		test -e /tmp/NI_release.txt && version=$(cat /tmp/NI_release.txt | grep ".img" | cut -d" " -f2)
-		echo "version=${version// /}" > /tmp/NI_update.txt
-		rm -f /tmp/NI_release.txt
+		#FIXME align url to box specs
+		wget -O /tmp/release.txt "http://neutrino-images.de/neutrino-images/update.php"
+		test -e /tmp/release.txt && version=$(cat /tmp/release.txt | grep ".img" | cut -d" " -f2)
+		echo "version=${version// /}" > /tmp/update.txt
+		rm -f /tmp/release.txt
 	;;
 	rm_update_txt)
-		rm -f /tmp/NI_update.txt
+		rm -f /tmp/update.txt
 	;;
 	get_flash_info)
 		MTPT=""