Commit Graph

130 Commits

Author SHA1 Message Date
martii
c015d4670f - adzap: port code from martiis-neutrino-mp 2016-03-03 11:18:14 +01:00
svenhoefer
5a9bee721d - user_menu: get resolution value for livestreams 2016-03-03 09:46:42 +01:00
svenhoefer
07b1f6f849 - infoviewer_bb: show resolution in livestream mode on color button 2016-03-03 09:46:42 +01:00
M. Liebmann
b4a2856e1c movieplayer: Use Lua scripts for selecting live stream urls 2016-03-03 09:46:42 +01:00
Thilo Graf
59d9b7068e Infoclock: unify handling in some classes with singleton 2016-02-29 08:05:05 +01:00
svenhoefer
32c28038a3 - infoviewer: fix audio description in mode_webtv 2016-01-26 00:57:08 +01:00
Stefan Seyfried
f5c72d35c8 Merge remote-tracking branch 'n/cst-next-fixed' 2016-01-24 13:15:43 +01:00
svenhoefer
2eb0aed5db - rc_lock: rework class; switch to singleton; add icon; vfd-support 2016-01-20 20:26:52 +01:00
Stefan Seyfried
b53fbaf327 Merge remote-tracking branch 'cst-next' 2016-01-08 19:52:41 +01:00
svenhoefer
5860045999 - locale: add usermenu title locales ...
some small reworks; cleanup from #if 0'ed code
2016-01-02 12:18:06 +01:00
Stefan Seyfried
9113716171 Merge remote-tracking branch 'uncool/cst-next' 2016-01-01 14:10:48 +01:00
svenhoefer
9325385ce9 - user_menu: allow controlable return_title value 2015-12-29 14:31:51 +01:00
Stefan Seyfried
b837d8697b Merge remote-tracking branch 'uncool/cst-next' 2015-12-28 16:15:14 +01:00
Thilo Graf
42102d432d CUserMenu: using native callback to ensure paint for info clock after hide of this menu window
menu->hide() handler comes too early, nice to see if clock is transparent.
2015-12-27 14:42:29 +01:00
Stefan Seyfried
2d949bce16 Merge remote-tracking branch 'uncool/cst-next' 2015-12-15 17:29:18 +01:00
svenhoefer
25e1f5bc9e - user_menue: disable some items in movieplayer mode 2015-12-15 08:15:17 +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
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
22dd798325 Merge remote-tracking branch 'check/cst-next' 2015-02-25 21:20:22 +01:00
[CST] Focus
24c4f5c0cd fix crash in user_menue when ITEM_EPG_MISC is selected 2015-02-25 17:03:14 +01: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
0bff1ff02d disarm broken HAVE_SPARK_HARDWARE code 2015-01-27 10:59:04 +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
Jacek Jendrzej
8023a6317b neutrino use check empty() instead of length() or size() 2015-01-03 17:51:08 +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
348add4acd - user_menue: minor optimizations 2014-11-07 15:39:53 +01:00
svenhoefer
5ec409b264 - user_menue: fix wrong changes in 19f7e04c77 2014-11-07 13:55:05 +01:00
svenhoefer
19f7e04c77 - user_menue: allow colored keys from plugin.cfg 2014-11-07 12:20:47 +01:00
svenhoefer
c0b130c490 - plugins: don't add hidden plugins to usermenu; ...
... use CPuginsExec::exec() to execute and drop CUserMenu::exec()
2014-11-07 09:44:53 +01:00
svenhoefer
b93cb83c7c - user_menue: fix hint icons for 'singe-added' plugins 2014-11-06 12:36:07 +01:00
[CST] Focus
5d6ea715d8 gui/user_menue.cpp: add network settings and software update as user-menu items 2014-10-16 13:56:15 +04:00
svenhoefer
088809b76f - - plugins: use hinticons for plugins in usermenu and pluginlist 2014-10-07 13:19:19 +04:00
svenhoefer
c166fc28af - plugins: don't show integrated plugins in usermenu 2014-09-30 14:27:48 +04:00
svenhoefer
237892ffd2 - setting_helpers: rename CStreamFeaturesChangeExec to CPluginsExec 2014-09-08 16:33:26 +02:00
[CST] Focus
e361f74af7 gui/user_menue.cpp: fix old items code c/p 2014-09-08 14:35:56 +04:00
svenhoefer
8047531bc5 - user_menu: re-rename ITEM_PLUGIN to ITEM_PLUGIN_TYPES 2014-09-05 18:47:44 +02:00
[CST] Focus
420af7a4dc neutrino: sync keybind and usermenu code with neutrino-mp, code (C) martii 2014-09-05 17:49:11 +04:00
BPanther
fe3379ddb7 missing lua ifdef 2014-05-02 09:47:42 +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
svenhoefer
a05121d9b7 - user_menue.cpp: whitespace cleanup 2014-03-06 12:56:24 +01:00
svenhoefer
7c19f53e4b - user_menu: add some pointers to delete 2014-03-06 12:45:48 +01:00
Stefan Seyfried
44e127a8dd revert the split into lots of plugin types
* present the user with only two types of extensions: games and
  everything else (lua, script, binary .so)
* use lua locale, right now it is translated to just "Plugins" :-)
2014-02-16 18:38:03 +01:00
Stefan Seyfried
ecd62d81d1 Merge remote-tracking branch 'check/next-cc'
...only build-tested, needs fixes
2014-02-15 20:22:07 +01:00
svenhoefer
e97ea955c9 - plugins: type for listed plugins on blue key is more selectable 2014-02-06 22:51:18 +01:00
svenhoefer
f9ad30f183 - plugins: type for listed plugins on blue key is selectable
* add mainmenu items for tools and lua-extensions
  (default not visible)
* add usermenu items for tools and lua-extensions
  (default off)
2014-02-04 09:08:21 +01:00
Stefan Seyfried
5525e9f4b5 Revert "Add a --enable-lua switch to enable LUA support"
This reverts commit 82d4832013.

This just makes the code unreadable and why would one build
without lua :-)
2014-01-23 14:11:03 +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