mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 23:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity
10,037 Commits 2 Branches 9 Tags
8c6d91b20e0c43bf95f0ae162c70e23eaf2e5577
Commit Graph

10037 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vanhofen
e75807ed88 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 5c077b22e4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-19 (Fri, 19 May 2017)
 2017-05-19 21:18:09 +02:00
vanhofen
e1837412ed flashtool: add some maybe usefull console output to reboot call 
Origin commit data
------------------
Commit: 68ce922da8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-19 (Fri, 19 May 2017)

Origin message was:
------------------
- flashtool: add some maybe usefull console output to reboot call
 2017-05-19 10:14:51 +02:00
gixxpunk
5f0192b3af Merge branch 'ni/tuxbox' of bitbucket.org:neutrino-images/ni-neutrino-hd into ni/tuxbox 
Origin commit data
------------------
Commit: 468022c3cc
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-18 (Thu, 18 May 2017)
 2017-05-18 08:40:58 +02:00
gixxpunk
551807d7b1 CVFD: do not show "save epg" in standby 
Origin commit data
------------------
Commit: 1f221f13e6
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-18 (Thu, 18 May 2017)

Origin message was:
------------------
- CVFD: do not show "save epg" in standby
 2017-05-18 08:40:33 +02:00
Jacek Jendrzej
da1903c11d src/gui/lua/lua_cc_text.cpp avoid segfault 
Origin commit data
------------------
Commit: ffe986f36b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-17 (Wed, 17 May 2017)
 2017-05-17 22:15:15 +02:00
Thilo Graf
44af471dd9 CHintBox: fix position in case of missing text 
Without text, position was not complete calculated.
Only default position was used.


Origin commit data
------------------
Commit: e48cc87b6f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-17 (Wed, 17 May 2017)
 2017-05-17 20:11:28 +02:00
vanhofen
3f417116a5 cables.xml: update Antennengemeinschaft "Goeltzschtalbruecke" 
Origin commit data
------------------
Commit: b7ef6e47fe
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-17 (Wed, 17 May 2017)

Origin message was:
------------------
- cables.xml: update Antennengemeinschaft "Goeltzschtalbruecke"
 2017-05-17 17:23:22 +02:00
vanhofen
3f96fc3aa4 locale: more minor changes 
Origin commit data
------------------
Commit: af1e89e656
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)

Origin message was:
------------------
- locale: more minor changes
 2017-05-16 16:43:10 +02:00
vanhofen
ce5eb71ba1 locale: clearify hints for bisection jumps 
Origin commit data
------------------
Commit: 22d36d3e83
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)

Origin message was:
------------------
- locale: clearify hints for bisection jumps
 2017-05-16 15:59:04 +02:00
vanhofen
9948881442 align existing g_settings.movieplayer_bisection_jump to new value 
Origin commit data
------------------
Commit: d657f993c4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)

Origin message was:
------------------
- align existing g_settings.movieplayer_bisection_jump to new value
 2017-05-16 15:47:26 +02:00
vanhofen
ce5ff0b75b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: b68ec1c65e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)
 2017-05-16 15:26:29 +02:00
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
f0147609d9 buttons: use OFFSET defines 
Origin commit data
------------------
Commit: bf852064bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)

Origin message was:
------------------
- buttons: use OFFSET defines
 2017-05-16 10:31:25 +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