Commit Graph

9885 Commits

Author SHA1 Message Date
Michael Liebmann
d811e09cb4 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7ad599c0c4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-04-12 (Wed, 12 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-12 07:06:44 +02:00
vanhofen
f50172b2fb Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/channellist.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fca2de73e7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-11 (Tue, 11 Apr 2017)



------------------
This commit was generated by Migit
2017-04-11 23:14:03 +02:00
vanhofen
c03b2777cd channellist: a bit more offset for item; fix progressbar's width
use OFFSET defines for logo in header and in right infozone


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e6746e2aa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-11 (Tue, 11 Apr 2017)

Origin message was:
------------------
- channellist: a bit more offset for item; fix progressbar's width

use OFFSET defines for logo in header and in right infozone


------------------
This commit was generated by Migit
2017-04-11 23:12:41 +02:00
vanhofen
d291aa3c22 channellist: simplify MaxChanNr() function
Origin commit data
------------------
Branch: ni/coolstream
Commit: 763f16ccca
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-11 (Tue, 11 Apr 2017)

Origin message was:
------------------
- channellist: simplify MaxChanNr() function

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

------------------
This commit was generated by Migit
2017-04-11 23:12:41 +02:00
vanhofen
290eb19dae remove obsolete src/driver/wav.h
Origin commit data
------------------
Branch: ni/coolstream
Commit: c3a1ef47dc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-11 (Tue, 11 Apr 2017)

Origin message was:
------------------
- remove obsolete src/driver/wav.h

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

------------------
This commit was generated by Migit
2017-04-11 17:32:46 +02:00
vanhofen
21e4bf01d2 remove obsolete src/gui/dmx_tspidbandwidth.c
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9ea5bcfd74
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-11 (Tue, 11 Apr 2017)

Origin message was:
------------------
- remove obsolete src/gui/dmx_tspidbandwidth.c

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

------------------
This commit was generated by Migit
2017-04-11 17:32:46 +02:00
vanhofen
6e6ffe3fce add missing //NI tags
Origin commit data
------------------
Branch: ni/coolstream
Commit: 880020cb54
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-11 (Tue, 11 Apr 2017)

Origin message was:
------------------
- add missing //NI tags

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

------------------
This commit was generated by Migit
2017-04-11 15:55:23 +02:00
vanhofen
1d3e4189c6 epgplus: use user's setting for progressbar color
Origin commit data
------------------
Branch: ni/coolstream
Commit: 86551c38a9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)

Origin message was:
------------------
- epgplus: use user's setting for progressbar color

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

------------------
This commit was generated by Migit
2017-04-10 22:05:18 +02:00
vanhofen
54ebce58d5 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7b74446729
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-10 21:45:15 +02:00
vanhofen
9d7faaa296 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9ccfeb1249
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-10 21:45:07 +02:00
vanhofen
426defdd04 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: e793927678
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-10 21:43:54 +02:00
vanhofen
df1b65524f epgplus: add missing separationline to clearMark() function
Origin commit data
------------------
Branch: ni/coolstream
Commit: a64225c09a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)

Origin message was:
------------------
- epgplus: add missing separationline to clearMark() function

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

------------------
This commit was generated by Migit
2017-04-10 21:43:01 +02:00
vanhofen
8f10bcefef epgplus: use enlighten background toggle color
Origin commit data
------------------
Branch: ni/coolstream
Commit: 41394be62e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)

Origin message was:
------------------
- epgplus: use enlighten background toggle color

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

------------------
This commit was generated by Migit
2017-04-10 21:43:01 +02:00
vanhofen
5b6034d48f color: allow to toggle normal <-> enlighten background colors
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1c75e7f447
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)

Origin message was:
------------------
- color: allow to toggle normal <-> enlighten background colors

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

------------------
This commit was generated by Migit
2017-04-10 21:43:01 +02:00
vanhofen
83a1fd845b epgplus: fix selected handling for channelevents
Origin commit data
------------------
Branch: ni/coolstream
Commit: 25e56bf5df
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)

Origin message was:
------------------
- epgplus: fix selected handling for channelevents

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

------------------
This commit was generated by Migit
2017-04-10 21:43:01 +02:00
vanhofen
4aaf207d31 epgplus: smoother aligment for channelnumbers
Origin commit data
------------------
Branch: ni/coolstream
Commit: ab4adc92d0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)

Origin message was:
------------------
- epgplus: smoother aligment for channelnumbers

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

------------------
This commit was generated by Migit
2017-04-10 21:43:01 +02:00
Thilo Graf
4f56df91de EpgPlus: fix missing to disble clock after hided window
btw: rename header->head, for better readability


