mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 09:21:18 +02:00
Code Issues Packages Projects Releases Wiki Activity
6,238 Commits 1 Branch 51 Tags
7625d7782c439d19f00e6a8ed71c98dead9e2d88
Commit Graph

208 Commits

Author SHA1 Message Date
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
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
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
548448456a Merge branch 'check/next-cc' 
Only compile-tested.
 2013-11-13 14:04:15 +01:00
Stefan Seyfried
4bc6e43ad4 global.h: Use forward-declarations to reduce number of dependencies 2013-11-13 10:40:03 +01:00
[CST] Focus
e2009a4681 neutrino_menue.cpp: for easymenu, replace 'Channels' with bouquet editor in main menu 2013-11-12 17:21:36 +04:00
Stefan Seyfried
b93a372b54 Merge branch 'check/next-cc' 
Compiles on most platforms, starts. Not really tested.
 2013-11-10 16:55:53 +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
Thilo Graf
6f700d80c0 CTestMenu: add configure option --enable-testmenu 2013-11-05 13:22:28 +01:00
svenhoefer
ad9e8e1ce3 - neutrino_menue: show always seperator line for secons section 2013-11-02 14:08:40 +01:00
[CST] Focus
067891fe52 move tuner setup to Service menu 2013-10-25 14:27:38 +04:00
[CST] Focus
606bd01878 as requested, implement 'easy' menu mode for novice users; 
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
 2013-10-25 13:03:26 +04:00
Stefan Seyfried
6b72095f5a neutrino: explicitly include vfd/lcd header 
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).
 2013-05-11 17:17:33 +02:00
