Commit Graph

374 Commits

Author SHA1 Message Date
vanhofen
15e1be104e imdb/tmdb: more unifications; poster handling
Origin commit data
------------------
Branch: ni/coolstream
Commit: b9aea3ae5d
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-04-08 (Thu, 08 Apr 2021)

Origin message was:
------------------
- imdb/tmdb: more unifications; poster handling

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

------------------
This commit was generated by Migit
2021-04-08 17:31:07 +02:00
vanhofen
9e3b439c16 epgview: more imdb/tmdb unifications
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2f72fb3590
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-04-08 (Thu, 08 Apr 2021)

Origin message was:
------------------
- epgview: more imdb/tmdb unifications

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

------------------
This commit was generated by Migit
2021-04-08 17:31:07 +02:00
vanhofen
07f77ef4c2 - imdb/tmdb: more unifications
Origin commit data
------------------
Branch: ni/coolstream
Commit: a4c9df53a5
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-04-08 (Thu, 08 Apr 2021)

Origin message was:
------------------
- - imdb/tmdb: more unifications

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

------------------
This commit was generated by Migit
2021-04-08 17:31:07 +02:00
vanhofen
8ee3ed9673 imdb/tmdb: unify some funtions
Origin commit data
------------------
Branch: ni/coolstream
Commit: c5701bd1db
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-04-05 (Mon, 05 Apr 2021)

Origin message was:
------------------
- imdb/tmdb: unify some funtions

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

------------------
This commit was generated by Migit
2021-04-05 23:23:51 +02:00
vanhofen
28463b9a47 epgview: fix saving of mp_movie_info->epgInfo2 for omdb
Origin commit data
------------------
Branch: ni/coolstream
Commit: c1065f5f74
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-04-03 (Sat, 03 Apr 2021)

Origin message was:
------------------
- epgview: fix saving of mp_movie_info->epgInfo2 for omdb

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

------------------
This commit was generated by Migit
2021-04-03 22:55:24 +02:00
Thilo Graf
d81ad3a3f5 epg_banner: outsource class for rate banners
For global use.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e7ddaa0f3
Author: Thilo Graf <dbt@novatux.de>
Date: 2020-03-03 (Tue, 03 Mar 2020)



------------------
This commit was generated by Migit
2020-03-03 21:22:34 +01:00
Jacek Jendrzej
d0b2bfcf0c epgview: fix memleak
Origin commit data
------------------
Branch: ni/coolstream
Commit: dce23d0c8d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2020-02-26 (Wed, 26 Feb 2020)


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

------------------
This commit was generated by Migit
2020-02-26 21:09:35 +01:00
Thilo Graf
3610e34f13 epgview.cpp: avoid possible compiler warnings -Waddress-of-packed-member
Origin commit data
------------------
Branch: ni/coolstream
Commit: b641291347
Author: Thilo Graf <dbt@novatux.de>
Date: 2020-01-23 (Thu, 23 Jan 2020)


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

------------------
This commit was generated by Migit
2020-01-23 21:15:51 +01:00
Thilo Graf
af337e12cb epgview: ensure paint of segment after changed background
Origin commit data
------------------
Branch: ni/coolstream
Commit: 14e31f4a21
Author: Thilo Graf <dbt@novatux.de>
Date: 2019-12-30 (Mon, 30 Dec 2019)


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

------------------
This commit was generated by Migit
2019-12-30 17:40:32 +01:00
vanhofen
bf1412a5c5 neutrino: use RC_tv/radio to toggle infoviewer/epg; ARM/MIPS_HARDWARE only
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5e8a1d0233
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-12-09 (Mon, 09 Dec 2019)

Origin message was:
------------------
- neutrino: use RC_tv/radio to toggle infoviewer/epg; ARM/MIPS_HARDWARE only

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

------------------
This commit was generated by Migit
2019-12-09 21:55:47 +01:00
Jacek Jendrzej
0a7ba6abff adzap, fix zap to last channel, disable hintbox with zap
Origin commit data
------------------
Branch: ni/coolstream
Commit: ce85015b9a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2019-05-04 (Sat, 04 May 2019)


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

------------------
This commit was generated by Migit
2019-05-04 18:19:22 +02:00
vanhofen
94e18c80c6 followscreenings: invert notify behaviour
Origin commit data
------------------
Branch: ni/coolstream
Commit: c3a13753f4
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-04-29 (Mon, 29 Apr 2019)

Origin message was:
------------------
- followscreenings: invert notify behaviour

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

