Commit Graph

10539 Commits

Author SHA1 Message Date
vanhofen
f070283853 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9415af0801
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-19 21:12:15 +01:00
vanhofen
a413bfb40d 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
------------------
Branch: ni/coolstream
Commit: 3420991007
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)



------------------
This commit was generated by Migit
2016-11-19 21:11:54 +01:00
TangoCash
16478a2d33 deactivate timer epg autoadjust until fixed and tested
Origin commit data
------------------
Branch: ni/coolstream
Commit: bf2c9818b0
Author: TangoCash <eric@loxat.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-19 18:47:35 +01:00
TangoCash
5de35b2406 [timers] fix start timers
Origin commit data
------------------
Branch: ni/coolstream
Commit: de6f90ac27
Author: TangoCash <eric@loxat.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-19 11:57:27 +01:00
Thilo Graf
705930e152 Merge branch 'pu/msgbox into master'
Rework hintbox and messagebox as derived classes with cc window functionality.
Details for structure and how it works to find under

 http://www.tuxbox-neutrino.org/widget/html/annotated.html


Origin commit data
------------------
Branch: ni/coolstream
Commit: 72ee10b43c
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-18 (Fri, 18 Nov 2016)

Origin message was:
------------------
Merge branch 'pu/msgbox into master'

Rework hintbox and messagebox as derived classes with cc window functionality.
Details for structure and how it works to find under

 http://www.tuxbox-neutrino.org/widget/html/annotated.html


------------------
This commit was generated by Migit
2016-11-18 22:22:57 +01:00
TangoCash
9816d4e36d [timermanager] fix stop recordings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9d3a48d3c0
Author: TangoCash <eric@loxat.de>
Date: 2016-11-18 (Fri, 18 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-18 22:20:03 +01:00
Jacek Jendrzej
ffcfe9a067 src/gui/moviebrowser/mb.cpp fix clean bookmarks
Origin commit data
------------------
Branch: ni/coolstream
Commit: 534fb3d5fe
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-18 (Fri, 18 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-18 22:20:03 +01:00
TangoCash
ebb061ec2c [timermanager] fix stop recordings
Origin commit data
------------------
Branch: ni/coolstream
Commit: a21eeea6f0
Author: TangoCash <eric@loxat.de>
Date: 2016-11-18 (Fri, 18 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-18 21:25:38 +01:00
Thilo Graf
898f86b97e prepare revision, bump version to 3.4.0
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4e3d2c854b
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-18 (Fri, 18 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-18 18:17:10 +01:00
Jacek Jendrzej
5f36783299 src/gui/moviebrowser/mb.cpp fix clean bookmarks
Origin commit data
------------------
Branch: ni/coolstream
Commit: ce0bb9fcd0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-18 (Fri, 18 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-18 17:50:41 +01:00
Thilo Graf
61be99ed13 Locales: use generic gui name in messages and windows
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1b4f976c6b
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-18 (Fri, 18 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-18 17:46:17 +01:00
Thilo Graf
b39aae929f Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 59ae2b52e9
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-17 21:53:06 +01:00
vanhofen
b0a78885b0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: addd53b04e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-17 21:33:46 +01:00
TangoCash
503c5013cc fix moviebrowser detailsline
Origin commit data
------------------
Branch: ni/coolstream
Commit: d3fe4f5e0a
Author: TangoCash <eric@loxat.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-17 21:02:28 +01:00
Jacek Jendrzej
c089c00bea src/gui/moviebrowser/mb.cpp fix bookmark Menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 531ab8f818
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-17 (Thu, 17 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-17 18:45:59 +01:00
vanhofen
b39f68a7bb Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 15f3b45175
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)



------------------
This commit was generated by Migit
2016-11-17 10:22:05 +01:00
vanhofen
b3a533e2fb moviebrowser: resort movie info update menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: de27a8a36c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)

Origin message was:
------------------
- moviebrowser: resort movie info update menu

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-17 10:19:53 +01:00
vanhofen
8c338780e8 moviebrowser: resort movie info menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: b43145af7c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)

Origin message was:
------------------
- moviebrowser: resort movie info menu

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-17 10:19:53 +01:00
vanhofen
f4c831795c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: b2b789452a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-17 01:48:51 +01:00
vanhofen
04d25db043 moviebrowser: more clarity in bookmark menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 365f36df92
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)

Origin message was:
------------------
- moviebrowser: more clarity in bookmark menu

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-17 01:48:32 +01:00
vanhofen
ac2c9e2822 moviebrowser: use red key to remove all user bookmarks
Origin commit data
------------------
Branch: ni/coolstream
Commit: d171038a6e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)

Origin message was:
------------------
- moviebrowser: use red key to remove all user bookmarks

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-17 01:48:32 +01:00
vanhofen
9d65df3050 locale: small changes in moviebrowser's bookmark locales
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3839c7f5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)

Origin message was:
------------------
- locale: small changes in moviebrowser's bookmark locales

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-17 01:48:32 +01:00
vanhofen
48ead0f169 moviebrowser: fix input for end mark and lastplay mark
Origin commit data
------------------
Branch: ni/coolstream
Commit: 86c3655e96
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)