Origin commit data
------------------
Branch: ni/coolstream
Commit: 46e298823f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)



------------------
This commit was generated by Migit
2017-04-10 13:25:06 +02:00
vanhofen
a7984b7368 epgplus: add missing round corner to selected item
Origin commit data
------------------
Branch: ni/coolstream
Commit: e54e112b24
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)

Origin message was:
------------------
- epgplus: add missing round corner to selected item

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

------------------
This commit was generated by Migit
2017-04-10 13:25:06 +02:00
vanhofen
fb1e8e43a7 epgplus: use getItemColors() to get global item colors
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8f8511a612
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)

Origin message was:
------------------
- epgplus: use getItemColors() to get global item colors

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

------------------
This commit was generated by Migit
2017-04-10 13:25:06 +02:00
vanhofen
e37d471b0d Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d55c0fa77
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-10 10:42:47 +02:00
vanhofen
f1b7a1a1f6 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 69d3e6ba35
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-10 10:27:25 +02:00
vanhofen
90fa6a567e epgplus: mark framebuffer pointer in header class as unused
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8e8b95a932
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)

Origin message was:
------------------
- epgplus: mark framebuffer pointer in header class as unused

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

------------------
This commit was generated by Migit
2017-04-10 10:26:21 +02:00
vanhofen
539d98f68f epgplus: add clock and context button to header
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ae1a6b459
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)

Origin message was:
------------------
- epgplus: add clock and context button to header

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

------------------
This commit was generated by Migit
2017-04-10 10:26:21 +02:00
vanhofen
cd8ce0a23d epgplus: fix text offsets in secontary timeline
Origin commit data
------------------
Branch: ni/coolstream
Commit: 69e478c195
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)

Origin message was:
------------------
- epgplus: fix text offsets in secontary timeline

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

------------------
This commit was generated by Migit
2017-04-10 10:26:21 +02:00
vanhofen
d036259b18 epgplus: always show a progressbar in secondary timeline ...
to avoid 'design changes' when cursor is moved left or right


Origin commit data
------------------
Branch: ni/coolstream
Commit: 56302f9eb7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)

Origin message was:
------------------
- epgplus: always show a progressbar in secondary timeline ...

to avoid 'design changes' when cursor is moved left or right


------------------
This commit was generated by Migit
2017-04-10 10:26:21 +02:00
TangoCash
55e790df7a epgplus: add progressbar for current event
Origin commit data
------------------
Branch: ni/coolstream
Commit: 44a0ec422e
Author: TangoCash <eric@loxat.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)

Origin message was:
------------------
- epgplus: add progressbar for current event

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

------------------
This commit was generated by Migit
2017-04-10 10:26:21 +02:00
TangoCash
a2923c5fda epgplus: bind display of channelnumbers to channelists's setting;
fix position of channelentry


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b44c162b4
Author: TangoCash <eric@loxat.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)

Origin message was:
------------------
- epgplus: bind display of channelnumbers to channelists's setting;

fix position of channelentry


------------------
This commit was generated by Migit
2017-04-10 10:26:21 +02:00
vanhofen
b7cf1d58ea Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: bf5105aa4f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-08 16:57:43 +02:00
TangoCash
c88fafbe61 epgplus: fix detailsline;
Origin commit data
------------------
Branch: ni/coolstream
Commit: c26e85cb55
Author: TangoCash <eric@loxat.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)

Origin message was:
------------------
- epgplus: fix detailsline;

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

------------------
This commit was generated by Migit
2017-04-08 16:25:59 +02:00
vanhofen
746012780a epgplus: fix detailsline; codeblock was removed by mistake
Origin commit data
------------------
Branch: ni/coolstream
Commit: 15b028d187
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)

Origin message was:
------------------
- epgplus: fix detailsline; codeblock was removed by mistake

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

------------------
This commit was generated by Migit
2017-04-08 15:47:38 +02:00
vanhofen
aeccbe22dc Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: fb707c2ea3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-08 14:38:33 +02:00
vanhofen
ce3fb71772 epgplus: reduce frame_thickness for footerbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8470de3a48
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)

Origin message was:
------------------
- epgplus: reduce frame_thickness for footerbox

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

------------------
This commit was generated by Migit
2017-04-08 14:33:12 +02:00
vanhofen
1606092aa6 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a0624cf4a1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-08 14:32:18 +02:00
Michael Liebmann
839daf7d73 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: f0ae55707a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-04-08 (Sat, 08 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-08 14:17:34 +02:00
vanhofen
f907bfd12f epgplus: simplify detailsline handling; fix coords in hide()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 01e0ae3696
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)

Origin message was:
------------------
- epgplus: simplify detailsline handling; fix coords in hide()

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

