Commit Graph

686 Commits

Author SHA1 Message Date
vanhofen
e60f6104eb channellist: don't show pip-button when pip is disabled
Origin commit data
------------------
Branch: ni/coolstream
Commit: dcd8d68931
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-03-16 (Sat, 16 Mar 2019)

Origin message was:
------------------
- channellist: don't show pip-button when pip is disabled

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-03-16 23:44:49 +01:00
vanhofen
48257a7111 channellist: show display mode in header (next/primetime only)
Origin commit data
------------------
Branch: ni/coolstream
Commit: bbf6f2e3c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-03-09 (Sat, 09 Mar 2019)

Origin message was:
------------------
- channellist: show display mode in header (next/primetime only)

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-03-09 22:28:44 +01:00
vanhofen
8e51f5b3ea channellist: show event description per default in primetime mode only
Origin commit data
------------------
Branch: ni/coolstream
Commit: db682f2ab7
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-03-09 (Sat, 09 Mar 2019)

Origin message was:
------------------
- channellist: show event description per default in primetime mode only

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-03-09 21:57:28 +01:00
vanhofen
f31586bbc6 channellist: respect g_settings.channellist_show_numbers in history mode too (first quick'n'dirty version)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0c4d842ce6
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-03-08 (Fri, 08 Mar 2019)

Origin message was:
------------------
- channellist: respect g_settings.channellist_show_numbers in history mode too (first quick'n'dirty version)

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-03-08 23:36:43 +01:00
TangoCash
3de0547953 channellist: set beginning of primetime to 20:00
Origin commit data
------------------
Branch: ni/coolstream
Commit: fb65c1b463
Author: TangoCash <eric@loxat.de>
Date: 2019-03-06 (Wed, 06 Mar 2019)

Origin message was:
------------------
- channellist: set beginning of primetime to 20:00

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-03-06 23:15:01 +01:00
vanhofen
d6ce4edc1c channellist: use OFFSET defines in showdescription() function
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6948c9424e
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-03-05 (Tue, 05 Mar 2019)

Origin message was:
------------------
- channellist: use OFFSET defines in showdescription() function

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-03-05 22:23:11 +01:00
vanhofen
a1c5e1be05 channellist: show event description in primetime mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: b8816141e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-03-05 (Tue, 05 Mar 2019)

Origin message was:
------------------
- channellist: show event description in primetime mode

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-03-05 21:50:03 +01:00
vanhofen
e8d73559c0 fix commit 548cde1 remove unnecessary
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3413d942a7
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-03-05 (Tue, 05 Mar 2019)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-03-05 21:50:03 +01:00
TangoCash
e330279e61 fix logic
Origin commit data
------------------
Branch: ni/coolstream
Commit: 59bb162730
Author: TangoCash <eric@loxat.de>
Date: 2019-03-05 (Tue, 05 Mar 2019)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-03-05 21:50:03 +01:00
TangoCash
7604b27d88 show tomorrows events after todays primetime
Origin commit data
------------------
Branch: ni/coolstream
Commit: a250b29b1b
Author: TangoCash <eric@loxat.de>
Date: 2019-03-05 (Tue, 05 Mar 2019)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-03-05 21:50:03 +01:00
vanhofen
548cde1383 channellist: rework behaviour of green and blue button; ...
* blue key: switches now/next/primetime
* green key: switches eventlist/description (in favorites mode)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7bb694c690
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-03-04 (Mon, 04 Mar 2019)

Origin message was:
------------------
- channellist: rework behaviour of green and blue button; ...

* blue key: switches now/next/primetime
* green key: switches eventlist/description (in favorites mode)


------------------
This commit was generated by Migit
2019-03-04 23:52:19 +01:00
vanhofen
f631af44f3 channellist: fix formatation of new code from "add primetime feature to channellist"
Origin commit data
------------------
Branch: ni/coolstream
Commit: 87027c22a4
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-03-03 (Sun, 03 Mar 2019)

Origin message was:
------------------
- channellist: fix formatation of new code from "add primetime feature to channellist"

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-03-03 22:20:23 +01:00
TangoCash
0959eccf23 add primetime feature to channellist
use green button in favorites to show whats showing on primetime


