Commit Graph

109 Commits

Author SHA1 Message Date
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
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
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
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
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
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
9abaa78d4c CMenuWidget: fix getSelected() member
preselected was not suitable as return value


Origin commit data
------------------
Branch: ni/coolstream
Commit: 930b40588c
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-12-05 (Fri, 05 Dec 2014)



------------------
This commit was generated by Migit
2015-03-29 22:39:59 +02:00
vanhofen
b976eb95c9 plugins: simplify integratePlugins(); ...
* CPluginsExec(): switch to singleton
* move CPluginsExec() to pluginlist.cpp|h
 because it's not really a settings_helper


Origin commit data
------------------
Branch: ni/coolstream
Commit: 389c4c232f
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-10 (Mon, 10 Nov 2014)

Origin message was:
------------------
- plugins: simplify integratePlugins(); ...

* CPluginsExec(): switch to singleton
* move CPluginsExec() to pluginlist.cpp|h
 because it's not really a settings_helper


------------------
This commit was generated by Migit
2014-11-10 22:41:08 +01:00
[CST] Focus
9c0617bb3c gui/widget/menue.cpp: add activate observer to notify when item become active
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2b50060bab
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-22 (Wed, 22 Oct 2014)


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

------------------
This commit was generated by Migit
2014-10-22 16:15:27 +04:00
Michael Liebmann
573c44da0a CMenuWidget::integratePlugins(): Add shortcut parameter
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7293c53600
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-10-16 (Thu, 16 Oct 2014)


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

------------------
This commit was generated by Migit
2014-10-16 09:49:19 +02:00
Michael Liebmann
ab5bf89953 CMenuWidget: Add function getNextShortcut()/setNextShortcut()
for setting of direktkey in the plugin integration


Origin commit data
------------------
Branch: ni/coolstream
Commit: 940a41aab2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-10-16 (Thu, 16 Oct 2014)

Origin message was:
------------------
CMenuWidget: Add function getNextShortcut()/setNextShortcut()

 for setting of direktkey in the plugin integration


------------------
This commit was generated by Migit
2014-10-16 09:49:18 +02:00
vanhofen
b8b5f4f4ef add function to integrate plugins
TODO: maybe find a solution without void *pluginsExec
Thanks to micha-bbg and SatBaby


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1b5a30c326
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-28 (Sun, 28 Sep 2014)

Origin message was:
------------------
- add function to integrate plugins

TODO: maybe find a solution without void *pluginsExec
Thanks to micha-bbg and SatBaby


------------------
This commit was generated by Migit
2014-09-29 14:38:43 +04:00
[CST] Focus
4eb5179286 neutrino: sync keybind and usermenu code with neutrino-mp, code (C) martii
Origin commit data
------------------
Branch: ni/coolstream
Commit: 420af7a4dc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)


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

------------------
This commit was generated by Migit
2014-09-05 17:49:11 +04:00
[CST] Focus
5d045938ae gui/widget/menue.h: fix suppressDetailsLine()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7cee5d3b2e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-10 (Thu, 10 Jul 2014)


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

------------------
This commit was generated by Migit
2014-07-17 17:02:32 +04:00
[CST] Focus
5ee14dabdd merge neutrino-mp menu/buttons/icons changes, (C) martii
Origin commit data
------------------
Branch: ni/coolstream
Commit: cf91f2eccb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-17 (Thu, 17 Jul 2014)


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

------------------
This commit was generated by Migit
2014-07-17 17:02:25 +04:00
Thilo Graf
19684ff082 CMenuWidget: add member to suppress paint of details line
In some situations is it more senseful to suppress painting of details line.
Required if menu window is painted over another window.
The hide() functionality of detailsline paints only an empty background on screen so we have
blank parts on screen. That looks bad. For example, this is to observe
on context menu in channellist.

We should see this as a workaround. It is not certain whether the
details line is really needed in the future.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 793230e9a7
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-06-09 (Mon, 09 Jun 2014)



------------------
This commit was generated by Migit
2014-06-23 18:43:47 +02:00
Thilo Graf
804facbcf8 CMenuWidget: implement CComponentsFooter, remove paintButtons
Origin commit data
------------------
Branch: ni/coolstream
Commit: d87807af67
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-05-02 (Fri, 02 May 2014)


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

