Commit Graph

1680 Commits

Author SHA1 Message Date
vanhofen
e26923f1a6 yWeb: enable grab to do screenshots
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 47e1382819
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-13 (Fri, 13 Oct 2017)

Origin message was:
------------------
- yWeb: enable grab to do screenshots

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-10-29 18:32:35 +01:00
vanhofen
284138fbc5 audio_select: copy full code from TangoCash
Just compile tested. Maybe some more alignments needed.

Signed-off-by: Thilo Graf <dbt@novatux.de>
Additional changes on cs playback_cs.h, because broken build
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 5fd7ec68ac
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)

Origin message was:
------------------
- audio_select: copy full code from TangoCash

Just compile tested. Maybe some more alignments needed.

Signed-off-by: Thilo Graf <dbt@novatux.de>
Additional changes on cs playback_cs.h, because broken build
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-10-29 18:32:30 +01:00
Thilo Graf
15fc40c893 data: add missing epglanguages.conf
Origin commit data
------------------
Commit: 12da6a5b05
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-24 (Tue, 24 Oct 2017)
2017-10-29 18:32:21 +01:00
TangoCash
39fc7eee38 update webif
Origin commit data
------------------
Commit: f7c72fcf00
Author: TangoCash <eric@loxat.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)
2017-10-29 18:31:52 +01:00
vanhofen
f8d931aad8 add hd51; mostly ported from TangoCash's neutrino-mp
Origin commit data
------------------
Commit: 6fe5d269af
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-05 (Thu, 05 Oct 2017)

Origin message was:
------------------
- add hd51; mostly ported from TangoCash's neutrino-mp
2017-10-29 18:31:30 +01:00
Thilo Graf
b01ae296b3 locales: generalize image settings, rewrite welcome text
Origin commit data
------------------
Commit: 91128cdfa4
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-22 (Sun, 22 Oct 2017)
2017-10-29 18:30:43 +01:00
Thilo Graf
5a6d59e0dd locales: use german entries for channel scan
Origin commit data
------------------
Commit: 54c8d9c4e9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-21 (Sat, 21 Oct 2017)
2017-10-29 18:30:38 +01:00
Thilo Graf
2fb0168871 locales: complete plugin entry for plugins.hdd_dir
Origin commit data
------------------
Commit: 1e006a9769
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-21 (Sat, 21 Oct 2017)
2017-10-29 18:30:31 +01:00
Thilo Graf
730435dfe2 locales: typo fix
Origin commit data
------------------
Commit: e372f02873
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-21 (Sat, 21 Oct 2017)
2017-10-29 18:30:27 +01:00
Thilo Graf
ee1e7c8a40 locales: message for record scan generalized
Origin commit data
------------------
Commit: 6ae15d962a
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-21 (Sat, 21 Oct 2017)
2017-10-29 18:30:17 +01:00
Thilo Graf
e3fc5d1454 locales: hint for followscreenings setup shortened
Origin commit data
------------------
Commit: 8eca73b6bd
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-21 (Sat, 21 Oct 2017)
2017-10-29 18:30:12 +01:00
Thilo Graf
f7befb4444 locales: hint for moviebrowser setup shortened
Origin commit data
------------------
Commit: 2652afbdfd
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-21 (Sat, 21 Oct 2017)
2017-10-29 18:30:09 +01:00
Thilo Graf
f26eacb9ae locales: hint for channel logo setup shortened
Origin commit data
------------------
Commit: 04368a4ec9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-21 (Sat, 21 Oct 2017)
2017-10-29 18:30:03 +01:00
Thilo Graf
33e284dd3b locales: generalize system info hint
Origin commit data
------------------
Commit: b10171d5b7
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-21 (Sat, 21 Oct 2017)
2017-10-29 18:29:54 +01:00
Thilo Graf
2b27fda610 locales: generalize channel logo option
Origin commit data
------------------
Commit: 3db24fe41b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-21 (Sat, 21 Oct 2017)
2017-10-29 18:29:43 +01:00
Thilo Graf
26c3f1f933 locales: use more shorter/plausible entries for hdd setup
Origin commit data
------------------
Commit: f6aac91037
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-21 (Sat, 21 Oct 2017)
2017-10-29 18:29:27 +01:00
Thilo Graf
faf2de1fcf locales: use shorter warning message for local update
Origin commit data
------------------
Commit: 7418ab7b9a
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-21 (Sat, 21 Oct 2017)
2017-10-29 18:29:18 +01:00
Thilo Graf
df87bbb6a1 locales: use more plausible name menue entry for theme reset
Origin commit data
------------------
Commit: e2eb683a4b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-21 (Sat, 21 Oct 2017)
2017-10-29 18:29:01 +01:00
Thilo Graf
e5c934eecb locales: use more plausible entries for audio and epg plus
Origin commit data
------------------
Commit: a6dab3b4c1
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-21 (Sat, 21 Oct 2017)
2017-10-29 18:27:52 +01:00
Thilo Graf
594f062088 icons/status/channel/Makefile: add entries for UHD status icons
Origin commit data
------------------
Commit: c3edbefa31
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-21 (Sat, 21 Oct 2017)
2017-10-29 18:26:55 +01:00
Thilo Graf
cdf2fb5512 neutrino: add Liberation Fonts
Signed-off-by: Thilo Graf <dbt@novatux.de>

