mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 02:11:04 +02:00
Code Issues Packages Projects Releases Wiki Activity
14,714 Commits 2 Branches 9 Tags
71ee241cb7d7c2a36d9cc60eb8b86bc870f60de2
Commit Graph

132 Commits

Author SHA1 Message Date
vanhofen
6dfd01e1cd adzap: align locale in usermenu item to adzap active status 
Origin commit data
------------------
Commit: 1dfc1bc452
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-29 (Mon, 29 Feb 2016)

Origin message was:
------------------
- adzap: align locale in usermenu item to adzap active status
 2016-03-03 11:18:15 +01:00
martii
06aae05e48 adzap: port code from martiis-neutrino-mp 
Origin commit data
------------------
Commit: c015d4670f
Author: martii <m4rtii@gmx.de>
Date: 2016-03-03 (Thu, 03 Mar 2016)

Origin message was:
------------------
- adzap: port code from martiis-neutrino-mp
 2016-03-03 11:18:14 +01:00
vanhofen
bf4739f7cf user_menu: get resolution value for livestreams 
Origin commit data
------------------
Commit: 5a9bee721d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-03 (Thu, 03 Mar 2016)

Origin message was:
------------------
- user_menu: get resolution value for livestreams
 2016-03-03 09:46:42 +01: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
d937358782 Infoclock: unify handling in some classes with singleton 
Origin commit data
------------------
Commit: 59d9b7068e
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-02-29 (Mon, 29 Feb 2016)
 2016-02-29 08:05:05 +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
Michael Liebmann
075d3a1794 Merge branch 'cst-next' into nmp-cst-next 
Origin commit data
------------------
Commit: 4edc580529
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-21 (Thu, 21 Jan 2016)
 2016-01-21 01:34:58 +01:00
vanhofen
2a442ac22f rc_lock: rework class; switch to singleton; add icon; vfd-support 
Origin commit data
------------------
Commit: 2eb0aed5db
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-20 (Wed, 20 Jan 2016)

Origin message was:
------------------
- rc_lock: rework class; switch to singleton; add icon; vfd-support
 2016-01-20 20:26:52 +01:00
Stefan Seyfried
f953af605a Merge remote-tracking branch 'cst-next' 
Origin commit data
------------------
Commit: b53fbaf327
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-08 (Fri, 08 Jan 2016)
 2016-01-08 19:52:41 +01:00
vanhofen
a4fd788090 locale: add usermenu title locales ... 
some small reworks; cleanup from #if 0'ed code


Origin commit data
------------------
Commit: 5860045999
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-02 (Sat, 02 Jan 2016)

Origin message was:
------------------
- locale: add usermenu title locales ...

 some small reworks; cleanup from #if 0'ed code
 2016-01-02 12:18:06 +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
vanhofen
98af60b459 user_menu: allow controlable return_title value 
Origin commit data
------------------
Commit: 9325385ce9
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-29 (Tue, 29 Dec 2015)

Origin message was:
------------------
- user_menu: allow controlable return_title value
 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
Thilo Graf
8fc52464b3 CUserMenu: using native callback to ensure paint for info clock after hide of this menu window 
menu->hide() handler comes too early, nice to see if clock is transparent.


Origin commit data
------------------
Commit: 42102d432d
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-11-18 (Wed, 18 Nov 2015)
 2015-12-27 14:42:29 +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
01dd5eedf9 user_menue: disable some items in movieplayer mode 
Origin commit data
------------------
Commit: 25e1f5bc9e
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-14 (Mon, 14 Dec 2015)

Origin message was:
------------------
- user_menue: disable some items in movieplayer mode
 2015-12-15 08:15:17 +01:00
Stefan Seyfried
17880c4125 Merge remote-tracking branch 'uncool/cst-next' 
This need buildfixes and some functional updates...


Origin commit data
------------------
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)
 2015-12-13 17:41:55 +01:00
vanhofen
92960161a9 remove w_max()-calls to define menu-width, because ... 
w-max() returns a pixel-value, but menus need a percentage-value.


Origin commit data
------------------
Commit: 9041bff59c
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-24 (Fri, 24 Apr 2015)

