mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-12 07:53:43 +02:00
Code Issues Packages Projects Releases Wiki Activity
11,299 Commits 1 Branch 51 Tags
3d6d5e233b147b9900074be9abfa81495ecf85d5
Commit Graph

104 Commits

Author SHA1 Message Date
Stefan Seyfried
69c4dbbdba 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
 2014-12-25 18:03:08 +01:00
svenhoefer
389c4c232f - 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
svenhoefer
348add4acd - user_menue: minor optimizations 2014-11-07 15:39:53 +01:00
svenhoefer
5ec409b264 - user_menue: fix wrong changes in 19f7e04c77 2014-11-07 13:55:05 +01:00
svenhoefer
19f7e04c77 - user_menue: allow colored keys from plugin.cfg 2014-11-07 12:20:47 +01:00
svenhoefer
c0b130c490 - 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
svenhoefer
b93cb83c7c - user_menue: fix hint icons for 'singe-added' plugins 2014-11-06 12:36:07 +01:00
[CST] Focus
5d6ea715d8 gui/user_menue.cpp: add network settings and software update as user-menu items 2014-10-16 13:56:15 +04:00
svenhoefer
088809b76f - - plugins: use hinticons for plugins in usermenu and pluginlist 2014-10-07 13:19:19 +04:00
svenhoefer
c166fc28af - plugins: don't show integrated plugins in usermenu 2014-09-30 14:27:48 +04:00
svenhoefer
237892ffd2 - setting_helpers: rename CStreamFeaturesChangeExec to CPluginsExec 2014-09-08 16:33:26 +02:00
[CST] Focus
e361f74af7 gui/user_menue.cpp: fix old items code c/p 2014-09-08 14:35:56 +04:00
svenhoefer
8047531bc5 - user_menu: re-rename ITEM_PLUGIN to ITEM_PLUGIN_TYPES 2014-09-05 18:47:44 +02:00
[CST] Focus
420af7a4dc neutrino: sync keybind and usermenu code with neutrino-mp, code (C) martii 2014-09-05 17:49:11 +04:00
BPanther
fe3379ddb7 missing lua ifdef 2014-05-02 09:47:42 +02:00
Stefan Seyfried
44ba8fafca 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
 2014-04-27 19:14:06 +02:00
svenhoefer
a05121d9b7 - user_menue.cpp: whitespace cleanup 2014-03-06 12:56:24 +01:00
svenhoefer
7c19f53e4b - user_menu: add some pointers to delete 2014-03-06 12:45:48 +01:00
Stefan Seyfried
44e127a8dd 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
ecd62d81d1 Merge remote-tracking branch 'check/next-cc' 
...only build-tested, needs fixes
 2014-02-15 20:22:07 +01:00
svenhoefer
e97ea955c9 - plugins: type for listed plugins on blue key is more selectable 2014-02-06 22:51:18 +01:00
svenhoefer
f9ad30f183 - 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
Stefan Seyfried
5525e9f4b5 Revert "Add a --enable-lua switch to enable LUA support" 
This reverts commit 82d4832013.

This just makes the code unreadable and why would one build
without lua :-)
 2014-01-23 14:11:03 +01:00
Stefan Seyfried
b414474323 Merge remote-tracking branch 'check/next-cc' 
compiles, nothing else.

Conflicts:
	configure.ac
	src/Makefile.am
	src/gui/Makefile.am
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan_setup.cpp
	src/gui/start_wizard.cpp
	src/gui/test_menu.cpp
	src/gui/user_menue.cpp
	src/gui/widget/hintboxext.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/messagebox.cpp
	src/gui/widget/stringinput.cpp
 2014-01-23 14:08:37 +01:00
M. Liebmann
82d4832013 Add a --enable-lua switch to enable LUA support 2014-01-21 17:05:24 +01:00
M. Liebmann
b41819190d Preparing the menu classes for Lua Part #2 
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
  THX Martii
 2014-01-19 20:57:37 +01:00
Stefan Seyfried
f26357e887 neutrino: add a prototype of a lua plugin interface 
this is just for preliminary tests, not yet really usable
for anything useful
 2014-01-19 20:57:35 +01:00