------------------
This commit was generated by Migit
2014-05-22 21:50:51 +02:00
vanhofen
e401dbe50f menu: add possibility to add a footer to the menus; fix alignment of menus
add footer-keys to testmenu

 (some of this code is based on code by martii; thx)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4fba818cc2
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-04-11 (Fri, 11 Apr 2014)

Origin message was:
------------------
- menu: add possibility to add a footer to the menus; fix alignment of menus

 add footer-keys to testmenu

 (some of this code is based on code by martii; thx)


------------------
This commit was generated by Migit
2014-04-11 00:26:52 +02:00
Thilo Graf
771a0cd265 /gui/widget/menue.cpp: rework constructors, use methodes for init
Many redundant code lines were never been refactored or reduced,
but instead came many in with some of last changes e.g. 7b4e3bc03b


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5f7f453bd7
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-04-07 (Mon, 07 Apr 2014)



------------------
This commit was generated by Migit
2014-04-09 19:02:38 +02:00
Michael Liebmann
d37b82c7d4 CMenuOptionChooser: Remove bad function getOptionName()
- Please use getName() as replacement.

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

partial revert of ed9ee24f68


Origin commit data
------------------
Branch: ni/coolstream
Commit: e07af686f0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-04-09 (Wed, 09 Apr 2014)



------------------
This commit was generated by Migit
2014-04-09 19:02:37 +02:00
[CST] Focus
9c91d7da7a gui/widget/menue.cpp: add CMenuOptionChooser::setOptions
Origin commit data
------------------
Branch: ni/coolstream
Commit: b36a66db34
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-21 (Fri, 21 Mar 2014)


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

------------------
This commit was generated by Migit
2014-03-21 17:18:21 +04:00
Thilo Graf
0cfa98486a CMenuItem: remove redundant member for background paint
It seems this method came with more functionality in past,
but it's currently not required in that Form.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8a39f01a79
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-02-26 (Wed, 26 Feb 2014)



------------------
This commit was generated by Migit
2014-03-03 08:54:10 +01:00
martii
dd21d71f7a gui/widget/menue, gui/osdlang_setup: drop CMenuOptionLanguageChooser class
Origin commit data
------------------
Branch: ni/coolstream
Commit: eb206ae523
Author: martii <m4rtii@gmx.de>
Date: 2014-03-02 (Sun, 02 Mar 2014)


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

