Commit Graph

8512 Commits

Author SHA1 Message Date
vanhofen
30a241a40b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: f8deee994d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-09 (Wed, 09 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-09 17:16:25 +01:00
vanhofen
7ee31ecf63 controlapi: fix compiler warning
error: declaration of 'channel_id' shadows a previous local


Origin commit data
------------------
Branch: ni/coolstream
Commit: 703caef3f6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-09 (Wed, 09 Nov 2016)

Origin message was:
------------------
- controlapi: fix compiler warning

error: declaration of 'channel_id' shadows a previous local


------------------
This commit was generated by Migit
2016-11-09 17:13:43 +01:00
vanhofen
86bd9623ee Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ca4bfdf36b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-09 (Wed, 09 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-09 12:35:39 +01:00
vanhofen
efad07c007 controlapi: add epg_id to several outputs; add /control/getepgid
* /control/getepgid[?format=plain|json|xml]


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3150d9edac
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-09 (Wed, 09 Nov 2016)

Origin message was:
------------------
- controlapi: add epg_id to several outputs; add /control/getepgid

* /control/getepgid[?format=plain|json|xml]


------------------
This commit was generated by Migit
2016-11-09 11:55:44 +01:00
vanhofen
773ef5c9b8 epgview: more intensive use of offset defines in imdb code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 317dd373fe
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)

Origin message was:
------------------
- epgview: more intensive use of offset defines in imdb code

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

------------------
This commit was generated by Migit
2016-11-08 22:11:57 +01:00
vanhofen
05ef8b83da Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: f0d9adbe46
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)



------------------
This commit was generated by Migit
2016-11-08 22:07:57 +01:00
vanhofen
7c4080e761 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5b7c68825e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-08 22:05:31 +01:00
vanhofen
2149135c85 epgview: use small vertical offset around channellogo; ...
more intensive use of offset defines


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d7a924d06
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)

Origin message was:
------------------
- epgview: use small vertical offset around channellogo; ...

more intensive use of offset defines


------------------
This commit was generated by Migit
2016-11-08 22:03:44 +01:00
vanhofen
92f79c9f15 infoviewer: use small vertical offset around channellogo
Origin commit data
------------------
Branch: ni/coolstream
Commit: 21b2fbd03c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)

Origin message was:
------------------
- infoviewer: use small vertical offset around channellogo

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

------------------
This commit was generated by Migit
2016-11-08 22:02:57 +01:00
vanhofen
16d1168a28 eventlist: use small vertical offset around channellogo
Origin commit data
------------------
Branch: ni/coolstream
Commit: c9be160f20
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)

Origin message was:
------------------
- eventlist: use small vertical offset around channellogo

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

------------------
This commit was generated by Migit
2016-11-08 22:02:08 +01:00
vanhofen
5390a84504 channellist: use small vertical offset around channellogo
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8f625c3d27
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)

Origin message was:
------------------
- channellist: use small vertical offset around channellogo

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

------------------
This commit was generated by Migit
2016-11-08 22:00:51 +01:00
vanhofen
ebc3ccba12 moviebrowser: simplify channellogo scaling code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1590f4a276
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)

Origin message was:
------------------
- moviebrowser: simplify channellogo scaling code

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

------------------
This commit was generated by Migit
2016-11-08 22:00:08 +01:00
vanhofen
2a7db99c6a Merge branch 'master' into pu/moviebrowser
Origin commit data
------------------
Branch: ni/coolstream
Commit: 30333ab2e4
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-08 21:54:51 +01:00
vanhofen
14cb560f5d channellist: fix epg for webtv channels
Origin commit data
------------------
Branch: ni/coolstream
Commit: b59527e987
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)

Origin message was:
------------------
- channellist: fix epg for webtv channels

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

