Commit Graph

59 Commits

Author SHA1 Message Date
gixxpunk
ab0440ccaa Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 4589862ad3
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-07 (Sun, 07 May 2017)
2017-05-07 19:05:56 +02:00
Thilo Graf
0553e50228 CEpgData: remove unused vars
Origin commit data
------------------
Commit: bbb04bfb20
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-06 (Sat, 06 May 2017)
2017-05-06 22:46:18 +02:00
Thilo Graf
d423c5ac0b CEpgData/CEventList: use class CNaviBar for bottom box
Origin commit data
------------------
Commit: 8f3fcc6060
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-05 (Fri, 05 May 2017)
2017-05-06 00:02:30 +02:00
gixxpunk
ce02d01a5a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 115c78404b
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-04 (Thu, 04 May 2017)
2017-05-04 20:04:03 +02:00
Thilo Graf
4d00d39731 CEpgData: fix header size
Header height was bound to font size in previous versions, but new
header is using other font as default, so we have wrong height,
therefore header items could paint outside of header. This should fix this.

In future we should unify header size with other windows.


Origin commit data
------------------
Commit: 23912ba583
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-04 (Thu, 04 May 2017)
2017-05-04 16:55:43 +02:00
vanhofen
fc65a7b6cf Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/channellist.cpp
	src/gui/epgview.cpp
	src/gui/epgview.h
	src/gui/eventlist.cpp


Origin commit data
------------------
Commit: 3210b958a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-03 (Wed, 03 May 2017)
2017-05-03 22:57:24 +02:00
Thilo Graf
a0b1d9c43f CEpgData: optimize handling of header and bottom box
Working with existant instances and reduce flicker effects.


Origin commit data
------------------
Commit: fc805049d3
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-03 (Wed, 03 May 2017)
2017-05-03 21:29:41 +02:00
TangoCash
b3ecc2b65c eventlist,epgview: adjust style, implement new header class
picked from:	https://github.com/TangoCash/neutrino-mp-cst-next
commit:	477db186ee4f306e191035ed2201ff4fc9d70b9d

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


Origin commit data
------------------
Commit: 3ac2f99a67
Author: TangoCash <eric@loxat.de>
Date: 2017-05-03 (Wed, 03 May 2017)

Origin message was:
------------------
-eventlist,epgview: adjust style, implement new header class

picked from:	https://github.com/TangoCash/neutrino-mp-cst-next
commit:	477db186ee4f306e191035ed2201ff4fc9d70b9d

Signed-off-by: Thilo Graf <dbt@novatux.de>
review reqiured
2017-05-03 21:29:41 +02:00
vanhofen
367caafa0b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: a0624cf4a1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)
2017-04-08 14:32:18 +02:00
vanhofen
712840c394 epgview: move BIGFONT_FACTOR to settings.h
Origin commit data
------------------
Commit: ddd803d8a3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)

Origin message was:
------------------
- epgview: move BIGFONT_FACTOR to settings.h
2017-04-08 14:11:27 +02:00
vanhofen
3154424592 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/epgview.h
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: a29d0613ee
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-20 (Mon, 20 Mar 2017)
2017-03-20 14:34:45 +01:00
vanhofen
ded87fe941 move movieinfo.cpp|h from src/gui to src/driver ...
because there are no gui-elements included anymore


Origin commit data
------------------
Commit: 0b629aafc7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-20 (Mon, 20 Mar 2017)

Origin message was:
------------------
- move movieinfo.cpp|h from src/gui to src/driver ...

because there are no gui-elements included anymore
2017-03-20 14:30:44 +01:00
vanhofen
999b2cf2ce Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: af8c4b8d97
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
2017-02-12 23:01:15 +01:00
Stefan Seyfried
ee9acfe1a4 remove unnecessary sectionsdclient.h includes
Origin commit data
------------------
Commit: c14c15ea24
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-11 (Sat, 11 Feb 2017)
2017-02-12 22:48:35 +01:00
vanhofen
0707fef642 Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/epgview.h


Origin commit data
------------------
Commit: e61a23cb74
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)
2017-02-08 08:02:39 +01:00
Stefan Seyfried
4fc79052ea move gui/color.h includes from headers to cpp files
Origin commit data
------------------
Commit: 648c00f26a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-07 17:23:42 +01:00
Stefan Seyfried
f6d5a96838 replace fontrenderer.h include with forward declaration
in order to flatten the build dependency tree further, include
fontrenderer.h directly where needed, in header files a forward
declaration is enough


Origin commit data
------------------
Commit: 2303d94300
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-07 17:23:42 +01:00
Stefan Seyfried
8b4c30e093 replace framebuffer.h include with forward declaration
instead of including framebuffer.h almost everywhere, replace it with
class CFrameBuffer forward declarations and/or generic system includes.
Add a hack to define fb_pixel_t to config.h (one reason for
framebuffer.h includes was the fb_pixel_t define)


