mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-16 01:43:35 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,823 Commits 2 Branches 9 Tags
32b9af3d96202ab43596b5361151f95cfd1ba6e3
Commit Graph

192 Commits

Author SHA1 Message Date
Michael Liebmann
4246a31ba6 Merge branch 'cst-next' into nmp-cst-next 
- Fix merge conflicts


Origin commit data
------------------
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)
 2016-08-19 17:40:48 +02:00
vanhofen
2be5df305e Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	src/gui/moviebrowser.cpp


Origin commit data
------------------
Commit: 3d04798d9b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)
 2016-08-15 19:08:28 +02:00
vanhofen
e49ee18fb3 fonts: add and use own font for all footers 
Origin commit data
------------------
Commit: 54f2ac510f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)

Origin message was:
------------------
- fonts: add and use own font for all footers
 2016-08-15 19:02:42 +02:00
vanhofen
4d2040dd5f Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Origin commit data
------------------
Commit: 76b68b0a26
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)
 2016-08-15 12:32:24 +02:00
vanhofen
e53de52f8c infoviewer_bb: respecting user colors in buttonbar 
Origin commit data
------------------
Commit: 0274471517
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)

Origin message was:
------------------
- infoviewer_bb: respecting user colors in buttonbar
 2016-08-15 12:29:23 +02:00
vanhofen
2dc8a2a968 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/themes.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: fd5029560e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)
 2016-08-15 00:19:32 +02:00
vanhofen
70abfb3339 colors: make footer background color configurable 
TODO: footer text color and maybe footer font


Origin commit data
------------------
Commit: cc5258e6d5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)

Origin message was:
------------------
- colors: make footer background color configurable

TODO: footer text color and maybe footer font
 2016-08-15 00:14:47 +02:00
vanhofen
ed1a6bc916 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Commit: 38ca43dde0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-14 (Sun, 14 Aug 2016)
 2016-08-14 22:05:07 +02:00
vanhofen
78230ead13 colors: some internal renamings 
* INFOBAR_SHADOW to SHADOW because it's not only used in infoviewer
* INFOBAR_SHADOW_TEXT to MENUFOOT_TEXT because it's the proper name

This is in preparation to make footer colors configurable


Origin commit data
------------------
Commit: bc39d1e14e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-14 (Sun, 14 Aug 2016)

Origin message was:
------------------
- colors: some internal renamings

* INFOBAR_SHADOW to SHADOW because it's not only used in infoviewer
* INFOBAR_SHADOW_TEXT to MENUFOOT_TEXT because it's the proper name

This is in preparation to make footer colors configurable
 2016-08-14 21:55:18 +02:00
vanhofen
31a80d2f93 use CFileHelpers::copyFile instead of own function; cleanup helpers 
Origin commit data
------------------
Commit: 6d01d59b53
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-11 (Thu, 11 Aug 2016)

Origin message was:
------------------
- use CFileHelpers::copyFile instead of own function; cleanup helpers
 2016-08-11 13:52:49 +02:00
vanhofen
e92701fa7c infoviewer_bb: fix infowindow again 
Origin commit data
------------------
Commit: d0687acfff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-06-13 (Mon, 13 Jun 2016)

Origin message was:
------------------
- infoviewer_bb: fix infowindow again
 2016-06-13 18:49:43 +02:00
FlatTV
52ef0d1221 infoviewer_bb.cpp: use variable instead of string text 
Origin commit data
------------------
Commit: 4a7d32d1ee
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-06-04 (Sat, 04 Jun 2016)
 2016-06-04 22:49:42 +02:00
FlatTV
0af040c937 infoviewer_bb.cpp: do not load data twice 
Origin commit data
------------------
Commit: 249d853cdf
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-06-04 (Sat, 04 Jun 2016)
 2016-06-04 22:43:28 +02:00
FlatTV
951f91ec1d fix display of info window 
Origin commit data
------------------
Commit: 1655ecc079
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-06-04 (Sat, 04 Jun 2016)
 2016-06-04 17:34:33 +02:00
FlatTV
c986e48f26 Revert "- infoviewer_bb: fix display of info window_" 
This reverts commit 8e536ab94e.


Origin commit data
------------------
Commit: bd089efd7d
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-06-04 (Sat, 04 Jun 2016)
 2016-06-04 10:48:19 +02:00
vanhofen
8e536ab94e infoviewer_bb: fix display of info window_ 
Origin commit data
------------------
Commit: a799de3a15
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-26 (Thu, 26 May 2016)

Origin message was:
------------------
- infoviewer_bb: fix display of info window_
 2016-05-26 21:56:18 +02:00
vanhofen
4cf2b60722 NI \o/ 
Origin commit data
------------------
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)
 2016-05-19 22:59:54 +02:00
vanhofen
b3e51013e8 infoviewer_bb: show resolution in livestream mode on color button 
Origin commit data
------------------
Commit: 07b1f6f849
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-03 (Thu, 03 Mar 2016)

Origin message was:
------------------
- infoviewer_bb: show resolution in livestream mode on color button
 2016-03-03 09:46:42 +01:00