------------------
This commit was generated by Migit
2016-11-08 21:48:51 +01:00
Jacek Jendrzej
1d22fadc6b src/gui/osd_setup.cpp supplement to d2ab0e9c , fix segfault if clock is NULL#
Origin commit data
------------------
Branch: ni/coolstream
Commit: ddd9bd3ca9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-07 (Mon, 07 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-07 22:54:53 +01:00
vanhofen
ea9e977f03 Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8d598b3d28
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-07 22:21:35 +01:00
vanhofen
de05882085 moviebrowser: use small offset in header to display channellogo
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9b79662575
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- moviebrowser: use small offset in header to display channellogo

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

------------------
This commit was generated by Migit
2016-11-07 21:11:13 +01:00
vanhofen
c5a2d47f51 listbox/moviebrowser: replace internal offsets with global defines
Origin commit data
------------------
Branch: ni/coolstream
Commit: b24ec63577
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- listbox/moviebrowser: replace internal offsets with global defines

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

------------------
This commit was generated by Migit
2016-11-07 21:10:21 +01:00
vanhofen
16245bdc76 settings.h: add OFFSET_INNER_MIN define
Origin commit data
------------------
Branch: ni/coolstream
Commit: 11383271ad
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- settings.h: add OFFSET_INNER_MIN define

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

------------------
This commit was generated by Migit
2016-11-07 21:09:45 +01:00
vanhofen
f1160e84c0 cc_frm_header: use OFFSET define
Origin commit data
------------------
Branch: ni/coolstream
Commit: 15e24a3e66
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- cc_frm_header: use OFFSET define

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

------------------
This commit was generated by Migit
2016-11-07 21:08:51 +01:00
vanhofen
4fb7d29886 Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0159ed78a0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-07 20:42:11 +01:00
vanhofen
3ec6e4bae1 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: de468d8016
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-07 20:40:57 +01:00
TangoCash
0ae28ef185 fix epgtitle
Origin commit data
------------------
Branch: ni/coolstream
Commit: 32c6eaf031
Author: TangoCash <eric@loxat.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-07 20:36:34 +01:00
FlatTV
36aa57d882 Merge branch 'ni/tuxbox' of bitbucket.org:neutrino-images/ni-neutrino-hd into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1915f59d91
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-07 17:35:54 +01:00
vanhofen
4bdef16c58 moviebrowser: increase default browserFrameHeight
Origin commit data
------------------
Branch: ni/coolstream
Commit: 16dfc2d5e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- moviebrowser: increase default browserFrameHeight

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

------------------
This commit was generated by Migit
2016-11-07 14:50:50 +01:00
vanhofen
5184ca6657 Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/widget/listframe.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: aa2517293f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)



------------------
This commit was generated by Migit
2016-11-07 13:48:21 +01:00
vanhofen
8b356f92b7 Merge branch 'master' into pu/moviebrowser
Origin commit data
------------------
Branch: ni/coolstream
Commit: c65dac6283
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-07 13:46:01 +01:00
vanhofen
b64f151731 moviebrowser: allow round borders in filter selection
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ca710ed4b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- moviebrowser: allow round borders in filter selection

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

------------------
This commit was generated by Migit
2016-11-07 13:45:55 +01:00
vanhofen
008d9e17aa listframe: allow round borders
Origin commit data
------------------
Branch: ni/coolstream
Commit: c7942adb8f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- listframe: allow round borders

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

------------------
This commit was generated by Migit
2016-11-07 13:45:55 +01:00
vanhofen
70a2e46814 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0f03766246
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-07 10:14:17 +01:00
vanhofen
64bf5d3494 timerlist: just small code cosmetics
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8ac3b64e75
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- timerlist: just small code cosmetics

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

------------------
This commit was generated by Migit
2016-11-07 10:13:04 +01:00
vanhofen
b2d2b3486e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a5632fdd76
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-06 21:08:43 +01:00
vanhofen
13f171b6a5 epgview: use movie-info's channelname in movieplayer mode to get channellogo
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3b25694983
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)

Origin message was:
------------------
- epgview: use movie-info's channelname in movieplayer mode to get channellogo

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

------------------
This commit was generated by Migit
2016-11-06 20:54:26 +01:00
vanhofen
58192b2280 acinclude.m4: fix WEBTVDIR
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3a0c196513
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)

