Commit Graph

189 Commits

Author SHA1 Message Date
gixxpunk
4c908eafae Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2594a60728
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-06-29 (Thu, 29 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-29 21:29:56 +02:00
Jacek Jendrzej
0dda6b7979 src/gui/moviebrowser/mb.cpp fix segfault if m_movieSelectionHandler is NULL
Origin commit data
------------------
Branch: ni/coolstream
Commit: fc5ba460a5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-29 (Thu, 29 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-29 19:04:10 +02:00
Jacek Jendrzej
ea4ea34255 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b89baa7a2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-26 (Mon, 26 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-26 22:22:07 +02:00
vanhofen
86a87a7083 moviebrowser: fix deletion of non-marked movies via mute-key
(cherry picked from commit 98dcedd452)
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2f8ae15b66
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)

Origin message was:
------------------
- moviebrowser: fix deletion of non-marked movies via mute-key

(cherry picked from commit 98dcedd452)
Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-06-26 20:53:12 +02:00
vanhofen
98dcedd452 moviebrowser: fix deletion of non-marked movies via mute-key
Origin commit data
------------------
Branch: ni/coolstream
Commit: 895aa1ca8c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)

Origin message was:
------------------
- moviebrowser: fix deletion of non-marked movies via mute-key

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

------------------
This commit was generated by Migit
2017-06-26 11:49:17 +02:00
Jacek Jendrzej
0d48f6627d Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2ddad19873
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-21 (Wed, 21 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-21 13:54:49 +02:00
vanhofen
1f79ba0b8a moviebrowser: clearify deletion-locale; add movie-title to menu
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 37f9306862
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-21 (Wed, 21 Jun 2017)

Origin message was:
------------------
- moviebrowser: clearify deletion-locale; add movie-title to menu

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-06-21 10:31:22 +02:00
vanhofen
54375b98b0 moviebrowser: fix deletion of cursor_only movie via "menu" -> "yellow"
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b4f34857f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-21 (Wed, 21 Jun 2017)

Origin message was:
------------------
- moviebrowser: fix deletion of cursor_only movie via "menu" -> "yellow"

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-06-21 10:31:22 +02:00
vanhofen
e637fe38f9 moviebrowser: clearify deletion-locale; add movie-title to menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: b6b4286c99
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-20 (Tue, 20 Jun 2017)

Origin message was:
------------------
- moviebrowser: clearify deletion-locale; add movie-title to menu

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

------------------
This commit was generated by Migit
2017-06-20 22:56:23 +02:00
vanhofen
72514e3610 moviebrowser: fix deletion of cursor_only movie via "menu" -> "yellow"
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3e053e7728
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-20 (Tue, 20 Jun 2017)

Origin message was:
------------------
- moviebrowser: fix deletion of cursor_only movie via "menu" -> "yellow"

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

------------------
This commit was generated by Migit
2017-06-20 22:13:49 +02:00
TangoCash
7a4bf83694 moviebrowser: fix directory count (thx dbo)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7b0eb94e76
Author: TangoCash <eric@loxat.de>
Date: 2017-06-19 (Mon, 19 Jun 2017)

Origin message was:
------------------
-moviebrowser: fix directory count (thx dbo)

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

------------------
This commit was generated by Migit
2017-06-19 20:57:23 +02:00
Jacek Jendrzej
0b9ac652bf Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: ca83324763
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-07 16:20:47 +02:00
vanhofen
04ec1ff0ca imdb: change getIMDbElement() handling; function now returns a string
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b5a851514
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-29 (Mon, 29 May 2017)

Origin message was:
------------------
- imdb: change getIMDbElement() handling; function now returns a string

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

------------------
This commit was generated by Migit
2017-05-29 11:49:00 +02:00
vanhofen
987dd9ea8c moviebrowser: bind display of channelogo to g_settings.channellist_show_channellogo
Origin commit data
------------------
Branch: ni/coolstream
Commit: d2da458a94
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)

Origin message was:
------------------
- moviebrowser: bind display of channelogo to g_settings.channellist_show_channellogo

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

------------------
This commit was generated by Migit
2017-05-23 17:58:53 +02:00
Jacek Jendrzej
9d8a618ef7 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b2f2afe01
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-05 (Fri, 05 May 2017)


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

------------------
This commit was generated by Migit
2017-05-05 13:27:14 +02:00
gixxpunk
e58b84de18 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 115c78404b
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-04 (Thu, 04 May 2017)


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

------------------
This commit was generated by Migit
2017-05-04 20:04:03 +02:00
Thilo Graf
47cec736d3 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: de43d212a4
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-04 (Thu, 04 May 2017)


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

------------------
This commit was generated by Migit
2017-05-04 16:59:01 +02:00
Thilo Graf
1fd65448eb CMovieBrowser: prevent possible segfault
Clock is disabled, will crash here.

comes with: e36f7ccecd


Origin commit data
------------------
Branch: ni/coolstream
Commit: 329fad5545
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-04 (Thu, 04 May 2017)



------------------
This commit was generated by Migit
2017-05-04 16:55:37 +02:00
vanhofen
43e622513a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/channellist.cpp
	src/gui/epgview.cpp
	src/gui/epgview.h
	src/gui/eventlist.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3210b958a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-03 (Wed, 03 May 2017)



------------------
This commit was generated by Migit
2017-05-03 22:57:24 +02:00
Thilo Graf
d9eca3375d Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 326fca55c0
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-03 (Wed, 03 May 2017)


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

------------------
This commit was generated by Migit
2017-05-03 21:36:45 +02:00
TangoCash
e36f7ccecd eventlist,epgview: adjust style, implement new header class
picked from:	https://github.com/TangoCash/neutrino-mp-cst-next
commit:	477db186ee4f306e191035ed2201ff4fc9d70b9d

Signed-off-by: Thilo Graf <dbt@novatux.de>
review reqiured


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3ac2f99a67
Author: TangoCash <eric@loxat.de>
Date: 2017-05-03 (Wed, 03 May 2017)

Origin message was:
------------------
-eventlist,epgview: adjust style, implement new header class

picked from:	https://github.com/TangoCash/neutrino-mp-cst-next
commit:	477db186ee4f306e191035ed2201ff4fc9d70b9d

Signed-off-by: Thilo Graf <dbt@novatux.de>
review reqiured


------------------
This commit was generated by Migit
2017-05-03 21:29:41 +02:00
vanhofen
c443deec6c moviebrowser: try to speed up reload movies
Origin commit data
------------------
Branch: ni/coolstream
Commit: 424250a7b7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-24 (Mon, 24 Apr 2017)

Origin message was:
------------------
- moviebrowser: try to speed up reload movies

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

------------------
This commit was generated by Migit
2017-04-24 10:36:23 +02:00
vanhofen
44e0f9300a Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4fb2785d72
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-19 (Wed, 19 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-19 21:34:05 +02:00
Thilo Graf
a3d93c29ac CMovieBrowser: try to reduce effort for vizualized scan
For comparings I added a benchmark with log output.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 68c2b29caf
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-13 (Thu, 13 Apr 2017)



------------------
This commit was generated by Migit
2017-04-13 22:36:48 +02:00
Michael Liebmann
10ea5b08d2 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2677543cc4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-13 21:55:50 +01:00
vanhofen
ae3ecfdcfb Merge remote-tracking branch 'neutrino-mp/master' into pu/mp
Conflicts:
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8bdb16cec6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)



------------------
This commit was generated by Migit
2017-03-13 16:14:33 +01:00
vanhofen
7dcc90f09f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c4fa0eb30e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)



