Commit Graph

281 Commits

Author SHA1 Message Date
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
63398f923d Revert "epgview: swap RC_info and RC_help in EPG view"
This reverts commit 3c2ba0b757.

Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Commit: eba2c14d8f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-26 (Tue, 26 Sep 2017)
2017-09-26 16:08:55 +02:00
vanhofen
fa1a2351bb Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/driver/fb_accel_sti.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp


Origin commit data
------------------
Commit: b3319a4561
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-26 (Tue, 26 Sep 2017)
2017-09-26 16:01:46 +02:00
Stefan Seyfried
3c2ba0b757 epgview: swap RC_info and RC_help in EPG view
this restores old behaviour of RC_info toggling big fonts.
RC_help toggles TMDB display (which is disabled by default anyway)


Origin commit data
------------------
Commit: 940fdf36fd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-24 (Sun, 24 Sep 2017)
2017-09-26 12:41:05 +02:00
vanhofen
0c076425eb cc_frm_header: remove CComponentsHeaderLocalized() subclass
use another constructor of CComponentsHeader() instead

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

Good idea, this I had already in mind too.


Origin commit data
------------------
Commit: 980e293517
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-21 (Wed, 21 Jun 2017)

Origin message was:
------------------
- cc_frm_header: remove CComponentsHeaderLocalized() subclass

use another constructor of CComponentsHeader() instead

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

Good idea, this I had already in mind too.
2017-06-21 10:31:22 +02:00
vanhofen
ad6ede01b2 cc_frm_header: remove CComponentsHeaderLocalized() subclass
use another constructor of CComponentsHeader() instead


Origin commit data
------------------
Commit: 92ceac6a5d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-20 (Tue, 20 Jun 2017)

Origin message was:
------------------
- cc_frm_header: remove CComponentsHeaderLocalized() subclass

use another constructor of CComponentsHeader() instead
2017-06-20 15:55:42 +02:00
vanhofen
ec37d41882 epgview: align with and height of progressbar
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 4adea23661
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-16 (Fri, 16 Jun 2017)

Origin message was:
------------------
- epgview: align with and height of progressbar

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-16 12:01:45 +02:00
vanhofen
e763541133 epgview: align with and height of progressbar
Origin commit data
------------------
Commit: aec47e2ec9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-16 (Fri, 16 Jun 2017)

Origin message was:
------------------
- epgview: align with and height of progressbar
2017-06-16 11:10:31 +02:00
vanhofen
bfb41fbd8b epgview: use CComponentsScrollbar
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 4255640ce1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- epgview: use CComponentsScrollbar

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-15 21:52:18 +02:00
vanhofen
94b0e077bd epgview: use CComponentsScrollbar
Origin commit data
------------------
Commit: 5888627c8d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- epgview: use CComponentsScrollbar
2017-06-15 16:18:25 +02:00
vanhofen
cb3b3b9749 epgview: fix green button behavior in imdb-view
Origin commit data
------------------
Commit: 37846b7a2f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)

Origin message was:
------------------
- epgview: fix green button behavior in imdb-view
2017-05-30 15:57:49 +02:00
vanhofen
d84bd94438 icons: add rating-stars to icons.h; version 2.0
Origin commit data
------------------
Commit: 76928f97a1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-29 (Mon, 29 May 2017)

Origin message was:
------------------
- icons: add rating-stars to icons.h; version 2.0
2017-05-29 16:30:39 +02:00
vanhofen
70bd825e23 imdb: cosmetics
Origin commit data
------------------
Commit: 4ef7333bf9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-29 (Mon, 29 May 2017)

Origin message was:
------------------
- imdb: cosmetics
2017-05-29 16:30:39 +02:00
vanhofen
0ff784a92d Revert "- icons: add rating-stars to icons.h to allow user's icons in ICONSDIR_VAR"
This reverts commit 5cc7f08eb6.


Origin commit data
------------------
Commit: 217a4ddd00
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-29 (Mon, 29 May 2017)
2017-05-29 15:05:31 +02:00
vanhofen
8b49f8bd59 Revert "- epgview: fix starbar/rating position"
This reverts commit ae86c8f542.


Origin commit data
------------------
Commit: 5f9b70cb66
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-29 (Mon, 29 May 2017)
2017-05-29 15:05:08 +02:00
vanhofen
ae86c8f542 epgview: fix starbar/rating position
Origin commit data
------------------
Commit: c6e559559f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-29 (Mon, 29 May 2017)

Origin message was:
------------------
- epgview: fix starbar/rating position
2017-05-29 14:50:57 +02:00
gixxpunk
de7d076390 Merge branch 'ni/tuxbox' of bitbucket.org:neutrino-images/ni-neutrino-hd into ni/tuxbox
Origin commit data
------------------
Commit: 230b3dfe5e
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-29 (Mon, 29 May 2017)
2017-05-29 14:01:08 +02:00
gixxpunk
f989a22b21 imdb: enable explicit search on www.imdb.com
Origin commit data
------------------
Commit: 27ad3ad04a
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-29 (Mon, 29 May 2017)

