Commit Graph

364 Commits

Author SHA1 Message Date
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
Jacek Jendrzej
a91765a685 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7ad4a0e6cc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-02 (Mon, 02 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-02 13:56:25 +02:00
Stefan Seyfried
ef71d00d7f remove "using namespace std" from header files
"using namespace std" in headers is considered bad practice, so move it
either into the respective cpp files or (for files which have lots of
other std::xxx usage anyway) just write it out explicitly.
Looking at the headers and the affected cpp files, one can actually see
why it is bad practice, as it's spreading very far ;-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d9139054a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)



------------------
This commit was generated by Migit
2017-10-02 13:43:57 +02:00
Jacek Jendrzej
43eeb40008 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4fc73acffc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-29 (Fri, 29 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-29 10:49:27 +02:00
vanhofen
3df3b9eafe rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
Origin commit data
------------------
Branch: ni/coolstream
Commit: 99cc7f850a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)

Origin message was:
------------------
- rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now

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

------------------
This commit was generated by Migit
2017-09-29 10:34:23 +02:00
vanhofen
369436124b rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
Origin commit data
------------------
Branch: ni/coolstream
Commit: ebc621f3b2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)

Origin message was:
------------------
- rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now

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

------------------
This commit was generated by Migit
2017-09-29 08:27:42 +02:00
Jacek Jendrzej
3d2186eafe Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e696818d1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-27 09:58:18 +02:00
vanhofen
a33872ac9c fix some timout-off-bugs in epgplus, epgview, eventlist and filebrowser
Origin commit data
------------------
Branch: ni/coolstream
Commit: f0e7069878
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- fix some timout-off-bugs in epgplus, epgview, eventlist and filebrowser

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

------------------
This commit was generated by Migit
2017-09-27 09:57:10 +02:00
vanhofen
2bcb920dae fix some timout-off-bugs in epgplus, epgview, eventlist and filebrowser
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5b8f7b86bf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- fix some timout-off-bugs in epgplus, epgview, eventlist and filebrowser

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

------------------
This commit was generated by Migit
2017-09-27 08:53:13 +02:00
vanhofen
f3f0829b2a Revert "epgview: swap RC_info and RC_help in EPG view"
This reverts commit 69391f8dd5.

Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: eba2c14d8f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-26 (Tue, 26 Sep 2017)



------------------
This commit was generated by Migit
2017-09-26 16:08:55 +02:00
vanhofen
553da74b03 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/driver/fb_accel_sti.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: b3319a4561
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-26 (Tue, 26 Sep 2017)



------------------
This commit was generated by Migit
2017-09-26 16:01:46 +02:00