Origin message was:
------------------
- moviebrowser: fix input for end mark and lastplay mark

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-17 01:48:32 +01:00
vanhofen
08cf7677c4 timerlist: reduce flicker-effects while timerlist construction
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0ce3513d78
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)

Origin message was:
------------------
- timerlist: reduce flicker-effects while timerlist construction

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-17 00:18:09 +01:00
vanhofen
70d2c535ae Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/nhttpd/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2eafc848f8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)



------------------
This commit was generated by Migit
2016-11-16 23:43:57 +01:00
TangoCash
e8f4b736cc Merge pull request #3 from neutrino-mp/master
move linux-dvb-headers out of the way for non-coolstream hardware

Origin commit data
------------------
Branch: ni/coolstream
Commit: 6128741ac2
Author: TangoCash <eric@loxat.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)



------------------
This commit was generated by Migit
2016-11-16 21:43:53 +01:00
vanhofen
38520024ef lcd4l: reduce console spam in module detection
Origin commit data
------------------
Branch: ni/coolstream
Commit: 90215fc6ee
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)

Origin message was:
------------------
- lcd4l: reduce console spam in module detection

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-16 20:43:28 +01:00
Stefan Seyfried
0f5446036c make sure the private dvb headers are used on coolstream
Origin commit data
------------------
Branch: ni/coolstream
Commit: 045587f6ec
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-16 20:30:14 +01:00
vanhofen
7ecbfdf325 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/timerd/timermanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 506f7acbdd
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)



------------------
This commit was generated by Migit
2016-11-16 20:17:27 +01:00
TangoCash
b74a76d7a5 timermanager: try fix autoAdjustToEPG for (repeating) timers
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8cb0bef8e1
Author: TangoCash <eric@loxat.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-16 20:09:17 +01:00
Stefan Seyfried
f1343bb815 disable private copy of the linux dvb headers
Move them into subdir private so that they are no longer used by
default. They still can be used by extending the include path.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5e1efd222f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-16 (Sun, 16 Feb 2014)



------------------
This commit was generated by Migit
2016-11-16 20:09:10 +01:00
Jacek Jendrzej
70a6056d49 src/gui/channellist.cpp cancel paint_events thread on hide
Origin commit data
------------------
Branch: ni/coolstream
Commit: f957bbaa37
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-16 (Wed, 16 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-16 19:29:19 +01:00
vanhofen
3e693c9047 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3a34b22e10
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-16 01:25:09 +01:00
vanhofen
e413239187 lcd4l: fix nevis build
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1b50438766
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)

Origin message was:
------------------
- lcd4l: fix nevis build

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-16 01:24:31 +01:00
vanhofen
179db9f1b4 lcd4l: try to fix ModeCam detection; add some new features:
* Resolution detection
* AspectRatio detection
* Videotext detection
* DolbyDigital detection


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6f10060211
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)

Origin message was:
------------------
- lcd4l: try to fix ModeCam detection; add some new features:

* Resolution detection
* AspectRatio detection
* Videotext detection
* DolbyDigital detection


------------------
This commit was generated by Migit
2016-11-16 00:55:52 +01:00
vanhofen
c72aac7588 record.cpp: avoid segfault in CRecordManager::getUseCI()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 79c12ed7ad
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)

Origin message was:
------------------
- record.cpp: avoid segfault in CRecordManager::getUseCI()

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-16 00:49:45 +01:00
TangoCash
874a27d7b2 timermanager: disable autoAdjustToEPG for repeating timers
Origin commit data
------------------
Branch: ni/coolstream
Commit: b657ef8b3c
Author: TangoCash <eric@loxat.de>
Date: 2016-11-15 (Tue, 15 Nov 2016)

Origin message was:
------------------
- timermanager: disable autoAdjustToEPG for repeating timers

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-15 21:30:12 +01:00
Thilo Graf
4aa0dca60b Merge branch 'master' into pu/msgbox
Conflicts:
 	src/gui/followscreenings.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e8c700dd2
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-15 (Tue, 15 Nov 2016)

Origin message was:
------------------
Merge branch 'master' into pu/msgbox

Conflicts:
  	src/gui/followscreenings.cpp


------------------
This commit was generated by Migit
2016-11-15 19:49:27 +01:00
Thilo Graf
4d952e9f00 CInfoViewer: add missing shadow for timescale
enableShadow() needs enum option.


Origin commit data
------------------
Branch: ni/coolstream
Commit: c8ad32b1e4
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-15 (Tue, 15 Nov 2016)



------------------
This commit was generated by Migit
2016-11-15 19:00:21 +01:00
vanhofen
aaf3946608 followscreenings: re-add possibility to show followscreenings in every case
This commit replaces formerly commit 5b4e8952fa


Origin commit data
------------------
Branch: ni/coolstream
Commit: b7838210a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-15 (Tue, 15 Nov 2016)

Origin message was:
------------------
- followscreenings: re-add possibility to show followscreenings in every case

This commit replaces formerly commit 5b4e8952fa


------------------
This commit was generated by Migit
2016-11-15 00:05:02 +01:00
vanhofen
ff9095e66b Revert "Recording Menu: Add option "Always show timer pick list""
This reverts commit 5b4e8952fa.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 226ec2c57d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)



------------------
This commit was generated by Migit
2016-11-14 23:05:36 +01:00
vanhofen
9cab869e17 Revert "- deutsch.locale: minor changes in menu.hint_record_tevents"
This reverts commit fa63ad16f7.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 23cbcbcdb5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)



------------------
This commit was generated by Migit
2016-11-14 23:05:20 +01:00
vanhofen
06ab0e9f73 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ca86828ff1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-14 23:02:33 +01:00
vanhofen
715af20490 followscreenings: allow to turn off followscreenings list
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6cb1d206f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)

Origin message was:
------------------
- followscreenings: allow to turn off followscreenings list

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-14 22:58:43 +01:00
Thilo Graf
e0d6d5537f Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: aa40d88300
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-14 20:38:01 +01:00
Jacek Jendrzej
5e16302783 src/gui/widget/menue.cpp try fix hide info_box (in channellist)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 99c57d3075
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-14 (Mon, 14 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-14 19:27:09 +01:00
vanhofen
83a0611b63 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 028049500d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-14 10:43:44 +01:00
vanhofen
a6a70301f0 moviebrowser: add PREVPLAYDATE/RECORDDATE sort buttons to footer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2f23aaedea
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)

Origin message was:
------------------
- moviebrowser: add PREVPLAYDATE/RECORDDATE sort buttons to footer

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-14 10:09:34 +01:00
vanhofen
69e17e4b10 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 73d3abcdef
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-13 20:25:22 +01:00
Thilo Graf
fd5bab0236 CMovieBrowser: unfify and reduce flicker effects of connect line
Connectline object can handle hide behavior itself.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5dc6255b43
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)



------------------
This commit was generated by Migit
2016-11-13 16:44:08 +01:00