Commit Graph

370 Commits

Author SHA1 Message Date
vanhofen
b393d775dc various: use DARK text color on DARK background
Origin commit data
------------------
Branch: ni/coolstream
Commit: 957b1e05df
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-19 (Wed, 19 Oct 2016)

Origin message was:
------------------
- various: use DARK text color on DARK background

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

------------------
This commit was generated by Migit
2016-10-19 14:35:38 +02:00
vanhofen
8c1d8a8323 menue: fix listModeKey handling
Origin commit data
------------------
Branch: ni/coolstream
Commit: 870981c889
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-19 (Wed, 19 Oct 2016)

Origin message was:
------------------
- menue: fix listModeKey handling

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

------------------
This commit was generated by Migit
2016-10-19 14:06:24 +02:00
vanhofen
aa65a615f9 add and use OFFSET_INTER definition
Origin commit data
------------------
Branch: ni/coolstream
Commit: 98500fdeb6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- add and use OFFSET_INTER definition

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

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
vanhofen
b59278067e rename SHADOW_OFFSET -> OFFSET_SHADOW
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5d450c60d3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- rename SHADOW_OFFSET -> OFFSET_SHADOW

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

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
vanhofen
7f19812d17 colors: add COL_SCROLLBAR_PASSIVE wrapper
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6629b64d6c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- colors: add COL_SCROLLBAR_PASSIVE wrapper

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

------------------
This commit was generated by Migit
2016-10-10 14:19:54 +02:00
vanhofen
e13c700904 colors: add COL_SCROLLBAR_ACTIVE wrapper
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e7d4e5fc1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- colors: add COL_SCROLLBAR_ACTIVE wrapper

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

------------------
This commit was generated by Migit
2016-10-10 14:19:54 +02:00
vanhofen
5987637998 colors: add COL_FRAME wrapper
Origin commit data
------------------
Branch: ni/coolstream
Commit: 75fe6e407d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- colors: add COL_FRAME wrapper

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

------------------
This commit was generated by Migit
2016-10-10 14:19:54 +02:00
Thilo Graf
862fb8107e CMenuItem: use reasonable radius
In some views the large radius looks too chunky.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 264366c792
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-09-24 (Sat, 24 Sep 2016)



------------------
This commit was generated by Migit
2016-09-24 20:59:49 +02:00
vanhofen
ed6f601639 detailsline: remove unneeded position/dimension additions
Origin commit data
------------------
Branch: ni/coolstream
Commit: 974ef11d5b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-12 (Mon, 12 Sep 2016)

Origin message was:
------------------
- detailsline: remove unneeded position/dimension additions

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

------------------
This commit was generated by Migit
2016-09-12 12:11:04 +02:00
vanhofen
58b62b0445 add listModeKey() function to simplify these calls
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2911e638c7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- add listModeKey() function to simplify these calls

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

------------------
This commit was generated by Migit
2016-09-09 10:42:46 +02:00
Thilo Graf
e6b7e1921a CMenuWidget: assign all layer colors out of header init
This fixes missing applying of possible changes of
colour settings in color setup for frame.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 41ed6513bd
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-21 (Sun, 21 Aug 2016)