------------------
This commit was generated by Migit
2019-04-29 23:58:11 +02:00
vanhofen
8cbc7c4576 epgview: show notifications when adding timers
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9fef7e4e0b
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-04-28 (Sun, 28 Apr 2019)

Origin message was:
------------------
- epgview: show notifications when adding timers

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

------------------
This commit was generated by Migit
2019-04-28 23:55:54 +02:00
vanhofen
677fd6a530 epgview: re-enable LOCALE_TIMER_EVENTRECORD_MSG messages
Origin commit data
------------------
Branch: ni/coolstream
Commit: d8300fb42e
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-04-28 (Sun, 28 Apr 2019)

Origin message was:
------------------
- epgview: re-enable LOCALE_TIMER_EVENTRECORD_MSG messages

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

------------------
This commit was generated by Migit
2019-04-28 22:06:11 +02:00
Jacek Jendrzej
fa1cc55abd adzap: add "zap on timer activation" to adzap menu too
Origin commit data
------------------
Branch: ni/coolstream
Commit: 35904d55c2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2019-04-28 (Sun, 28 Apr 2019)

Origin message was:
------------------
- adzap: add "zap on timer activation" to adzap menu too

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

------------------
This commit was generated by Migit
2019-04-28 18:34:24 +02:00
vanhofen
1b9593b994 code formatting of "add option to adzap: zap on timer activation"
Origin commit data
------------------
Branch: ni/coolstream
Commit: d48072967e
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-04-28 (Sun, 28 Apr 2019)

Origin message was:
------------------
- code formatting of "add option to adzap: zap on timer activation"

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

------------------
This commit was generated by Migit
2019-04-28 00:32:34 +02:00
Jacek Jendrzej
653c1004df fix 44fb2039e1f0fc6dd10352014bed69a66d217eae typo
Origin commit data
------------------
Branch: ni/coolstream
Commit: 11d6073de4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2019-04-28 (Sun, 28 Apr 2019)


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

------------------
This commit was generated by Migit
2019-04-28 00:32:34 +02:00
Jacek Jendrzej
03203eead3 add option to adzap: zap on timer activation
Origin commit data
------------------
Branch: ni/coolstream
Commit: 710009728e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2019-04-28 (Sun, 28 Apr 2019)


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

------------------
This commit was generated by Migit
2019-04-28 00:32:34 +02:00
TangoCash
a9b3fd02c6 rework tmdb class
Origin commit data
------------------
Branch: ni/coolstream
Commit: a633525ba2
Author: TangoCash <eric@loxat.de>
Date: 2019-03-03 (Sun, 03 Mar 2019)


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

------------------
This commit was generated by Migit
2019-03-03 22:20:23 +01:00
Frankenstone
d541e48e94 epgview: use define tmdb_cover
Origin commit data
------------------
Branch: ni/coolstream
Commit: dd39f9249e
Author: Frankenstone <dampf_acc@online.de>
Date: 2019-03-03 (Sun, 03 Mar 2019)


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

------------------
This commit was generated by Migit
2019-03-03 22:20:23 +01:00
BPanther
3c80a3bb0c fix remove tmdb.jpg
Origin commit data
------------------
Branch: ni/coolstream
Commit: f906380a1c
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2019-03-03 (Sun, 03 Mar 2019)


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

------------------
This commit was generated by Migit
2019-03-03 22:20:23 +01:00
GetAway
8947425469 epgview.cpp: fix recalculation of several heights
Origin commit data
------------------
Branch: ni/coolstream
Commit: 95b1472bde
Author: GetAway <get-away@t-online.de>
Date: 2018-12-11 (Tue, 11 Dec 2018)


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

------------------
This commit was generated by Migit
2018-12-11 22:15:05 +01:00
vanhofen
79756e767c epgview/folowscreenings: disable LOCALE_TIMER_EVENTRECORD_MSG messages ...
the signalization with record icon is enough as i think


Origin commit data
------------------
Branch: ni/coolstream
Commit: 665446269e
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-11-29 (Thu, 29 Nov 2018)

Origin message was:
------------------
- epgview/folowscreenings: disable LOCALE_TIMER_EVENTRECORD_MSG messages ...

the signalization with record icon is enough as i think


------------------
This commit was generated by Migit
2018-11-29 22:47:42 +01:00
vanhofen
c76c28b675 epgplus: move CEPGplusHandler::exec() code to end of file; ...
* really minor code changes in CEPGDataHandler::exec() and
 CEventListHandler::exec()