Origin commit data
------------------
Branch: ni/coolstream
Commit: eb8b55fa72
Author: TangoCash <eric@loxat.de>
Date: 2019-03-03 (Sun, 03 Mar 2019)



------------------
This commit was generated by Migit
2019-03-03 22:20:23 +01:00
vanhofen
9ec8edc7ea timeshift: unify config keywords and locales
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6755b49e20
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-01-15 (Tue, 15 Jan 2019)

Origin message was:
------------------
- timeshift: unify config keywords and locales

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-01-15 23:39:10 +01:00
vanhofen
80f47013a3 use new edit icon in several headers
Origin commit data
------------------
Branch: ni/coolstream
Commit: a96e1d3ccd
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-12-16 (Sun, 16 Dec 2018)

Origin message was:
------------------
- use new edit icon in several headers

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-12-16 02:15:58 +01:00
vanhofen
d447baa820 channellist: re-allow switching bouquets in zaphistory/current_transponder mode
see https://www.neutrino-images.de/board/viewtopic.php?f=61&t=2728


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7dbded93ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-08-13 (Mon, 13 Aug 2018)

Origin message was:
------------------
- channellist: re-allow switching bouquets in zaphistory/current_transponder mode

see https://www.neutrino-images.de/board/viewtopic.php?f=61&t=2728


------------------
This commit was generated by Migit
2018-08-13 22:14:11 +02:00
vanhofen
5a07187270 channellist: move avoid-zap-in-movieplayer-mode-message ...
... to a global reachable place to avoid all zap tries


Origin commit data
------------------
Branch: ni/coolstream
Commit: 984e187855
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-29 (Sun, 29 Jul 2018)

Origin message was:
------------------
- channellist: move avoid-zap-in-movieplayer-mode-message ...

... to a global reachable place to avoid all zap tries


------------------
This commit was generated by Migit
2018-07-29 00:54:55 +02:00
vanhofen
fc2e407816 epgplus: signalize zap tries while movie playback
Origin commit data
------------------
Branch: ni/coolstream
Commit: b913a04f40
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-23 (Mon, 23 Jul 2018)

Origin message was:
------------------
- epgplus: signalize zap tries while movie playback

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-07-23 19:48:47 +02:00
vanhofen
d12b8301c7 channellist: fix display of very long channelnames
Origin commit data
------------------
Branch: ni/coolstream
Commit: ff1db4da8b
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-06-26 (Tue, 26 Jun 2018)

Origin message was:
------------------
- channellist: fix display of very long channelnames

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-06-26 00:02:15 +02:00
vanhofen
bab8cf8e31 channellist: allow to show resolution icons
Origin commit data
------------------
Branch: ni/coolstream
Commit: 114bc9f4be
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-06-24 (Sun, 24 Jun 2018)

Origin message was:
------------------
- channellist: allow to show resolution icons

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-06-24 23:07:02 +02:00
vanhofen
d8233ff455 lcd4l: move lcd4l-code to driver directory
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3a82bfab40
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-05-09 (Wed, 09 May 2018)

Origin message was:
------------------
- lcd4l: move lcd4l-code to driver directory

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-05-09 23:41:37 +02:00
vanhofen
9800bec147 remove NI-tags from progressbar color code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 75fc656e49
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-04-11 (Wed, 11 Apr 2018)

Origin message was:
------------------
- remove NI-tags from progressbar color code

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-04-11 23:58:15 +02:00
Thilo Graf
bf4df77987 infobar timout: add member to get current timeout modes
Avoids multiple code in some source files.


Origin commit data
------------------
Branch: ni/coolstream
Commit: e0be304aef
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-04-10 (Tue, 10 Apr 2018)

Origin message was:
------------------
infobar timout: add member to get current timeout modes

Avoids multiple code in some source files.


------------------
This commit was generated by Migit
2018-04-10 22:30:17 +02:00
Thilo Graf
5223a302f9 infobar: rework infobar timeout behavior
Options were sometimes described ambiguously and previous behavior was no longer available.
Now the descriptions should be more plausible for current behavior.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 89770bae19
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-04-10 (Tue, 10 Apr 2018)



------------------
This commit was generated by Migit
2018-04-10 22:30:17 +02:00
vanhofen
85cb750380 channellist: signalize zap tries while movie playback
Origin commit data
------------------
Branch: ni/coolstream
Commit: afaa9d2838
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-04-09 (Mon, 09 Apr 2018)

