Commit Graph

355 Commits

Author SHA1 Message Date
vanhofen
54d7d92401 Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/epgview.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: e61a23cb74
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)



------------------
This commit was generated by Migit
2017-02-08 08:02:39 +01:00
Stefan Seyfried
86f609bc17 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
------------------
Branch: ni/coolstream
Commit: 2303d94300
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)



------------------
This commit was generated by Migit
2017-02-07 17:23:42 +01:00
Michael Liebmann
1d472ccf02 CInfoViewer: Use flag Font::FULLBG for RenderString()
dependent on g_settings.theme.infobar_gradient_*


Origin commit data
------------------
Branch: ni/coolstream
Commit: a7ef709e55
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-25 (Wed, 25 Jan 2017)



------------------
This commit was generated by Migit
2017-01-31 16:36:42 +01:00
Thilo Graf
1eb76c353d CInfoViewer: enable kill text items after killed title
This causes repaint text on next view of infobar.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0de9490326
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-23 (Mon, 23 Jan 2017)



------------------
This commit was generated by Migit
2017-01-31 16:36:42 +01:00
Thilo Graf
4b52331066 Experimental try to rework isPainted()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 26eb4d079b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-19 (Thu, 19 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-31 16:36:41 +01:00
vanhofen
37030339ad Merge branch 'pu/font' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/screensaver.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 47d0b6efb5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-25 (Wed, 25 Jan 2017)



------------------
This commit was generated by Migit
2017-01-25 21:02:22 +01:00
Michael Liebmann
31ce3ec966 CInfoViewer: Use flag Font::FULLBG for RenderString()
dependent on g_settings.theme.infobar_gradient_*


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2b24da376c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-25 (Wed, 25 Jan 2017)



------------------
This commit was generated by Migit
2017-01-25 16:33:47 +01:00
Thilo Graf
bd0c404cf6 CInfoViewer: enable kill text items after killed title
This causes repaint text on next view of infobar.


Origin commit data
------------------
Branch: ni/coolstream
Commit: fb541268f5
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-23 (Mon, 23 Jan 2017)



------------------
This commit was generated by Migit
2017-01-25 16:33:46 +01:00
Thilo Graf
8877619610 Experimental try to rework isPainted()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9d3a968506
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-19 (Thu, 19 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-25 16:33:46 +01:00
FlatTV
902cc57d77 OSD Menu: Add progressbar color
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2570e06e7d
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-12-26 (Mon, 26 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-26 14:58:51 +01:00
vanhofen
a413bfb40d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/lua/lua_misc.cpp
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h


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



------------------
This commit was generated by Migit
2016-11-19 21:11:54 +01:00
Thilo Graf
4d952e9f00 CInfoViewer: add missing shadow for timescale
enableShadow() needs enum option.


Origin commit data
------------------
Branch: ni/coolstream
Commit: c8ad32b1e4
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-15 (Tue, 15 Nov 2016)



------------------
This commit was generated by Migit
2016-11-15 19:00:21 +01:00
Thilo Graf
0018c2b158 Merge branch 'master' into pu/msgbox
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3efaac5725
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-10 (Thu, 10 Nov 2016)



------------------
This commit was generated by Migit
2016-11-10 10:27:22 +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
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
Thilo Graf
8b6a60f100 Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ab9bf2ffa6
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-02 21:05:36 +01:00
vanhofen
cadcab4744 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e3648ef31
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-31 (Mon, 31 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-31 23:23:36 +01:00
Jacek Jendrzej
8412a9b608 fix possible segfault and negative height
Origin commit data
------------------
Branch: ni/coolstream
Commit: b8849d53b5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-10-31 (Mon, 31 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-31 15:53:29 +01:00
Thilo Graf
8ca8486085 Shadow: try to optimize shadow areas
* cleanup inner part of box on round corners, frames considered
* adopt implementations in some gui classes
* some debug lines removed
* test menu adopted
* try to fix corner caluculation to avoid transparent holes


Origin commit data
------------------
Branch: ni/coolstream
Commit: a17d61de8c
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-30 (Tue, 30 Aug 2016)



------------------
This commit was generated by Migit
2016-10-24 10:31:25 +02:00
vanhofen
3739b4de04 Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/components/cc_detailsline.h
	src/gui/components/cc_item_infobox.h
	src/gui/infoviewer.cpp
	src/gui/upnpbrowser.cpp
	src/gui/widget/keyboard_input.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a70a3f78e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)



------------------
This commit was generated by Migit
2016-10-10 16:45:30 +02:00
vanhofen
bb756163b1 rename customcolor.h -> color_custom.h; reduce unneeded inludes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 104d21e784
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- rename customcolor.h -> color_custom.h; reduce unneeded inludes

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

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
vanhofen
b59278067e rename SHADOW_OFFSET -> OFFSET_SHADOW
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5d450c60d3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- rename SHADOW_OFFSET -> OFFSET_SHADOW

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

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
vanhofen
b9174571ca infoviewer: align progressbar/sigbox code to latest changes
Origin commit data
------------------
Branch: ni/coolstream
Commit: d77858683b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- infoviewer: align progressbar/sigbox code to latest changes

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

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
vanhofen
7cc0ff4e16 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 39e5880a70
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-28 (Wed, 28 Sep 2016)


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

------------------
This commit was generated by Migit
2016-09-28 21:14:17 +02:00
Thilo Graf
74e7a6901f CInfoViewer: allow fe change without new sigbox object
Origin commit data
------------------
Branch: ni/coolstream
Commit: ad189f180d
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-09-28 (Wed, 28 Sep 2016)


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

------------------
This commit was generated by Migit
2016-09-28 21:12:32 +02:00
vanhofen
a45417ba8b Revert "CInfoViewer: try to fix show current frontend before paint signallbars"
This reverts commit 224c7a0545.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 608247657c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-28 (Wed, 28 Sep 2016)



------------------
This commit was generated by Migit
2016-09-28 12:54:40 +02:00
Thilo Graf
224c7a0545 CInfoViewer: try to fix show current frontend before paint signallbars
In some constellations it is possible that the wrong fe is assigned,
so it's ensured we have the current fe assigned.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4ff40432cc
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-09-21 (Wed, 21 Sep 2016)



------------------
This commit was generated by Migit
2016-09-21 22:38:12 +02:00
vanhofen
af4767a199 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: e419a5c3b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)


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

------------------
This commit was generated by Migit
2016-09-09 10:45:45 +02:00
vanhofen
58b62b0445 add listModeKey() function to simplify these calls
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2911e638c7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- add listModeKey() function to simplify these calls

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

------------------
This commit was generated by Migit
2016-09-09 10:42:46 +02:00
Michael Liebmann
dd5f370fcc analogclock: Save background for using transparent clock images
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5d04ea65f4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-22 (Mon, 22 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-22 16:37:04 +02:00
vanhofen
1a26af0576 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 38ca43dde0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-14 (Sun, 14 Aug 2016)



------------------
This commit was generated by Migit
2016-08-14 22:05:07 +02:00
vanhofen
1c1c5a05f3 colors: some internal renamings
* INFOBAR_SHADOW to SHADOW because it's not only used in infoviewer
* INFOBAR_SHADOW_TEXT to MENUFOOT_TEXT because it's the proper name

This is in preparation to make footer colors configurable


Origin commit data
------------------
Branch: ni/coolstream
Commit: bc39d1e14e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-14 (Sun, 14 Aug 2016)

Origin message was:
------------------
- colors: some internal renamings

* INFOBAR_SHADOW to SHADOW because it's not only used in infoviewer
* INFOBAR_SHADOW_TEXT to MENUFOOT_TEXT because it's the proper name

This is in preparation to make footer colors configurable


------------------
This commit was generated by Migit
2016-08-14 21:55:18 +02:00
vanhofen
6f9255e0c4 allow tmdb in moviebrowser/movieplayer to satisfy Knicko ;)
Origin commit data
------------------
Branch: ni/coolstream
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 ;)

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

------------------
This commit was generated by Migit
2016-08-03 00:53:41 +02:00
vanhofen
45df54a682 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
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp


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



------------------
This commit was generated by Migit
2016-08-02 11:43:59 +02:00
vanhofen
97b471ebcf minor code cosmetics; no binary changes
Origin commit data
------------------
Branch: ni/coolstream
Commit: adb48f523d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-02 (Tue, 02 Aug 2016)

Origin message was:
------------------
- minor code cosmetics; no binary changes

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

------------------
This commit was generated by Migit
2016-08-02 11:36:29 +02:00
vanhofen
1d14f8630a add/use //NI tags instead of /*NI*/; just cosmetic changes
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-07-31 21:04:37 +02:00
vanhofen
dc943d450e disable new tmdb code; we use imdb
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-07-31 16:33:36 +02:00
vanhofen
d5953343ea Revert "- disable new tmdb code; we use imdb"
This reverts commit 423b4d858e.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3eb2b8aaf4
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-31 (Sun, 31 Jul 2016)



------------------
This commit was generated by Migit
2016-07-31 16:18:27 +02:00
vanhofen
423b4d858e disable new tmdb code; we use imdb
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-07-29 21:10:13 +02:00
vanhofen
7cfc6ad001 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
------------------
Branch: ni/coolstream
Commit: 4999c74ac0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-29 (Fri, 29 Jul 2016)



------------------
This commit was generated by Migit
2016-07-29 20:55:15 +02:00
TangoCash
d4cb71e80b adding Live-TV look alike EPG-Infos in Movieplayer incl. TMDB
Origin commit data
------------------
Branch: ni/coolstream
Commit: 44ca60eb17
Author: TangoCash <eric@loxat.de>
Date: 2016-03-07 (Mon, 07 Mar 2016)


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

------------------
This commit was generated by Migit
2016-07-28 15:02:20 +02:00
vanhofen
a86bc779b4 NI \o/
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)


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

------------------
This commit was generated by Migit
2016-05-19 22:59:54 +02:00
Jacek Jendrzej
beae26be1d some never read compil warning fixes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d9fbd5378
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-24 (Sun, 24 Apr 2016)


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

------------------
This commit was generated by Migit
2016-04-24 17:18:37 +02:00
Thilo Graf
d9cf02eef5 CInfoViewer: remove clock object interval allocation
Already allocated with default value (1s) by constructor and
also not required, because internal clock timer is not used here.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 74caa1a949
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-04-10 (Sun, 10 Apr 2016)



------------------
This commit was generated by Migit
2016-04-10 14:12:03 +02:00
[CST] Focus
f02dae27c7 neutrino: add webtv channel list mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 302642cee7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-23 (Wed, 23 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-23 16:36:00 +03:00
defans
da3b79ea70 infoviewer: don't handle volume keys in movieplayer
Origin commit data
------------------
Branch: ni/coolstream
Commit: de490421e3
Author: defans <defans@bluepeercrew.us>
Date: 2016-03-10 (Thu, 10 Mar 2016)

Origin message was:
------------------
- infoviewer: don't handle volume keys in movieplayer

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

------------------
This commit was generated by Migit
2016-03-10 22:23:45 +01:00
vanhofen
5ef7eb27a1 infoviewer: we don't have starttimes in livestream mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8a12d3ef8d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-03 (Thu, 03 Mar 2016)

Origin message was:
------------------
- infoviewer: we don't have starttimes in livestream mode

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

------------------
This commit was generated by Migit
2016-03-03 09:46:42 +01:00
Michael Liebmann
f21a74ff57 Display of livestream infos in IV if no EPG data available
Origin commit data
------------------
Branch: ni/coolstream
Commit: eb1826ebee
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-03-03 (Thu, 03 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-03 09:46:42 +01:00
Thilo Graf
112207f338 Infoclock: unify handling in some classes with singleton
Origin commit data
------------------
Branch: ni/coolstream
Commit: 59d9b7068e
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-02-29 (Mon, 29 Feb 2016)


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

------------------
This commit was generated by Migit
2016-02-29 08:05:05 +01:00
Thilo Graf
7428d84357 CInfoViewer: use binary operators for zap mode statements
Origin commit data
------------------
Branch: ni/coolstream
Commit: f75402e571
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-02-19 (Fri, 19 Feb 2016)


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

------------------
This commit was generated by Migit
2016-02-24 15:06:15 +01:00