Stefan Seyfried
8253c4d67c Merge remote-tracking branch 'check/next-cc' 
needs some build-fixing and merge errors are likely :-(

Conflicts:
	configure.ac
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/unmaintained/dutch.locale
	lib/libdvbsub/Makefile.am
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/daemonc/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/framebuffer.h
	src/driver/pictureviewer/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/driver/volume.cpp
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/audioplayer.cpp
	src/gui/bedit/Makefile.am
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/keybind_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/test_menu.cpp
	src/gui/test_menu.h
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
	src/system/setting_helpers.cpp
	src/system/settings.h
	src/zapit/include/zapit/client/zapitclient.h
	src/zapit/include/zapit/femanager.h
	src/zapit/include/zapit/getservices.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
 2013-05-10 10:06:47 +02:00
Stefan Seyfried
da327c099b add menu option to delete 'removed channels' 2013-04-17 10:21:33 +04:00
Stefan Seyfried
1c58f5f093 add menu option to delete 'removed channels' 2013-04-14 12:46:10 +02:00
[CST] Focus
e14043dbfb neutrino GUI: more places to disable anything record-related, if recording_type is RECORDING_OFF 2013-04-09 18:37:25 +04:00
Stefan Seyfried
49a19112af mainmenu: use hw_caps instead of cs_get_revision 2012-11-14 22:21:51 +01:00
Stefan Seyfried
a28e42adc2 fix build after last merge 2012-10-14 12:57:01 +02:00
Stefan Seyfried
adb23b23ee Merge branch 'uncool/dvbsi++' commit 'dc95ffa37c6' 
...needs buildfixing...

Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	lib/libtuxtxt/tuxtxt.h
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/record.cpp
	src/driver/volume.cpp
	src/gui/audio_setup.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/system/Makefile.am
	src/system/configure_network.cpp
	src/system/httptool.cpp
	src/system/setting_helpers.cpp
	src/timerd/timermanager.cpp
	src/zapit/include/zapit/frontend_c.h
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp
 2012-10-14 12:51:07 +02:00
satbaby
a3bfab0bcd remove doubles include 2012-09-11 20:31:33 +02:00
Stefan Seyfried
ae1b98aa38 Merge branch 'uncool/dvbsi++' commit '6e0bc85a6c0' 
This is the last commit before the "menu hints" started.
Needs buildfixing...

Conflicts:
	configure.ac
	src/daemonc/remotecontrol.cpp
	src/daemonc/remotecontrol.h
	src/driver/audiodec/basedec.cpp
	src/driver/fb_window.cpp
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/global.h
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/plugins.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/neutrino.cpp
	src/sectionsd/dmx.cpp
	src/sectionsd/dmxapi.cpp
	src/sectionsd/sectionsd.cpp
	src/system/setting_helpers.cpp
	src/zapit/include/zapit/client/zapittypes.h
	src/zapit/include/zapit/frontend_c.h
	src/zapit/include/zapit/satconfig.h
	src/zapit/include/zapit/scan.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/pmt.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/sdt.cpp
	src/zapit/src/zapit.cpp
 2012-07-23 01:02:29 +02:00
svenhoefer
e391ea7dfd - mainmenu: add an icon for tv-radio-switch 2012-07-19 21:23:53 +02:00
micha-bbg
c542cb3360 * Menu hints: Update loclale 
- english.locale sorted
- deutsch.locale sorted and translated some new entries (THX Tomworld)
- locals.h/locals_intern.h rebuild
- Corrected typo in the locale/source
 2012-07-11 23:41:08 +01:00
[CST] Focus
eac5349e67 neutrino_menue.cpp: add menu hints 2012-07-08 21:36:21 +04:00
Stefan Seyfried
2be328ade2 implement shutdown handling for azbox 2012-06-27 21:18:19 +02:00
[CST] Focus
59dd04c11b neutrino_menue.cpp: remove obsolete epg_menu.h include 2012-06-13 17:54:34 +04:00
Thilo Graf
643b9f485f update: reworked update menu 
-moved software_update.cpp/h to update_menue.cpp/h
-add new class CUpdateSettings into files update_settings.cpp/h
-using update settings in sub menus, so we've got only hotkeys
 and less menu items in update menu
-reworked some locales
 2012-06-08 23:15:30 +02:00
[CST] Focus
5399f3fbe5 neutrino_menue.cpp: move TEST_MENU define to gui/test_menu.h 2012-05-22 16:56:39 +04:00
Stefan Seyfried
ec83c10c6b neutrino: add deep-standby support on SPARK 2012-04-22 21:08:16 +02:00
Stefan Seyfried
90bb145049 neutrino: lock bouquet editor if parental pin is active 2012-04-17 19:33:49 +02:00
thilo
cfa58da3c6 * neutrino clean up: move "start wizard" into its own module 
It's better, to have a single module for coming features in the wizard

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2154 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-03-19 09:00:11 +00:00
thilo
3e4f90c194 *neutrino personalize: rework pin access 
PIN access of  personalize setup now managed with an own pin management.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2105 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-02-15 18:21:52 +00:00
thilo
095839fed4 *neutrino settings menu: sort items for more logical order 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2101 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-02-15 18:21:42 +00:00
thilo
b016c674e0 *neutrino service menu: add separator 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2100 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-02-15 18:21:40 +00:00
focus
5d4ccfcac6 neutrino_menue.cpp: fix compile with enabled TEST_MENU 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2088 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-02-15 09:50:28 +00:00
thilo
5ac1ce2690 *neutrino-menu: change order of tv/radio items and add observe parameters 
Required for personalize the tv/radio toggle option.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2079 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-01-28 15:28:18 +00:00
thilo
6bca015604 *neutrino personalize: don't show parental setup in personalize setup 
It's not very useful to manage parental setup with more than one pin option
see also:
http://www.dbox2world.net/board293-coolstream-hd1/board314-coolstream-development/p138010-personalisierungsmen%C3%BCs-anpassen/#post138010

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2039 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-01-05 23:39:13 +00:00
thilo
b408d5487b *neutrino parental_setup: requesting for pincode in parental setup independently of item in settings menu 
this fixes also the correct pin request in settings menu for parental-setup, because personalize-PIN was requested

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2031 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-01-01 21:43:06 +00:00
thilo
cf9e6dee65 *neutrino: add toggle item for tv and radio mode to main menue 
Note: this menu item is also personalized with red button,
probaly we should use other button

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2016 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-12-28 00:19:52 +00:00
thilo
9dc2ef58bc *neutrino: add timer list item to main menu 
Games are moved to number shortcut.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2015 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-12-28 00:19:44 +00:00
thilo
20b68312e8 *neutrino: backslashes in comments removed 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2014 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-12-28 00:19:38 +00:00
thilo
7c756e1e4b *neutrino clean up: remove unused zapit setup 
If somebody needs this lines, it should be easy to revert this commit, but
I don't see any sense to beware it.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2013 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-12-28 00:19:33 +00:00
thilo
c1cb264231 *neutrino personalize: don't use codlines for prevered keys 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2012 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-12-28 00:19:26 +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
focus
5743a6dd29 Remove rfmod code and unused settings 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2002 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-12-25 12:37:16 +00:00
thilo
9141258e3a *neutrino: partial revert of r1985, but without clock 
User request: implementation of timerlist needs personalisation
see also: http://www.dbox2world.net/board293-coolstream-hd1/board314-coolstream-development/p137661-dikussion-neues-hauptmen%C3%BC-mit-timerliste/#post137661

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1995 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-12-23 22:04:40 +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
seife
997dd62ae7 neutrino: only show CA menue for machines with CI or smartcard slot 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1834 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-11-06 15:12:43 +00:00
striper
8b0dc24e90 - add new info buttons and use them 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1763 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-10-21 09:39:08 +00:00