Commit Graph

241 Commits

Author SHA1 Message Date
vanhofen
afe5368cc1 eventlist: small design reworks ...
* rename some variables and functions
* small cleanups
* add shadow to gui-elements; need more fixes

FIXME: progressbar (painted by paintItem()) isn't displayed


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7160d47850
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-19 (Mon, 19 Jun 2017)

Origin message was:
------------------
- eventlist: small design reworks ...

* rename some variables and functions
* small cleanups
* add shadow to gui-elements; need more fixes

FIXME: progressbar (painted by paintItem()) isn't displayed


------------------
This commit was generated by Migit
2017-06-19 22:38:39 +02:00
vanhofen
4f132f64d8 eventlist: use CComponentsScrollbar
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5974757414
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- eventlist: use CComponentsScrollbar

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

------------------
This commit was generated by Migit
2017-06-15 13:51:27 +02:00
vanhofen
8e6aebc8d4 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/icons/headers/pictureviewer.png
	data/locale/english.locale
	src/global.h
	src/gui/components/cc_frm_footer.h
	src/gui/eventlist.cpp
	src/gui/pictureviewer.cpp
	src/gui/widget/icons.h
	src/gui/widget/menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a8ef409ff6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)



------------------
This commit was generated by Migit
2017-06-15 10:37:41 +02:00
Thilo Graf
42d6c768fc CEventList: Move channel name to left side
Center place is reserved for logo


Origin commit data
------------------
Branch: ni/coolstream
Commit: 14ea1c3a31
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)



------------------
This commit was generated by Migit
2017-06-15 01:01:54 +02:00
vanhofen
7d168259c2 eventlist: fix calculation of theight; ...
FONT_TYPE_EVENTLIST_TITLE isn't used in header


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3e0986e16e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)

Origin message was:
------------------
- eventlist: fix calculation of theight; ...

FONT_TYPE_EVENTLIST_TITLE isn't used in header


------------------
This commit was generated by Migit
2017-05-23 18:05:32 +02:00
vanhofen
8a0e162d85 eventlist: bind display of channelogo to g_settings.channellist_show_channellogo
Origin commit data
------------------
Branch: ni/coolstream
Commit: af59d90248
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)

Origin message was:
------------------
- eventlist: bind display of channelogo to g_settings.channellist_show_channellogo

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

------------------
This commit was generated by Migit
2017-05-23 17:58:53 +02:00
gixxpunk
c43e77c038 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ad61c7e183
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-12 (Fri, 12 May 2017)


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

------------------
This commit was generated by Migit
2017-05-12 08:42:16 +02:00
Thilo Graf
064b2cc588 cc_frm_header.cpp/h: remove CTextBox types for title allignment
Title object has only width of current text content. This causes CTextBox
types have not a really visible effect. Now we have only three align types for title
and these are related to cc-text object position.

Involved classes adjusted too.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 942a27e3ef
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-11 (Thu, 11 May 2017)



------------------
This commit was generated by Migit
2017-05-11 12:15:16 +02:00
vanhofen
ff37c99f40 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 71b9627b6c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)



------------------
This commit was generated by Migit
2017-05-08 23:46:54 +02:00
vanhofen
248fca8a7a eventlist: minor cosmetics;
rename getPrvNextChannelName() to getChannelNames()


Origin commit data
------------------
Branch: ni/coolstream
Commit: edb4ce3e4f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)

Origin message was:
------------------
- eventlist: minor cosmetics;

rename getPrvNextChannelName() to getChannelNames()


------------------
This commit was generated by Migit
2017-05-08 21:08:23 +02:00
vanhofen
49601b7909 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: bfe33826c6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)


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

------------------
This commit was generated by Migit
2017-05-08 20:51:21 +02:00
Jacek Jendrzej
f35bc8f430 supplement 2 to bdb2607b8e
Origin commit data
------------------
Branch: ni/coolstream
Commit: d051691f89
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-08 (Mon, 08 May 2017)


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

------------------
This commit was generated by Migit
2017-05-08 19:43:36 +02:00
Jacek Jendrzej
cdd0bec2c7 supplement to bdb2607b8e
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5dc4424d96
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-08 (Mon, 08 May 2017)


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

------------------
This commit was generated by Migit
2017-05-08 18:02:04 +02:00
vanhofen
413a019430 eventlist: add new button for epg-plus
Origin commit data
------------------
Branch: ni/coolstream
Commit: caf0c9a166
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)

