Commit Graph

256 Commits

Author SHA1 Message Date
vanhofen
d1cd154ef7 eventlist: use new record/timeshift/zap marker icons
Origin commit data
------------------
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
2018-01-04 16:07:46 +01:00
vanhofen
ae6ad8b758 icons: better names for currently unused NEUTRINO_ICON_MARKER_RECORD
Origin commit data
------------------
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
2018-01-04 01:14:43 +01:00
vanhofen
d6fe9b555b icons: rename and sort new marker icons
Origin commit data
------------------
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
2018-01-04 01:06:58 +01:00
vanhofen
268e94d9e3 rename IS_WEBTV => IS_WEBCHAN
Origin commit data
------------------
Commit: ebcd15da41
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- rename IS_WEBTV => IS_WEBCHAN
2017-11-03 09:36:19 +01:00
vanhofen
583f45fad7 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
------------------
Commit: 9e8dd73320
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)
2017-10-02 23:19:49 +02:00
Stefan Seyfried
c9d4fdd9cc 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
------------------
Commit: 0d9139054a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)
2017-10-02 13:43:57 +02:00
vanhofen
20451a9be6 rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
Origin commit data
------------------
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
2017-09-29 10:34:23 +02:00
vanhofen
1776ae664d rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
Origin commit data
------------------
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
2017-09-29 08:27:42 +02:00
vanhofen
6c32f7b375 fix some timout-off-bugs in epgplus, epgview, eventlist and filebrowser
Origin commit data
------------------
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
2017-09-27 09:57:10 +02:00
vanhofen
7eefaebe15 fix some timout-off-bugs in epgplus, epgview, eventlist and filebrowser
Origin commit data
------------------
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
2017-09-27 08:53:13 +02:00
vanhofen
5628badb78 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 470a8b62dd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-23 (Wed, 23 Aug 2017)
2017-08-23 15:24:38 +02:00
Jacek Jendrzej
96edd2f2c1 some inits and never read var
Origin commit data
------------------
Commit: ba600f0e5c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)
2017-08-23 12:58:26 +02:00
vanhofen
c7c36aceb1 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
------------------
Commit: 9b97705a3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-20 (Tue, 20 Jun 2017)
2017-06-20 14:24:59 +02:00
vanhofen
8b6b7c854b audioplayer: minor format changes in title box
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
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>
2017-06-20 11:25:56 +02:00
vanhofen
37cbe5ff7a 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
------------------
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
2017-06-19 22:38:39 +02:00
vanhofen
cc2a3cf3d0 eventlist: use CComponentsScrollbar
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
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>
2017-06-15 21:51:54 +02:00
vanhofen
98a8e6a129 eventlist: use CComponentsScrollbar
Origin commit data
------------------
Commit: 5974757414
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- eventlist: use CComponentsScrollbar
2017-06-15 13:51:27 +02:00
vanhofen
a4aa97f4c5 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
------------------
Commit: a8ef409ff6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
2017-06-15 10:37:41 +02:00
Thilo Graf
3df418ffed CEventList: Move channel name to left side
Center place is reserved for logo


Origin commit data
------------------
Commit: 14ea1c3a31
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
2017-06-15 01:01:54 +02:00
vanhofen
e1620dbfe8 eventlist: fix calculation of theight; ...
FONT_TYPE_EVENTLIST_TITLE isn't used in header


Origin commit data
------------------
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
2017-05-23 18:05:32 +02:00
vanhofen
a38a0b0e1d eventlist: bind display of channelogo to g_settings.channellist_show_channellogo
Origin commit data
------------------
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
2017-05-23 17:58:53 +02:00
gixxpunk
cd39eb364b Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: ad61c7e183
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-12 (Fri, 12 May 2017)
2017-05-12 08:42:16 +02:00
Thilo Graf
653c5af07c 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
------------------
Commit: 942a27e3ef
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-11 (Thu, 11 May 2017)
2017-05-11 12:15:16 +02:00
vanhofen
a76db329fa Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 71b9627b6c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)
2017-05-08 23:46:54 +02:00
vanhofen
e1b3c314cd eventlist: minor cosmetics;
rename getPrvNextChannelName() to getChannelNames()


