Commit Graph

73 Commits

Author SHA1 Message Date
vanhofen
2d6ad62b30 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6d49aee959
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-07 (Mon, 07 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-07 08:20:56 +02:00
GetAway
aaee0baf07 neutrino: disable some menus in upnp & ts mode
to prevent inoperability of neutrino


Origin commit data
------------------
Branch: ni/coolstream
Commit: 90de51de38
Author: GetAway <get-away@t-online.de>
Date: 2017-08-06 (Sun, 06 Aug 2017)



------------------
This commit was generated by Migit
2017-08-07 07:52:41 +02:00
vanhofen
9bd8b2b10c 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
------------------
Branch: ni/coolstream
Commit: f30f4da574
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)



------------------
This commit was generated by Migit
2017-03-01 13:09:50 +01:00
vanhofen
c1140e0c1c rename g_PluginList to g_Plugins; this isn't a list of plugins
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-03-01 13:03:50 +01:00
vanhofen
354ce26578 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/user_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a4b150ca3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-13 (Tue, 13 Dec 2016)



------------------
This commit was generated by Migit
2016-12-13 12:42:47 +01:00
vanhofen
3706c9177d usermenu: add brackets to code; fix compilation
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8dcaad4f07
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-13 (Tue, 13 Dec 2016)

Origin message was:
------------------
- usermenu: add brackets to code; fix compilation

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-12-13 12:32:00 +01:00
vanhofen
8034891ce9 usermenu: sort NI code to original code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 224c4b6774
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-13 (Tue, 13 Dec 2016)

Origin message was:
------------------
- usermenu: sort NI code to original code

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-12-13 11:39:09 +01:00
vanhofen
bb28e4756e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/user_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 13de196622
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-13 (Tue, 13 Dec 2016)



------------------
This commit was generated by Migit
2016-12-13 11:18:47 +01:00
vanhofen
0caf40d664 usermenu: sort/cleanup code by items; just code cosmetics
Origin commit data
------------------
Branch: ni/coolstream
Commit: e0f860664c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-13 (Tue, 13 Dec 2016)

Origin message was:
------------------
- usermenu: sort/cleanup code by items; just code cosmetics

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-12-13 10:53:24 +01:00
vanhofen
f673e1c62b usermenu: allow testmenu in usermenu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7fcf19b967
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)