Michael Liebmann
ed7b2f91e4 movieplayer: Use Lua scripts for selecting live stream urls 
Origin commit data
------------------
Commit: b4a2856e1c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-03-03 (Thu, 03 Mar 2016)
 2016-03-03 09:46:42 +01:00
Thilo Graf
f7c2d3588c CInfoViewerBB: ensure reinit bboffset before paint ca bar and footer 
Value of bb offset was only initialized on bb init. If a user has changed
ca bar settings (e.g. enable/disable frame around ca bar) while runtime, the
current offset value could be wrong and infoviewer has display errors.
To solve this restart of neutrino was required.


Origin commit data
------------------
Commit: 6f3df3a5a8
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-02-17 (Wed, 17 Feb 2016)
 2016-02-17 10:18:44 +01:00
Thilo Graf
ac7d8d670d CInfoViewerBB: try to fix repaint of sys scales after channel switch 
Reset should force repaint and scales should be always visible after
footer paint.


Origin commit data
------------------
Commit: 3dc56386f5
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-02-16 (Tue, 16 Feb 2016)
 2016-02-16 11:11:38 +01:00
Michael Liebmann
d7166da64a Merge branch 'cst-next' into nmp-cst-next 
Conflicts: src/zapit/src/getservices.cpp


Origin commit data
------------------
Commit: c657e2d892
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-29 (Fri, 29 Jan 2016)
 2016-01-29 15:41:18 +01:00
Michael Liebmann
ec4980f2a0 CCDraw: Set cc_gradient_bg_cleanup to true 
Except menu headers: Disable cleanup when save screen is disabled


Origin commit data
------------------
Commit: 6c72fe94bc
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-29 (Fri, 29 Jan 2016)

Origin message was:
------------------
CCDraw: Set cc_gradient_bg_cleanup to true

 Except menu headers: Disable cleanup when save screen is disabled
 2016-01-29 15:31:12 +01:00
Michael Liebmann
52e28a66d3 Merge branch 'cst-next' into nmp-cst-next 
Origin commit data
------------------
Commit: f628ca6af8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-28 (Thu, 28 Jan 2016)
 2016-01-28 05:32:50 +01:00
Michael Liebmann
5811644376 Fix osd error on nevis 
Origin commit data
------------------
Commit: 87e6f328dd
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-27 (Wed, 27 Jan 2016)
 2016-01-27 10:07:33 +01:00
Michael Liebmann
3d0eca59b6 Fix ghost text in infoviewer 
Origin commit data
------------------
Commit: 8dd426d714
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-26 (Tue, 26 Jan 2016)
 2016-01-26 20:00:22 +01:00
Michael Liebmann
86fd5344a6 Merge branch 'cst-next' into nmp-cst-next 
Origin commit data
------------------
Commit: ed99066466
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-26 (Tue, 26 Jan 2016)
 2016-01-26 06:55:54 +01:00
vanhofen
c4459dfedb infoviewer: fix audio description in mode_webtv 
Origin commit data
------------------
Commit: 32c28038a3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-26 (Tue, 26 Jan 2016)

Origin message was:
------------------
- infoviewer: fix audio description in mode_webtv
 2016-01-26 00:57:08 +01:00
vanhofen
5449a843bf Revert "- infoviewer_bb: use getMoviePlayerButtonName in mode_audio too;" 
This reverts ugly commit 709277bb24


Origin commit data
------------------
Commit: 61e457c0a6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-25 (Mon, 25 Jan 2016)
 2016-01-25 22:45:18 +01:00
Michael Liebmann
5e03ef38b0 Merge branch 'cst-next' into nmp-cst-next 
Origin commit data
------------------
Commit: 2b011914bb
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-25 (Mon, 25 Jan 2016)
 2016-01-25 13:55:18 +01:00
vanhofen
2fa4974acb infoviewer: supplement to 9d4ed047dd 
Origin commit data
------------------
Commit: 766276df9f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-25 (Mon, 25 Jan 2016)

Origin message was:
------------------
- infoviewer: supplement to 9d4ed047dd
 2016-01-25 13:28:25 +01:00
Michael Liebmann
48acf5fcc4 Merge branch 'cst-next' into nmp-cst-next 
Origin commit data
------------------
Commit: db8a9e6388
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-25 (Mon, 25 Jan 2016)
 2016-01-25 13:20:10 +01:00
vanhofen
9d4ed047dd Revert "- infoviewer_bb: use getMoviePlayerButtonName in mode_webtv too" 
This reverts commit a6ac956894
because mode_webtv == (something like) live tv.
So the movieplayer button names shouldn't be displayed.

Conflicts:
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Commit: 2786c13867
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-25 (Mon, 25 Jan 2016)
 2016-01-25 13:05:16 +01:00
vanhofen
e07988e7bd infoviewer: show plugin name, when movieplayer-plugin is selected 
Origin commit data
------------------
Commit: 0b74f601db
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-25 (Mon, 25 Jan 2016)

Origin message was:
------------------
- infoviewer: show plugin name, when movieplayer-plugin is selected
 2016-01-25 12:00:47 +01:00
