Commit Graph

10037 Commits

Author SHA1 Message Date
vanhofen
7aa4eed69b Revert "- remove obsolete ifdef's"
This reverts commit 8ce36eb9e1.


Origin commit data
------------------
Commit: a6814161a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)
2017-05-08 16:45:10 +02:00
Michael Liebmann
e768096b64 HD1 compat #2; pu/fb-setmode
Origin commit data
------------------
Commit: 894233a9db
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-05-04 (Thu, 04 May 2017)
2017-05-08 16:44:14 +02:00
Michael Liebmann
15e77032a8 HD1 compat #1; master
Origin commit data
------------------
Commit: db9d1599ea
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-05-04 (Thu, 04 May 2017)
2017-05-08 16:39:16 +02:00
vanhofen
9e75ed21f8 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/epgplus.cpp


Origin commit data
------------------
Commit: 429d510ef1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)
2017-05-08 16:23:25 +02:00
Thilo Graf
eb91142a01 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: 07c72026ed
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-08 (Mon, 08 May 2017)
2017-05-08 12:25:42 +02:00
Thilo Graf
01e06fa98e movieplayer.cpp: prevent build error
Avoid build error if build not configured with -D__STDC_LIMIT_MACROS


Origin commit data
------------------
Commit: f1779d0a97
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-08 (Mon, 08 May 2017)
2017-05-08 12:18:52 +02:00
vanhofen
7664c683ac epgplus: fix progressbar's type
Origin commit data
------------------
Commit: 7b9f8e9720
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)

Origin message was:
------------------
- epgplus: fix progressbar's type
2017-05-08 08:41:28 +02:00
Thilo Graf
73f35cbaa2 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: e35acf2e2f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-08 (Mon, 08 May 2017)
2017-05-08 08:28:20 +02:00
Thilo Graf
7b32c620cf CChannelList: fix code indentation
Origin commit data
------------------
Commit: 9fd3b27d61
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-08 (Mon, 08 May 2017)
2017-05-08 08:26:21 +02:00
Thilo Graf
bb04af3ff8 CNaviBar: prevent compiler warning -Wshadow
Origin commit data
------------------
Commit: 970390a320
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-08 (Mon, 08 May 2017)
2017-05-08 08:26:17 +02:00
Thilo Graf
369e8b670e movieplayer.cpp: remove possible compile issue
"__STDC_LIMIT_MACROS" redefined


Origin commit data
------------------
Commit: 65b09044c5
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-08 (Mon, 08 May 2017)
2017-05-08 08:26:14 +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
867b5db369 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: d0357b6850
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-07 (Sun, 07 May 2017)
2017-05-07 19:09:04 +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
d378e70a56 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: 9c4e0d1737
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-07 (Sun, 07 May 2017)
2017-05-07 18:36:16 +02:00
Thilo Graf
56ae8eb9b5 CChannelList: change scope of bool unlocked
Scope of the variable 'unlocked' can be reduced.


Origin commit data
------------------
Commit: c8f6888d8f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-07 (Sun, 07 May 2017)
2017-05-07 18:33:25 +02:00
Thilo Graf
5bb1f36a42 CChannelList: use enums for additional modes
Readability


Origin commit data
------------------
Commit: 761bac8ca1
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-07 (Sun, 07 May 2017)
2017-05-07 18:33:25 +02:00
Thilo Graf
1a50a2022e SNeutrinoSettings: add missing enums for channellist additional modes
Origin commit data
------------------
Commit: 5778d9295a
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-07 (Sun, 07 May 2017)
2017-05-07 18:33:25 +02:00
Thilo Graf
2ffc6efa27 CChannelList: ensure disconnect signal/slot on delete of channellist ojects
Origin commit data
------------------
Commit: 66c109f8f9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-07 (Sun, 07 May 2017)
2017-05-07 18:26:51 +02:00
Thilo Graf
c7e6857e54 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: 2b17db46ee
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-07 (Sun, 07 May 2017)
2017-05-07 14:21:19 +02:00
Thilo Graf
d7b5cb3caf CChannelList: delete and reset minitv object inside unified scope
Origin commit data
------------------
Commit: cf7a21032c
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-07 (Sun, 07 May 2017)
2017-05-07 14:18:47 +02:00
Thilo Graf
4fb21cadc2 CChannelList: add connection to ResetModuls()
Ensures re init after font changes.


Origin commit data
------------------
Commit: 1359248f72
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-07 (Sun, 07 May 2017)
2017-05-07 14:18:47 +02:00
Thilo Graf
dceb593867 CChannelList: remove init of cc_minitv from constructor.
Is not a member of CChannelList and already inititialized
as static outside of constructor.


Origin commit data
------------------
Commit: d7f839dcc9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-06 (Sat, 06 May 2017)
2017-05-06 23:18:43 +02:00
Thilo Graf
4853fffbf5 CChannelList: add missing compare for existant header object.
Origin commit data
------------------
Commit: 86c18141dd
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-06 (Sat, 06 May 2017)
2017-05-06 22:46:20 +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
320a4f842a Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: 237ae21bf7
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-06 (Sat, 06 May 2017)
2017-05-06 00:07:06 +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
Thilo Graf
7a654df1b7 CNaviBar: add new widget class: CNaviBar
Should help to reduce and unify code in some epg windows.


Origin commit data
------------------
Commit: cf7dd61fd7
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-05 (Fri, 05 May 2017)
2017-05-06 00:02:26 +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
73cd00ddc2 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: de43d212a4
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-04 (Thu, 04 May 2017)
2017-05-04 16:59:01 +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
Thilo Graf
929a561c3d CMovieBrowser: prevent possible segfault
Clock is disabled, will crash here.

comes with: b3ecc2b65c


Origin commit data
------------------
Commit: 329fad5545
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-04 (Thu, 04 May 2017)
2017-05-04 16:55:37 +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
57093d1922 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 655e97be0e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-03 (Wed, 03 May 2017)
2017-05-03 23:07:51 +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
add5cc9491 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: 326fca55c0
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-03 (Wed, 03 May 2017)
2017-05-03 21:36:45 +02:00
Thilo Graf
2eefbfab7a CChannelList: rework details line handling, fix hide() after setup
Detailsline is handling hide() by itself.

After channellist setup, eg. switching additional infos and channellist
window has different size, artefacts were possible.


Origin commit data
------------------
Commit: 81001410f3
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-03 (Wed, 03 May 2017)
2017-05-03 21:29:41 +02:00
Thilo Graf
639a56b845 CComponentsHeader: optimize logo size/position handling
Prevent oversized paint with stupid screen and/or font size settings


Origin commit data
------------------
Commit: 18fb99688c
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-03 (Wed, 03 May 2017)
2017-05-03 21:29:41 +02:00
Thilo Graf
fd43f9e123 Revert "-cc_form_header: add max caption width"
This reverts commit 9bbc06f3ae.


Origin commit data
------------------
Commit: cb02d6253d
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-03 (Wed, 03 May 2017)
2017-05-03 21:29:41 +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
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
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
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
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
Thilo Graf
e58cea5ea0 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: 1d63606bb9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-02 (Tue, 02 May 2017)
2017-05-02 21:15:26 +02:00