Origin message was:
------------------
- channellist: signalize zap tries while movie playback

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-04-09 22:49:40 +02:00
vanhofen
3dc1c9b1a9 channellist: try to respect users timeout settings when hiding infobar
Origin commit data
------------------
Branch: ni/coolstream
Commit: b2830a90a1
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-04-08 (Sun, 08 Apr 2018)

Origin message was:
------------------
- channellist: try to respect users timeout settings when hiding infobar

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-04-08 23:55:37 +02:00
Thilo Graf
90a49b465a src/gui/channellist.cpp: use channellist object on stack
Heap not required here.


Origin commit data
------------------
Branch: ni/coolstream
Commit: e138d8a517
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-03-25 (Sun, 25 Mar 2018)



------------------
This commit was generated by Migit
2018-04-01 21:17:20 +02:00
vanhofen
9bbefa3e64 channellist: re-add list of recordable channels (while recording) to key_current_transponder
Origin commit data
------------------
Branch: ni/coolstream
Commit: a84c0a14a7
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-03-22 (Thu, 22 Mar 2018)

Origin message was:
------------------
- channellist: re-add list of recordable channels (while recording) to key_current_transponder

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-03-22 00:44:46 +01:00
vanhofen
0d3d142017 channellist: move zaphistory/current_transponder handling into sepatate function
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8dbd41921a
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-03-22 (Thu, 22 Mar 2018)

Origin message was:
------------------
- channellist: move zaphistory/current_transponder handling into sepatate function

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-03-22 00:09:41 +01:00
vanhofen
a11ed4ffe9 channellist: avoid switching bouquets in zaphistory/current_transponder mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 12a67c5cdf
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-03-21 (Wed, 21 Mar 2018)

Origin message was:
------------------
- channellist: avoid switching bouquets in zaphistory/current_transponder mode

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-03-21 00:45:21 +01:00
vanhofen
319dadfadc channellist: simplify key_zaphistory/key_current_transponder handling
* Remove strange list of "zapable" channels while recording. Channellist
(RC_ok) has same feature ... not avalable channels are marked inactive.

* Add hint, when no zapping histoty is available to confirm user's keypress


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9034fd3ea6
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-03-21 (Wed, 21 Mar 2018)

Origin message was:
------------------
- channellist: simplify key_zaphistory/key_current_transponder handling

* Remove strange list of "zapable" channels while recording. Channellist
(RC_ok) has same feature ... not avalable channels are marked inactive.

* Add hint, when no zapping histoty is available to confirm user's keypress


------------------
This commit was generated by Migit
2018-03-21 00:45:21 +01:00
vanhofen
59bcbddb83 channellist: show choosen channelnumber on vfd while numeric zapping
Origin commit data
------------------
Branch: ni/coolstream
Commit: efa5621cc5
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-03-12 (Mon, 12 Mar 2018)

Origin message was:
------------------
- channellist: show choosen channelnumber on vfd while numeric zapping

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-03-12 00:53:21 +01:00
vanhofen
dcf30fc281 channellist/infoviewer: align calculations for "since-time" of current event
Origin commit data
------------------
Branch: ni/coolstream
Commit: 61a116a2eb
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-03-11 (Sun, 11 Mar 2018)

Origin message was:
------------------
- channellist/infoviewer: align calculations for "since-time" of current event

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-03-11 21:53:20 +01:00
TangoCash
1f84dc9470 fix channellist footer
Origin commit data
------------------
Branch: ni/coolstream
Commit: bd3933d005
Author: TangoCash <eric@loxat.de>
Date: 2018-02-03 (Sat, 03 Feb 2018)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-02-03 20:57:29 +01:00
vanhofen
fd9be21477 channelist: small reworks in numericZap() function; use OFFSET defines
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7ab983b72f
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-26 (Fri, 26 Jan 2018)

Origin message was:
------------------
- channelist: small reworks in numericZap() function; use OFFSET defines

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-01-26 09:57:40 +01:00
vanhofen
a8bbad2772 framebuffer: better name for getWindowWidth/Height() functions
getScreenWidth/HeightRel() was confusing because it depends on users window settings.
Replace names in old unused framebuffer code too.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 86cdc12c8f
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-22 (Mon, 22 Jan 2018)