------------------
This commit was generated by Migit
2016-08-22 21:16:58 +02:00
Jacek Jendrzej
59d3c49084 src/gui/widget/menue.cpp check if pointer is not NULL
Origin commit data
------------------
Branch: ni/coolstream
Commit: a29f433ded
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-08-17 (Wed, 17 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-17 17:23:08 +02:00
Thilo Graf
edfe7aa268 CMenuWidget: adopt shadow color to newer color macros
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1306a7c1a3
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-17 (Wed, 17 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-17 10:55:12 +02:00
vanhofen
fb9eaf294f colors: make footer background color configurable
TODO: footer text color and maybe footer font


Origin commit data
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2016-08-15 00:14:47 +02:00
vanhofen
1c1c5a05f3 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
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2016-08-14 21:55:18 +02:00
Thilo Graf
cb31f448c3 CMenuWidget: use real paint mode of info box
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5788d744c6
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-07-25 (Mon, 25 Jul 2016)


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

------------------
This commit was generated by Migit
2016-08-12 17:39:11 +02:00
Jacek Jendrzej
ffd6e7fc7a src/gui/widget/menue.cpp fix possible heap-buffer-overflow
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5be8af9890
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-07-21 (Thu, 21 Jul 2016)


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

------------------
This commit was generated by Migit
2016-07-21 15:38:34 +02:00
Thilo Graf
6cb561b25e CMenuWidget: avoid dangling pointer after delete
Origin commit data
------------------
Branch: ni/coolstream
Commit: 91729dc48a
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-05-04 (Wed, 04 May 2016)


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

------------------
This commit was generated by Migit
2016-06-26 15:32:31 +02:00
Jacek Jendrzej
beae26be1d some never read compil warning fixes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d9fbd5378
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-24 (Sun, 24 Apr 2016)


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

------------------
This commit was generated by Migit
2016-04-24 17:18:37 +02:00
Jacek Jendrzej
c33b5aad44 pass by reference
Origin commit data
------------------
Branch: ni/coolstream
Commit: a918ca56b6
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-20 (Wed, 20 Apr 2016)


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

------------------
This commit was generated by Migit
2016-04-20 12:52:16 +02:00
[CST] Focus
f02dae27c7 neutrino: add webtv channel list mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 302642cee7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-23 (Wed, 23 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-23 16:36:00 +03:00
Michael Liebmann
8372065c10 CCDraw: Set cc_gradient_bg_cleanup to true
Except menu headers: Disable cleanup when save screen is disabled


Origin commit data
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2016-01-29 15:31:12 +01:00
Jacek Jendrzej
579cabe970 CMenuWidget: try to fix possible overlength of details line
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a338357fc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-01-25 (Mon, 25 Jan 2016)



------------------
This commit was generated by Migit
2016-01-26 20:00:22 +01:00
Michael Liebmann
a8244f8aa3 CMenuWidget: Enable cleanup gradient background for menu hints...
... and for menu headers when save screen is enabled


Origin commit data
------------------
Branch: ni/coolstream
Commit: ef9246d892
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-26 (Tue, 26 Jan 2016)



------------------
This commit was generated by Migit
2016-01-26 09:51:48 +01:00
Stefan Seyfried
0a95a07654 Merge remote-tracking branch 'uncool/cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: b837d8697b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-28 (Mon, 28 Dec 2015)


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

------------------
This commit was generated by Migit
2015-12-28 16:15:14 +01:00
Thilo Graf
6e833a30ee CMenuWidget: rework cc modules implementation
- don't create header instance on every widget paint.
- remove parameters from hide(), not needed anymore
- add signal/slot OnBeforePaint(), OnAfterHide()
- try to fix infoclock handling
- add member ResetModules()
- allow separator to paint with gradient


Origin commit data
------------------
Branch: ni/coolstream
Commit: 77518102f8
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-11-18 (Wed, 18 Nov 2015)



------------------
This commit was generated by Migit
2015-12-27 14:42:28 +01:00
Stefan Seyfried
4df1487cd9 Merge remote-tracking branch 'uncool/cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 880115fa98
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-25 (Fri, 25 Dec 2015)


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

------------------
This commit was generated by Migit
2015-12-25 16:28:39 +01:00
vanhofen
52af84fc14 menue: fix format warning 'too many arguments'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 92abb85a9d
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-21 (Mon, 21 Dec 2015)

Origin message was:
------------------
- menue: fix format warning 'too many arguments'

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

------------------
This commit was generated by Migit
2015-12-22 13:14:18 +01:00
vanhofen
19a054cf59 menue: don't paint hotkey icons on deactivated items; use dummy icon
Origin commit data
------------------
Branch: ni/coolstream
Commit: 809274d750
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-21 (Mon, 21 Dec 2015)

Origin message was:
------------------
- menue: don't paint hotkey icons on deactivated items; use dummy icon

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

------------------
This commit was generated by Migit
2015-12-22 13:14:18 +01:00
Thilo Graf
cf5f9ee37e Main Menu: try to add dynamic possibility to disable items on runtime
The issue is that it's not really possible to disable/enable menu items on
runtime with an existant menu widget instance eg with personalized menu items.

Here we need a dynamic solution to disable items depends on stb-mode (mode_ts, mode_tv etc)
This should be solved here with an additional parameter for personalized items.

New paramter is named: disable_condition
Possible alvailable values at the moment are:

 DCOND_MODE_NONE as default

 DCOND_MODE_TV
 DCOND_MODE_RADIO
 DCOND_MODE_TS

includes some improvements by Sven

- menue: remove old_iconName handling
 ... icons should be painted on deactivated items too

- menue: try to fix position <-> selection missmatch


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1f95f38d32
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)

Origin message was:
------------------
Main Menu: try to add dynamic possibility to disable items on runtime

The issue is that it's not really possible to disable/enable menu items on
runtime with an existant menu widget instance eg with personalized menu items.

Here we need a dynamic solution to disable items depends on stb-mode (mode_ts, mode_tv etc)
This should be solved here with an additional parameter for personalized items.

New paramter is named: disable_condition
Possible alvailable values at the moment are:

 DCOND_MODE_NONE as default

 DCOND_MODE_TV
 DCOND_MODE_RADIO
 DCOND_MODE_TS

includes some improvements by Sven

- menue: remove old_iconName handling
 ... icons should be painted on deactivated items too

- menue: try to fix position <-> selection missmatch


------------------
This commit was generated by Migit
2015-12-22 13:14:18 +01:00
Stefan Seyfried
5f89c9a312 Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...


Origin commit data
------------------
Branch: ni/coolstream
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)



------------------
This commit was generated by Migit
2015-12-13 17:41:55 +01:00
Michael Liebmann
b9505e6a73 Disable multimedia plugins and video functions...
...(movie player & upnp browser) when movieplayer is in use


Origin commit data
------------------
Branch: ni/coolstream
Commit: 189b2e0fb0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-12-08 (Tue, 08 Dec 2015)



------------------
This commit was generated by Migit
2015-12-08 12:01:25 +01:00
Thilo Graf
6059f2ff12 CMenuWidget: remove double assignment of info box color
Origin commit data
------------------
Branch: ni/coolstream
Commit: 89cc6628ca
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-07-17 (Fri, 17 Jul 2015)


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

------------------
This commit was generated by Migit
2015-07-17 17:31:57 +02:00
vanhofen
bc1abed6fa menue: allow brief hints in all introItems
Origin commit data
------------------
Branch: ni/coolstream
Commit: 524563f448
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-19 (Tue, 19 May 2015)

Origin message was:
------------------
- menue: allow brief hints in all introItems

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

------------------
This commit was generated by Migit
2015-05-19 12:28:28 +02:00
vanhofen
fb3b71925f menu: use brief hint in start_wizards first steps
Origin commit data
------------------
Branch: ni/coolstream
Commit: c87ccae290
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-14 (Thu, 14 May 2015)

Origin message was:
------------------
- menu: use brief hint in start_wizards first steps

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

------------------
This commit was generated by Migit
2015-05-15 03:46:50 +02:00
vanhofen
f26b53d4ad start_wizard: use a global enum; switch detection from bool to int
Origin commit data
------------------
Branch: ni/coolstream
Commit: af90286a30
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-15 (Fri, 15 May 2015)

Origin message was:
------------------
- start_wizard: use a global enum; switch detection from bool to int

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

------------------
This commit was generated by Migit
2015-05-15 03:46:50 +02:00
vanhofen
3a1e7261cc menu: add hint-icon and hint-text to "continue" menu items
Origin commit data
------------------
Branch: ni/coolstream
Commit: d9b3e9420a
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-15 (Fri, 15 May 2015)

Origin message was:
------------------
- menu: add hint-icon and hint-text to "continue" menu items

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

------------------
This commit was generated by Migit
2015-05-15 03:46:50 +02:00
vanhofen
9c75cab7ae menue: small color changes for a smoother view
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3ece820b07
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-04 (Mon, 04 May 2015)

Origin message was:
------------------
- menue: small color changes for a smoother view

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

------------------
This commit was generated by Migit
2015-05-04 09:42:07 +02:00
Thilo Graf
cefb8f9594 themes: use hintbox and header gradient option in theme settings
Color gradient feature was originally intended for use
inside theme settings and it's not really suitable for
generally use as default in all themes at the moment, so it makes more
sense to have options in theme settings and let the user decide
to customize this, unless enough other gui parts can use this feature.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 01516cf943
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-04-29 (Wed, 29 Apr 2015)

Origin message was:
------------------
themes: use hintbox and header gradient option in theme settings

Color gradient feature was originally intended for use
inside theme settings and it's not really suitable for
generally use as default in all themes at the moment, so it makes more
sense to have options in theme settings and let the user decide
to customize this, unless enough other gui parts can use this feature.


------------------
This commit was generated by Migit
2015-04-29 10:16:55 +02:00
[CST] Focus
c6c9a104a9 CMenueWidget: add color gradient to menue hints
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8a41089a92
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-04-27 (Mon, 27 Apr 2015)



------------------
This commit was generated by Migit
2015-04-27 09:55:26 +02:00
Thilo Graf
fe347b1177 CMenuWidget: move include of neutrino_menue.h to menue.h
makes explicit include unnecessary if it is needed by a widget, eg: widget id's are
parameter of constructor and is one of required widget elements.


Origin commit data
------------------
Branch: ni/coolstream
Commit: d3f9aa33f7
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-12-08 (Mon, 08 Dec 2014)



------------------
This commit was generated by Migit
2015-03-29 22:40:00 +02:00
Thilo Graf
3755ba38e3 CMenuWidget: fix applying of hintbox text color after changed theme
Origin commit data
------------------
Branch: ni/coolstream
Commit: 20180b5b83
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-10-26 (Sun, 26 Oct 2014)


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

------------------
This commit was generated by Migit
2015-03-29 22:39:52 +02:00
Stefan Seyfried
4d42e1df42 Merge remote-tracking branch 'check/cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 79b9a8050e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-21 (Sat, 21 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-21 21:56:22 +01:00
vanhofen
24c2506951 menue.cpp: fix details_line hight
* former code matches only by chance and will fail, when another
 value than 2 is set in INFO_BOX_Y_OFFSET (cc_item_infobox.h)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 13d7ec55a5
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-02-20 (Fri, 20 Feb 2015)

Origin message was:
------------------
- menue.cpp: fix details_line hight

* former code matches only by chance and will fail, when another
 value than 2 is set in INFO_BOX_Y_OFFSET (cc_item_infobox.h)


------------------
This commit was generated by Migit
2015-02-20 08:23:07 +01:00
Stefan Seyfried
e4e9fb1e46 Merge remote-tracking branch 'test/cst-next'
Conflicts:
	src/gui/osdlang_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 48fdfc5e5e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-19 (Thu, 19 Feb 2015)



------------------
This commit was generated by Migit
2015-02-19 14:10:26 +01:00
Jacek Jendrzej
88c7a4f4b4 menue.cpp fix CMenuForwarder::setOption set option_string_ptr
Origin commit data
------------------
Branch: ni/coolstream
Commit: 721cb9bd74
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-02-14 (Sat, 14 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-14 18:42:40 +01:00
Stefan Seyfried
2263c8bd2e Merge remote-tracking branch 'check/cst-next'
*needs buildfixing*

Conflicts:
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/driver/vfd.cpp
	src/gui/bedit/Makefile.am
	src/gui/components/Makefile.am
	src/gui/luainstance.cpp
	src/gui/widget/Makefile.am
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: b5a64e6887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)



------------------
This commit was generated by Migit
2015-01-26 17:26:26 +01:00
Jacek Jendrzej
5afc24dc67 use empty to check string
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2b5e7b5ba3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-01-09 (Fri, 09 Jan 2015)


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

------------------
This commit was generated by Migit
2015-01-09 17:15:11 +01:00
Stefan Seyfried
770e405c50 Merge remote-tracking branch 'check/cst-next'
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: d37b3c0f9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-28 (Sun, 28 Dec 2014)



------------------
This commit was generated by Migit
2014-12-28 12:32:12 +01:00
Stefan Seyfried
c8e3ec41a9 Merge remote-tracking branch 'check/cst-next'
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)



------------------
This commit was generated by Migit
2014-12-25 18:03:08 +01:00