Origin message was:
------------------
- acinclude.m4: fix WEBTVDIR

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

------------------
This commit was generated by Migit
2016-11-06 20:52:14 +01:00
FlatTV
80495e16e5 timerlist: try to fix segfault in askUserOnTimerConflict()
Origin commit data
------------------
Branch: ni/coolstream
Commit: b70160a992
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)

Origin message was:
------------------
- timerlist: try to fix segfault in askUserOnTimerConflict()

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

------------------
This commit was generated by Migit
2016-11-06 20:51:09 +01:00
vanhofen
2c2e712af5 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7b469ff17d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-06 20:30:18 +01:00
FlatTV
06d6dd915c capmt: set rmode only if recording channel use CI
Origin commit data
------------------
Branch: ni/coolstream
Commit: 07c090b9cc
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-06 10:46:50 +01:00
FlatTV
f8a395eba5 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 53016b4818
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-06 08:15:03 +01:00
vanhofen
ccc9e0c65d locale: update slovak; thx to Pr0metheus
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7cbe38e249
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)

Origin message was:
------------------
- locale: update slovak; thx to Pr0metheus

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

------------------
This commit was generated by Migit
2016-11-05 22:15:49 +01:00
vanhofen
a6e101a42a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3eca5d6bab
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-05 21:22:15 +01:00
Thilo Graf
09beeabc34 CComponentsInfoBox: ensure matching object height after assigned image
Images are not defined with constructor, so it is possible we must
consider the image height after called setPicture() methode.
This is important if an infobox sould be
added into a cc form object. This avoids overlapping of dynamic added items.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 18695fb0c9
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)



------------------
This commit was generated by Migit
2016-11-05 21:17:31 +01:00
vanhofen
0f3d453a5b Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 84d2cfab81
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-05 21:11:46 +01:00
vanhofen
11b0ea0b84 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e893472e77
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-05 21:11:37 +01:00
vanhofen
cbf9a2d128 Merge branch 'master' into pu/moviebrowser
Origin commit data
------------------
Branch: ni/coolstream
Commit: 664bd8dcf9
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-05 21:09:27 +01:00
vanhofen
0e3c24452f timermanager: try to fix successive timers
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c74d0bc3b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)

Origin message was:
------------------
- timermanager: try to fix successive timers

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

------------------
This commit was generated by Migit
2016-11-05 21:07:12 +01:00
Thilo Graf
c782bff2b4 CComponentsInfoBox: fix missing calculation of image position with parent
Origin commit data
------------------
Branch: ni/coolstream
Commit: 90a693a1ec
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-04 (Fri, 04 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-04 23:56:29 +01:00
vanhofen
fa63ad16f7 deutsch.locale: minor changes in menu.hint_record_tevents
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7276489faf
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-04 (Fri, 04 Nov 2016)

Origin message was:
------------------
- deutsch.locale: minor changes in menu.hint_record_tevents

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

------------------
This commit was generated by Migit
2016-11-04 22:30:21 +01:00
vanhofen
15a345b484 cablex.xml: update Unitymedia; thx to klauser
Origin commit data
------------------
Branch: ni/coolstream
Commit: bf987b7478
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-04 (Fri, 04 Nov 2016)

Origin message was:
------------------
- cablex.xml: update Unitymedia; thx to klauser

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

------------------
This commit was generated by Migit
2016-11-04 16:49:01 +01:00
vanhofen
ea127a5d37 cablex.xml: update Unitymedia; thx to klauser
Origin commit data
------------------
Branch: ni/coolstream
Commit: b94f35421a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-04 (Fri, 04 Nov 2016)

Origin message was:
------------------
- cablex.xml: update Unitymedia; thx to klauser

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

------------------
This commit was generated by Migit
2016-11-04 16:46:47 +01:00
vanhofen
e98ff3856b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7b92927555
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-04 (Fri, 04 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-04 09:07:22 +01:00