Origin message was:
------------------
- framebuffer: better name for getWindowWidth/Height() functions

getScreenWidth/HeightRel() was confusing because it depends on users window settings.
Replace names in old unused framebuffer code too.


------------------
This commit was generated by Migit
2018-01-22 12:06:15 +01:00
vanhofen
26a55540dc Revert "channellist: use "classic" width if minitv is unused"
This reverts commit 2e2487dbaa


Origin commit data
------------------
Branch: ni/coolstream
Commit: 82bdff5185
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-21 (Sun, 21 Jan 2018)



------------------
This commit was generated by Migit
2018-01-21 23:00:37 +01:00
vanhofen
65ae1b767c channellist: use more new marker icons
Origin commit data
------------------
Branch: ni/coolstream
Commit: 39e19273a9
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-04 (Thu, 04 Jan 2018)

Origin message was:
------------------
- channellist: use more new marker icons

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-01-04 16:07:47 +01:00
vanhofen
cc22b20c92 channellist: use new marker icons
Origin commit data
------------------
Branch: ni/coolstream
Commit: 65b84b40d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-04 (Thu, 04 Jan 2018)

Origin message was:
------------------
- channellist: use new marker icons

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-01-04 16:07:46 +01:00
Stefan Seyfried
3cf2a4dbfb Channellist: only show lock icon if parental lock is active
additionally, remove the icon on change to an unlocked bouquet


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8ab511fdbc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)



------------------
This commit was generated by Migit
2017-12-26 22:58:36 +01:00
vanhofen
938b53bb4b neutrino: add more RC_playpause handling
Origin commit data
------------------
Branch: ni/coolstream
Commit: 764b25542f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-19 (Tue, 19 Dec 2017)

Origin message was:
------------------
- neutrino: add more RC_playpause handling

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-12-19 10:58:44 +01:00
vanhofen
725aec0118 channellist: fix segfault while virtual zapping and bouquets are empty
Origin commit data
------------------
Branch: ni/coolstream
Commit: 89019ac222
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-11 (Mon, 11 Dec 2017)

Origin message was:
------------------
- channellist: fix segfault while virtual zapping and bouquets are empty

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-12-11 13:05:18 +01:00
vanhofen
476ce63d99 neutrino: unify modes handling; ...
remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes


Origin commit data
------------------
Branch: ni/coolstream
Commit: 028ec3cf3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Origin message was:
------------------
- neutrino: unify modes handling; ...

remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes


------------------
This commit was generated by Migit
2017-11-20 15:19:06 +01:00
vanhofen
0ab3e628f3 rename LIST_MODE_WEBTV => LIST_MODE_WEB
Origin commit data
------------------
Branch: ni/coolstream
Commit: cd5577e8b5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- rename LIST_MODE_WEBTV => LIST_MODE_WEB

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-11-03 09:36:19 +01:00
vanhofen
52a5d800a4 rename IS_WEBTV => IS_WEBCHAN
Origin commit data
------------------
Branch: ni/coolstream
Commit: ebcd15da41
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- rename IS_WEBTV => IS_WEBCHAN

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-11-03 09:36:19 +01:00
vanhofen
66784d42af add webradio; first steps
Origin commit data
------------------
Branch: ni/coolstream
Commit: a8b0fee599
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- add webradio; first steps

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-11-03 09:36:19 +01:00
vanhofen
082dcc37bc Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a57a7dc44b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-25 (Wed, 25 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-25 00:31:24 +02:00
vanhofen
25414ad0b4 channellist: add separator item to menu for a smoother view
Origin commit data
------------------
Branch: ni/coolstream
Commit: 49cd7b13a3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-25 (Wed, 25 Oct 2017)

Origin message was:
------------------
- channellist: add separator item to menu for a smoother view

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-25 00:30:32 +02:00
vanhofen
e143e0bcb0 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
------------------
Branch: ni/coolstream
Commit: 4121099dcf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-18 (Wed, 18 Oct 2017)



------------------
This commit was generated by Migit
2017-10-18 09:41:46 +02:00
vanhofen
39f90ef9e7 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b6f2568ca
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-07 (Sat, 07 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-07 10:52:18 +02:00