Based up commit from:
2577990c6e/


Origin commit data
------------------
Commit: 13a5815018
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-06-03 (Mon, 03 Jun 2013)
2017-10-29 18:26:44 +01:00
vanhofen
1bc2c96751 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: d8dad4f7ea
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-28 (Sat, 28 Oct 2017)
2017-10-28 23:09:54 +02:00
vanhofen
85f90e0c72 locale: minor changes in filebrowser locales
Origin commit data
------------------
Commit: a34db982ee
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-28 (Sat, 28 Oct 2017)

Origin message was:
------------------
- locale: minor changes in filebrowser locales
2017-10-28 23:09:22 +02:00
vanhofen
5e05b7aed3 multiformat audioplayer: add separate timeout for infobar
Origin commit data
------------------
Commit: f945a9b127
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-28 (Sat, 28 Oct 2017)

Origin message was:
------------------
- multiformat audioplayer: add separate timeout for infobar
2017-10-28 19:13:46 +02:00
vanhofen
8ebff3af91 allow to play audiofiles with multiformat player; split into video and audio
Origin commit data
------------------
Commit: ab3b4993ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-28 (Sat, 28 Oct 2017)

Origin message was:
------------------
- allow to play audiofiles with multiformat player; split into video and audio
2017-10-28 19:13:45 +02:00
vanhofen
5e58fc9c7b update: ask for copy settings to new image
Origin commit data
------------------
Commit: 1b5b18c2f7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-27 (Fri, 27 Oct 2017)

Origin message was:
------------------
- update: ask for copy settings to new image
2017-10-27 13:17:17 +02:00
vanhofen
25778e2985 update: allow ofgwrite to flash another partition
Origin commit data
------------------
Commit: 28f522884e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-26 (Thu, 26 Oct 2017)

Origin message was:
------------------
- update: allow ofgwrite to flash another partition
2017-10-26 21:42:51 +02:00
vanhofen
af27aee505 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: ec807f6799
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-25 (Wed, 25 Oct 2017)
2017-10-25 14:09:24 +02:00
vanhofen
a170dd18d9 backup.sh: add /var/httpd
Origin commit data
------------------
Commit: 91ec595ba3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-25 (Wed, 25 Oct 2017)

Origin message was:
------------------
- backup.sh: add /var/httpd
2017-10-25 14:08:50 +02:00
vanhofen
f3adf96b6e Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 3dd50dfb50
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-23 (Mon, 23 Oct 2017)
2017-10-23 15:01:10 +02:00
vanhofen
a470578bba locale: minor changes in update-locales
Origin commit data
------------------
Commit: 0c252a08d3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-23 (Mon, 23 Oct 2017)