------------------
This commit was generated by Migit
2014-03-02 21:31:26 +01:00
Michael Liebmann
6e440ebc11 CMenuForwarder: Fix options handling
Origin commit data
------------------
Branch: ni/coolstream
Commit: 08130328a0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-30 (Thu, 30 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-30 09:13:51 +01:00
vanhofen
b87b7e17c8 CLuaInstance::MenuAddItem: add 'next' and 'cancel' items
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6a821fe2a5
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-27 (Mon, 27 Jan 2014)

Origin message was:
------------------
- CLuaInstance::MenuAddItem: add 'next' and 'cancel' items

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

------------------
This commit was generated by Migit
2014-01-27 21:10:41 +01:00
Michael Liebmann
c980278eb1 Add a --enable-lua switch to enable LUA support
Origin commit data
------------------
Branch: ni/coolstream
Commit: 82d4832013
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-21 (Tue, 21 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-21 17:05:24 +01:00
Michael Liebmann
2fd195d66a Preparing the input classes for Lua
- Add non locale variants for CExtendedInput, CStringInput,
 CStringInputSMS, CPINInput
 THX Martii


Origin commit data
------------------
Branch: ni/coolstream
Commit: 31842369cc
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-18 (Sat, 18 Jan 2014)

Origin message was:
------------------
Preparing the input classes for Lua

- Add non locale variants for CExtendedInput, CStringInput,
 CStringInputSMS, CPINInput
 THX Martii


------------------
This commit was generated by Migit
2014-01-19 20:57:38 +01:00
Michael Liebmann
ed9ee24f68 Preparing the menu classes for Lua Part #3
- Add non locale variants for CMenuOptionNumberChooser and
 CMenuOptionChooser
- Adaptation of CMenuOptionStringChooser, CChangeObserver
 THX Martii


Origin commit data
------------------
Branch: ni/coolstream
Commit: afbd87083b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-18 (Sat, 18 Jan 2014)

Origin message was:
------------------
Preparing the menu classes for Lua Part #3

- Add non locale variants for CMenuOptionNumberChooser and
 CMenuOptionChooser
- Adaptation of CMenuOptionStringChooser, CChangeObserver
 THX Martii


------------------
This commit was generated by Migit
2014-01-19 20:57:37 +01:00
Michael Liebmann
7b4e3bc03b Preparing the menu classes for Lua Part #2
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii


Origin commit data
------------------
Branch: ni/coolstream
Commit: b41819190d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-16 (Thu, 16 Jan 2014)

Origin message was:
------------------
Preparing the menu classes for Lua Part #2

- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii


------------------
This commit was generated by Migit
2014-01-19 20:57:37 +01:00
Michael Liebmann
917e8aafa4 Preparing the menu classes for Lua Part #1
- Remove CNonLocalizedMenuSeparator
- Add overloaded function CMenuSeparator for non local
 THX Martii


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c9c9debcc
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-16 (Thu, 16 Jan 2014)

Origin message was:
------------------
Preparing the menu classes for Lua Part #1

- Remove CNonLocalizedMenuSeparator
- Add overloaded function CMenuSeparator for non local
 THX Martii


------------------
This commit was generated by Migit
2014-01-19 20:57:37 +01:00
Michael Liebmann
6fe97065c5 CMenuOptionChooser: Fix multiple menu items, when using sort option
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9af1cdb318
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-04 (Sat, 04 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-04 15:25:28 +01:00
Michael Liebmann
b26b45a866 CMenuOptionChooser: Add alphanumeric sort option
- default is false
- Activate by OptionsSort = true


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8832b803bd
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-04 (Sat, 04 Jan 2014)



------------------
This commit was generated by Migit
2014-01-04 13:08:48 +01:00
Christian Schuett
30fb5e2f60 Neutrino menu forwarder: add possibility to show value from jump target
based on idea by martii <m4rtii@gmx.de> in Neutrino-MP Git


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d04113307
Author: Christian Schuett <Gaucho316@hotmail.com>
Date: 2013-12-30 (Mon, 30 Dec 2013)



------------------
This commit was generated by Migit
2013-12-30 23:25:26 +01:00
martii
7ebfe9959d convert most char[...] configuration values to std::string
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: cbc9299df8
Author: martii <m4rtii@gmx.de>
Date: 2013-06-11 (Tue, 11 Jun 2013)



------------------
This commit was generated by Migit
2013-12-25 12:08:14 +01:00
martii
b2727d774b gui/scan_setup: show unit for motor speed
Origin commit data
------------------
Branch: ni/coolstream
Commit: a0f2960501
Author: martii <m4rtii@gmx.de>
Date: 2013-12-21 (Sat, 21 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-22 16:36:13 +01:00
martii
46499fee08 gui/widget/menu: CMenuOptionNumberChooser: add option to show units
Origin commit data
------------------
Branch: ni/coolstream
Commit: 86221de3d9
Author: martii <m4rtii@gmx.de>
Date: 2013-12-21 (Sat, 21 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-21 22:04:24 +01:00
Thilo Graf
218aa70106 CMenuForwarder: declare some members as const
Technically some member functions can be const


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



------------------
This commit was generated by Migit
2013-12-03 14:55:39 +01:00
[CST] Focus
6f54aebcbf gui/widget/menue.cpp: add CMenuDForwarderNonLocalized
Origin commit data
------------------
Branch: ni/coolstream
Commit: ac773ea896
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-27 (Wed, 27 Nov 2013)


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

------------------
This commit was generated by Migit
2013-11-29 17:27:10 +04:00
Thilo Graf
cbc2b193af CComponents: add unfied header file for general include of cc classes
Provides a unified header file, so it is not required to select a
certain header file.


Origin commit data
------------------
Branch: ni/coolstream
Commit: f7798affc6
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-24 (Thu, 24 Oct 2013)



------------------
This commit was generated by Migit
2013-10-24 21:19:07 +02:00
[CST] Focus
8e99f40f53 colorchooser: display selected color in menue, based on patch (c) martii <m4rtii@gmx.de>
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5d95016b37
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-12 (Fri, 12 Jul 2013)


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

------------------
This commit was generated by Migit
2013-07-18 14:51:59 +04:00
martii
4c0df0e0a8 widget/menue: implement CMenuOptionNumberChooser::getWidth()
Origin commit data
------------------
Branch: ni/coolstream
Commit: ca519aa074
Author: martii <m4rtii@gmx.de>
Date: 2013-06-09 (Sun, 09 Jun 2013)


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

------------------
This commit was generated by Migit
2013-07-18 14:51:58 +04:00
martii
3f20773129 CMenuWidget: add action keys
Conflicts:
	src/gui/widget/menue.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3d187e56da
Author: martii <m4rtii@gmx.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)



------------------
This commit was generated by Migit
2013-07-18 14:51:58 +04:00
[CST] Focus
2d41d8a39b gui/widget/menue.cpp: add CMenuItem isStatic param, (c) martii <m4rtii@gmx.de>
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b5bbf8911
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-05 (Fri, 05 Jul 2013)


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

------------------
This commit was generated by Migit
2013-07-18 14:51:58 +04:00
Michael Liebmann
2dae834a11 Revert "CMenuForwarder: Use std::string (not pointer to std::string or char) for option"
This reverts commit 1c1cec1dde.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5f4d598b1e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-04 (Thu, 04 Jul 2013)



------------------
This commit was generated by Migit
2013-07-04 07:45:51 +02:00
Michael Liebmann
1c1cec1dde CMenuForwarder: Use std::string (not pointer to std::string or char) for option
Origin commit data
------------------
Branch: ni/coolstream
Commit: b5d1322617
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-04 (Thu, 04 Jul 2013)


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

------------------
This commit was generated by Migit
2013-07-04 02:05:33 +02:00
Stefan Seyfried
e1706580fc menu: make page_start[] int, avoids lots of casts
Origin commit data
------------------
Branch: ni/coolstream
Commit: ed039d6ba9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-02 (Sun, 02 Jun 2013)


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

------------------
This commit was generated by Migit
2013-06-20 12:11:45 +02:00
Thilo Graf
fc53c928a3 CComponents: split some header files
CComponentsInfoBox
CComponentsShapeCircle/Square
CComponentsDetailLine
CComponentsPIP
CComponentsText/CComponentsLabel
CComponentsPicture


Origin commit data
------------------
Branch: ni/coolstream
Commit: d39eaa22fc
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-05-26 (Sun, 26 May 2013)



------------------
This commit was generated by Migit
2013-05-27 09:30:50 +02:00
[CST] Focus
0c3a4fa858 Merge branch 'pu/cc' into next-cc
Conflicts:
	acinclude.m4
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/volume.cpp
	src/eitd/SIlanguage.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan.h
	src/gui/test_menu.cpp
	src/gui/timeosd.cpp
	src/gui/widget/progressbar.cpp
	src/gui/widget/progressbar.h
	src/neutrino.cpp
	src/nhttpd/yconfig.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8bb70d1ab3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-17 (Wed, 17 Apr 2013)



------------------
This commit was generated by Migit
2013-04-17 13:32:12 +04:00
[CST] Focus
785bca0d55 gui/widget/menue.cpp: fix CMenuForwarderNonLocalized::getWidth
Origin commit data
------------------
Branch: ni/coolstream
Commit: f21b291fcd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-29 (Fri, 29 Mar 2013)


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

------------------
This commit was generated by Migit
2013-03-29 17:12:23 +04:00
Thilo Graf
69b54672a6 CMenuWidget: implement CComponentsInfoBox functionality for text and icon
Origin commit data
------------------
Branch: ni/coolstream
Commit: 53ff9cdddf
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-19 (Sun, 19 Aug 2012)


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

------------------
This commit was generated by Migit
2013-03-06 11:27:53 +01:00