Origin message was:
------------------
- eventlist: add new button for epg-plus

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

------------------
This commit was generated by Migit
2017-05-08 17:51:18 +02:00
Jacek Jendrzej
bdb2607b8e src/gui/eventlist.cpp show prev next channel name on start
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5f9f82b8e6
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-08 (Mon, 08 May 2017)


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

------------------
This commit was generated by Migit
2017-05-08 17:39:30 +02:00
gixxpunk
d60bb70533 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4589862ad3
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-07 (Sun, 07 May 2017)


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

------------------
This commit was generated by Migit
2017-05-07 19:05:56 +02:00
Thilo Graf
c44c067b3a CEpgData/CEventList: use class CNaviBar for bottom box
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8f3fcc6060
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-05 (Fri, 05 May 2017)


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

------------------
This commit was generated by Migit
2017-05-06 00:02:30 +02:00
vanhofen
4da52adb39 eventlist: remove obsolete buttons from footer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8d4469feff
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-03 (Wed, 03 May 2017)

Origin message was:
------------------
- eventlist: remove obsolete buttons from footer

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

------------------
This commit was generated by Migit
2017-05-03 23:15:56 +02:00
vanhofen
43e622513a 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
------------------
Branch: ni/coolstream
Commit: 3210b958a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-03 (Wed, 03 May 2017)



------------------
This commit was generated by Migit
2017-05-03 22:57:24 +02:00
Thilo Graf
ef15f83fb1 CEventList: optimize handling of header and bottom box
Mainly to reduce flicker effects on right/left scroll.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 43fda8bc11
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-03 (Wed, 03 May 2017)



------------------
This commit was generated by Migit
2017-05-03 21:29:41 +02:00
TangoCash
981af1f699 eventlist,epgview: reduce header flickering
picked from:	https://github.com/TangoCash/neutrino-mp-cst-next
commit:	df6862963a9b29a4d0955b01a22e1061c312b17f

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

Conflicts:
 src/gui/epgview.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: e98564c8e9
Author: TangoCash <eric@loxat.de>
Date: 2017-05-03 (Wed, 03 May 2017)

Origin message was:
------------------
-eventlist,epgview: reduce header flickering

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

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

Conflicts:
  src/gui/epgview.cpp


------------------
This commit was generated by Migit
2017-05-03 21:29:41 +02:00
TangoCash
93ef2ac356 eventlist: fix segfault
Signed-off-by: Thilo Graf <dbt@novatux.de>
review required


Origin commit data
------------------
Branch: ni/coolstream
Commit: 08c4801698
Author: TangoCash <eric@loxat.de>
Date: 2017-05-03 (Wed, 03 May 2017)

Origin message was:
------------------
-eventlist: fix segfault

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


------------------
This commit was generated by Migit
2017-05-03 21:29:41 +02:00
TangoCash
1dbd9769df eventlist: fix gradient background
Signed-off-by: Thilo Graf <dbt@novatux.de>
review required


Origin commit data
------------------
Branch: ni/coolstream
Commit: ae0810e339
Author: TangoCash <eric@loxat.de>
Date: 2017-05-03 (Wed, 03 May 2017)

Origin message was:
------------------
-eventlist: fix gradient background

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


------------------
This commit was generated by Migit
2017-05-03 21:29:41 +02:00
TangoCash
bb4fd66cae eventlist,epgview: add infoviewer bottom gradient style
Signed-off-by: Thilo Graf <dbt@novatux.de>
review required


Origin commit data
------------------
Branch: ni/coolstream
Commit: 54ce85c598
Author: TangoCash <eric@loxat.de>
Date: 2017-05-03 (Wed, 03 May 2017)

Origin message was:
------------------
-eventlist,epgview: add infoviewer bottom gradient style

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


------------------
This commit was generated by Migit
2017-05-03 21:29:41 +02:00
TangoCash
b9a2458f1b eventlist: fix clock
Signed-off-by: Thilo Graf <dbt@novatux.de>
review required


Origin commit data
------------------
Branch: ni/coolstream
Commit: 099f83e819
Author: TangoCash <eric@loxat.de>
Date: 2017-05-03 (Wed, 03 May 2017)

Origin message was:
------------------
-eventlist: fix clock

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


