Commit Graph

260 Commits

Author SHA1 Message Date
vanhofen
b628f6d4de eventlist: re-add RC_0 to execute timerlist, because CST-hardware has no RC_timer key
Origin commit data
------------------
Branch: ni/coolstream
Commit: c06c984df0
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-03-11 (Sun, 11 Mar 2018)

Origin message was:
------------------
- eventlist: re-add RC_0 to execute timerlist, because CST-hardware has no RC_timer key

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

------------------
This commit was generated by Migit
2018-03-11 22:44:48 +01:00
vanhofen
1221b31fc6 eventlist: use RC_timer or RC_program to execute timerlist; use new timer icon
Origin commit data
------------------
Branch: ni/coolstream
Commit: a0e1cab9a0
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-03-08 (Thu, 08 Mar 2018)

Origin message was:
------------------
- eventlist: use RC_timer or RC_program to execute timerlist; use new timer icon

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

------------------
This commit was generated by Migit
2018-03-08 22:15:53 +01:00
vanhofen
a8bbad2772 framebuffer: better name for getWindowWidth/Height() functions
getScreenWidth/HeightRel() was confusing because it depends on users window settings.
Replace names in old unused framebuffer code too.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 86cdc12c8f
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-22 (Mon, 22 Jan 2018)

Origin message was:
------------------
- framebuffer: better name for getWindowWidth/Height() functions

getScreenWidth/HeightRel() was confusing because it depends on users window settings.
Replace names in old unused framebuffer code too.


------------------
This commit was generated by Migit
2018-01-22 12:06:15 +01:00
vanhofen
6257d9f269 eventlist: add small separator line between navibar and footer
Origin commit data
------------------
Branch: ni/coolstream
Commit: c2137a61c4
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-21 (Sun, 21 Jan 2018)

Origin message was:
------------------
- eventlist: add small separator line between navibar and footer

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

------------------
This commit was generated by Migit
2018-01-21 21:31:58 +01:00
vanhofen
9911dd9625 eventlist: use new record/timeshift/zap marker icons
Origin commit data
------------------
Branch: ni/coolstream
Commit: 33a35ed59c
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-04 (Thu, 04 Jan 2018)

Origin message was:
------------------
- eventlist: use new record/timeshift/zap marker icons

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

------------------
This commit was generated by Migit
2018-01-04 16:07:46 +01:00
vanhofen
5c30660edd icons: better names for currently unused NEUTRINO_ICON_MARKER_RECORD
Origin commit data
------------------
Branch: ni/coolstream
Commit: b7c43d9a62
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-04 (Thu, 04 Jan 2018)

Origin message was:
------------------
- icons: better names for currently unused NEUTRINO_ICON_MARKER_RECORD

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

------------------
This commit was generated by Migit
2018-01-04 01:14:43 +01:00
vanhofen
d6c071aec8 icons: rename and sort new marker icons
Origin commit data
------------------
Branch: ni/coolstream
Commit: 299fdda059
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-04 (Thu, 04 Jan 2018)

Origin message was:
------------------
- icons: rename and sort new marker icons

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

------------------
This commit was generated by Migit
2018-01-04 01:06:58 +01:00
vanhofen
52a5d800a4 rename IS_WEBTV => IS_WEBCHAN
Origin commit data
------------------
Branch: ni/coolstream
Commit: ebcd15da41
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- rename IS_WEBTV => IS_WEBCHAN

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

------------------
This commit was generated by Migit
2017-11-03 09:36:19 +01:00
vanhofen
463700033b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/dboxinfo.cpp
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9e8dd73320
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)



------------------
This commit was generated by Migit
2017-10-02 23:19:49 +02:00
Stefan Seyfried
ef71d00d7f remove "using namespace std" from header files
"using namespace std" in headers is considered bad practice, so move it
either into the respective cpp files or (for files which have lots of
other std::xxx usage anyway) just write it out explicitly.
Looking at the headers and the affected cpp files, one can actually see
why it is bad practice, as it's spreading very far ;-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d9139054a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)



------------------
This commit was generated by Migit
2017-10-02 13:43:57 +02:00
vanhofen
3df3b9eafe rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
Origin commit data
------------------
Branch: ni/coolstream
Commit: 99cc7f850a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)

Origin message was:
------------------
- rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now

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

------------------
This commit was generated by Migit
2017-09-29 10:34:23 +02:00
vanhofen
369436124b rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
Origin commit data
------------------
Branch: ni/coolstream
Commit: ebc621f3b2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)

Origin message was:
------------------
- rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now

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

------------------
This commit was generated by Migit
2017-09-29 08:27:42 +02:00
vanhofen
a33872ac9c fix some timout-off-bugs in epgplus, epgview, eventlist and filebrowser
Origin commit data
------------------
Branch: ni/coolstream
Commit: f0e7069878
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- fix some timout-off-bugs in epgplus, epgview, eventlist and filebrowser

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

------------------
This commit was generated by Migit
2017-09-27 09:57:10 +02:00
vanhofen
2bcb920dae fix some timout-off-bugs in epgplus, epgview, eventlist and filebrowser
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5b8f7b86bf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- fix some timout-off-bugs in epgplus, epgview, eventlist and filebrowser

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

------------------
This commit was generated by Migit
2017-09-27 08:53:13 +02:00
vanhofen
79c24b3173 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: 470a8b62dd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-23 (Wed, 23 Aug 2017)



------------------
This commit was generated by Migit
2017-08-23 15:24:38 +02:00
Jacek Jendrzej
d7856dc0ce some inits and never read var
Origin commit data
------------------
Branch: ni/coolstream
Commit: ba600f0e5c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-23 12:58:26 +02:00
vanhofen
ce2e053bff Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/components/cc_frm_scrollbar.cpp
	src/gui/eventlist.cpp
	src/gui/widget/progresswindow.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9b97705a3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-20 (Tue, 20 Jun 2017)



------------------
This commit was generated by Migit
2017-06-20 14:24:59 +02:00
vanhofen
b75a9e3f36 audioplayer: minor format changes in title box
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- audioplayer: minor format changes in title box

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


------------------
This commit was generated by Migit
2017-06-20 11:25:56 +02:00
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
625c39fa4e eventlist: use CComponentsScrollbar
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

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

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


------------------
This commit was generated by Migit
2017-06-15 21:51:54 +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