Commit Graph

30 Commits

Author SHA1 Message Date
vanhofen
fb0a25d759 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/info_menue.cpp
	src/gui/widget/menue.cpp
	src/nhttpd/yconfig.h
	src/system/helpers.h


Origin commit data
------------------
Commit: 9152c228ed
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)
2017-09-14 16:23:15 +02:00
vanhofen
883034a60d 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>


Origin commit data
------------------
Commit: f2ec46311c
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.

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +02:00
vanhofen
9db42a7d2b drop easymenu
Origin commit data
------------------
Commit: 816de89898
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop easymenu
2017-09-13 13:35:23 +02:00
vanhofen
ff21981795 drop easymenu
Origin commit data
------------------
Commit: b502ed31b9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop easymenu
2017-09-12 23:46:22 +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
cf8a76c2ce Revert "Revert "- remove obsolete ifdef's""
This reverts commit 7aa4eed69b.


Origin commit data
------------------
Commit: 3c3707b119
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)
2017-05-08 23:47:26 +02:00
vanhofen
7aa4eed69b Revert "- remove obsolete ifdef's"
This reverts commit 8ce36eb9e1.


Origin commit data
------------------
Commit: a6814161a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)
2017-05-08 16:45:10 +02:00
vanhofen
8ce36eb9e1 remove obsolete ifdef's
Origin commit data
------------------
Commit: 4aecc9f1b5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- remove obsolete ifdef's
2017-03-10 15:27:30 +01:00
vanhofen
e97d93f824 NI-code: Rename hardware defined macros for coolstream stb
Origin commit data
------------------
Commit: f02c3dc1db
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
- NI-code: Rename hardware defined macros for coolstream stb
2017-02-12 21:57:06 +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
vanhofen
dffca87dfa minor alignments to cst-git; no binary changes
Origin commit data
------------------
Commit: 750c779f9f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-21 (Sat, 21 May 2016)

Origin message was:
------------------
- minor alignments to cst-git; no binary changes
2016-05-21 22:21:08 +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
vanhofen
92960161a9 remove w_max()-calls to define menu-width, because ...
w-max() returns a pixel-value, but menus need a percentage-value.


Origin commit data
------------------
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.
2015-04-24 09:11:04 +02:00
vanhofen
cb354188c7 plugins: simplify integratePlugins(); ...
* CPluginsExec(): switch to singleton
* move CPluginsExec() to pluginlist.cpp|h
 because it's not really a settings_helper


Origin commit data
------------------
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
2014-11-10 22:41:08 +01:00
Michael Liebmann
a203233a18 integrated plugins: Add direct keys
Origin commit data
------------------
Commit: ddd41e05ef
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-10-16 (Thu, 16 Oct 2014)
2014-10-16 09:49:19 +02:00
vanhofen
598ff73df6 add plugins to info menu
Origin commit data
------------------
Commit: e6cbd53dd2
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-28 (Sun, 28 Sep 2014)

Origin message was:
------------------
- add plugins to info menu
2014-09-29 14:38:55 +04:00
martii
69f917f16d 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


Origin commit data
------------------
Commit: e84782bc4c
Author: martii <m4rtii@gmx.de>
Date: 2014-02-22 (Sat, 22 Feb 2014)
2014-09-15 11:44:08 +04:00
Thilo Graf
b609204685 CTestMenu: add buildinfo as menu entry
Buildinfo also exists in infomenu, but is outcommented, so it is
prepared just for testings.


Origin commit data
------------------
Commit: ac6f547d0f
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-11-11 (Mon, 11 Nov 2013)
2013-11-11 00:20:10 +01:00
Michael Liebmann
92dd88d98d Add display of build info
- Display compiler version, compiler flags, build PC, kernel version
- configure.ac part ported from filezilla project


Origin commit data
------------------
Commit: 4cf4857201
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-10-17 (Thu, 17 Oct 2013)
2013-11-11 00:20:09 +01:00
[CST] Focus
e091a84f2b as requested, implement 'easy' menu mode for novice users;
default behavior should not be changed, easy mode forced by /var/etc/.easymenu file inside image;
at the moment switch between modes is done by main menu -> 'stop' button -> enter pin code,
restart needed after mode switch


Origin commit data
------------------
Commit: 606bd01878
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-25 (Fri, 25 Oct 2013)
2013-10-25 13:03:26 +04:00
Jacek Jendrzej
d3e8add995 disable tech.info if channelist is empty (fix possible segfault)
Origin commit data
------------------
Commit: 775a4a7229
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-20 (Sat, 20 Oct 2012)
2012-10-20 13:26:27 +02:00
Jacek Jendrzej
9868a4308b remove doubles include
Origin commit data
------------------
Commit: a3bfab0bcd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-11 (Tue, 11 Sep 2012)
2012-09-11 20:31:33 +02:00
[CST] Focus
3322ec9b38 gui/info_menue.cpp: add menu hints
Origin commit data
------------------
Commit: 62448cd43c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-08 (Sun, 08 Jul 2012)
2012-07-08 21:37:57 +04:00
[CST] Focus
af4205e76b GUI: remove CMenuWidget->hide() calls - CMenuWidget->exec() always hide before return
Origin commit data
------------------
Commit: 0319c4faad
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-05-07 (Mon, 07 May 2012)
2012-05-07 15:37:02 +04:00
[CST] Focus
d4b973faff gui/info_menue.cpp: fix memleaks when using CMenuForwarder
Origin commit data
------------------
Commit: 7a1a165670
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-05-04 (Fri, 04 May 2012)
2012-05-04 15:50:05 +04:00
Thilo Graf
5057126cf7 neutrino infomenu: add widget index
Replaces getSelect(), setSelect() in this context.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1921 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: e663e1e0c5
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-11-28 (Mon, 28 Nov 2011)

Origin message was:
------------------
*neutrino infomenu: add widget index

Replaces getSelect(), setSelect() in this context.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1921 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-11-28 10:58:37 +00:00
[CST] Focus
9fd2136a57 Return menu result
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1893 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: cefd76754d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-11-25 (Fri, 25 Nov 2011)
2011-11-25 09:58:24 +00:00
gixxpunk
a947f79c59 fix streaminfo menu handler (patch by snafed)
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1687 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 99894a26d1
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2011-09-12 (Mon, 12 Sep 2011)

Origin message was:
------------------
- fix streaminfo menu handler (patch by snafed)

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1687 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-09-12 16:04:49 +00:00
Thilo Graf
93cff95432 neutrino info-menu: fix exit handling
While leaving of imageinfo, we jumped to main menu, that was not right.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1667 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 8210f6f445
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-09-06 (Tue, 06 Sep 2011)

Origin message was:
------------------
*neutrino info-menu: fix exit handling

While leaving of imageinfo, we jumped to main menu, that was not right.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1667 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-09-06 08:04:06 +00:00
Thilo Graf
44131ce2e5 neutrino info_menue: moved info menu into it's own modul
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1332 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 7cd862d52a
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-03-23 (Wed, 23 Mar 2011)

Origin message was:
------------------
*neutrino info_menue: moved info menu into it's own modul

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1332 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-03-23 10:58:02 +00:00