Origin message was:
------------------
- usermenu: allow testmenu in usermenu

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-12-12 20:35:29 +01:00
vanhofen
a86bc779b4 NI \o/
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-05-19 22:59:54 +02:00
Jacek Jendrzej
ea6d4ee461 src/gui/user_menue.cpp fix AddressSanitizer: heap-use-after-free
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4947a71782
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-03-06 (Sun, 06 Mar 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-03-06 13:15:36 +01:00
vanhofen
6160cf9291 adzap: call adzap directly from usermenu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2b0996e3d3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-29 (Mon, 29 Feb 2016)

Origin message was:
------------------
- adzap: call adzap directly from usermenu

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-03-03 11:18:15 +01:00
vanhofen
550709de5e adzap: add hint icon by fred_feuerstein
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1df41008a4
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-29 (Mon, 29 Feb 2016)

Origin message was:
------------------
- adzap: add hint icon by fred_feuerstein

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-03-03 11:18:15 +01:00
vanhofen
f277c6d889 adzap: align locale in usermenu item to adzap active status
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1dfc1bc452
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-29 (Mon, 29 Feb 2016)

Origin message was:
------------------
- adzap: align locale in usermenu item to adzap active status

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-03-03 11:18:15 +01:00
martii
155c0ba036 adzap: port code from martiis-neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: c015d4670f
Author: martii <m4rtii@gmx.de>
Date: 2016-03-03 (Thu, 03 Mar 2016)

Origin message was:
------------------
- adzap: port code from martiis-neutrino-mp

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-03-03 11:18:14 +01:00
vanhofen
5e8cccbe23 user_menu: get resolution value for livestreams
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a9bee721d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-03 (Thu, 03 Mar 2016)

Origin message was:
------------------
- user_menu: get resolution value for livestreams

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-03-03 09:46:42 +01:00
vanhofen
fe7c215286 infoviewer_bb: show resolution in livestream mode on color button
Origin commit data
------------------
Branch: ni/coolstream
Commit: 07b1f6f849
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-03 (Thu, 03 Mar 2016)

Origin message was:
------------------
- infoviewer_bb: show resolution in livestream mode on color button

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-03-03 09:46:42 +01:00
Michael Liebmann
4f41565587 movieplayer: Use Lua scripts for selecting live stream urls
Origin commit data
------------------
Branch: ni/coolstream
Commit: b4a2856e1c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-03-03 (Thu, 03 Mar 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-03-03 09:46:42 +01:00
Thilo Graf
112207f338 Infoclock: unify handling in some classes with singleton
Origin commit data
------------------
Branch: ni/coolstream
Commit: 59d9b7068e
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-02-29 (Mon, 29 Feb 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-02-29 08:05:05 +01:00
vanhofen
8e70d9fe7e infoviewer: fix audio description in mode_webtv
Origin commit data
------------------
Branch: ni/coolstream
Commit: 32c28038a3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-26 (Tue, 26 Jan 2016)

Origin message was:
------------------
- infoviewer: fix audio description in mode_webtv

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-26 00:57:08 +01:00
vanhofen
fd0317a21a rc_lock: rework class; switch to singleton; add icon; vfd-support
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2eb0aed5db
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-20 (Wed, 20 Jan 2016)

Origin message was:
------------------
- rc_lock: rework class; switch to singleton; add icon; vfd-support

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-20 20:26:52 +01:00
vanhofen
d8269b9be5 locale: add usermenu title locales ...
some small reworks; cleanup from #if 0'ed code


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5860045999
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-02 (Sat, 02 Jan 2016)

Origin message was:
------------------
- locale: add usermenu title locales ...

 some small reworks; cleanup from #if 0'ed code


------------------
This commit was generated by Migit
2016-01-02 12:18:06 +01:00
vanhofen
935e0ece89 user_menu: allow controlable return_title value
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9325385ce9
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-29 (Tue, 29 Dec 2015)

Origin message was:
------------------
- user_menu: allow controlable return_title value

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-12-29 14:31:51 +01:00
Thilo Graf
6b38f03efe 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.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 42102d432d
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-11-18 (Wed, 18 Nov 2015)



------------------
This commit was generated by Migit
2015-12-27 14:42:29 +01:00
vanhofen
5033776bdd user_menue: disable some items in movieplayer mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 25e1f5bc9e
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-14 (Mon, 14 Dec 2015)

Origin message was:
------------------
- user_menue: disable some items in movieplayer mode

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-12-15 08:15:17 +01:00
vanhofen
32365276ef remove w_max()-calls to define menu-width, because ...
w-max() returns a pixel-value, but menus need a percentage-value.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9041bff59c
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-24 (Fri, 24 Apr 2015)

Origin message was:
------------------
- remove w_max()-calls to define menu-width, because ...

 w-max() returns a pixel-value, but menus need a percentage-value.


------------------
This commit was generated by Migit
2015-04-24 09:11:04 +02:00
[CST] Focus
f62fbd7b50 fix crash in user_menue when ITEM_EPG_MISC is selected
Origin commit data
------------------
Branch: ni/coolstream
Commit: 24c4f5c0cd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-02-25 (Wed, 25 Feb 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-02-25 17:03:14 +01:00
Stefan Seyfried
34024351ba neutrino.h: use forward declaration instead of includes
this reduces the dependency chain on partial rebuilds considerably


Origin commit data
------------------
Branch: ni/coolstream
Commit: b3bfb361f5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-11 (Wed, 11 Feb 2015)



------------------
This commit was generated by Migit
2015-02-14 14:31:12 +01:00
Jacek Jendrzej
5288c70665 neutrino use check empty() instead of length() or size()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8023a6317b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-01-03 (Sat, 03 Jan 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-01-03 17:51:08 +01:00
vanhofen
b976eb95c9 plugins: simplify integratePlugins(); ...
* CPluginsExec(): switch to singleton
* move CPluginsExec() to pluginlist.cpp|h
 because it's not really a settings_helper


Origin commit data
------------------
Branch: ni/coolstream
Commit: 389c4c232f
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-10 (Mon, 10 Nov 2014)

Origin message was:
------------------
- plugins: simplify integratePlugins(); ...

* CPluginsExec(): switch to singleton
* move CPluginsExec() to pluginlist.cpp|h
 because it's not really a settings_helper


------------------
This commit was generated by Migit
2014-11-10 22:41:08 +01:00
vanhofen
d27045664b user_menue: minor optimizations
Origin commit data
------------------
Branch: ni/coolstream
Commit: 348add4acd
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-07 (Fri, 07 Nov 2014)

Origin message was:
------------------
- user_menue: minor optimizations

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-11-07 15:39:53 +01:00
vanhofen
f7de4d583e user_menue: fix wrong changes in ec6cb635c0
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ec409b264
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-07 (Fri, 07 Nov 2014)

Origin message was:
------------------
- user_menue: fix wrong changes in ec6cb635c0

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-11-07 13:55:05 +01:00
vanhofen
ec6cb635c0 user_menue: allow colored keys from plugin.cfg
Origin commit data
------------------
Branch: ni/coolstream
Commit: 19f7e04c77
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-07 (Fri, 07 Nov 2014)

Origin message was:
------------------
- user_menue: allow colored keys from plugin.cfg

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-11-07 12:20:47 +01:00
vanhofen
8d64978b13 plugins: don't add hidden plugins to usermenu; ...
... use CPuginsExec::exec() to execute and drop CUserMenu::exec()


Origin commit data
------------------
Branch: ni/coolstream
Commit: c0b130c490
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-07 (Fri, 07 Nov 2014)

Origin message was:
------------------
- plugins: don't add hidden plugins to usermenu; ...

... use CPuginsExec::exec() to execute and drop CUserMenu::exec()


------------------
This commit was generated by Migit
2014-11-07 09:44:53 +01:00
vanhofen
539be4ea84 user_menue: fix hint icons for 'singe-added' plugins
Origin commit data
------------------
Branch: ni/coolstream
Commit: b93cb83c7c
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-06 (Thu, 06 Nov 2014)

Origin message was:
------------------
- user_menue: fix hint icons for 'singe-added' plugins

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-11-06 12:36:07 +01:00
[CST] Focus
11ad004322 gui/user_menue.cpp: add network settings and software update as user-menu items
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5d6ea715d8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-16 (Thu, 16 Oct 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-10-16 13:56:15 +04:00
vanhofen
facb9da7b8 - plugins: use hinticons for plugins in usermenu and pluginlist
Origin commit data
------------------
Branch: ni/coolstream
Commit: 088809b76f
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-10-06 (Mon, 06 Oct 2014)

Origin message was:
------------------
- - plugins: use hinticons for plugins in usermenu and pluginlist

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-10-07 13:19:19 +04:00
vanhofen
242ded4cc6 plugins: don't show integrated plugins in usermenu
Origin commit data
------------------
Branch: ni/coolstream
Commit: c166fc28af
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-30 (Tue, 30 Sep 2014)

Origin message was:
------------------
- plugins: don't show integrated plugins in usermenu

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-09-30 14:27:48 +04:00
vanhofen
167f8e295b setting_helpers: rename CStreamFeaturesChangeExec to CPluginsExec
Origin commit data
------------------
Branch: ni/coolstream
Commit: 237892ffd2
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-08 (Mon, 08 Sep 2014)

Origin message was:
------------------
- setting_helpers: rename CStreamFeaturesChangeExec to CPluginsExec

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-09-08 16:33:26 +02:00
[CST] Focus
626782207b gui/user_menue.cpp: fix old items code c/p
Origin commit data
------------------
Branch: ni/coolstream
Commit: e361f74af7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-08 (Mon, 08 Sep 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-09-08 14:35:56 +04:00
vanhofen
d641783b25 user_menu: re-rename ITEM_PLUGIN to ITEM_PLUGIN_TYPES
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8047531bc5
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-05 (Fri, 05 Sep 2014)

Origin message was:
------------------
- user_menu: re-rename ITEM_PLUGIN to ITEM_PLUGIN_TYPES

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-09-05 18:47:44 +02:00
[CST] Focus
4eb5179286 neutrino: sync keybind and usermenu code with neutrino-mp, code (C) martii
Origin commit data
------------------
Branch: ni/coolstream
Commit: 420af7a4dc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-09-05 17:49:11 +04:00
BPanther
6d40f01812 missing lua ifdef
Origin commit data
------------------
Branch: ni/coolstream
Commit: fe3379ddb7
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2014-05-02 (Fri, 02 May 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-05-02 09:47:42 +02:00
vanhofen
f1eee29e83 user_menue.cpp: whitespace cleanup
Origin commit data
------------------
Branch: ni/coolstream
Commit: a05121d9b7
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-03-06 (Thu, 06 Mar 2014)

Origin message was:
------------------
- user_menue.cpp: whitespace cleanup

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-03-06 12:56:24 +01:00
vanhofen
4d0f4ce3ac user_menu: add some pointers to delete
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c19f53e4b
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-03-06 (Thu, 06 Mar 2014)

Origin message was:
------------------
- user_menu: add some pointers to delete

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-03-06 12:45:48 +01:00
vanhofen
076c7bb7ad plugins: type for listed plugins on blue key is more selectable
Origin commit data
------------------
Branch: ni/coolstream
Commit: e97ea955c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-02-06 (Thu, 06 Feb 2014)

Origin message was:
------------------
- plugins: type for listed plugins on blue key is more selectable

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-02-06 22:51:18 +01:00
vanhofen
b00e109f84 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
------------------
Branch: ni/coolstream
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)


------------------
This commit was generated by Migit
2014-02-04 09:08:21 +01:00
Michael Liebmann
c980278eb1 Add a --enable-lua switch to enable LUA support
Origin commit data
------------------
Branch: ni/coolstream
Commit: 82d4832013
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-21 (Tue, 21 Jan 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-01-21 17:05:24 +01:00
Michael Liebmann
7b4e3bc03b Preparing the menu classes for Lua Part #2
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii


Origin commit data
------------------
Branch: ni/coolstream
Commit: b41819190d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-16 (Thu, 16 Jan 2014)

Origin message was:
------------------
Preparing the menu classes for Lua Part #2

- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii


------------------
This commit was generated by Migit
2014-01-19 20:57:37 +01:00