Commit Graph

9925 Commits

Author SHA1 Message Date
vanhofen
aa49ad86ff configure.ac: increase version to 3.40
Origin commit data
------------------
Commit: cade9ead98
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)

Origin message was:
------------------
- configure.ac: increase version to 3.40
2017-05-16 15:26:20 +02:00
vanhofen
53007ef0a9 movieplayer: make bisection jump period configurable
Origin commit data
------------------
Commit: 69e5cb286c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)

Origin message was:
------------------
- movieplayer: make bisection jump period configurable
2017-05-16 15:26:20 +02:00
vanhofen
4d2bab5fa0 deutsch.locale: minor change
Origin commit data
------------------
Commit: e99b0188ab
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)

Origin message was:
------------------
- deutsch.locale: minor change
2017-05-16 15:26:20 +02:00
vanhofen
0a278faf0c movieplayer: reduce timeout for bisectional jumps
Origin commit data
------------------
Commit: a0918616dc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)

Origin message was:
------------------
- movieplayer: reduce timeout for bisectional jumps
2017-05-16 15:26:20 +02:00
vanhofen
77ac470486 movieplayer: allow bisectional jumps with RC_page_up/down
based upon code by TangoCash


Origin commit data
------------------
Commit: ca218e5390
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-13 (Sat, 13 May 2017)

Origin message was:
------------------
- movieplayer: allow bisectional jumps with RC_page_up/down

based upon code by TangoCash
2017-05-13 17:45:59 +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
801e94d938 Merge branch 'master' into pu/fb-setmode
# Conflicts:
#	src/gui/components/cc_frm_window.h


Origin commit data
------------------
Commit: aaa34d8887
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-11 (Thu, 11 May 2017)
2017-05-11 12:18:38 +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
Thilo Graf
9a0a266f27 EpgPlus: use default parameter for titel arrangement
Origin commit data
------------------
Commit: 100a1606f0
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-11 (Thu, 11 May 2017)
2017-05-11 11:28:06 +02:00
Thilo Graf
509dff5c83 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: a26c1bc868
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-11 (Thu, 11 May 2017)
2017-05-11 08:43:29 +02:00
Thilo Graf
e2fce7a702 CComponentsHeader: fix brace error
suggest explicit braces to avoid ambiguous ‘else’


Origin commit data
------------------
Commit: 1b2f1d320d
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-11 (Thu, 11 May 2017)
2017-05-11 08:39:20 +02:00
Jacek Jendrzej
19b084cb4c use lua_Integer
Origin commit data
------------------
Commit: 843703b175
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-10 (Wed, 10 May 2017)
2017-05-10 15:35:44 +02:00
Thilo Graf
ccdf4ef3da Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: 60fed9cc02
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-10 (Wed, 10 May 2017)
2017-05-10 10:45:28 +02:00
Thilo Graf
660b18be51 CLuaInstCCWindow: try to fix window title align parameter
Additional (lua_Integer)CTextBox::NO_AUTO_LINEBREAK) overwrites
passed parameter and has no effect, because NO_AUTO_LINEBREAK is
already default.


Origin commit data
------------------
Commit: 27eb80eb5b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-10 (Wed, 10 May 2017)
2017-05-10 10:42:08 +02:00
Thilo Graf
908e23005d CComponentsHeader: Try to adopt different logo/title alignments
Not all constellations are tested. Please report.


Origin commit data
------------------
Commit: 5b541571f9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-10 (Wed, 10 May 2017)
2017-05-10 10:42:08 +02:00
Thilo Graf
8d11ff178f CComponentsHeader: fix centering of header title
Origin commit data
------------------
Commit: 178bf6f596
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-10 (Wed, 10 May 2017)
2017-05-10 10:42:08 +02:00
Thilo Graf
83784f3cd4 CComponentsHeader: remove double text color assignment
Origin commit data
------------------
Commit: c320dbf8ec
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-10 (Wed, 10 May 2017)
2017-05-10 10:42:08 +02:00
Thilo Graf
783d2efe04 CComponentsHeader: fix order of width calculation
Required for following position calculation


Origin commit data
------------------
Commit: 107db09299
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-10 (Wed, 10 May 2017)
2017-05-10 10:42:08 +02:00
gixxpunk
ff8ad12d1b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 4c0d6c0930
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-09 (Tue, 09 May 2017)
2017-05-09 18:36:27 +02:00
vanhofen
a7ec15ee9c locale: small changes in EPG Plus titles
Origin commit data
------------------
Commit: 3b53914eba
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-09 (Tue, 09 May 2017)

Origin message was:
------------------
- locale: small changes in EPG Plus titles
2017-05-09 14:05:32 +02:00
vanhofen
3e0a8d3ff0 clearify comment
Origin commit data
------------------
Commit: c08144a9d9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-09 (Tue, 09 May 2017)

Origin message was:
------------------
- clearify comment
2017-05-09 13:31:59 +02:00
vanhofen
b394608761 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale


Origin commit data
------------------
Commit: 66e3c79ee1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-09 (Tue, 09 May 2017)
2017-05-09 13:19:56 +02:00
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