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
10,655 Commits 1 Branch 51 Tags
2ebb47f51979a397ccbd91a51fa41580f5a4f658
Commit Graph

124 Commits

Author SHA1 Message Date
Jacek Jendrzej
2ebb47f519 Merge branch 'master' into pu/mp 2017-09-14 13:54:04 +02:00
Jacek Jendrzej
97442240f8 remove unused 2017-09-14 13:29:47 +02:00
Jacek Jendrzej
2c5bf73006 Merge branch 'master' into pu/mp 2017-09-13 13:40:40 +02:00
vanhofen
816de89898 - drop easymenu 2017-09-13 13:35:23 +02:00
svenhoefer
b12624d1fa Merge branch 'master' into pu/mp 
Conflicts:
	src/gui/miscsettings_menu.cpp
	src/neutrino.cpp
	src/system/settings.h
 2017-03-20 01:31:51 +01:00
svenhoefer
de1ee8b73a - use g_info.hw_caps->can_shutdown; mostly ported from neutrino-mp 2017-03-19 23:50:52 +01:00
svenhoefer
4f202b19d6 - use g_info.hw_caps->has_fan; remove old g_info.has_fan 2017-03-19 01:04:48 +01:00
Stefan Seyfried
abec1c311b Merge remote-tracking branch 'tuxbox/master' 2017-03-04 19:32:30 +01:00
svenhoefer
856c676430 - rename g_PluginList to g_Plugins; this isn't a list of plugins 2017-03-01 13:03:50 +01:00
Stefan Seyfried
a409047714 Merge remote-tracking branch 'tuxbox/master' 2017-01-22 22:59:39 +01:00
Marc Szymkowiak
9b2a0d4414 add entry to load saved epg data manual 2017-01-09 19:39:30 +01:00
Stefan Seyfried
c6d7968381 Merge remote-tracking branch 'tuxbox/master' 2016-12-04 18:02:51 +01:00
TangoCash
6cd5dd8e23 add option to read saved epg data frequently 2016-11-20 19:24:08 +01:00
Stefan Seyfried
2c92d112d0 Merge remote-tracking branch 'tuxbox/master' 2016-11-12 18:06:26 +01:00
Thilo Graf
ab9bf2ffa6 Merge branch 'master' into pu/msgbox 2016-11-02 21:05:36 +01:00
svenhoefer
da14d72dcb - miscsettings_menu: fix youtube api key length 2016-11-01 22:20:26 +01:00
Thilo Graf
dde298b1b7 CMsgBox: rework msgbox classes with Window class implementation 
Replacing messagebox, hintbox_ext and some derivated parts with
basic class hintbox and derivated class CMsgBox. This should unify
window handling and avoids maintain of multiple classes with quasi
same purpose and adds more functionality.

TODO: fix and optimize details
 2016-10-24 10:31:24 +02:00
Stefan Seyfried
13ab1ebc8a Merge remote-tracking branch 'tuxbox/master' 
* needs compile fixes
* needs additional tests, of course :-)
 2016-10-22 11:37:40 +02:00
svenhoefer
db896847b9 - allow to disable online services w/o cleaning the keys 2016-08-08 23:11:17 +02:00
vanhofen
a291b11300 - add submenu to configure and control online services like youtube, shoutcast and tmdb 2016-08-06 22:52:37 +02:00
Jacek Jendrzej
374a172aef remove unused and some clang compil fixes 2016-04-17 13:46:16 +02:00
svenhoefer
a4bd8cc5a8 - miscsettings_menu: allow to reset movieplayer plugin 2016-02-22 21:06:46 +01:00
Stefan Seyfried
eeee5bacab Merge remote-tracking branch 'uncool/cst-next' 
This need buildfixes and some functional updates...
 2015-12-13 17:41:55 +01:00
[CST] Focus
60c45ec06c gui/osd_setup.cpp, gui/miscsettings_menu.cpp: do not delete items added to menu - menu dtor do it 2015-06-19 15:48:15 +03:00
svenhoefer
9041bff59c - 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
dbac5741db allow choosing bouquets to epg-scan in "favorites only" mode 2015-03-04 19:52:25 +01:00
Stefan Seyfried
2d4c6eedad miscsettings: use correct SleepTimerWidget invocation 2015-02-17 21:18:54 +01:00
Stefan Seyfried
b5a64e6887 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
 2015-01-26 17:26:26 +01:00
[CST] Focus
d98d94550f gui/miscsettings_menu.cpp: add option to cache EPG only for favorite channels, 
filter not yet reconfigured after scan or editing favorite bouquets
 2015-01-22 18:58:53 +03:00
Stefan Seyfried
d37b3c0f9a 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
 2014-12-28 12:32:12 +01:00
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
e21a79195e - add epg_save_frequently feature ... 
... to provide the EPG data in frequently intervals on an external device
 2014-12-05 09:08:56 +01:00
svenhoefer
4c621f1dec - split epg_read from epg_save ... 
... to get the possibility to read EPG-data from an external device
at boot w/o saving the own data at shutdown/standby.
 2014-12-05 09:08:56 +01:00
[CST] Focus
8772d219f1 gui/miscsettings_menu.cpp: add option to enable/disable empty favorites in bouquet list 2014-10-27 13:52:23 +03:00
[CST] Focus
320c3b163c gui/miscsettings_menu.cpp: fix settings sectionsd config 2014-10-20 11:16:14 +04:00
martii
e84782bc4c drop explicit CMenuForwarder icon assignments 
Conflicts:
	src/gui/3dsetup.cpp
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/keybind_setup.cpp
	src/gui/mediaplayer.cpp
	src/gui/mediaplayer_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/network_setup.cpp
	src/gui/nfs.cpp
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/parentallock_setup.cpp
	src/gui/personalize.cpp
	src/gui/proxyserver_setup.cpp
	src/gui/record_setup.cpp
	src/gui/scan_setup.cpp
	src/gui/screensetup.cpp
	src/gui/settings_manager.cpp
	src/gui/timerlist.cpp
	src/gui/update_menue.cpp
	src/gui/vfd_setup.cpp
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp
 2014-09-15 11:44:08 +04:00
[CST] Focus
420af7a4dc neutrino: sync keybind and usermenu code with neutrino-mp, code (C) martii 2014-09-05 17:49:11 +04:00
[CST] Focus
a473fe8194 webtv channels integration port, 
initial code (C) martii,
initial patch from jacek
 2014-08-27 17:32:26 +04:00
svenhoefer
5d8814f1d4 - miscsettings_menu: remove double include 2014-08-26 17:33:18 +04:00
[CST] Focus
cf91f2eccb merge neutrino-mp menu/buttons/icons changes, (C) martii 2014-07-17 17:02:25 +04:00
[CST] Focus
0c22682df3 gui/miscsettings_menu.cpp: move epg scan OFF option to epg mode, 
reorder epg settings, add separators
 2014-05-14 16:32:49 +04: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
Thilo Graf
8a8748c5e7 CMiscMenue: add entry for temporarily debug mode settings 
Option "Level" overwrites assigned debug level output mode of Neutrino
start parameters, but only temporarily till change of options by user
or restart of Neutrino.
 2014-04-02 08:40:21 +02:00
[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