mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity
13,174 Commits 1 Branch 51 Tags
fa20c92b431e2d8cc2b0b1ef5dbabee853ba7f1c
Commit Graph

154 Commits

Author SHA1 Message Date
svenhoefer
505c4ba80d Revert "Revert '- channellist.cpp: enable to lock new_zap_mode'" 
This reverts commit fb892d18ff.
 2013-02-17 22:55:28 +01:00
svenhoefer
fb892d18ff Revert "- channellist.cpp: enable to lock new_zap_mode" 
This reverts commit 15d787f79b
because the display of infobar while zapping is broken with
this commit.
 2013-02-15 22:55:45 +01:00
[CST] Focus
46657a1c6b merge dvbsi++ 2013-02-11 13:29:09 +04:00
svenhoefer
15d787f79b - channellist.cpp: enable to lock new_zap_mode 2013-02-10 21:03:43 +01:00
[CST] Focus
dd3bc579a0 gui/miscsettings_menu.cpp: use CFEManager::haveSat in place of glocal delivery system 2013-01-16 15:49:24 +04:00
Stefan Seyfried
f8f5467fdb Merge branch 'uncool/dvbsi++' commit 4965619a79 
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
 2012-12-30 21:35:20 +01:00
[CST] Focus
5749f86323 gui/miscsettings_menu.cpp: always enable EPG options, 
which not depend on save epg on/off
 2012-12-19 16:45:40 +04:00
Stefan Seyfried
10e359e43b miscsettings: use correct scope for sleeptimer menuwidget 2012-11-14 21:32:35 +01:00
Stefan Seyfried
c480e36746 Merge branch 'uncool/dvbsi++' 
Conflicts:
	src/driver/Makefile.am
	src/driver/streamts.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/widget/textbox.h
 2012-11-11 01:45:22 +01:00
satbaby
0acc943a4f src/gui/miscsettings_menu.cpp: -add COnOffNotifier for EPG menu 2012-11-08 17:24:10 +01:00
satbaby
a47c6593dc neutrino: -add save epg on stadbyOn/Off option 2012-11-08 13:35:00 +01:00
Stefan Seyfried
7e23ac7223 Merge branch 'uncool/dvbsi++' commit '7ea3a20a808' 
...needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/capmt.cpp
 2012-11-03 10:45:33 +01:00
[CST] Focus
dc58416597 gui/miscsettings_menu.cpp: remove unneeded fanNotifier->changeNotify 2012-11-02 12:56:08 +04:00
Stefan Seyfried
d30b97afa9 miscsettings: prevent segfault on hardware that can't shutdown 2012-10-16 09:13:21 +02:00
satbaby
f85251128c miscsettings_menu.cpp: fix segfault on ZEE/HD1 2012-10-15 12:10:28 +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
7b06b3fd38 Neutrino: rework COnOffNotifier and use it if possible, ported from tuxbox cvs 2012-10-11 14:11:05 +02:00
Stefan Seyfried
04ee2e87f3 neutrino: start to use hardware_caps 
Use hardware_caps instead of cs_get_revision() and #ifdef HAVE_FOO_HW
to distinguish between different boxtypes.
 2012-09-23 21:34:47 +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
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
ec1cccf571 gui/miscsettings_menu.cpp: add menu hints 2012-07-08 21:36:42 +04:00
Stefan Seyfried
2be328ade2 implement shutdown handling for azbox 2012-06-27 21:18:19 +02:00
[CST] Focus
0b23198e56 remove unused emlog setting 2012-06-27 14:37:07 +04:00
[CST] Focus
cfdf7b0c69 gui/miscsettings_menu.cpp: fix memleak - CMiscNotifier 2012-05-07 16:10:20 +04:00
[CST] Focus
0319c4faad GUI: remove CMenuWidget->hide() calls - CMenuWidget->exec() always hide before return 2012-05-07 15:37:02 +04:00
[CST] Focus
0a94cd0267 gui/miscsettings_menu.cpp: fix memleak - sectionsdConfigNotifier 2012-05-07 12:13:38 +04:00
[CST] Focus
464199411d gui/miscsettings_menu.cpp: fix memleaks when using CMenuForwarder, 
use CMenuDForwarder for created objects
 2012-05-05 12:21:09 +04:00