Origin message was:
------------------
- locale: minor changes in update-locales
2017-10-23 15:00:28 +02:00
vanhofen
e340361fd9 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 74d839af62
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-22 (Sun, 22 Oct 2017)
2017-10-22 20:35:58 +02:00
J. Krieg
43f8852aee cables.xml: update Unitymedia BW (former Kabel BW) - rearrangement channels, October 2017
Origin commit data
------------------
Commit: 61990a21d9
Author: J. Krieg <bellum07@googlemail.com>
Date: 2017-10-22 (Sun, 22 Oct 2017)
2017-10-22 20:35:27 +02:00
vanhofen
41820f1e26 yWeb: silent screenshots
Origin commit data
------------------
Commit: 05734bbc4b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-21 (Sat, 21 Oct 2017)

Origin message was:
------------------
- yWeb: silent screenshots
2017-10-21 16:29:48 +02:00
gixxpunk
d5643e9ef8 Merge branch 'ni/mp/tuxbox' of bitbucket.org:neutrino-images/ni-neutrino-hd into ni/mp/tuxbox
Origin commit data
------------------
Commit: c82563efdf
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-10-21 (Sat, 21 Oct 2017)
2017-10-21 14:48:02 +02:00
gixxpunk
32e3e87e2f fix typo
Origin commit data
------------------
Commit: 8f1ed9e031
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-10-21 (Sat, 21 Oct 2017)

Origin message was:
------------------
- fix typo
2017-10-21 14:47:23 +02:00
vanhofen
12904b0fae Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: d45ef31a04
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-20 (Fri, 20 Oct 2017)
2017-10-20 10:06:07 +02:00
vanhofen
ca0861c67f align backup.sh to latest shellexec changes
Origin commit data
------------------
Commit: dbd1f1f27d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-20 (Fri, 20 Oct 2017)

Origin message was:
------------------
- align backup.sh to latest shellexec changes
2017-10-20 09:43:26 +02:00
vanhofen
d7ed874838 deutsch.locale: small spelling fixes
Origin commit data
------------------
Commit: 34f8f9bccd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-20 (Fri, 20 Oct 2017)

Origin message was:
------------------
- deutsch.locale: small spelling fixes
2017-10-20 08:02:09 +02:00
TangoCash
589b8485da modify autocreate HD _and_ UHD channels as seperate lists
Origin commit data
------------------
Commit: ec7f5e9b98
Author: TangoCash <eric@loxat.de>
Date: 2017-10-20 (Fri, 20 Oct 2017)
2017-10-20 08:02:09 +02:00
vanhofen
687a72161c use bootlogo in gray color
Origin commit data
------------------
Commit: 7fac7b229c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-20 (Fri, 20 Oct 2017)

Origin message was:
------------------
- use bootlogo in gray color
2017-10-20 08:02:09 +02:00
vanhofen
a76763262e Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 1ec298224c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-19 (Thu, 19 Oct 2017)
2017-10-19 16:08:21 +02:00
vanhofen
c442d261af yWeb: fix 13d189d622
Origin commit data
------------------
Commit: 849cb7dc0f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-19 (Thu, 19 Oct 2017)

Origin message was:
------------------
- yWeb: fix 13d189d622
2017-10-19 16:06:42 +02:00
vanhofen
700e670b32 yWeb: fix 4eff70753a
Origin commit data
------------------
Commit: a19a08636f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-19 (Thu, 19 Oct 2017)

Origin message was:
------------------
- yWeb: fix 4eff70753a
2017-10-19 16:06:42 +02:00
vanhofen
42b43c524c add bootlogo.m2v for armbox
Origin commit data
------------------
Commit: 641d53101d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-19 (Thu, 19 Oct 2017)

