vanhofen
f37efba8f7
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Origin commit data
------------------
Commit: 4bc4a80094
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-09-09 (Sat, 09 Sep 2017)
2017-09-09 08:44:18 +02:00
vanhofen
2ee7a428d9
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Origin commit data
------------------
Commit: eb76978295
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-09-09 (Sat, 09 Sep 2017)
2017-09-09 08:43:52 +02:00
Jacek Jendrzej
b03ab5cb9e
remove double includes
...
Origin commit data
------------------
Commit: 6576729fd1
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2017-09-08 (Fri, 08 Sep 2017)
2017-09-08 21:21:32 +02:00
vanhofen
7650e3e748
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Conflicts:
src/gui/plugins.cpp
src/gui/plugins.h
Origin commit data
------------------
Commit: a11e7df409
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-09-08 (Fri, 08 Sep 2017)
2017-09-08 12:24:32 +02:00
vanhofen
5dc6e26d36
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.
Origin commit data
------------------
Commit: f0f0c1f55d
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-09-08 (Fri, 08 Sep 2017)
Origin message was:
------------------
- 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.
2017-09-08 10:53:03 +02:00
vanhofen
a360c99a70
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Origin commit data
------------------
Commit: c3ed2ed700
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-03-01 (Wed, 01 Mar 2017)
2017-03-01 13:10:36 +01:00
vanhofen
260127f781
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Conflicts:
src/gui/movieplayer.cpp
src/nhttpd/tuxboxapi/controlapi.cpp
Origin commit data
------------------
Commit: f30f4da574
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-03-01 (Wed, 01 Mar 2017)
2017-03-01 13:09:50 +01:00
vanhofen
a9edf315db
rename g_PluginList to g_Plugins; this isn't a list of plugins
...
Origin commit data
------------------
Commit: 856c676430
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-03-01 (Wed, 01 Mar 2017)
Origin message was:
------------------
- rename g_PluginList to g_Plugins; this isn't a list of plugins
2017-03-01 13:03:50 +01:00
vanhofen
65e0a39980
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Conflicts:
data/locale/deutsch.locale
data/locale/english.locale
data/locale/nederlands.locale
data/locale/slovak.locale
data/locale/unmaintained/czech.locale
src/gui/components/cc_frm_footer.cpp
src/gui/start_wizard.cpp
src/gui/widget/msgbox.cpp
Origin commit data
------------------
Commit: fce378f8ff
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-11-21 (Mon, 21 Nov 2016)
2016-11-21 12:46:49 +01:00
vanhofen
cc7ad7ce1a
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Conflicts:
data/locale/deutsch.locale
data/locale/english.locale
src/gui/lua/lua_misc.cpp
src/neutrino.cpp
src/system/locals.h
src/system/locals_intern.h
Origin commit data
------------------
Commit: 3420991007
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-11-19 (Sat, 19 Nov 2016)
2016-11-19 21:11:54 +01:00
Thilo Graf
e216fc6824
Includes: remove unused includes
...
Origin commit data
------------------
Commit: e19536fe99
Author: Thilo Graf <dbt@novatux.de >
Date: 2016-10-26 (Wed, 26 Oct 2016)
2016-10-26 10:25:07 +02:00
vanhofen
ee5ff0408d
Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
...
Conflicts:
configure.ac
data/locale/deutsch.locale
data/locale/english.locale
data/locale/slovak.locale
lib/libcoolstream/hardware_caps.cpp
lib/libcoolstream/hardware_caps.h
lib/libdvbsub/dvbsubtitle.cpp
lib/timerdclient/timerdclient.cpp
src/daemonc/Makefile.am
src/daemonc/remotecontrol.cpp
src/driver/framebuffer_ng.h
src/driver/pictureviewer/Makefile.am
src/driver/streamts.cpp
src/eitd/sectionsd.cpp
src/gui/bedit/bouqueteditor_channels.cpp
src/gui/dboxinfo.cpp
src/gui/epgplus.cpp
src/gui/epgview.cpp
src/gui/plugins.cpp
src/gui/streaminfo2.cpp
src/gui/themes.cpp
src/gui/widget/listbox.cpp
src/gui/widget/listhelpers.cpp
src/neutrino.cpp
src/system/helpers.cpp
src/system/helpers.h
src/system/settings.cpp
src/system/settings.h
src/zapit/src/getservices.cpp
Origin commit data
------------------
Commit: 75cce3b113
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-10-25 (Tue, 25 Oct 2016)
2016-10-25 13:08:01 +02:00
Stefan Seyfried
54189f271a
Merge remote-tracking branch 'tuxbox/master'
...
* needs compile fixes
* needs additional tests, of course :-)
Origin commit data
------------------
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2016-10-22 (Sat, 22 Oct 2016)
2016-10-22 11:37:40 +02:00
vanhofen
7220c6b265
Merge branch 'ni/cst-next' into ni/mp/cst-next
...
Conflicts:
acinclude.m4
src/gui/bedit/bouqueteditor_channels.cpp
src/gui/epgplus.cpp
src/gui/plugins.cpp
src/gui/widget/listbox.cpp
src/zapit/src/capmt.cpp
Origin commit data
------------------
Commit: 7135aac394
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-10-10 (Mon, 10 Oct 2016)
2016-10-10 17:27:55 +02:00
vanhofen
9b1904e84d
Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
...
Conflicts:
data/locale/deutsch.locale
data/locale/english.locale
src/system/locals.h
src/system/locals_intern.h
Origin commit data
------------------
Commit: 6c8ea9793f
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-10-06 (Thu, 06 Oct 2016)
2016-10-06 21:18:48 +02:00
Thilo Graf
fc29cf8824
lua api: fix broken build with --disable-lua
...
Origin commit data
------------------
Commit: 1d74379981
Author: Thilo Graf <dbt@novatux.de >
Date: 2016-10-02 (Sun, 02 Oct 2016)
2016-10-03 01:44:54 +02:00
vanhofen
bc33663742
Merge branch 'ni/mp' into ni/cst-next
...
Conflicts:
data/icons/shutdown.jpg
data/icons/start.jpg
data/locale/Makefile.am
data/locale/deutsch.locale
data/locale/english.locale
lib/libdvbsub/dvbsub.cpp
lib/libdvbsub/dvbsubtitle.cpp
lib/libtuxtxt/tuxtxt.cpp
lib/libtuxtxt/tuxtxt.h
src/gui/dboxinfo.cpp
src/gui/movieplayer.cpp
src/gui/streaminfo2.cpp
src/gui/themes.cpp
src/neutrino.cpp
src/neutrino_menue.cpp
src/nhttpd/Makefile.am
src/system/flashtool.cpp
Origin commit data
------------------
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-08-26 (Fri, 26 Aug 2016)
2016-08-26 19:13:47 +02:00
vanhofen
4cf2b60722
NI \o/
...
Origin commit data
------------------
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-05-19 (Thu, 19 May 2016)
2016-05-19 22:59:54 +02:00
Michael Liebmann
48acf5fcc4
Merge branch 'cst-next' into nmp-cst-next
...
Origin commit data
------------------
Commit: db8a9e6388
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2016-01-25 (Mon, 25 Jan 2016)
2016-01-25 13:20:10 +01:00
vanhofen
88794c8873
plugins: startPlugin works with filename; just for clarity
...
Origin commit data
------------------
Commit: 55f0ab75af
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-01-24 (Sun, 24 Jan 2016)
Origin message was:
------------------
- plugins: startPlugin works with filename; just for clarity
2016-01-24 21:29:31 +01:00
vanhofen
9e2492ab2a
plugins: fix movieplayer-plugin
...
Origin commit data
------------------
Commit: bbd88cd051
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-01-24 (Sun, 24 Jan 2016)
Origin message was:
------------------
- plugins: fix movieplayer-plugin
2016-01-24 21:28:37 +01:00
Stefan Seyfried
f953af605a
Merge remote-tracking branch 'cst-next'
...
Origin commit data
------------------
Commit: b53fbaf327
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2016-01-08 (Fri, 08 Jan 2016)
2016-01-08 19:52:41 +01:00
Thilo Graf
a5c80536e0
CPlugins: try to fix possible segfault while open shellwindow scripts
...
Origin commit data
------------------
Commit: f54f1d0805
Author: Thilo Graf <dbt@novatux.de >
Date: 2016-01-02 (Sat, 02 Jan 2016)
2016-01-02 00:10:20 +01:00
Stefan Seyfried
17880c4125
Merge remote-tracking branch 'uncool/cst-next'
...
This need buildfixes and some functional updates...
Origin commit data
------------------
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2015-12-13 (Sun, 13 Dec 2015)
2015-12-13 17:41:55 +01:00
Michael Liebmann
6cef9d09fb
CLuaInstance: Move luainstance into a separate directory (src/gui/lua)
...
- Move video functions from luainstance.cpp to lua_video.cpp
- For the future, provided the individual classes
(eg menu, CComponents etc.) to move in separate files.
Origin commit data
------------------
Commit: 464f929437
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2015-12-08 (Tue, 08 Dec 2015)
Origin message was:
------------------
CLuaInstance: Move luainstance into a separate directory (src/gui/lua)
- Move video functions from luainstance.cpp to lua_video.cpp
- For the future, provided the individual classes
(eg menu, CComponents etc.) to move in separate files.
2015-12-08 12:01:25 +01:00
vanhofen
8e23a560fd
move PLUGINDIR_VAR to global.h to avoid some hardcoded paths
...
Origin commit data
------------------
Commit: 6e6d7ad765
Author: vanhofen <vanhofen@gmx.de >
Date: 2015-05-06 (Wed, 06 May 2015)
Origin message was:
------------------
- move PLUGINDIR_VAR to global.h to avoid some hardcoded paths
2015-05-06 22:58:54 +02:00
vanhofen
c6e3c167f0
plugins: replace PLUGINDIR_USB with PLUGINDIR_MNT (/mnt/plugins)
...
Origin commit data
------------------
Commit: 75f84739a5
Author: vanhofen <vanhofen@gmx.de >
Date: 2015-05-05 (Tue, 05 May 2015)
Origin message was:
------------------
- plugins: replace PLUGINDIR_USB with PLUGINDIR_MNT (/mnt/plugins)
2015-05-05 14:46:46 +02:00
vanhofen
35b0a1f6bd
plugins: add GAMESDIR (/var/tuxbox/games) to plugin list
...
Origin commit data
------------------
Commit: 14dc610a68
Author: vanhofen <vanhofen@gmx.de >
Date: 2015-05-05 (Tue, 05 May 2015)
Origin message was:
------------------
- plugins: add GAMESDIR (/var/tuxbox/games) to plugin list
2015-05-05 14:45:28 +02:00
Stefan Seyfried
98fe56c38b
Merge remote-tracking branch 'test/cst-next'
...
Origin commit data
------------------
Commit: 92fcc879b4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2015-03-07 (Sat, 07 Mar 2015)
2015-03-07 20:09:44 +01:00
vanhofen
d29d29c6fa
plugins: allow localization in plugin.cfg
...
Example:
name=Default plugin name
description=Default plugin desription
name.deutsch=Deutscher Plugin-Name
name.english=English plugin name
Origin commit data
------------------
Commit: 4baeab4353
Author: vanhofen <vanhofen@gmx.de >
Date: 2015-03-05 (Thu, 05 Mar 2015)
Origin message was:
------------------
- plugins: allow localization in plugin.cfg
Example:
name=Default plugin name
description=Default plugin desription
name.deutsch=Deutscher Plugin-Name
name.english=English plugin name
2015-03-05 17:03:21 +01:00
Stefan Seyfried
1a17fed057
disarm broken HAVE_SPARK_HARDWARE code
...
Origin commit data
------------------
Commit: 0bff1ff02d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2015-01-27 (Tue, 27 Jan 2015)
2015-01-27 10:59:04 +01:00
Stefan Seyfried
d1e2143fd6
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
Origin commit data
------------------
Commit: d37b3c0f9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-12-28 (Sun, 28 Dec 2014)
2014-12-28 12:32:12 +01:00
Stefan Seyfried
ec1a9fce17
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
Origin commit data
------------------
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-12-25 (Thu, 25 Dec 2014)
2014-12-25 18:03:08 +01:00
vanhofen
3c55104f98
Revert "- plugins: allow empty menu hints"
...
This reverts commit 5858675c2c
because 6453c8a7b7
do the same.
Origin commit data
------------------
Commit: 3a401a46b3
Author: vanhofen <vanhofen@gmx.de >
Date: 2014-11-22 (Sat, 22 Nov 2014)
2014-11-22 16:17:30 +01:00
vanhofen
4695c00999
plugins: Fix assignment of prefered keys
...
New keyword in plugin.cfg: key=<key>
* key=red
* key=green
* key=yellow
* key=blue
* key=auto
If entry is missing key is auto-assigned
Origin commit data
------------------
Commit: c0a0cdb221
Author: vanhofen <vanhofen@gmx.de >
Date: 2014-11-07 (Fri, 07 Nov 2014)
Origin message was:
------------------
- plugins: Fix assignment of prefered keys
New keyword in plugin.cfg: key=<key>
* key=red
* key=green
* key=yellow
* key=blue
* key=auto
If entry is missing key is auto-assigned
2014-11-07 12:17:29 +01:00
vanhofen
5858675c2c
plugins: allow empty menu hints
...
Origin commit data
------------------
Commit: 95eab2a48d
Author: vanhofen <vanhofen@gmx.de >
Date: 2014-11-06 (Thu, 06 Nov 2014)
Origin message was:
------------------
- plugins: allow empty menu hints
2014-11-06 12:36:07 +01:00
vanhofen
4d59eee6be
plugins: disable unused cfg-params
...
Origin commit data
------------------
Commit: c8522bae71
Author: vanhofen <vanhofen@gmx.de >
Date: 2014-11-06 (Thu, 06 Nov 2014)
Origin message was:
------------------
- plugins: disable unused cfg-params
2014-11-06 12:36:07 +01:00
vanhofen
6b21320aa3
plugins: add and use default hint icon; THX to fred_feuerstein
...
Origin commit data
------------------
Commit: 765ad18b07
Author: vanhofen <vanhofen@gmx.de >
Date: 2014-10-08 (Wed, 08 Oct 2014)
Origin message was:
------------------
- plugins: add and use default hint icon; THX to fred_feuerstein
2014-10-08 14:14:24 +04:00
vanhofen
979e85ff5b
plugins: allow hinticons for plugins
...
Default is <plugin>_hint.png; an entry 'hinticon=another_name' in
<plugin>.cfg overrides this; use icon in plugindir first; if not found
use icon in one of the other wellknown neutrino icon directories.
Origin commit data
------------------
Commit: ebbed374af
Author: vanhofen <vanhofen@gmx.de >
Date: 2014-10-06 (Mon, 06 Oct 2014)
Origin message was:
------------------
- plugins: allow hinticons for plugins
Default is <plugin>_hint.png; an entry 'hinticon=another_name' in
<plugin>.cfg overrides this; use icon in plugindir first; if not found
use icon in one of the other wellknown neutrino icon directories.
2014-10-07 13:19:15 +04:00
vanhofen
cd2b6e5596
plugins: add new configuration item 'integration'
...
Integrate plugins in existing neutrino menues. Usage in plugin.cfg:
integration=0; disabled
integration=1; reserved
integration=2; multimedia menu
integration=3; settings menu
integration=4; service menu
integration=5; information menu
Origin commit data
------------------
Commit: f586552719
Author: vanhofen <vanhofen@gmx.de >
Date: 2014-09-28 (Sun, 28 Sep 2014)
Origin message was:
------------------
- plugins: add new configuration item 'integration'
Integrate plugins in existing neutrino menues. Usage in plugin.cfg:
integration=0; disabled
integration=1; reserved
integration=2; multimedia menu
integration=3; settings menu
integration=4; service menu
integration=5; information menu
2014-09-29 14:38:39 +04:00
vanhofen
855995f5c7
plugins: add configparam 'shellwindow'
...
Origin commit data
------------------
Commit: b46ad0c5ae
Author: vanhofen <vanhofen@gmx.de >
Date: 2014-09-17 (Wed, 17 Sep 2014)
Origin message was:
------------------
- plugins: add configparam 'shellwindow'
2014-09-17 18:04:54 +02:00
[CST] Focus
34d2776109
neutrino: sync keybind and usermenu code with neutrino-mp, code (C) martii
...
Origin commit data
------------------
Commit: 420af7a4dc
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2014-09-05 (Fri, 05 Sep 2014)
2014-09-05 17:49:11 +04:00
martii
2c73f75ec2
gui/plugins: exclude unused methods
...
Origin commit data
------------------
Commit: a7ebf966c4
Author: martii <m4rtii@gmx.de >
Date: 2014-05-31 (Sat, 31 May 2014)
2014-05-31 12:10:54 +02:00
Stefan Seyfried
3f36062fe7
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
Origin commit data
------------------
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-04-27 (Sun, 27 Apr 2014)
2014-04-27 19:14:06 +02:00
vanhofen
e45d1c6a11
plugins: cleanup
...
* drop PLUGINDIR_USB
* drop unused 'param' from startPlugin
Origin commit data
------------------
Commit: 4b5242c254
Author: vanhofen <vanhofen@gmx.de >
Date: 2014-03-02 (Sun, 02 Mar 2014)
Origin message was:
------------------
- plugins: cleanup
* drop PLUGINDIR_USB
* drop unused 'param' from startPlugin
2014-03-02 00:43:59 +01:00
Stefan Seyfried
26600340e1
add virtual plugin type 'not game'
...
the only maybe useful distinction between plugin types
is game / others, so add a 'virtual' plugin type which
represents everything but games
Origin commit data
------------------
Commit: 44cd36c412
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-02-16 (Sun, 16 Feb 2014)
2014-02-16 18:29:23 +01:00
Stefan Seyfried
d06c1d8ad6
Merge remote-tracking branch 'check/next-cc'
...
...only build-tested, needs fixes
Origin commit data
------------------
Commit: ecd62d81d1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-02-15 (Sat, 15 Feb 2014)
2014-02-15 20:22:07 +01:00
vanhofen
530d403ee0
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)
Origin commit data
------------------
Commit: f9ad30f183
Author: vanhofen <vanhofen@gmx.de >
Date: 2014-02-04 (Tue, 04 Feb 2014)
Origin message was:
------------------
- 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
e05d1def44
Revert "Add a --enable-lua switch to enable LUA support"
...
This reverts commit 2056b4ed80
.
This just makes the code unreadable and why would one build
without lua :-)
Origin commit data
------------------
Commit: 5525e9f4b5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-23 (Thu, 23 Jan 2014)
2014-01-23 14:11:03 +01:00
Stefan Seyfried
a112e8fb49
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
Origin commit data
------------------
Commit: b414474323
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-23 (Thu, 23 Jan 2014)
2014-01-23 14:08:37 +01:00