Stefan Seyfried
ae3bb2bddf neturino: add energy settings menu on spark 2012-05-01 19:43:50 +02:00
[CST] Focus
3d09ab7e33 gui/miscsettings_menu.cpp: add option to enable/disable persistent channel numbers 2012-04-27 15:35:06 +04:00
[CST] Focus
ff04a1d594 gui/miscsettings_menu.cpp: add options to create new/removed channel lists 2012-04-22 15:19:19 +04:00
Stefan Seyfried
56b9b9bcc5 neutrino: enable 'standby after inactivity' for Tripledragon 2012-04-17 19:33:54 +02:00
Stefan Seyfried
832b2d3096 neutrino: don't show CEC settings on Tripledragon 2012-04-17 19:33:47 +02:00
[CST] Focus
2bdb3539cb gui/miscsettings_menu.cpp: increase max events to 6 digits 2012-02-27 17:43:56 +04:00
thilo
8b5857909b *neutrino menu: remove parameter 'mwidth' from widget constructor 
Hope we don't need it anymore...

*neutrino menu: remove select functions

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1909 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-11-25 23:48:30 +00:00
thilo
eff98c661e *neutrino menu: fix 'memory ' of selected items in submenues 
Add small helper class to manage missing values
e.g. needed for deallocated widget objects.
This class we can also use for other things in future!

In this context I added a vector for 'selected' values needed for
deeper and deallocated submenues.
The identification of widgets working now with a new widget parameter named 'w_index'.
setSelected() and getSelected() functions are still working, but are not needed, if we use an index

-add define for default widget index
-add new header file for enums
-adapted many menu classes for this parameter

Hope it' works fine. If you find any menu without  a 'memory', please add an index.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1908 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-11-25 23:48:18 +00:00
focus
d4eb80abec Return menu result, to close all menus 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1879 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-11-22 11:46:22 +00:00
micha-bbg
d837bbbbaf Mute-Zap switch channel list 
- Mute-Zap Icon remove from the channel list
- Moved Mute-Zap switch in the Misc Settings menu
- Mute function restored in the channel list


git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1840 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-11-09 01:02:27 +00:00
thilo
d7c0bcd68f *neutrino record_setup: moved zapto pre time option from misc to record-setup 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1837 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-11-07 20:35:07 +00:00
thilo
6c5742e4a9 *neutrino radiotext: removed from misc settings 
Radiotext still not working fine and it makes no really sense to
show this option.
This fixes also a memleak in miscsettings.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1558 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-07-03 12:01:03 +00:00
striper
ec402d9518 - add support for radiotext (needs testing) -> http://www.dbox2world.net/board293-coolstream-hd1/board296-coolstream-software/10635-radiotext-einbauen/ 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1501 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-06-02 15:29:40 +00:00
striper
8b65e65781 - move logodir settings from misc to infobar settings 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1481 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-05-18 12:08:46 +00:00
thilo
a3fe9039e9 *neutrino miscsettings: possible memleak sealed 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1327 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-03-23 10:57:25 +00:00
satbaby
74d2f2ee76 -add zapto time correction option 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1281 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-03-10 14:54:57 +00:00
striper
977e62202a - small fix 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1220 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-02-26 17:38:50 +00:00
satbaby
53baf1cd86 make fanNotifier private 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1219 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-02-26 16:40:46 +00:00
seife
931c2c2661 neutrino: don't crash during fanspeed setup 
Dear pupils, this is what we learned in todays:
* crashing == bad
* not crashing == good
* deleting an object and then using it == crash

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1218 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-02-26 16:22:24 +00:00
seife
07ea7e9c63 neutrino: consolidate fan detection in one place 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1217 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-02-26 16:13:46 +00:00
satbaby
eb10c59a43 -fix: I'm your fan, have fun ;) 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1216 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-02-26 12:37:19 +00:00
striper
2e967702eb - revert to rev. 1213 since my changes didn't fix it 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1215 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-02-26 10:59:55 +00:00