Stefan Seyfried
a92141d147 Merge remote-tracking branch 'check/next-cc' 2014-01-12 14:41:44 +01:00
M. Liebmann
4c797ec3ec Disable infoclock when user menu activ 2014-01-12 10:48:06 +01:00
Stefan Seyfried
56a7262d5d Merge remote-tracking branch 'check/next-cc' 2014-01-05 18:31:31 +01:00
svenhoefer
e529bd011b - usermenu: cleanup from unused code 2014-01-02 22:57:01 +01:00
svenhoefer
419cff8c8a - usermenu: add file player 2014-01-02 22:36:42 +01:00
svenhoefer
47a2cf0e54 - usermenu: add youtube player 2014-01-02 21:52:33 +01:00
svenhoefer
3c8d47fa49 Revert "global.h: Use forward-declarations to reduce number of dependencies" 
This reverts commit 4bc6e43ad4.
 2013-11-13 23:40:16 +01:00
Stefan Seyfried
4bc6e43ad4 global.h: Use forward-declarations to reduce number of dependencies 2013-11-13 10:40:03 +01:00
martii
4eb66ba4b2 global.h: Use forward-declarations to reduce number of dependencies 
[seife: amended to fix build]

Signed-off-by: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
 2013-11-09 17:03:03 +01:00
Stefan Seyfried
5ad0b6b6dc Merge branch 'check/pu-cc' into master 
needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/framebuffer.h
	src/driver/volume.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/filebrowser.cpp
	src/gui/imageinfo.cpp
	src/gui/infoviewer.cpp
	src/gui/streaminfo2.cpp
	src/gui/widget/textbox.cpp
 2013-04-06 11:21:55 +02:00
Thilo Graf
0dc4686874 fix license text, sorry, was a c&p error 2013-03-21 11:37:00 +01:00
Stefan Seyfried
da358e7502 neutrino: add a prototype of a lua plugin interface 
this is just for preliminary tests, not yet really usable
for anything useful
 2013-03-17 23:24:45 +01:00
satbaby
775a4a7229 disable tech.info if channelist is empty (fix possible segfault) 2012-10-20 13:26:27 +02:00
[CST] Focus
9fdbdbd343 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++ 2012-09-13 11:24:13 +04:00
satbaby
a3bfab0bcd remove doubles include 2012-09-11 20:31:33 +02:00
[CST] Focus
ba051aaf41 gui/user_menue.cpp: comment unused code 2012-08-30 11:31:05 +04:00
[CST] Focus
76200ddc94 gui/user_menue.cpp: add sectionsd pause to changeNotify 2012-05-31 15:59:13 +04:00
thilo
bdb0c6f63c *neutrino user-menu: remove color button from clock 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2119 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-02-23 10:45:22 +00:00
thilo
19f717fd3e *neutrino features menu: fix missing sripts 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2115 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-02-18 19:50:38 +00:00
thilo
4836f13d79 *neutrino scripts: move scripts into features menu 
...scripts are still available in main menue, but not default visible.
If user wants to use scripts as usual, he can customize it in the
personalize setup.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2094 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-02-15 18:21:28 +00:00
thilo
bca7b50726 *neutrino games: move games into features menu 
...games are still available in main menue, but not default visible.
If user wants to use games as usual, he can customize it in the
personalize setup.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2093 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-02-15 18:21:25 +00:00
thilo
aaa988db5f *neutrino: port personalize feature from tuxbox 
This is a partial port of original neutrino personalize feature
and includes also moving of user menu settings from key setup into this setup,
but it's not completley yet in some details and so I think it's a lot to do.
I hope it works fine and the many user requests are justifying this feature.

TODO:
- doc into wiki
- adapt for yWeb
- some reworks for user menu settings and plugin management
- add timer and rework tv radio mode switch item(s)
and many more...

please report: http://www.dbox2world.net/board293-coolstream-hd1/board314-coolstream-development/9565-diskussion-neutrino-goes-neutrinohd-welche-features-funktionen-aus-dem-tuxbox-cvs-%C3%BCbernehmen/

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2010 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-12-28 00:19:15 +00:00
thilo
ed0166e600 *neutrino: rework clock and radio/tv switch functionality 
- move clock function from red button (main menu) into features menu
- ...so it's customizable in all user menus
- switching between tv and radio only with red button (main menu) depend of current mode
- add timerlist into main menu

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1985 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-12-20 21:56:44 +00:00