Origin message was:
------------------
- add bootlogo.m2v for armbox
2017-10-19 13:13:25 +02:00
vanhofen
08b87137cc Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: ef0f0116ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-19 (Thu, 19 Oct 2017)
2017-10-19 10:24:47 +02:00
vanhofen
7be8e25298 backup.sh: add some files; sort entrys alphabetically
Origin commit data
------------------
Commit: 5ac127c9aa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-19 (Thu, 19 Oct 2017)

Origin message was:
------------------
- backup.sh: add some files; sort entrys alphabetically
2017-10-19 10:24:04 +02:00
vanhofen
904003dede Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac
	data/icons/buttons/0.png
	data/icons/buttons/1.png
	data/icons/buttons/2.png
	data/icons/buttons/3.png
	data/icons/buttons/4.png
	data/icons/buttons/5.png
	data/icons/buttons/6.png
	data/icons/buttons/7.png
	data/icons/buttons/8.png
	data/icons/buttons/9.png
	data/icons/buttons/blau.png
	data/icons/buttons/btn_backward.png
	data/icons/buttons/btn_forward.png
	data/icons/buttons/btn_pause.png
	data/icons/buttons/btn_play.png
	data/icons/buttons/btn_record_active.png
	data/icons/buttons/btn_record_inactive.png
	data/icons/buttons/btn_stop.png
	data/icons/buttons/down.png
	data/icons/buttons/gelb.png
	data/icons/buttons/gruen.png
	data/icons/buttons/help.png
	data/icons/buttons/help_small.png
	data/icons/buttons/home.png
	data/icons/buttons/info.png
	data/icons/buttons/info_small.png
	data/icons/buttons/left.png
	data/icons/buttons/menu.png
	data/icons/buttons/menu_small.png
	data/icons/buttons/mute_small.png
	data/icons/buttons/mute_zap_gray.png
	data/icons/buttons/mute_zap_green.png
	data/icons/buttons/ok.png
	data/icons/buttons/power.png
	data/icons/buttons/right.png
	data/icons/buttons/rot.png
	data/icons/buttons/up.png
	data/icons/filetypes/movie.png
	data/icons/filetypes/mp3.png
	data/icons/headers/audio.png
	data/icons/headers/bookmarkmanager.png
	data/icons/headers/colors.png
	data/icons/headers/error.png
	data/icons/headers/features.png
	data/icons/headers/games.png
	data/icons/headers/icon_blue.png
	data/icons/headers/icon_green.png
	data/icons/headers/icon_red.png
	data/icons/headers/icon_yellow.png
	data/icons/headers/information.png
	data/icons/headers/keybinding.png
	data/icons/headers/language.png
	data/icons/headers/lcd.png
	data/icons/headers/mainmenue.png
	data/icons/headers/multimedia.png
	data/icons/headers/network.png
	data/icons/headers/personalize.png
	data/icons/headers/shell.png
	data/icons/headers/softupdate.png
	data/icons/headers/streaming.png
	data/icons/headers/timer.png
	data/icons/headers/upnp.png
	data/icons/headers/video.png
	data/icons/movieplayer/mp_b-skip.png
	data/icons/movieplayer/mp_f-skip.png
	data/icons/movieplayer/mp_pause.png
	data/icons/movieplayer/mp_play.png
	data/icons/movieplayer/mp_play_repeat_all.png
	data/icons/movieplayer/mp_play_repeat_track.png
	data/icons/status/ca/biss_green.png
	data/icons/status/ca/biss_white.png
	data/icons/status/ca/biss_yellow.png
	data/icons/status/ca/conax_green.png
	data/icons/status/ca/conax_white.png
	data/icons/status/ca/conax_yellow.png
	data/icons/status/ca/cw_green.png
	data/icons/status/ca/cw_white.png
	data/icons/status/ca/cw_yellow.png
	data/icons/status/ca/d_green.png
	data/icons/status/ca/d_white.png
	data/icons/status/ca/d_yellow.png
	data/icons/status/ca/ird_green.png
	data/icons/status/ca/ird_white.png
	data/icons/status/ca/ird_yellow.png
	data/icons/status/ca/nagra_green.png
	data/icons/status/ca/nagra_white.png
	data/icons/status/ca/nagra_yellow.png
	data/icons/status/ca/nds_green.png
	data/icons/status/ca/nds_white.png
	data/icons/status/ca/nds_yellow.png
	data/icons/status/ca/powervu_green.png
	data/icons/status/ca/powervu_white.png
	data/icons/status/ca/powervu_yellow.png
	data/icons/status/ca/seca_green.png
	data/icons/status/ca/seca_white.png
	data/icons/status/ca/seca_yellow.png
	data/icons/status/ca/via_green.png
	data/icons/status/ca/via_white.png
	data/icons/status/ca/via_yellow.png
	data/icons/status/ca/x_green.png
	data/icons/status/ca/x_white.png
	data/icons/status/ca/x_yellow.png
	data/icons/status/channel/16_9.png
	data/icons/status/channel/16_9_gray.png
	data/icons/status/channel/ca2.png
	data/icons/status/channel/ca2_gray.png
	data/icons/status/channel/dd.png
	data/icons/status/channel/dd_avail.png
	data/icons/status/channel/dd_gray.png
	data/icons/status/channel/radiotextget.png
	data/icons/status/channel/radiotextoff.png
	data/icons/status/channel/radiotextwait.png
	data/icons/status/channel/res_000.png
	data/icons/status/channel/res_1080.png
	data/icons/status/channel/res_1280.png
	data/icons/status/channel/res_1440.png
	data/icons/status/channel/res_1920.png
	data/icons/status/channel/res_288.png
	data/icons/status/channel/res_352.png
	data/icons/status/channel/res_382.png
	data/icons/status/channel/res_480.png
	data/icons/status/channel/res_528.png
	data/icons/status/channel/res_544.png
	data/icons/status/channel/res_576.png
	data/icons/status/channel/res_704.png
	data/icons/status/channel/res_720.png
	data/icons/status/channel/res_hd.png
	data/icons/status/channel/res_sd.png
	data/icons/status/channel/subt.png
	data/icons/status/channel/subt_gray.png
	data/icons/status/channel/tuner_1.png
	data/icons/status/channel/tuner_2.png
	data/icons/status/channel/tuner_3.png
	data/icons/status/channel/tuner_4.png
	data/icons/status/channel/vtxt.png
	data/icons/status/channel/vtxt_gray.png
	data/icons/status/various/ats.png
	data/icons/status/various/ats_gray.png
	data/icons/status/various/ca.png
	data/icons/status/various/lock.png
	data/icons/status/various/mounted.png
	data/icons/status/various/mute.png
	data/icons/status/various/not_mounted.png
	data/icons/status/various/pip.png
	data/icons/status/various/rec_event_marker.png
	data/icons/status/various/rec_gray.png
	data/icons/status/various/zap.png
	data/locale/Makefile.am
	data/locale/english.locale
	data/pictures/backgrounds/1280x720/start.jpg
	src/driver/fb_accel_sti.cpp
	src/gui/Makefile.am
	src/gui/dboxinfo.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/system/settings.cpp
	src/system/settings.h


Origin commit data
------------------
Commit: 4121099dcf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-18 (Wed, 18 Oct 2017)
2017-10-18 09:41:46 +02:00
vanhofen
57e1571833 scripts: install restore_flash.sh on armbox
Origin commit data
------------------
Commit: 4d8f898aef
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-17 (Tue, 17 Oct 2017)

Origin message was:
------------------
- scripts: install restore_flash.sh on armbox
2017-10-17 23:03:48 +02:00
Thilo Graf
fcd9d06d45 Merge branch 'pu/mp' into 'master'
Origin commit data
------------------
Commit: ccb19a8880
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-17 (Tue, 17 Oct 2017)
2017-10-17 20:38:58 +02:00