- Fix merge conflicts
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0c0b1981f6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-06-23 (Thu, 23 Jun 2016)
Origin message was:
------------------
- no need to assign mainmenu as an argument to realrun()
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
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
just disable channel-scan and software-update in service menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1e5e30ab2b
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-23 (Wed, 23 Dec 2015)
Origin message was:
------------------
- menue: don't disable whole settings and service menu in mp mode;
just disable channel-scan and software-update in service menu
------------------
This commit was generated by Migit
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
strange circular include global.h <-> settings.h is maybe to fix
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e15577bf1
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-16 (Thu, 16 Apr 2015)
Origin message was:
------------------
- add missing includes to fix menu-width
strange circular include global.h <-> settings.h is maybe to fix
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ab6b53054
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-04-16 (Thu, 16 Apr 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
this reduces the dependency chain on partial rebuilds considerably
Origin commit data
------------------
Branch: ni/coolstream
Commit: b3bfb361f5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-11 (Wed, 11 Feb 2015)
------------------
This commit was generated by Migit
this reduces the dependency chain on partial rebuilds considerably
Origin commit data
------------------
Branch: ni/coolstream
Commit: a7bad347d7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-11 (Wed, 11 Feb 2015)
------------------
This commit was generated by Migit
* 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
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c52e2b87f
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-04 (Tue, 04 Nov 2014)
Origin message was:
------------------
- re-enable front-panel settings for Trinity; re-sort vfd_setup
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: ddd41e05ef
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
Origin commit data
------------------
Branch: ni/coolstream
Commit: 16e0975a29
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-28 (Sun, 28 Sep 2014)
Origin message was:
------------------
- add plugins to settings menu and service menu
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Testing is also plausible for general usage of other tests or other
experimental code parts.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 201a6aa56e
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-09-19 (Fri, 19 Sep 2014)
------------------
This commit was generated by Migit
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
Origin commit data
------------------
Branch: ni/coolstream
Commit: f07e81c4b9
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-03 (Wed, 03 Sep 2014)
Origin message was:
------------------
- neutrino_menue: rename audioplayer/picviewer menu to multimedia menu
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: aad8c86cb8
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-28 (Sat, 28 Jun 2014)
Origin message was:
------------------
- neutrino_menue: add own personalize item to standby item
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Signed-off-by: Markus Volk <f_l_k@gmx.net>
Signed-off-by: Thilo Graf <dbt@novatux.de>
Opkg is a lightweight package management system based on Ipkg.
For usage with Neutrino, installed opkg programms opkg-cl and opkg-key
are required and can be find in service update menu,
otherwise this feature is not available.
With this feature it is possible to select packages for install and remove
via gui-menu.
See also:
OPKG-Website
- http://bitbucket.org/opkg/opkg for more details.
Tuxbox:
- http://wiki.tuxbox.org/Neutrino-MP Entwicklungsumgebung#OPKG-Pakete
- http://wiki.tuxbox.org.Neutrino-HD Entwicklungsumgebung:OPKG-SystemInstall
Buildsystems with opkg support:
- http://gitorious.org/neutrino-hd/buildsystem-cs
- http://sourceforge.net/p/bstuff/bs4cs/
- Yocto
OPKG-Manager Neutrino:
- picked from http://gitorious.org/neutrino-mp/martiis-neutrino-mp include shellwindow feature by martii
- update License text
- add missing icon
- use macros to get opkg binaries
- use matching buttons in footer, menu button is already reserved to left menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 758f3535c8
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-04-13 (Sun, 13 Apr 2014)
------------------
This commit was generated by Migit
* present the user with only two types of extensions: games and
everything else (lua, script, binary .so)
* use lua locale, right now it is translated to just "Plugins" :-)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 44e127a8dd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-16 (Sun, 16 Feb 2014)
Origin message was:
------------------
revert the split into lots of plugin types
* present the user with only two types of extensions: games and
everything else (lua, script, binary .so)
* use lua locale, right now it is translated to just "Plugins" :-)
------------------
This commit was generated by Migit
...only build-tested, needs fixes
Origin commit data
------------------
Branch: ni/coolstream
Commit: ecd62d81d1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-15 (Sat, 15 Feb 2014)
------------------
This commit was generated by Migit
* add mainmenu items for tools and lua-extensions
(default not visible)
* add usermenu items for tools and lua-extensions
(default off)
Origin commit data
------------------
Branch: ni/coolstream
Commit: f9ad30f183
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-02-04 (Tue, 04 Feb 2014)
Origin message was:
------------------
- plugins: type for listed plugins on blue key is selectable
* add mainmenu items for tools and lua-extensions
(default not visible)
* add usermenu items for tools and lua-extensions
(default off)
------------------
This commit was generated by Migit
- 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
This reverts commit c266f96560.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c8d47fa49
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)
------------------
This commit was generated by Migit
Only compile-tested.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 548448456a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4bc6e43ad4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: e2009a4681
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-12 (Tue, 12 Nov 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Compiles on most platforms, starts. Not really tested.
Origin commit data
------------------
Branch: ni/coolstream
Commit: b93a372b54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)
------------------
This commit was generated by Migit
[seife: amended to fix build]
Signed-off-by: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4eb66ba4b2
Author: martii <m4rtii@gmx.de>
Date: 2013-11-09 (Sat, 09 Nov 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6f700d80c0
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-11-04 (Mon, 04 Nov 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: ad9e8e1ce3
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-02 (Sat, 02 Nov 2013)
Origin message was:
------------------
- neutrino_menue: show always seperator line for secons section
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 067891fe52
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-25 (Fri, 25 Oct 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
default behavior should not be changed, easy mode forced by /var/etc/.easymenu file inside image;
at the moment switch between modes is done by main menu -> 'stop' button -> enter pin code,
restart needed after mode switch
Origin commit data
------------------
Branch: ni/coolstream
Commit: 606bd01878
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-25 (Fri, 25 Oct 2013)
------------------
This commit was generated by Migit
Instead of including it everywhere through global.h, just include
the lcd/vfd header where needed. Add a tiny helper header "display.h"
to divert between vfd.h (coolstream) and lcdd.h (everything else).
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6b72095f5a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-11 (Sat, 11 May 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: da327c099b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1c58f5f093
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: e14043dbfb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-09 (Tue, 09 Apr 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 49a19112af
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-14 (Wed, 14 Nov 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: a28e42adc2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-14 (Sun, 14 Oct 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: a3bfab0bcd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-11 (Tue, 11 Sep 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