------------------
This commit was generated by Migit
2017-03-13 12:45:30 +01:00
vanhofen
51c85e1c58 unify DetailsLine-names; move define to settings.h
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5b0faeab8c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)

Origin message was:
------------------
- unify DetailsLine-names; move define to settings.h

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

------------------
This commit was generated by Migit
2017-03-13 12:40:04 +01:00
vanhofen
038c20d9b4 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/moviebrowser/mb.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 73ea6fddcb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)



------------------
This commit was generated by Migit
2017-03-06 23:26:32 +01:00
Thilo Graf
a41f318adc CMovieBrowser/cYTFeedParser: implement signals from CProgressSignals
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8c6a47ee3a
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-06 21:26:26 +01:00
Thilo Graf
8b8723a297 CMovieBrowser: remove wrong progress value
Origin commit data
------------------
Branch: ni/coolstream
Commit: 26a0f31923
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-06 21:26:26 +01:00
vanhofen
7d68b0c284 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: b47a570fd2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-03 10:34:35 +01:00
vanhofen
c7d0a88e07 fix funny typo
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8862ef621b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- fix funny typo

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

------------------
This commit was generated by Migit
2017-03-03 09:52:57 +01:00
Thilo Graf
7f9168a7e2 CMovieBrowser: adaopt for discret percental window dimensions
Origin commit data
------------------
Branch: ni/coolstream
Commit: 21b700879e
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-03 09:22:08 +01:00
vanhofen
9ca012f83a Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: db2a8c021b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-26 (Sun, 26 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-26 22:31:51 +01:00
Thilo Graf
259ace12c2 CMovieBrowser: use percental calculated dimensions for progress window
Useful for possible for different screen resolutions.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 11d8be5307
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-25 (Sat, 25 Feb 2017)



------------------
This commit was generated by Migit
2017-02-26 21:29:53 +01:00
Thilo Graf
2e9293fdc2 CMovieBrowser: visualize global loading of defined directories
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e487f2840
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-23 (Thu, 23 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-26 21:29:53 +01:00
Stefan Seyfried
ba84b4493a Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1d9d81d448
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-15 20:26:44 +01:00
vanhofen
8398d99c24 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 026247a40f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-13 11:43:13 +01:00
Thilo Graf
e22dc3d33d CMovieBrowser: vizualize progress for loading of youtube vidoes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 690ac7c428
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-13 10:05:34 +01:00
Thilo Graf
bf3a0863de CMovieBrowser: visualize progress during load movies
TODO: youtube load


Origin commit data
------------------
Branch: ni/coolstream
Commit: a907afdc7c
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-10 (Fri, 10 Feb 2017)



------------------
This commit was generated by Migit
2017-02-13 09:02:43 +01:00
vanhofen
54d7d92401 Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/epgview.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: e61a23cb74
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)



------------------
This commit was generated by Migit
2017-02-08 08:02:39 +01:00
Stefan Seyfried
86f609bc17 replace fontrenderer.h include with forward declaration
in order to flatten the build dependency tree further, include
fontrenderer.h directly where needed, in header files a forward
declaration is enough


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2303d94300
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)