Origin message was:
------------------
- remove w_max()-calls to define menu-width, because ...

 w-max() returns a pixel-value, but menus need a percentage-value.
 2015-04-24 09:11:04 +02:00
Stefan Seyfried
0ca22ef7f4 Merge remote-tracking branch 'check/cst-next' 
Origin commit data
------------------
Commit: 22dd798325
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-25 (Wed, 25 Feb 2015)
 2015-02-25 21:20:22 +01:00
[CST] Focus
61aa4d0150 fix crash in user_menue when ITEM_EPG_MISC is selected 
Origin commit data
------------------
Commit: 24c4f5c0cd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-02-25 (Wed, 25 Feb 2015)
 2015-02-25 17:03:14 +01:00
Stefan Seyfried
f2a55bddf4 neutrino.h: use forward declaration instead of includes 
this reduces the dependency chain on partial rebuilds considerably


Origin commit data
------------------
Commit: b3bfb361f5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-11 (Wed, 11 Feb 2015)
 2015-02-14 14:31:12 +01:00
Stefan Seyfried
2b81e1c517 neutrino.h: use forward declaration instead of includes 
this reduces the dependency chain on partial rebuilds considerably


Origin commit data
------------------
Commit: a7bad347d7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-11 (Wed, 11 Feb 2015)
 2015-02-11 08:22:36 +01:00
Stefan Seyfried
1a17fed057 disarm broken HAVE_SPARK_HARDWARE code 
Origin commit data
------------------
Commit: 0bff1ff02d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-27 (Tue, 27 Jan 2015)
 2015-01-27 10:59:04 +01:00
Stefan Seyfried
a968a12b8d 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
------------------
Commit: b5a64e6887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)
 2015-01-26 17:26:26 +01:00
Jacek Jendrzej
d339fff93d neutrino use check empty() instead of length() or size() 
Origin commit data
------------------
Commit: 8023a6317b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-01-03 (Sat, 03 Jan 2015)
 2015-01-03 17:51:08 +01:00
Stefan Seyfried
d1e2143fd6 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
------------------
Commit: d37b3c0f9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-28 (Sun, 28 Dec 2014)
 2014-12-28 12:32:12 +01:00
Stefan Seyfried
ec1a9fce17 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
------------------
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)
 2014-12-25 18:03:08 +01:00
vanhofen
cb354188c7 plugins: simplify integratePlugins(); ... 
* CPluginsExec(): switch to singleton
* move CPluginsExec() to pluginlist.cpp|h
 because it's not really a settings_helper


Origin commit data
------------------
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
 2014-11-10 22:41:08 +01:00
vanhofen
8262f7ffbd user_menue: minor optimizations 
Origin commit data
------------------
Commit: 348add4acd
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-07 (Fri, 07 Nov 2014)

Origin message was:
------------------
- user_menue: minor optimizations
 2014-11-07 15:39:53 +01:00
vanhofen
5295a76dfc user_menue: fix wrong changes in 4064861b43 
Origin commit data
------------------
Commit: 5ec409b264
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-07 (Fri, 07 Nov 2014)

Origin message was:
------------------
- user_menue: fix wrong changes in 4064861b43
 2014-11-07 13:55:05 +01:00
vanhofen
4064861b43 user_menue: allow colored keys from plugin.cfg 
Origin commit data
------------------
Commit: 19f7e04c77
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-07 (Fri, 07 Nov 2014)

Origin message was:
------------------
- user_menue: allow colored keys from plugin.cfg
 2014-11-07 12:20:47 +01:00
vanhofen
6ac49b606c plugins: don't add hidden plugins to usermenu; ... 
... use CPuginsExec::exec() to execute and drop CUserMenu::exec()


Origin commit data
------------------
Commit: c0b130c490
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-07 (Fri, 07 Nov 2014)

Origin message was:
------------------
- plugins: don't add hidden plugins to usermenu; ...

... use CPuginsExec::exec() to execute and drop CUserMenu::exec()
 2014-11-07 09:44:53 +01:00
vanhofen
2d6cf7401b user_menue: fix hint icons for 'singe-added' plugins 
Origin commit data
------------------
Commit: b93cb83c7c
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-06 (Thu, 06 Nov 2014)