Origin commit data
------------------
Commit: e490f84ea8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-07 17:23:42 +01:00
vanhofen
e8e319215b Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Commit: 1ef027bdca
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-10 (Wed, 10 Aug 2016)
2016-08-10 16:01:20 +02:00
vanhofen
964ad94a87 epgview: show progressbar in movieplayer mode
Origin commit data
------------------
Commit: de74242310
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-10 (Wed, 10 Aug 2016)

Origin message was:
------------------
- epgview: show progressbar in movieplayer mode
2016-08-10 15:53:11 +02:00
vanhofen
f0ddecb625 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Commit: 7dbda6c25e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-10 (Wed, 10 Aug 2016)
2016-08-10 13:02:18 +02:00
vanhofen
7a90c723d8 epgview: fix bigfonts switch in movieplayer mode
Origin commit data
------------------
Commit: a6875eb3f3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-10 (Wed, 10 Aug 2016)

Origin message was:
------------------
- epgview: fix bigfonts switch in movieplayer mode
2016-08-10 12:58:43 +02:00
vanhofen
6faa23a177 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Commit: 9613ee37d1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-10 (Wed, 10 Aug 2016)
2016-08-10 12:19:02 +02:00
vanhofen
3202d27319 epgview: fix content of small bottom box in movieplayer mode
Origin commit data
------------------
Commit: 99de005c68
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-10 (Wed, 10 Aug 2016)

Origin message was:
------------------
- epgview: fix content of small bottom box in movieplayer mode
2016-08-10 12:17:16 +02:00
vanhofen
cb9bdf1577 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/moviebrowser.cpp


Origin commit data
------------------
Commit: 9f8499d661
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-09 (Tue, 09 Aug 2016)
2016-08-09 15:37:20 +02:00
vanhofen
29b2eab290 epgview: add extended movie info; code from movieinfo.cpp
comment out unused showMovieInfo() in movieinfo.cpp


Origin commit data
------------------
Commit: 766c4fd9c8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-09 (Tue, 09 Aug 2016)

Origin message was:
------------------
- epgview: add extended movie info; code from movieinfo.cpp

comment out unused showMovieInfo() in movieinfo.cpp
2016-08-09 14:13:19 +02:00
vanhofen
0279707f1e epgview: fix segfault, when imdb cover is saved in moviebrowser
Origin commit data
------------------
Commit: 979c109dbf
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-07 (Sun, 07 Aug 2016)

Origin message was:
------------------
- epgview: fix segfault, when imdb cover is saved in moviebrowser
2016-08-07 00:33:00 +02:00
vanhofen
116c1c8704 allow tmdb in moviebrowser/movieplayer to satisfy Knicko ;)
Origin commit data
------------------
Commit: a66b6677ab
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-03 (Wed, 03 Aug 2016)