Origin commit data
------------------
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()
2017-05-08 21:08:23 +02:00
vanhofen
794b2e60d4 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: bfe33826c6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)
2017-05-08 20:51:21 +02:00
Jacek Jendrzej
47224210cd supplement 2 to 6244405703
Origin commit data
------------------
Commit: d051691f89
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-08 (Mon, 08 May 2017)
2017-05-08 19:43:36 +02:00
Jacek Jendrzej
67f0ac7260 supplement to 6244405703
Origin commit data
------------------
Commit: 5dc4424d96
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-08 (Mon, 08 May 2017)
2017-05-08 18:02:04 +02:00
vanhofen
4fedddf2de eventlist: add new button for epg-plus
Origin commit data
------------------
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
2017-05-08 17:51:18 +02:00
Jacek Jendrzej
6244405703 src/gui/eventlist.cpp show prev next channel name on start
Origin commit data
------------------
Commit: 5f9f82b8e6
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-08 (Mon, 08 May 2017)
2017-05-08 17:39:30 +02:00
gixxpunk
ab0440ccaa Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 4589862ad3
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-07 (Sun, 07 May 2017)
2017-05-07 19:05:56 +02:00
Thilo Graf
d423c5ac0b CEpgData/CEventList: use class CNaviBar for bottom box
Origin commit data
------------------
Commit: 8f3fcc6060
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-05 (Fri, 05 May 2017)
2017-05-06 00:02:30 +02:00
vanhofen
50bc4148b7 eventlist: remove obsolete buttons from footer
Origin commit data
------------------
Commit: 8d4469feff
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-03 (Wed, 03 May 2017)

Origin message was:
------------------
- eventlist: remove obsolete buttons from footer
2017-05-03 23:15:56 +02:00
vanhofen
fc65a7b6cf Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/channellist.cpp
	src/gui/epgview.cpp
	src/gui/epgview.h
	src/gui/eventlist.cpp


Origin commit data
------------------
Commit: 3210b958a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-03 (Wed, 03 May 2017)
2017-05-03 22:57:24 +02:00
Thilo Graf
08f5820f72 CEventList: optimize handling of header and bottom box
Mainly to reduce flicker effects on right/left scroll.


Origin commit data
------------------
Commit: 43fda8bc11
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-03 (Wed, 03 May 2017)
2017-05-03 21:29:41 +02:00
TangoCash
d9aa5d0496 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
------------------
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
2017-05-03 21:29:41 +02:00
TangoCash
c092c7642d eventlist: fix segfault
Signed-off-by: Thilo Graf <dbt@novatux.de>
review required


Origin commit data
------------------
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
2017-05-03 21:29:41 +02:00
TangoCash
5d6a052efc eventlist: fix gradient background
Signed-off-by: Thilo Graf <dbt@novatux.de>
review required


Origin commit data
------------------
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
2017-05-03 21:29:41 +02:00
TangoCash
e549dcca7a eventlist,epgview: add infoviewer bottom gradient style
Signed-off-by: Thilo Graf <dbt@novatux.de>
review required


Origin commit data
------------------
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
2017-05-03 21:29:41 +02:00
TangoCash
e8a4516c6d eventlist: fix clock
Signed-off-by: Thilo Graf <dbt@novatux.de>
review required


Origin commit data
------------------
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
2017-05-03 21:29:41 +02:00
TangoCash
b3ecc2b65c eventlist,epgview: adjust style, implement new header class
picked from:	https://github.com/TangoCash/neutrino-mp-cst-next
commit:	477db186ee4f306e191035ed2201ff4fc9d70b9d

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


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

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

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

Signed-off-by: Thilo Graf <dbt@novatux.de>
review reqiured
2017-05-03 21:29:41 +02:00
vanhofen
ce5078e378 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: a34a8992d4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-24 (Mon, 24 Apr 2017)
2017-04-24 12:56:51 +02:00
vanhofen
ce494cbd38 scrollbars: avoid usage of COL_SCROLLBAR_PASSIVE_PLUS_0 ...
... outside of CComponentsScrollBar(). Since the color-changes in
9c8c262 the non-CC scrollbars looks weird.


Origin commit data
------------------
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
9c8c262 the non-CC scrollbars looks weird.
2017-04-24 12:29:52 +02:00
vanhofen
6bfa07de7d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/channellist.cpp


Origin commit data
------------------
Commit: 7c12bba6e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-13 (Thu, 13 Apr 2017)
2017-04-13 10:02:31 +02:00
vanhofen
9b51ccc6a1 eventlist: use OFFSET defines for right infobox
Origin commit data
------------------
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
2017-04-12 09:31:21 +02:00
vanhofen
0707fef642 Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/epgview.h


Origin commit data
------------------
Commit: e61a23cb74
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)
2017-02-08 08:02:39 +01:00
Stefan Seyfried
f6d5a96838 replace fontrenderer.h include with forward declaration
in order to flatten the build dependency tree further, include
fontrenderer.h directly where needed, in header files a forward
declaration is enough


Origin commit data
------------------
Commit: 2303d94300
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-07 17:23:42 +01:00
Thilo Graf
1e761b3203 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
------------------
Commit: 17a84f0e75
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-24 (Tue, 24 Jan 2017)
2017-01-31 16:36:42 +01:00
vanhofen
7fa810e183 Merge branch 'pu/font' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/screensaver.cpp


Origin commit data
------------------
Commit: 47d0b6efb5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-25 (Wed, 25 Jan 2017)
2017-01-25 21:02:22 +01:00
Thilo Graf
a71be1422b 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
------------------
Commit: 5e43b1f7e1
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-24 (Tue, 24 Jan 2017)
2017-01-25 16:33:46 +01:00