Origin message was:
------------------
- user_menue: fix hint icons for 'singe-added' plugins
 2014-11-06 12:36:07 +01:00
[CST] Focus
7e6a96df05 gui/user_menue.cpp: add network settings and software update as user-menu items 
Origin commit data
------------------
Commit: 5d6ea715d8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-16 (Thu, 16 Oct 2014)
 2014-10-16 13:56:15 +04:00
vanhofen
749d5a20a7 - plugins: use hinticons for plugins in usermenu and pluginlist 
Origin commit data
------------------
Commit: 088809b76f
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-10-06 (Mon, 06 Oct 2014)

Origin message was:
------------------
- - plugins: use hinticons for plugins in usermenu and pluginlist
 2014-10-07 13:19:19 +04:00
vanhofen
681bb74d8d plugins: don't show integrated plugins in usermenu 
Origin commit data
------------------
Commit: c166fc28af
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-30 (Tue, 30 Sep 2014)

Origin message was:
------------------
- plugins: don't show integrated plugins in usermenu
 2014-09-30 14:27:48 +04:00
vanhofen
955a6dd90e setting_helpers: rename CStreamFeaturesChangeExec to CPluginsExec 
Origin commit data
------------------
Commit: 237892ffd2
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-08 (Mon, 08 Sep 2014)

Origin message was:
------------------
- setting_helpers: rename CStreamFeaturesChangeExec to CPluginsExec
 2014-09-08 16:33:26 +02:00
[CST] Focus
7670fac614 gui/user_menue.cpp: fix old items code c/p 
Origin commit data
------------------
Commit: e361f74af7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-08 (Mon, 08 Sep 2014)
 2014-09-08 14:35:56 +04:00
vanhofen
107ea89fa2 user_menu: re-rename ITEM_PLUGIN to ITEM_PLUGIN_TYPES 
Origin commit data
------------------
Commit: 8047531bc5
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-05 (Fri, 05 Sep 2014)

Origin message was:
------------------
- user_menu: re-rename ITEM_PLUGIN to ITEM_PLUGIN_TYPES
 2014-09-05 18:47:44 +02:00
[CST] Focus
34d2776109 neutrino: sync keybind and usermenu code with neutrino-mp, code (C) martii 
Origin commit data
------------------
Commit: 420af7a4dc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)
 2014-09-05 17:49:11 +04:00
BPanther
e2ec5cf5a5 missing lua ifdef 
Origin commit data
------------------
Commit: fe3379ddb7
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2014-05-02 (Fri, 02 May 2014)
 2014-05-02 09:47:42 +02:00
Stefan Seyfried
3f36062fe7 Merge remote-tracking branch 'check/next-cc' 
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)
 2014-04-27 19:14:06 +02:00
vanhofen
50f87f5921 user_menue.cpp: whitespace cleanup 
Origin commit data
------------------
Commit: a05121d9b7
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-03-06 (Thu, 06 Mar 2014)

Origin message was:
------------------
- user_menue.cpp: whitespace cleanup
 2014-03-06 12:56:24 +01:00
vanhofen
b54e30a612 user_menu: add some pointers to delete 
Origin commit data
------------------
Commit: 7c19f53e4b
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-03-06 (Thu, 06 Mar 2014)

Origin message was:
------------------
- user_menu: add some pointers to delete
 2014-03-06 12:45:48 +01:00
Stefan Seyfried
a670ec4346 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" :-)


Origin commit data
------------------
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" :-)
 2014-02-16 18:38:03 +01:00
Stefan Seyfried
d06c1d8ad6 Merge remote-tracking branch 'check/next-cc' 
...only build-tested, needs fixes


Origin commit data
------------------
Commit: ecd62d81d1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-15 (Sat, 15 Feb 2014)
 2014-02-15 20:22:07 +01:00
vanhofen
e3d12f21e1 plugins: type for listed plugins on blue key is more selectable 
Origin commit data
------------------
Commit: e97ea955c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-02-06 (Thu, 06 Feb 2014)

Origin message was:
------------------
- plugins: type for listed plugins on blue key is more selectable
 2014-02-06 22:51:18 +01:00
vanhofen
530d403ee0 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)


Origin commit data
------------------
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)
 2014-02-04 09:08:21 +01:00