mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 10:21:10 +02:00
Code Issues Packages Projects Releases Wiki Activity
13,450 Commits 1 Branch 51 Tags
caaa27e39f63b98dd9a36fa513d064fd9064803c
Commit Graph

262 Commits

Author SHA1 Message Date
svenhoefer
76735f088b - configure: depending --enable-quadpip on --enable-pip 
* unify ENABLE_PIP defines
* simplify ENABLE_QUADPIP defines

 Conflicts:
	src/gui/infoviewer.cpp
	src/gui/videosettings.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2021-10-17 15:59:59 +02:00
BPanther
e2b696f785 more pip changes 2021-10-15 20:18:42 +02:00
BPanther
a686f3bb03 add some more quidpip stuff (still NOT working) 2021-10-15 20:00:18 +02:00
BPanther
20e2aec336 more QuadPiP stuff (still NOT ready!) 
Conflicts:
	src/neutrino_menue.cpp
 2021-10-15 20:00:18 +02:00
TangoCash
8b5ac83f27 use autodetect pip 2021-05-30 16:48:10 +02:00
svenhoefer
cdc91ef601 - neutrino-menu: change position of avinput; add hint and icons 
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2021-05-15 22:05:59 +02:00
BPanther
f841b55c65 vuduo4k/vuduo4kse/vuultimo4k/vuuno4kse: HDMI input as mode and PiP added 
Conflicts:
	src/neutrino.cpp
 2021-05-11 10:21:06 +02:00
Thilo Graf
00fcf91936 neutrino_menue.cpp: use #if instead #ifdef for TESTING 2021-04-13 06:03:34 +02:00
svenhoefer
df692287d8 - rework VUPLUS defines 
Conflicts:
	src/gui/cam_menu.cpp
	src/neutrino_menue.cpp
	src/zapit/src/zapit.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-06-15 20:00:35 +02:00
svenhoefer
ff51f31f51 - revert 2e6e2ef and 08b5b19 partly 
Signed-off-by: Thilo Graf <dbt@novatux.de>

commits:
- neutrino_menu: use RC_help to show info_menu; ARM/MIPS_HARDWARE only
- add some mor help keys; fix 5e8a1d0233781d1b4a7494e5be8107ef4094ba85

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-01-05 16:53:14 +01:00
svenhoefer
d2ce9328e7 - neutrino_menu: use RC_help to show info_menu; ARM/MIPS_HARDWARE only 
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-01-05 16:53:14 +01:00
GetAway
99a6ab267d add lcd4linux support, ported from 
defans and vanhofen, modded by TangoCash
 2018-12-26 20:04:32 +01:00
BPanther
411c650809 plugin integration main menu added 2018-09-04 20:38:10 +02:00
svenhoefer
00536713c6 - neutrino-menu: use new marker icons 
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2018-01-05 00:52:58 +01:00
svenhoefer
5019b3577e - remove obsolete streaminfo includes 
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2018-01-03 16:44:36 +01:00
svenhoefer
dbb726e191 - code alignments to master branch 2017-09-21 11:41:59 +02:00
Jacek Jendrzej
2ebb47f519 Merge branch 'master' into pu/mp 2017-09-14 13:54:04 +02:00
svenhoefer
f2ec46311c - plugin-code: cleanup from many unused code; ... 
* remove intergration conversion because we can use the integer as it is
* update headers

  Do we need /src/plugin.h anymore? Maybe this code could be merged into src/gui/plugins.h.

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-09-14 12:14:41 +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
Jacek Jendrzej
ed416416cd Merge branch 'master' into pu/mp 2017-08-14 16:26:49 +02:00
svenhoefer
944ad7cb63 Revert "neutrino: disable some menus in upnp & ts mode" 
This reverts commit 90de51de38.

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-08-12 14:05:17 +02:00
Jacek Jendrzej
1763bb9e64 Merge branch 'master' into pu/mp 2017-08-08 20:06:40 +02:00
GetAway
90de51de38 neutrino: disable some menus in upnp & ts mode 
to prevent inoperability of neutrino
 2017-08-07 07:52:41 +02:00
M. Liebmann
d2b3a8da68 CNeutrinoApp::InitMenuMain: Fix compiler warning 2017-03-20 00:40:10 +01:00
svenhoefer
de1ee8b73a - use g_info.hw_caps->can_shutdown; mostly ported from neutrino-mp 2017-03-19 23:50:52 +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
13ab1ebc8a Merge remote-tracking branch 'tuxbox/master' 
* needs compile fixes
* needs additional tests, of course :-)
 2016-10-22 11:37:40 +02:00
svenhoefer
0c0b1981f6 - no need to assign mainmenu as an argument to realrun() 2016-07-01 15:13:54 +02:00
Stefan Seyfried
880115fa98 Merge remote-tracking branch 'uncool/cst-next' 2015-12-25 16:28:39 +01:00
svenhoefer
1e5e30ab2b - menue: don't disable whole settings and service menu in mp mode; 
just disable channel-scan and software-update in service menu
 2015-12-23 10:16:26 +01:00
Thilo Graf
1f95f38d32 Main Menu: try to add dynamic possibility to disable items on runtime 
The issue is that it's not really possible to disable/enable menu items on
runtime with an existant menu widget instance eg with personalized menu items.

Here we need a dynamic solution to disable items depends on stb-mode (mode_ts, mode_tv etc)
This should be solved here with an additional parameter for personalized items.

New paramter is named: disable_condition
Possible alvailable values at the moment are:

  DCOND_MODE_NONE as default

  DCOND_MODE_TV
  DCOND_MODE_RADIO
  DCOND_MODE_TS

includes some improvements by Sven

- menue: remove old_iconName handling
  ... icons should be painted on deactivated items too

- menue: try to fix position <-> selection missmatch
 2015-12-22 13:14:18 +01:00
svenhoefer
6e15577bf1 - add missing includes to fix menu-width 
strange circular include global.h <-> settings.h is maybe to fix
 2015-04-16 18:36:17 +02:00
Stefan Seyfried
5ab6b53054 global.h: Use forward-declarations to reduce number of dependencies 2015-04-16 13:39:35 +02:00
Stefan Seyfried
b3bfb361f5 neutrino.h: use forward declaration instead of includes 
this reduces the dependency chain on partial rebuilds considerably
 2015-02-14 14:31:12 +01:00
Stefan Seyfried
a7bad347d7 neutrino.h: use forward declaration instead of includes 
this reduces the dependency chain on partial rebuilds considerably
 2015-02-11 08:22:36 +01: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
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
3c52e2b87f - re-enable front-panel settings for Trinity; re-sort vfd_setup 2014-11-04 14:59:23 +01:00
M. Liebmann
ddd41e05ef integrated plugins: Add direct keys 2014-10-16 09:49:19 +02:00
svenhoefer
16e0975a29 - add plugins to settings menu and service menu 2014-09-29 14:38:51 +04:00
Thilo Graf
201a6aa56e configure: move option enable testmenu to enable testing 
Testing is also plausible for general usage of other tests or other
experimental code parts.
 2014-09-25 11:01:17 +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
svenhoefer
f07e81c4b9 - neutrino_menue: rename audioplayer/picviewer menu to multimedia menu 2014-09-03 16:31:53 +02:00
svenhoefer
aad8c86cb8 - neutrino_menue: add own personalize item to standby item 2014-06-28 14:28:35 +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
[CST] Focus
6be2b32cd3 gui/hdd_menu.cpp: convert to singleton; 
add basic notify about device hotplug/remove
 2014-04-23 17:44:24 +04:00