------------------
This commit was generated by Migit
2017-02-07 17:23:42 +01:00
Stefan Seyfried
7e25a8dace replace fontrenderer.h include with forward declaration
in order to flatten the build dependency tree further, include
fontrenderer.h directly where needed, in header files a forward
declaration is enough


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9082ddf287
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)



------------------
This commit was generated by Migit
2017-02-05 13:37:53 +01:00
Stefan Seyfried
d6861c1054 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: a409047714
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-22 (Sun, 22 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-22 22:59:39 +01:00
vanhofen
2cd0bbb9f1 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: eee55893c6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-05 (Thu, 05 Jan 2017)



------------------
This commit was generated by Migit
2017-01-05 23:07:16 +01:00
Thilo Graf
f22390f80d CMovieBrowser: fix possible compiler warning
-misleading-indentatio


Origin commit data
------------------
Branch: ni/coolstream
Commit: 64b2f94dd7
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-05 (Thu, 05 Jan 2017)



------------------
This commit was generated by Migit
2017-01-05 22:19:08 +01:00
vanhofen
107026cb75 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/themes.cpp
	src/neutrino.cpp
	src/system/settings.h
	version_pseudo.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4f2d36fe3e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)



------------------
This commit was generated by Migit
2016-12-29 00:59:00 +01:00
vanhofen
9445cd0324 Revert "- moviebrowser: fix crash; disable non-existing movie directories"
This reverts commit 37e9819938, because
this forces user to re-enable these directories manually.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 95c619ad88
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)



------------------
This commit was generated by Migit
2016-12-29 00:47:35 +01:00
vanhofen
8df6242d49 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 758a2b9f28
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-16 (Fri, 16 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-16 23:18:24 +01:00