No binary changes, just code cosmetic.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a4397b3f0
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-23 (Mon, 23 Jul 2018)

Origin message was:
------------------
- epgplus: move CEPGplusHandler::exec() code to end of file; ...

* really minor code changes in CEPGDataHandler::exec() and
 CEventListHandler::exec()

No binary changes, just code cosmetic.


------------------
This commit was generated by Migit
2018-07-23 19:48:47 +02:00
vanhofen
435159cfe9 epgview: fix CEPGDataHandler::exec() in timeshift mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6b9cb7f543
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-23 (Mon, 23 Jul 2018)

Origin message was:
------------------
- epgview: fix CEPGDataHandler::exec() in timeshift mode

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

------------------
This commit was generated by Migit
2018-07-23 00:13:37 +02:00
vanhofen
7f1ed1eb40 epgview: rework CEPGDataHandler::exec() to get work in movieplayer-mode too
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3dc2c47e9d
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-22 (Sun, 22 Jul 2018)

Origin message was:
------------------
- epgview: rework CEPGDataHandler::exec() to get work in movieplayer-mode too

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

------------------
This commit was generated by Migit
2018-07-22 23:27:23 +02:00
vanhofen
92beb0684a epgview: fix display of mp_movie_info->dateOfLastPlay
Origin commit data
------------------
Branch: ni/coolstream
Commit: 208eb90792
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-05 (Thu, 05 Jul 2018)

Origin message was:
------------------
- epgview: fix display of mp_movie_info->dateOfLastPlay

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

------------------
This commit was generated by Migit
2018-07-05 20:34:10 +02:00
vanhofen
bd0125cfed epgview: small fixes in imdb text arrangement
Origin commit data
------------------
Branch: ni/coolstream
Commit: 79c72f63a1
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-05-01 (Tue, 01 May 2018)

Origin message was:
------------------
- epgview: small fixes in imdb text arrangement

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

------------------
This commit was generated by Migit
2018-05-01 23:36:02 +02:00
vanhofen
160f11e05c tmdb: show decimal points in rating stars
Origin commit data
------------------
Branch: ni/coolstream
Commit: a873e5b2b2
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-05-01 (Tue, 01 May 2018)

Origin message was:
------------------
- tmdb: show decimal points in rating stars

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

------------------
This commit was generated by Migit
2018-05-01 23:07:28 +02:00
vanhofen
eb6883f473 epgview: re-use our smooth starbar to signalize decimal points in rating-stars
* fix text start position on first page
* rename variable stars => tmdb_stars


Origin commit data
------------------
Branch: ni/coolstream
Commit: be655910ad
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-04-29 (Sun, 29 Apr 2018)

Origin message was:
------------------
- epgview: re-use our smooth starbar to signalize decimal points in rating-stars

* fix text start position on first page
* rename variable stars => tmdb_stars


------------------
This commit was generated by Migit
2018-04-29 22:33:48 +02:00
vanhofen
bc50f13b5e epgview: sync with tuxbox; our code was completely taken
Origin commit data
------------------
Branch: ni/coolstream
Commit: 82ffe57174
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-04-29 (Sun, 29 Apr 2018)

Origin message was:
------------------
- epgview: sync with tuxbox; our code was completely taken

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

------------------
This commit was generated by Migit
2018-04-29 03:13:08 +02:00
Thilo Graf
eab9319aa8 src/gui/epgview.cpp: optimize text arrangement for tmdb/imdb
Origin commit data
------------------
Branch: ni/coolstream
Commit: ef03c4d739
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-04-29 (Sun, 29 Apr 2018)


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

------------------
This commit was generated by Migit
2018-04-29 03:13:08 +02:00
vanhofen
93796e04fd epgview: use OFFSET define instead of fixed value
Origin commit data
------------------
Branch: ni/coolstream
Commit: da603e85be
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-04-29 (Sun, 29 Apr 2018)

Origin message was:
------------------
- epgview: use OFFSET define instead of fixed value

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

------------------
This commit was generated by Migit
2018-04-29 03:13:08 +02:00
Thilo Graf
65e5c41667 src/gui/epgview.cpp: rework online epg database handling
Vizualize of TMDb starbar was partial broken, should working now and IMDb (in reality OMDb)
should working too. DEV/Api keys are required and are managed with
misc settings menue. To get reqiured keys see https://www.omdbapi.com/ and
for TMDb see https://www.themoviedb.org

