[CST] Focus
a6bd2589dd
gui/miscsettings_menu.cpp: add option to scan epg in standby or live or always
2014-03-27 18:56:49 +04:00
[CST] Focus
a3f4cbaa90
gui/miscsettings_menu.cpp: remove global rotor_swap option
2014-03-06 16:09:09 +04:00
svenhoefer
580fcc97e5
- fix (and enable) one-key-plugin; fix movieplayer-plugin
2014-03-01 23:33:45 +01:00
Stefan Seyfried
e9bc524562
Merge remote-tracking branch 'check/next-cc'
2014-01-27 21:00:18 +01:00
Jacek Jendrzej
3dc41ac047
-fix CMenuDForwarder option change
2014-01-27 17:11:27 +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
svenhoefer
53f5801d6f
- adapt ShowMsg handling from martii's neutrino-mp
2014-01-22 12:37:21 +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
7d379dcb30
Merge remote-tracking branch 'check/next-cc'
2013-12-29 22:12:09 +01:00
Jacek Jendrzej
a7f68a519f
supplement to b45511b196
2013-12-27 11:39:42 +01:00
Stefan Seyfried
cdd065fc2e
Merge remote-tracking branch 'check/next-cc'
...
Lightly tested only...
2013-12-25 22:51:23 +01:00
martii
b45511b196
system/settings: store epg times in integers
...
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com >
2013-12-25 12:08:14 +01:00
martii
d125301ede
system/settings: use integers for shutdown_count/_min
...
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com >
2013-12-25 12:08:14 +01: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
[CST] Focus
dd509ef0c2
gui/miscsettings_menu.cpp: add video.h header
2013-10-25 16:41:03 +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
d244a5991a
Merge branch 'check/next-cc'
...
Compiles on most platforms, starts. Not really tested.
Conflicts:
acinclude.m4
lib/libdvbsub/Makefile.am
lib/libtriple/Makefile.am
lib/libtuxtxt/Makefile.am
src/Makefile.am
src/create_rcsim_h.sh
src/daemonc/Makefile.am
src/driver/Makefile.am
src/driver/audiodec/Makefile.am
src/driver/pictureviewer/Makefile.am
src/eitd/Makefile.am
src/gui/Makefile.am
src/gui/bouquetlist.cpp
src/gui/channellist.cpp
src/gui/scan_setup.cpp
src/gui/streaminfo2.cpp
src/gui/streaminfo2.h
src/gui/update.cpp
src/gui/widget/Makefile.am
src/gui/widget/listbox.cpp
src/neutrino.cpp
src/nhttpd/tuxboxapi/coolstream/Makefile.am
src/rcsim.c
src/system/Makefile.am
src/zapit/src/Makefile.am
src/zapit/src/frontend.cpp
src/zapit/src/zapit.cpp
2013-10-21 22:58:55 +02:00
svenhoefer
25e550e9e3
- sleeptimer: add possibilty to preset with a fixed value
2013-10-16 10:37:23 +02:00
[CST] Focus
ebaa844494
src/gui/miscsettings_menu.cpp: always enable epg scan item
2013-10-10 19:01:46 +04:00
[CST] Focus
41f6e03e3e
gui/miscsettings_menu.cpp: add epg scan modes
2013-10-02 15:30:44 +04:00
[CST] Focus
550ca1dedb
gui/miscsettings_menu.cpp: add 'info' action key in epg settings to show current eit event count
2013-09-27 16:27:21 +04:00
Stefan Seyfried
d5d5a60261
Merge branch 'check/next-cc'
...
it compiles, but is not really tested...
Conflicts:
src/driver/netfile.cpp
src/driver/volume.cpp
src/eitd/sectionsd.cpp
src/gui/audioplayer.cpp
src/gui/bedit/bouqueteditor_bouquets.cpp
src/gui/bedit/bouqueteditor_channels.cpp
src/gui/bookmarkmanager.cpp
src/gui/bouquetlist.cpp
src/gui/eventlist.cpp
src/gui/movieplayer.cpp
src/gui/pictureviewer.cpp
src/gui/scan.cpp
src/gui/test_menu.h
src/gui/timerlist.cpp
src/gui/update.cpp
src/gui/widget/listbox.cpp
src/neutrino.cpp
src/system/flashtool.cpp
src/zapit/src/Makefile.am
src/zapit/src/femanager.cpp
2013-06-16 21:22:14 +02:00
Michael Liebmann
7833cd4dc6
scan epg: fix shadow warning
...
- fix display menuhint
2013-06-12 17:50:10 +02:00
[CST] Focus
680f684ce4
gui/miscsettings_menu.cpp: add option to enable/disable epg scan
2013-06-12 18:46:34 +04: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
[CST] Focus
56eb53ec78
gui/miscsettings_menu.cpp: add option to adjust channel list
...
on numeric zap to first fav/provider/sat mode where channel exist
2013-04-01 14:14:47 +04:00
Stefan Seyfried
0cf191822a
Merge branch 'check/dvbsi++' commit 5db16ee2ff
...
Conflicts:
src/eitd/sectionsd.cpp
src/gui/audioplayer.cpp
src/gui/channellist.cpp
src/gui/components/Makefile.am
src/gui/components/cc.h
src/gui/components/components.cpp
src/gui/moviebrowser.cpp
src/gui/scan.cpp
src/neutrino.cpp
src/zapit/src/bouquets.cpp
src/zapit/src/getservices.cpp
src/zapit/src/transponder.cpp
2013-02-21 17:07:18 +01:00
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
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