Origin message was:
------------------
- allow tmdb in moviebrowser/movieplayer to satisfy Knicko ;)
2016-08-03 00:53:41 +02:00
vanhofen
fe1e97ad50 epgview: rework imdb view; allow tmdb view
* needs rework; not happy about key assignment
 ('info -> info -> info' should close epgview, it's historically)
* mix imdb view with tmdb description
* align to cst-git; remove many of our old code to keep it easy in sync


Origin commit data
------------------
Commit: d395d42133
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-03 (Wed, 03 Aug 2016)

Origin message was:
------------------
- epgview: rework imdb view; allow tmdb view

* needs rework; not happy about key assignment
 ('info -> info -> info' should close epgview, it's historically)
* mix imdb view with tmdb description
* align to cst-git; remove many of our old code to keep it easy in sync
2016-08-03 00:52:18 +02:00
vanhofen
cf5fb865fa epgview/imdb: rename bool 'imdb_activ' to 'imdb_active'
Origin commit data
------------------
Commit: d9e78fac28
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-02 (Tue, 02 Aug 2016)

Origin message was:
------------------
- epgview/imdb: rename bool 'imdb_activ' to 'imdb_active'
2016-08-02 13:05:06 +02:00
vanhofen
d68e5e79c9 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Commit: ee90a7e353
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-02 (Tue, 02 Aug 2016)
2016-08-02 12:51:05 +02:00
vanhofen
a72ab43971 epgview: rename bool 'tmdbtoggle' to 'tmdb_active'
Origin commit data
------------------
Commit: 7df061947e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-02 (Tue, 02 Aug 2016)

Origin message was:
------------------
- epgview: rename bool 'tmdbtoggle' to 'tmdb_active'
2016-08-02 12:48:18 +02:00
vanhofen
edd34162b4 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Commit: 5e3842cb51
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-02 (Tue, 02 Aug 2016)
2016-08-02 11:26:37 +02:00
vanhofen
2c134ac53a epgview: rename bool 'cover' to 'has_cover'
Origin commit data
------------------
Commit: a4ffdcd413
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-02 (Tue, 02 Aug 2016)

Origin message was:
------------------
- epgview: rename bool 'cover' to 'has_cover'
2016-08-02 10:28:49 +02:00
vanhofen
2561ecf644 add/use //NI tags instead of /*NI*/; just cosmetic changes
Origin commit data
------------------
Commit: 7927af07cf
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-31 (Sun, 31 Jul 2016)

Origin message was:
------------------
- add/use //NI tags instead of /*NI*/; just cosmetic changes
2016-07-31 21:04:37 +02:00
vanhofen
a466b03c59 disable new tmdb code; we use imdb
Origin commit data
------------------
Commit: a05c67187f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-31 (Sun, 31 Jul 2016)

Origin message was:
------------------
- disable new tmdb code; we use imdb
2016-07-31 16:33:36 +02:00
vanhofen
11d7e96980 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Commit: 28331cc635
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-31 (Sun, 31 Jul 2016)
2016-07-31 16:24:39 +02:00
vanhofen
0648bec1c9 Revert "- disable new tmdb code; we use imdb"
This reverts commit 8bd42933ef.


Origin commit data
------------------
Commit: 3eb2b8aaf4
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-31 (Sun, 31 Jul 2016)
2016-07-31 16:18:27 +02:00
Jacek Jendrzej
c3fbfd9cb3 src/gui/epgview.cpp use show function for mp info view
Origin commit data
------------------
Commit: bedd37b1af
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-07-30 (Sat, 30 Jul 2016)
2016-07-30 18:54:53 +02:00
vanhofen
8bd42933ef disable new tmdb code; we use imdb
Origin commit data
------------------
Commit: 073d867d81
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-29 (Fri, 29 Jul 2016)

Origin message was:
------------------
- disable new tmdb code; we use imdb
2016-07-29 21:10:13 +02:00
vanhofen
14b27e9905 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/epgview.cpp
	src/gui/infoviewer.cpp


Origin commit data
------------------
Commit: 4999c74ac0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-29 (Fri, 29 Jul 2016)
2016-07-29 20:55:15 +02:00
TangoCash
9d86befe20 adding Live-TV look alike EPG-Infos in Movieplayer incl. TMDB
Origin commit data
------------------
Commit: 44ca60eb17
Author: TangoCash <eric@loxat.de>
Date: 2016-03-07 (Mon, 07 Mar 2016)
2016-07-28 15:02:20 +02:00
vanhofen
4cf2b60722 NI \o/
Origin commit data
------------------
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)
2016-05-19 22:59:54 +02:00
Thilo Graf
1538428615 CEpgData: hold header instance to prevent flickering on page scroll
Header class is not required here, square-object is adequate,
therefore usage of title text object is justified and can be used on stack,
heap is not required in this case.
Note: Header class provides a title parameter and could do this at once.


Origin commit data
------------------
Commit: 14da9e510b
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-03-22 (Tue, 22 Mar 2016)
2016-03-22 13:15:18 +01:00
[CST] Focus
1caaaf0b99 gui/epgview.cpp: attribute with TMDB logo along with stars
Origin commit data
------------------
Commit: 7680cf156f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-07 (Mon, 07 Mar 2016)
2016-03-07 14:34:29 +03:00
Michael Liebmann
4bdb765185 tmdb: Suppress cover flickering when scrolling
Origin commit data
------------------
Commit: 99a9cfe8c6
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-03-04 (Fri, 04 Mar 2016)
2016-03-04 14:15:50 +01:00
TangoCash
f2791f7f9c neutrino-mp tmdb -> neutrino-hd
Origin commit data
------------------
Commit: f07b01b418
Author: TangoCash <eric@loxat.de>
Date: 2016-03-04 (Fri, 04 Mar 2016)
2016-03-04 14:15:50 +01:00
vanhofen
87689bdf1e adzap: use adzap-thread in epg view; remove pseudo timertype ADZAP
Origin commit data
------------------
Commit: 19154192db
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-29 (Mon, 29 Feb 2016)

Origin message was:
------------------
- adzap: use adzap-thread in epg view; remove pseudo timertype ADZAP
2016-03-03 11:18:15 +01:00
Jacek Jendrzej
b91133af92 epgview.cpp: -add adzap
Origin commit data
------------------
Commit: 3818875a80
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-02-04 (Tue, 04 Feb 2014)
2014-02-04 19:32:47 +01:00
Jacek Jendrzej
28883ba73b src/gui/epgview.cpp: further corrections for followlist
Origin commit data
------------------
Commit: 5e284c68c3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-04 (Sun, 04 Nov 2012)
2012-11-04 22:13:36 +01:00