------------------
This commit was generated by Migit
2017-05-03 21:29:41 +02:00
TangoCash
e36f7ccecd 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
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2017-05-03 21:29:41 +02:00
vanhofen
3c5a9a5d88 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a34a8992d4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-24 (Mon, 24 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-24 12:56:51 +02:00
vanhofen
a2cab1dffa scrollbars: avoid usage of COL_SCROLLBAR_PASSIVE_PLUS_0 ...
... outside of CComponentsScrollBar(). Since the color-changes in
cd80e26 the non-CC scrollbars looks weird.


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

Origin message was:
------------------
- scrollbars: avoid usage of COL_SCROLLBAR_PASSIVE_PLUS_0 ...

... outside of CComponentsScrollBar(). Since the color-changes in
cd80e26 the non-CC scrollbars looks weird.


------------------
This commit was generated by Migit
2017-04-24 12:29:52 +02:00
vanhofen
5bc6b7c1a1 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: 7c12bba6e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-13 (Thu, 13 Apr 2017)



------------------
This commit was generated by Migit
2017-04-13 10:02:31 +02:00
vanhofen
0122d29078 eventlist: use OFFSET defines for right infobox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a1f174b80a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-12 (Wed, 12 Apr 2017)

Origin message was:
------------------
- eventlist: use OFFSET defines for right infobox

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

------------------
This commit was generated by Migit
2017-04-12 09:31:21 +02:00
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
Thilo Graf
1c286a20ad CEventList: fix current channel position and ensure clean up header
Current channel name was out of center and a clean up of header
background was required because texts are only painted with transparent background and old texts are futher visible.
Now we have a clean background before repaint logo or new channel names.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 17a84f0e75
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-24 (Tue, 24 Jan 2017)



------------------
This commit was generated by Migit
2017-01-31 16:36:42 +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
Thilo Graf
a6244caf0a CEventList: fix current channel position and ensure clean up header
Current channel name was out of center and a clean up of header
background was required because texts are only painted with transparent background and old texts are futher visible.
Now we have a clean background before repaint logo or new channel names.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5e43b1f7e1
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-24 (Tue, 24 Jan 2017)



------------------
This commit was generated by Migit
2017-01-25 16:33:46 +01:00
vanhofen
dc58fffbea Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/movieplayer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 461f9f046d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-06 (Tue, 06 Dec 2016)



------------------
This commit was generated by Migit
2016-12-06 13:02:25 +01:00
vanhofen
514ae3e19d eventlist: fix icon-alignment ...
some small text-alignment fixes; use OFFSET defines


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9d949c7074
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-06 (Tue, 06 Dec 2016)

Origin message was:
------------------
- eventlist: fix icon-alignment ...

some small text-alignment fixes; use OFFSET defines


------------------
This commit was generated by Migit
2016-12-06 09:54:56 +01:00
vanhofen
8797982e76 eventlist: fix button_label size
Origin commit data
------------------
Branch: ni/coolstream
Commit: 72c1445825
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)

Origin message was:
------------------
- eventlist: fix button_label size

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

------------------
This commit was generated by Migit
2016-11-21 00:14:45 +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
e85436e185 Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 97006c6615
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-11 21:33:12 +01:00
vanhofen
081398a626 eventlist: show left/right buttons in footer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8fab6e7212
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- eventlist: show left/right buttons in footer

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

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


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

------------------
This commit was generated by Migit
2016-11-11 00:51:58 +01:00
vanhofen
cd019ed4c1 eventlist: allow windows size changes w/o neutrino restart
Origin commit data
------------------
Branch: ni/coolstream
Commit: e3306076de
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- eventlist: allow windows size changes w/o neutrino restart

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

------------------
This commit was generated by Migit
2016-11-11 00:51:32 +01:00
Thilo Graf
fd32ad9b83 Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 96ffa4778a
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-11 00:51:20 +01:00
vanhofen
87990f548e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e36759695
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-11 00:26:49 +01:00
vanhofen
f2eb47b9fc eventlist: allow gradient/radius changes w/o neutrino restart
Origin commit data
------------------
Branch: ni/coolstream
Commit: c056b56d12
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- eventlist: allow gradient/radius changes w/o neutrino restart

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

------------------
This commit was generated by Migit
2016-11-11 00:25:25 +01:00
vanhofen
b1d2a19a42 eventlist: fix right textbox in header; last char was not displayed
Origin commit data
------------------
Branch: ni/coolstream
Commit: 00ad1ecd1c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- eventlist: fix right textbox in header; last char was not displayed

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

------------------
This commit was generated by Migit
2016-11-11 00:18:43 +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
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