------------------
This commit was generated by Migit
2017-04-08 14:11:28 +02:00
vanhofen
502e9ca3d6 epgplus: re-implement bigfont handling
Origin commit data
------------------
Branch: ni/coolstream
Commit: c3e49887de
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)

Origin message was:
------------------
- epgplus: re-implement bigfont handling

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

------------------
This commit was generated by Migit
2017-04-08 14:11:28 +02:00
vanhofen
19eefe7914 epgplus: use CComponenentsFooter to paint buttonbar
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0ee10f1516
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)

Origin message was:
------------------
- epgplus: use CComponenentsFooter to paint buttonbar

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

------------------
This commit was generated by Migit
2017-04-08 14:11:28 +02:00
vanhofen
3c98b77418 epgplus: add separationline to event's left side
Origin commit data
------------------
Branch: ni/coolstream
Commit: df49551258
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)

Origin message was:
------------------
- epgplus: add separationline to event's left side

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

------------------
This commit was generated by Migit
2017-04-08 14:11:28 +02:00
vanhofen
158ea7a8f6 epgplus: use new FONT_TYPE_EPGPLUS_ITEM font; ...
TODO: re-implement bigfont handling


Origin commit data
------------------
Branch: ni/coolstream
Commit: 21b25fb1fe
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)

Origin message was:
------------------
- epgplus: use new FONT_TYPE_EPGPLUS_ITEM font; ...

TODO: re-implement bigfont handling


------------------
This commit was generated by Migit
2017-04-08 14:11:28 +02:00
vanhofen
4df1b65ec0 osd_setup: add new epgplus font
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7b7430969a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)

Origin message was:
------------------
- osd_setup: add new epgplus font

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

------------------
This commit was generated by Migit
2017-04-08 14:11:28 +02:00
vanhofen
16b8793638 epgplus: add detailsline
Origin commit data
------------------
Branch: ni/coolstream
Commit: b24d55413d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)

Origin message was:
------------------
- epgplus: add detailsline

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

------------------
This commit was generated by Migit
2017-04-08 14:11:28 +02:00
vanhofen
0199ae91ad epgplus: add missing round corners to footer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9c3c6332fd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)

Origin message was:
------------------
- epgplus: add missing round corners to footer

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

------------------
This commit was generated by Migit
2017-04-08 14:11:28 +02:00
vanhofen
6c9da30dc6 epgplus: add an inner small offset and a small frame to footer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4513953607
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)

Origin message was:
------------------
- epgplus: add an inner small offset and a small frame to footer

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

------------------
This commit was generated by Migit
2017-04-08 14:11:28 +02:00
vanhofen
abac099187 epgplus: move footer-box to bottom of screen
Origin commit data
------------------
Branch: ni/coolstream
Commit: b3cc850a08
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)

Origin message was:
------------------
- epgplus: move footer-box to bottom of screen

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

------------------
This commit was generated by Migit
2017-04-08 14:11:28 +02:00
vanhofen
f05b336d90 epgplus: remove obsolete icon calculation
Origin commit data
------------------
Branch: ni/coolstream
Commit: ca20473787
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)

Origin message was:
------------------
- epgplus: remove obsolete icon calculation

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

------------------
This commit was generated by Migit
2017-04-08 14:11:28 +02:00
vanhofen
268bb32b30 epgplus: change toggle colors
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8a09c7a83f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)

Origin message was:
------------------
- epgplus: change toggle colors

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

------------------
This commit was generated by Migit
2017-04-08 14:11:28 +02:00
vanhofen
a1c9ac3b45 epgplus: use OFFSET defines
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2371ce0d01
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)

Origin message was:
------------------
- epgplus: use OFFSET defines

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

------------------
This commit was generated by Migit
2017-04-08 14:11:28 +02:00
vanhofen
ef31d89c99 epgplus: add separationline to timeline
Origin commit data
------------------
Branch: ni/coolstream
Commit: a026813ad3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)

Origin message was:
------------------
- epgplus: add separationline to timeline

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

------------------
This commit was generated by Migit
2017-04-08 14:11:28 +02:00
vanhofen
f4ce797576 epgplus: use a small dark separation line
Origin commit data
------------------
Branch: ni/coolstream
Commit: bfc94ed1bd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)

Origin message was:
------------------
- epgplus: use a small dark separation line

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

------------------
This commit was generated by Migit
2017-04-08 14:11:28 +02:00
vanhofen
3919ec9c7a epgplus: change colors in footer
Origin commit data
------------------
Branch: ni/coolstream
Commit: a702399c12
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)

Origin message was:
------------------
- epgplus: change colors in footer

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

------------------
This commit was generated by Migit
2017-04-08 14:11:28 +02:00