TODO: Better encapsulating for db classes for unified data tapping.


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



------------------
This commit was generated by Migit
2018-04-29 03:13:08 +02:00
Thilo Graf
88ffa984b5 src/gui/epgview.cpp: update license text
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9833dfce03
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-04-29 (Sun, 29 Apr 2018)


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

------------------
This commit was generated by Migit
2018-04-29 03:13:08 +02:00
Thilo Graf
bcbfe9f988 src/gui/epgview.cpp: small indent fix
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0f75bb3b76
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-03-25 (Sun, 25 Mar 2018)


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

------------------
This commit was generated by Migit
2018-03-25 22:48:12 +02: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
3aa69c6e7f epgview: add small separator line between navibar and footer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 980c62d853
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-21 (Sun, 21 Jan 2018)

Origin message was:
------------------
- epgview: add small separator line between navibar and footer

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

------------------
This commit was generated by Migit
2018-01-21 21:31:58 +01:00
vanhofen
cea8bc1f1b epgview: fix stupid c/p error; now it's hopefully right
Origin commit data
------------------
Branch: ni/coolstream
Commit: 79c2590c4c
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-19 (Fri, 19 Jan 2018)

Origin message was:
------------------
- epgview: fix stupid c/p error; now it's hopefully right

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

------------------
This commit was generated by Migit
2018-01-19 20:34:08 +01:00
vanhofen
9abb0c861d epgview: fix logic for followscreenings- and tmdb-button
Origin commit data
------------------
Branch: ni/coolstream
Commit: 92b6731e59
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-19 (Fri, 19 Jan 2018)

Origin message was:
------------------
- epgview: fix logic for followscreenings- and tmdb-button

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

------------------
This commit was generated by Migit
2018-01-19 19:47:41 +01:00
vanhofen
eec4e01b4e epgview: use OFFSET define for navigation bar
Origin commit data
------------------
Branch: ni/coolstream
Commit: bb7f532506
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-19 (Fri, 19 Jan 2018)

Origin message was:
------------------
- epgview: use OFFSET define for navigation bar

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

------------------
This commit was generated by Migit
2018-01-19 15:34:40 +01:00
vanhofen
212d08454a epgview: take footer height from CComponentsFooter ...
to get this footer in sync with the footers of other gui elements


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3ae39ce6a5
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-19 (Fri, 19 Jan 2018)

Origin message was:
------------------
- epgview: take footer height from CComponentsFooter ...

to get this footer in sync with the footers of other gui elements


------------------
This commit was generated by Migit
2018-01-19 15:34:40 +01:00
vanhofen
4c468ed8fc epgview: change and simplify button logic; ...
this avoids annoying "button-jumps" while navigating through events


Origin commit data
------------------
Branch: ni/coolstream
Commit: 998dce9010
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-19 (Fri, 19 Jan 2018)

Origin message was:
------------------
- epgview: change and simplify button logic; ...

this avoids annoying "button-jumps" while navigating through events


------------------
This commit was generated by Migit
2018-01-19 13:43:59 +01:00
vanhofen
72f8a92e90 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Conflicts:
	src/driver/simple_display.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: db0efcca40
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)



------------------
This commit was generated by Migit
2017-11-03 22:40:43 +01:00
Jacek Jendrzej
6e8dcaa0fb silence -Wparentheses-equality warning
Origin commit data
------------------
Branch: ni/coolstream
Commit: 75fd96f6b7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-03 20:14:37 +01:00
vanhofen
ccccafacab epgview: disable epgid debug code
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 61a31e2609
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-01 (Wed, 01 Nov 2017)

Origin message was:
------------------
- epgview: disable epgid debug code

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-11-01 15:42:05 +01:00
vanhofen
4a85c69a81 epgview: disable epgid debug code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 98fa2e2722
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-01 (Wed, 01 Nov 2017)

Origin message was:
------------------
- epgview: disable epgid debug code

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

------------------
This commit was generated by Migit
2017-11-01 12:21:16 +01:00
vanhofen
cf82a4e8a8 epgview: fix adzap message
Origin commit data
------------------
Branch: ni/coolstream
Commit: b9020ee889
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-28 (Sat, 28 Oct 2017)

Origin message was:
------------------
- epgview: fix adzap message

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

------------------
This commit was generated by Migit
2017-10-28 14:30:59 +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
463700033b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/dboxinfo.cpp
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9e8dd73320
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)



------------------
This commit was generated by Migit
2017-10-02 23:19:49 +02:00