Commit Graph

10353 Commits

Author SHA1 Message Date
Thilo Graf
810f5cd6d6 CLuaInstCCWindow: fix passed shadow paramater
Origin commit data
------------------
Commit: 1f978f01ad
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-09 (Tue, 09 May 2017)
2017-05-09 12:09:20 +02:00
vanhofen
7db4f0e954 locale: minor changes in EPG-Plus locales
Origin commit data
------------------
Commit: 468fbcd79c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-09 (Tue, 09 May 2017)

Origin message was:
------------------
- locale: minor changes in EPG-Plus locales
2017-05-09 11:40:32 +02:00
Thilo Graf
2f5874838d CBuildInfo: fix shadow parameter
Type is int not bool


Origin commit data
------------------
Commit: 1d5bb7cd8e
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-09 (Tue, 09 May 2017)
2017-05-09 11:34:11 +02:00
vanhofen
231bbbae7a Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: b213316d44
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)
2017-05-08 23:48:19 +02:00
vanhofen
11bf56675a Revert "HD1 compat #1; master"
This reverts commit 15e77032a8.


Origin commit data
------------------
Commit: ebc3ce2e43
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)
2017-05-08 23:47:51 +02:00
vanhofen
9973792652 Revert "HD1 compat #2; pu/fb-setmode"
This reverts commit e768096b64.


Origin commit data
------------------
Commit: 48480e94d2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)
2017-05-08 23:47:39 +02:00
vanhofen
cf8a76c2ce Revert "Revert "- remove obsolete ifdef's""
This reverts commit 7aa4eed69b.


Origin commit data
------------------
Commit: 3c3707b119
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)
2017-05-08 23:47:26 +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
2d4130dab8 neutrino: fix hw_caps init; it must be initialized after zapit start
Origin commit data
------------------
Commit: edb0a5937e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)

Origin message was:
------------------
- neutrino: fix hw_caps init; it must be initialized after zapit start
2017-05-08 23:44:45 +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
vanhofen
4120703710 icons: add new icons for epg-button
Origin commit data
------------------
Commit: b44a047e7e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)

Origin message was:
------------------
- icons: add new icons for epg-button
2017-05-08 17:39:34 +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
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