Michael Liebmann
7873f82534 Merge branch 'cst-next' into nmp-cst-next 
Origin commit data
------------------
Commit: 343f45aa1e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-23 (Sat, 23 Jan 2016)
 2016-01-23 05:08:52 +01:00
vanhofen
749e5b2e57 infoviewer: fix overlaps on buttons while zapping 
Origin commit data
------------------
Commit: 23242e605c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-22 (Fri, 22 Jan 2016)

Origin message was:
------------------
- infoviewer: fix overlaps on buttons while zapping
 2016-01-22 10:49:45 +01:00
Michael Liebmann
304fea8be0 Merge branch 'cst-next' into nmp-cst-next 
Origin commit data
------------------
Commit: b6d2bad857
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-21 (Thu, 21 Jan 2016)
 2016-01-21 17:57:38 +01:00
vanhofen
8bcbb0b77b infoviewer: fix display of DolbyDigital icon 
Origin commit data
------------------
Commit: 2694b87d08
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-21 (Thu, 21 Jan 2016)

Origin message was:
------------------
- infoviewer: fix display of DolbyDigital icon
 2016-01-21 08:25:18 +01:00
Stefan Seyfried
0222346c9a Merge remote-tracking branch 'uncool/cst-next' 
Origin commit data
------------------
Commit: 9113716171
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-01 (Fri, 01 Jan 2016)
 2016-01-01 14:10:48 +01:00
Thilo Graf
b82892a27f CInfoViewerBB: fix missing parameter 
Shadow was lost after repaint


Origin commit data
------------------
Commit: f5fba42118
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-12-30 (Wed, 30 Dec 2015)
 2015-12-30 13:09:37 +01:00
vanhofen
8136071418 infoviewer_bb: use new infobar_buttons_usertitle key 
Origin commit data
------------------
Commit: 974480fc4f
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-29 (Tue, 29 Dec 2015)

Origin message was:
------------------
- infoviewer_bb: use new infobar_buttons_usertitle key
 2015-12-29 14:31:52 +01:00
vanhofen
49a62fb5d8 infoviewer_bb: remove labeling of audio control from green button ... 
... now user can use any color key to control audio


Origin commit data
------------------
Commit: 0561f6e663
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-29 (Tue, 29 Dec 2015)

Origin message was:
------------------
- infoviewer_bb: remove labeling of audio control from green button ...

 ... now user can use any color key to control audio
 2015-12-29 14:31:51 +01:00
vanhofen
acf3a5a980 infoviewer_bb: remove arbitrarily titles from color buttons 
Origin commit data
------------------
Commit: 6d144ad685
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-27 (Sun, 27 Dec 2015)

Origin message was:
------------------
- infoviewer_bb: remove arbitrarily titles from color buttons
 2015-12-29 14:31:51 +01:00
vanhofen
709277bb24 infoviewer_bb: use getMoviePlayerButtonName in mode_audio too; 
ugly workaround; why we're in mode_audio when using upnp-browser?
 do we need a mode_upnp?


Origin commit data
------------------
Commit: a2b28048d6
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-27 (Sun, 27 Dec 2015)

Origin message was:
------------------
- infoviewer_bb: use getMoviePlayerButtonName in mode_audio too;

 ugly workaround; why we're in mode_audio when using upnp-browser?
 do we need a mode_upnp?
 2015-12-29 14:31:51 +01:00
vanhofen
a6ac956894 infoviewer_bb: use getMoviePlayerButtonName in mode_webtv too 
Origin commit data
------------------
Commit: 5e51b5e252
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-27 (Sun, 27 Dec 2015)

Origin message was:
------------------
- infoviewer_bb: use getMoviePlayerButtonName in mode_webtv too
 2015-12-29 14:31:51 +01:00
Stefan Seyfried
8822421c6b Merge remote-tracking branch 'uncool/cst-next' 
Origin commit data
------------------
Commit: b837d8697b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-28 (Mon, 28 Dec 2015)
 2015-12-28 16:15:14 +01:00
Michael Liebmann
8dbfd8e3fd CInfoViewerBB: try to fix missing sys scales in infoviewer 
Signed-off-by: M. Liebmann <tuxcode.bbg@gmail.com>
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: f111ccc98e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-12-26 (Sat, 26 Dec 2015)
 2015-12-27 14:42:31 +01:00
Thilo Graf
c6905d2f03 Colors: init global color gradient implementation 
Origin commit data
------------------
Commit: 523b273af8
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-11-19 (Thu, 19 Nov 2015)
 2015-12-27 14:42:27 +01:00
Stefan Seyfried
03e3eb95f1 Merge remote-tracking branch 'uncool/cst-next' 
Origin commit data
------------------
Commit: 2d949bce16
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-15 (Tue, 15 Dec 2015)
 2015-12-15 17:29:18 +01:00
vanhofen
a98f6bd1da infoviewer_bb: don't paint deactivated buttons 
Origin commit data
------------------
Commit: 47eb2e27ec
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-14 (Mon, 14 Dec 2015)

Origin message was:
------------------
- infoviewer_bb: don't paint deactivated buttons
 2015-12-15 08:15:17 +01:00