Commit Graph

364 Commits

Author SHA1 Message Date
TangoCash
a1e8a70582 fix epgview channelogo (from moviebrowser)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0040a21293
Author: TangoCash <eric@loxat.de>
Date: 2016-08-09 (Tue, 09 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-09 19:00:22 +02:00
vanhofen
8c85d81624 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: a62689a553
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-09 (Tue, 09 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-09 18:01:04 +02:00
TangoCash
7e296ed9d8 fix fading from moviebrowser
Origin commit data
------------------
Branch: ni/coolstream
Commit: c0f3e908ff
Author: TangoCash <eric@loxat.de>
Date: 2016-08-09 (Tue, 09 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-09 17:56:00 +02:00
vanhofen
0a47dbd97a Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/moviebrowser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9f8499d661
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-09 (Tue, 09 Aug 2016)



------------------
This commit was generated by Migit
2016-08-09 15:37:20 +02:00
vanhofen
a0203076f2 epgview: add extended movie info; code from movieinfo.cpp
comment out unused showMovieInfo() in movieinfo.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 766c4fd9c8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-09 (Tue, 09 Aug 2016)

Origin message was:
------------------
- epgview: add extended movie info; code from movieinfo.cpp

comment out unused showMovieInfo() in movieinfo.cpp


------------------
This commit was generated by Migit
2016-08-09 14:13:19 +02:00
vanhofen
f66f51f7fc epgview: fix segfault, when imdb cover is saved in moviebrowser
Origin commit data
------------------
Branch: ni/coolstream
Commit: 979c109dbf
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-07 (Sun, 07 Aug 2016)

Origin message was:
------------------
- epgview: fix segfault, when imdb cover is saved in moviebrowser

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

------------------
This commit was generated by Migit
2016-08-07 00:33:00 +02:00
vanhofen
b679fea30f Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/epgview.cpp
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4d898949e3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-06 (Sat, 06 Aug 2016)



------------------
This commit was generated by Migit
2016-08-06 23:06:36 +02:00
vanhofen
51f6079070 disable tmdb, when tmdb_api_key is empty
Origin commit data
------------------
Branch: ni/coolstream
Commit: bbccd92b49
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-06 (Sat, 06 Aug 2016)

Origin message was:
------------------
- disable tmdb, when tmdb_api_key is empty

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

------------------
This commit was generated by Migit
2016-08-06 22:52:37 +02:00
vanhofen
54155f4a28 epgview: add imdb button to footer
Origin commit data
------------------
Branch: ni/coolstream
Commit: ed71c60a6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-06 (Sat, 06 Aug 2016)

Origin message was:
------------------
- epgview: add imdb button to footer

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

------------------
This commit was generated by Migit
2016-08-06 08:42:54 +02:00
vanhofen
083eb93b55 epgview: remove imdb/tmdb mixing
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4f66026c95
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-04 (Thu, 04 Aug 2016)

Origin message was:
------------------
- epgview: remove imdb/tmdb mixing

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

------------------
This commit was generated by Migit
2016-08-04 16:00:34 +02:00
vanhofen
fd27ac9ad5 epgview: add own locale for tmdb-info
Origin commit data
------------------
Branch: ni/coolstream
Commit: da9e024d40
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-03 (Wed, 03 Aug 2016)

Origin message was:
------------------
- epgview: add own locale for tmdb-info

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

------------------
This commit was generated by Migit
2016-08-03 23:56:16 +02:00
vanhofen
69dadf3490 epgview: laying tmbd to RC_0 to get back historically control
Origin commit data
------------------
Branch: ni/coolstream
Commit: 40547ffab7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-03 (Wed, 03 Aug 2016)

Origin message was:
------------------
- epgview: laying tmbd to RC_0 to get back historically control

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

------------------
This commit was generated by Migit
2016-08-03 23:41:59 +02:00
vanhofen
7c1d6ef008 epgview: re-fix description of adzap-button
Origin commit data
------------------
Branch: ni/coolstream
Commit: b6c394228a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-03 (Wed, 03 Aug 2016)

Origin message was:
------------------
- epgview: re-fix description of adzap-button

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

------------------
This commit was generated by Migit
2016-08-03 13:03:07 +02:00
vanhofen
092c8c6ab1 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3f92ab9eea
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-03 (Wed, 03 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-03 12:53:37 +02:00
vanhofen
02a496ef35 epgview: remove obsolte calculation for footer witdh
Origin commit data
------------------
Branch: ni/coolstream
Commit: f9a8b5a656
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-03 (Wed, 03 Aug 2016)

Origin message was:
------------------
- epgview: remove obsolte calculation for footer witdh

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

------------------
This commit was generated by Migit
2016-08-03 12:50:34 +02:00
vanhofen
be67bf8af8 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3ec246f0a9
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-03 (Wed, 03 Aug 2016)



------------------
This commit was generated by Migit
2016-08-03 12:24:40 +02:00
vanhofen
bad5426b9f epgview: cleanup from unused code
Origin commit data
------------------
Branch: ni/coolstream
Commit: be2a5bcbb5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-03 (Wed, 03 Aug 2016)

Origin message was:
------------------
- epgview: cleanup from unused code

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

------------------
This commit was generated by Migit
2016-08-03 12:19:52 +02:00
vanhofen
0816ab59b9 epgview: rework buttonbar logic
Origin commit data
------------------
Branch: ni/coolstream
Commit: 999d61f923
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-03 (Wed, 03 Aug 2016)

Origin message was:
------------------
- epgview: rework buttonbar logic

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

------------------
This commit was generated by Migit
2016-08-03 11:12:45 +02:00
vanhofen
79b01b511d fix aba234f5ba582074134033cb643bb1a42de5a86f; many missing changes :/
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b30271d21
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-03 (Wed, 03 Aug 2016)

Origin message was:
------------------
- fix aba234f5ba582074134033cb643bb1a42de5a86f; many missing changes :/

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

------------------
This commit was generated by Migit
2016-08-03 01:08:56 +02:00
vanhofen
6f9255e0c4 allow tmdb in moviebrowser/movieplayer to satisfy Knicko ;)
Origin commit data
------------------
Branch: ni/coolstream
Commit: a66b6677ab
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-03 (Wed, 03 Aug 2016)

Origin message was:
------------------
- allow tmdb in moviebrowser/movieplayer to satisfy Knicko ;)

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

------------------
This commit was generated by Migit
2016-08-03 00:53:41 +02:00
vanhofen
aba234f5ba epgview: rework imdb view; allow tmdb view
* needs rework; not happy about key assignment
 ('info -> info -> info' should close epgview, it's historically)
* mix imdb view with tmdb description
* align to cst-git; remove many of our old code to keep it easy in sync


Origin commit data
------------------
Branch: ni/coolstream
Commit: d395d42133
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-03 (Wed, 03 Aug 2016)

Origin message was:
------------------
- epgview: rework imdb view; allow tmdb view

* needs rework; not happy about key assignment
 ('info -> info -> info' should close epgview, it's historically)
* mix imdb view with tmdb description
* align to cst-git; remove many of our old code to keep it easy in sync


------------------
This commit was generated by Migit
2016-08-03 00:52:18 +02:00
vanhofen
3f3adb9d77 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: b2d7fd97ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-03 (Wed, 03 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-03 00:18:54 +02:00
vanhofen
81afac71ac epgview: fix y-position of tmdb-logo and rating-stars
Origin commit data
------------------
Branch: ni/coolstream
Commit: 25e29c30be
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-03 (Wed, 03 Aug 2016)

Origin message was:
------------------
- epgview: fix y-position of tmdb-logo and rating-stars

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

------------------
This commit was generated by Migit
2016-08-03 00:12:29 +02:00
vanhofen
46851fe4e0 epgview/imdb: rename bool 'imdb_activ' to 'imdb_active'
Origin commit data
------------------
Branch: ni/coolstream
Commit: d9e78fac28
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-02 (Tue, 02 Aug 2016)

Origin message was:
------------------
- epgview/imdb: rename bool 'imdb_activ' to 'imdb_active'

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

------------------
This commit was generated by Migit
2016-08-02 13:05:06 +02:00
vanhofen
57d01e1fbe Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: ee90a7e353
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-02 (Tue, 02 Aug 2016)



------------------
This commit was generated by Migit
2016-08-02 12:51:05 +02:00
vanhofen
e93066ed22 epgview: rename bool 'tmdbtoggle' to 'tmdb_active'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7df061947e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-02 (Tue, 02 Aug 2016)

Origin message was:
------------------
- epgview: rename bool 'tmdbtoggle' to 'tmdb_active'

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

------------------
This commit was generated by Migit
2016-08-02 12:48:18 +02:00
vanhofen
5dd769e524 epgview: completion of 9786102aa8
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e3ef2375b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-02 (Tue, 02 Aug 2016)

Origin message was:
------------------
- epgview: completion of 9786102aa8

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

------------------
This commit was generated by Migit
2016-08-02 12:03:42 +02:00
vanhofen
45df54a682 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/epgview.cpp
	src/gui/infoviewer.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: f49da45cc7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-02 (Tue, 02 Aug 2016)



------------------
This commit was generated by Migit
2016-08-02 11:43:59 +02:00
vanhofen
97b471ebcf minor code cosmetics; no binary changes
Origin commit data
------------------
Branch: ni/coolstream
Commit: adb48f523d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-02 (Tue, 02 Aug 2016)

Origin message was:
------------------
- minor code cosmetics; no binary changes

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

------------------
This commit was generated by Migit
2016-08-02 11:36:29 +02:00
vanhofen
de162753a5 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5e3842cb51
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-02 (Tue, 02 Aug 2016)



------------------
This commit was generated by Migit
2016-08-02 11:26:37 +02:00
vanhofen
9786102aa8 epgview: scale tmdb-cover; smoother view (use a larger offset)
Origin commit data
------------------
Branch: ni/coolstream
Commit: d3cdf8d250
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-02 (Tue, 02 Aug 2016)

Origin message was:
------------------
- epgview: scale tmdb-cover; smoother view (use a larger offset)

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

------------------
This commit was generated by Migit
2016-08-02 11:19:38 +02:00
vanhofen
90b7eb069c epgview: rename bool 'cover' to 'has_cover'
Origin commit data
------------------
Branch: ni/coolstream
Commit: a4ffdcd413
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-02 (Tue, 02 Aug 2016)

Origin message was:
------------------
- epgview: rename bool 'cover' to 'has_cover'

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

------------------
This commit was generated by Migit
2016-08-02 10:28:49 +02:00
vanhofen
4bc4e9c271 epgview: revert wrong changes in 50b3060b5a
Origin commit data
------------------
Branch: ni/coolstream
Commit: b6fcf49a7f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-01 (Mon, 01 Aug 2016)

Origin message was:
------------------
- epgview: revert wrong changes in 50b3060b5a

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

------------------
This commit was generated by Migit
2016-08-01 18:05:13 +02:00
vanhofen
50b3060b5a imdb: fix poster position
Origin commit data
------------------
Branch: ni/coolstream
Commit: 256da8b204
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-01 (Mon, 01 Aug 2016)

Origin message was:
------------------
- imdb: fix poster position

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

------------------
This commit was generated by Migit
2016-08-01 17:41:52 +02:00
vanhofen
6afdf0f9e7 imdb: show english title in txt-field to get more space for data
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1b902ebdae
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-31 (Sun, 31 Jul 2016)

Origin message was:
------------------
- imdb: show english title in txt-field to get more space for data

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

------------------
This commit was generated by Migit
2016-07-31 22:54:16 +02:00
vanhofen
1d14f8630a add/use //NI tags instead of /*NI*/; just cosmetic changes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7927af07cf
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-31 (Sun, 31 Jul 2016)

Origin message was:
------------------
- add/use //NI tags instead of /*NI*/; just cosmetic changes

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

------------------
This commit was generated by Migit
2016-07-31 21:04:37 +02:00
vanhofen
dc943d450e disable new tmdb code; we use imdb
Origin commit data
------------------
Branch: ni/coolstream
Commit: a05c67187f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-31 (Sun, 31 Jul 2016)

Origin message was:
------------------
- disable new tmdb code; we use imdb

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

------------------
This commit was generated by Migit
2016-07-31 16:33:36 +02:00
vanhofen
bc3485e0f0 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 28331cc635
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-31 (Sun, 31 Jul 2016)



------------------
This commit was generated by Migit
2016-07-31 16:24:39 +02:00
vanhofen
d5953343ea Revert "- disable new tmdb code; we use imdb"
This reverts commit 423b4d858e.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3eb2b8aaf4
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-31 (Sun, 31 Jul 2016)



------------------
This commit was generated by Migit
2016-07-31 16:18:27 +02:00
Jacek Jendrzej
caf8b38616 src/gui/epgview.cpp fix clear epgtext
Origin commit data
------------------
Branch: ni/coolstream
Commit: 148ba9428a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-07-30 (Sat, 30 Jul 2016)


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

------------------
This commit was generated by Migit
2016-07-30 19:15:15 +02:00
Jacek Jendrzej
e8f666332f src/gui/epgview.cpp use show function for mp info view
Origin commit data
------------------
Branch: ni/coolstream
Commit: bedd37b1af
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-07-30 (Sat, 30 Jul 2016)


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

------------------
This commit was generated by Migit
2016-07-30 18:54:53 +02:00
vanhofen
974f25c903 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 483e4796cd
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-29 (Fri, 29 Jul 2016)


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

------------------
This commit was generated by Migit
2016-07-29 21:11:00 +02:00
vanhofen
423b4d858e disable new tmdb code; we use imdb
Origin commit data
------------------
Branch: ni/coolstream
Commit: 073d867d81
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-29 (Fri, 29 Jul 2016)

Origin message was:
------------------
- disable new tmdb code; we use imdb

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

------------------
This commit was generated by Migit
2016-07-29 21:10:13 +02:00
vanhofen
7cfc6ad001 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/epgview.cpp
	src/gui/infoviewer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4999c74ac0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-29 (Fri, 29 Jul 2016)



------------------
This commit was generated by Migit
2016-07-29 20:55:15 +02:00
Jacek Jendrzej
aecdac18a9 fix logic
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b2e809ab2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-07-29 (Fri, 29 Jul 2016)


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

------------------
This commit was generated by Migit
2016-07-29 19:11:13 +02:00
Jacek Jendrzej
b1998476ba dont use tmdb if api key not defined
Origin commit data
------------------
Branch: ni/coolstream
Commit: 86cea031ad
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-07-29 (Fri, 29 Jul 2016)


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

------------------
This commit was generated by Migit
2016-07-29 17:00:29 +02:00
TangoCash
461791aadd fix bigfonts in last commits
Origin commit data
------------------
Branch: ni/coolstream
Commit: c3d91b7040
Author: TangoCash <eric@loxat.de>
Date: 2016-03-08 (Tue, 08 Mar 2016)


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

------------------
This commit was generated by Migit
2016-07-28 16:15:23 +02:00
Jacek Jendrzej
e6db442ed0 fix compil warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: e681ca2b04
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-07-28 (Thu, 28 Jul 2016)


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

------------------
This commit was generated by Migit
2016-07-28 15:17:01 +02:00
TangoCash
96367f4a5d add option to replace EPG Info with tmdb Info - be careful
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7aa3656b14
Author: TangoCash <eric@loxat.de>
Date: 2016-03-08 (Tue, 08 Mar 2016)


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

------------------
This commit was generated by Migit
2016-07-28 15:02:44 +02:00
TangoCash
dc320bae79 urgent fix for last commit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 98640e1b1f
Author: TangoCash <eric@loxat.de>
Date: 2016-03-08 (Tue, 08 Mar 2016)


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

------------------
This commit was generated by Migit
2016-07-28 15:02:33 +02:00