Origin message was:
------------------
- imdb: enable explicit search on www.imdb.com
2017-05-29 14:00:42 +02:00
vanhofen
5cc7f08eb6 icons: add rating-stars to icons.h to allow user's icons in ICONSDIR_VAR
Origin commit data
------------------
Commit: abdf87c367
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-29 (Mon, 29 May 2017)

Origin message was:
------------------
- icons: add rating-stars to icons.h to allow user's icons in ICONSDIR_VAR
2017-05-29 13:22:13 +02:00
vanhofen
1e3291480d imdb: localize output
Origin commit data
------------------
Commit: 47d920a3e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-29 (Mon, 29 May 2017)

Origin message was:
------------------
- imdb: localize output
2017-05-29 11:49:00 +02:00
vanhofen
ec0a5de898 imdb: change getIMDbElement() handling; function now returns a string
Origin commit data
------------------
Commit: 0b5a851514
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-29 (Mon, 29 May 2017)

Origin message was:
------------------
- imdb: change getIMDbElement() handling; function now returns a string
2017-05-29 11:49:00 +02:00
vanhofen
0983e4002b epgview: use default header font; ...
now FONT_TYPE_EPG_TITLE is obsolete and can be removed


Origin commit data
------------------
Commit: deed324a98
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)

Origin message was:
------------------
- epgview: use default header font; ...

now FONT_TYPE_EPG_TITLE is obsolete and can be removed
2017-05-23 17:58:53 +02:00
vanhofen
24b24b3e4a epgview: bind display of channelogo to g_settings.channellist_show_channellogo
Origin commit data
------------------
Commit: c9015d7bbe
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)

Origin message was:
------------------
- epgview: bind display of channelogo to g_settings.channellist_show_channellogo
2017-05-23 17:58:53 +02:00
vanhofen
c47fb666ba epgview: minor change in navibar's epg_date format
Origin commit data
------------------
Commit: dfd3cdb9a6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-07 (Sun, 07 May 2017)

Origin message was:
------------------
- epgview: minor change in navibar's epg_date format
2017-05-07 21:48:16 +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
0553e50228 CEpgData: remove unused vars
Origin commit data
------------------
Commit: bbb04bfb20
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-06 (Sat, 06 May 2017)
2017-05-06 22:46:18 +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
gixxpunk
ce02d01a5a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 115c78404b
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-04 (Thu, 04 May 2017)
2017-05-04 20:04:03 +02:00
Thilo Graf
242c20c467 CEpgData: supplement to 'fix header size'
commit: 7583714e6703a7ae9591e112726759c4070d0c68

Permanent font init is required to avoid possible crash after
changed font settings by user.


Origin commit data
------------------
Commit: 17958da28f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-04 (Thu, 04 May 2017)
2017-05-04 19:45:11 +02:00
Thilo Graf
4d00d39731 CEpgData: fix header size
Header height was bound to font size in previous versions, but new
header is using other font as default, so we have wrong height,
therefore header items could paint outside of header. This should fix this.

In future we should unify header size with other windows.


Origin commit data
------------------
Commit: 23912ba583
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-04 (Thu, 04 May 2017)
2017-05-04 16:55:43 +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
a0b1d9c43f CEpgData: optimize handling of header and bottom box
Working with existant instances and reduce flicker effects.


Origin commit data
------------------
Commit: fc805049d3
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-03 (Wed, 03 May 2017)
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
9ff141a81a epgview: fix movieinfo
Origin commit data
------------------
Commit: 5b0668cc23
Author: TangoCash <eric@loxat.de>
Date: 2017-05-03 (Wed, 03 May 2017)

Origin message was:
------------------
-epgview: fix movieinfo
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
367caafa0b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: a0624cf4a1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)
2017-04-08 14:32:18 +02:00
vanhofen
712840c394 epgview: move BIGFONT_FACTOR to settings.h
Origin commit data
------------------
Commit: ddd803d8a3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)

Origin message was:
------------------
- epgview: move BIGFONT_FACTOR to settings.h
2017-04-08 14:11:27 +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
vanhofen
cc7ad7ce1a 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
------------------
Commit: 3420991007
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)
2016-11-19 21:11:54 +01:00
Thilo Graf
373c2967dd Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Commit: 96ffa4778a
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)
2016-11-11 00:51:20 +01:00
vanhofen
350f044a33 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 98a6554d7b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-10 (Thu, 10 Nov 2016)
2016-11-10 21:39:39 +01:00
Jacek Jendrzej
d1655acd40 src/gui/epgview.cpp reset header height to single size
Origin commit data
------------------
Commit: e3136b888c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-10 (Thu, 10 Nov 2016)
2016-11-10 20:52:58 +01:00