Commit Graph

179 Commits

Author SHA1 Message Date
Thilo Graf
ca401844b8 CMenuSeparator: clean up multiple code parts
Origin commit data
------------------
Commit: 326a9634e1
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)
2017-06-18 00:04:40 +02:00
Thilo Graf
449d2a0fe4 CMenuOptionNumberChooser: clean up multiple code parts
Origin commit data
------------------
Commit: f2e8f95e66
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)
2017-06-18 00:04:40 +02:00
Thilo Graf
e6175baf29 CMenuForwarder: clean up multiple code parts
Origin commit data
------------------
Commit: 7b3ce6f330
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)
2017-06-18 00:04:40 +02:00
Thilo Graf
761c660670 CMenuOptionStringChooser: clean up multiple code parts
Origin commit data
------------------
Commit: 284dba8c25
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)
2017-06-18 00:04:40 +02:00
Thilo Graf
ae5aad38f5 CMenuOptionChooser: clean up multiple code parts
Origin commit data
------------------
Commit: 8899660dad
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)
2017-06-18 00:04:40 +02:00
vanhofen
63b648fb3e menue: fix lcd4l-support for directly started items; ...
this fixes missing lcd4l-support in mode_upnp


Origin commit data
------------------
Commit: da62cd195b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-26 (Sun, 26 Mar 2017)

Origin message was:
------------------
- menue: fix lcd4l-support for directly started items; ...

this fixes missing lcd4l-support in mode_upnp
2017-03-26 23:21:29 +02:00
Michael Liebmann
bbaad5b19d Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: 2677543cc4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)
2017-03-13 21:55:50 +01:00
vanhofen
30fd965086 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: c4fa0eb30e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
2017-03-13 12:45:30 +01:00
vanhofen
9c009ade29 unify DetailsLine-names; move define to settings.h
Origin commit data
------------------
Commit: 5b0faeab8c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)

Origin message was:
------------------
- unify DetailsLine-names; move define to settings.h
2017-03-13 12:40:04 +01:00
Michael Liebmann
b19cf5238c CMenuWidget::calcSize: Recalculation of min_width ...
... for adjustment to the osd resolution


Origin commit data
------------------
Commit: 30db40da1a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)
2017-03-13 09:55:58 +01:00
Michael Liebmann
c1dd0ff7de Merge branch 'master' into pu/fb-modules
Origin commit data
------------------
Commit: db8ea57da2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 22:58:09 +01:00
Thilo Graf
829d045a99 CMenuWidget: remove dub code from init
Origin commit data
------------------
Commit: 0435ca20a3
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 16:35:03 +01:00
Thilo Graf
a3f59e7c4a CMenuWidget: use only nameString as container for widget name
neutrino_locale_t	name could be transformed always to real string to
unify this container


Origin commit data
------------------
Commit: 2dda93ed2b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 15:52:39 +01:00
Stefan Seyfried
8b4c30e093 replace framebuffer.h include with forward declaration
instead of including framebuffer.h almost everywhere, replace it with
class CFrameBuffer forward declarations and/or generic system includes.
Add a hack to define fb_pixel_t to config.h (one reason for
framebuffer.h includes was the fb_pixel_t define)


Origin commit data
------------------
Commit: e490f84ea8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-07 17:23:42 +01:00
Thilo Graf
d2860579e1 menue.cpp: CChangeObserver add overloaded changeNotify() with string param
Origin commit data
------------------
Commit: c92fa3f0f4
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-23 (Fri, 23 Dec 2016)
2016-12-23 20:46:30 +01:00
Jacek Jendrzej
77adc62153 supplement to 192a9d80ed
Origin commit data
------------------
Commit: 91e0f8070b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-25 (Fri, 25 Nov 2016)
2016-11-25 16:45:26 +01:00
Jacek Jendrzej
192a9d80ed src/gui/widget/menue.cpp try to fix widget segfault menu with keyboard and background restore
Origin commit data
------------------
Commit: a8ea7c60d5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-24 (Thu, 24 Nov 2016)
2016-11-24 19:21:14 +01:00
Thilo Graf
99b7d20f99 CMenuTarget: outsource CMenuTarget-class
It's required for some inheritations into other classes if include
of menue.h is not wanted


Origin commit data
------------------
Commit: 098905e8e1
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-10 (Thu, 10 Nov 2016)
2016-11-10 09:08:47 +01:00
Jacek Jendrzej
f964a56c0d pass by reference
Origin commit data
------------------
Commit: a918ca56b6
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-20 (Wed, 20 Apr 2016)
2016-04-20 12:52:16 +02:00
Thilo Graf
f04da41440 CMenuWidget: rework cc modules implementation
- don't create header instance on every widget paint.
- remove parameters from hide(), not needed anymore
- add signal/slot OnBeforePaint(), OnAfterHide()
- try to fix infoclock handling
- add member ResetModules()
- allow separator to paint with gradient


Origin commit data
------------------
Commit: 77518102f8
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-11-18 (Wed, 18 Nov 2015)
2015-12-27 14:42:28 +01:00
Thilo Graf
e5e740fcf7 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


Origin commit data
------------------
Commit: 1f95f38d32
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)

Origin message was:
------------------
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
Michael Liebmann
54e7e45ab9 Disable multimedia plugins and video functions...
...(movie player & upnp browser) when movieplayer is in use


Origin commit data
------------------
Commit: 189b2e0fb0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-12-08 (Tue, 08 Dec 2015)
2015-12-08 12:01:25 +01:00
vanhofen
2e3fc2b18d menue: allow brief hints in all introItems
Origin commit data
------------------
Commit: 524563f448
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-19 (Tue, 19 May 2015)

Origin message was:
------------------
- menue: allow brief hints in all introItems
2015-05-19 12:28:28 +02:00
vanhofen
7882347718 start_wizard: use a global enum; switch detection from bool to int
Origin commit data
------------------
Commit: af90286a30
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-15 (Fri, 15 May 2015)

Origin message was:
------------------
- start_wizard: use a global enum; switch detection from bool to int
2015-05-15 03:46:50 +02:00
Thilo Graf
6261b3b869 themes: use hintbox and header gradient option in theme settings
Color gradient feature was originally intended for use
inside theme settings and it's not really suitable for
generally use as default in all themes at the moment, so it makes more
sense to have options in theme settings and let the user decide
to customize this, unless enough other gui parts can use this feature.


Origin commit data
------------------
Commit: 01516cf943
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-04-29 (Wed, 29 Apr 2015)

Origin message was:
------------------
themes: use hintbox and header gradient option in theme settings

Color gradient feature was originally intended for use
inside theme settings and it's not really suitable for
generally use as default in all themes at the moment, so it makes more
sense to have options in theme settings and let the user decide
to customize this, unless enough other gui parts can use this feature.
2015-04-29 10:16:55 +02:00
Thilo Graf
5f5943b144 CMenuWidget: move include of neutrino_menue.h to menue.h
makes explicit include unnecessary if it is needed by a widget, eg: widget id's are
parameter of constructor and is one of required widget elements.


Origin commit data
------------------
Commit: d3f9aa33f7
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-12-08 (Mon, 08 Dec 2014)
2015-03-29 22:40:00 +02:00
Thilo Graf
0a21f82bb5 CMenuWidget: fix getSelected() member
preselected was not suitable as return value


Origin commit data
------------------
Commit: 930b40588c
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-12-05 (Fri, 05 Dec 2014)
2015-03-29 22:39:59 +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
[CST] Focus
1e81103be9 gui/widget/menue.cpp: add activate observer to notify when item become active
Origin commit data
------------------
Commit: 2b50060bab
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-22 (Wed, 22 Oct 2014)
2014-10-22 16:15:27 +04:00
Michael Liebmann
d372df5f35 CMenuWidget::integratePlugins(): Add shortcut parameter
Origin commit data
------------------
Commit: 7293c53600
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-10-16 (Thu, 16 Oct 2014)
2014-10-16 09:49:19 +02:00
Michael Liebmann
a3b6ca14b9 CMenuWidget: Add function getNextShortcut()/setNextShortcut()
for setting of direktkey in the plugin integration


Origin commit data
------------------
Commit: 940a41aab2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-10-16 (Thu, 16 Oct 2014)

Origin message was:
------------------
CMenuWidget: Add function getNextShortcut()/setNextShortcut()

 for setting of direktkey in the plugin integration
2014-10-16 09:49:18 +02:00
vanhofen
62f47c6f59 add function to integrate plugins
TODO: maybe find a solution without void *pluginsExec
Thanks to micha-bbg and SatBaby


Origin commit data
------------------
Commit: 1b5a30c326
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-28 (Sun, 28 Sep 2014)

Origin message was:
------------------
- add function to integrate plugins

TODO: maybe find a solution without void *pluginsExec
Thanks to micha-bbg and SatBaby
2014-09-29 14:38:43 +04: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
[CST] Focus
8e810750de gui/widget/menue.h: fix suppressDetailsLine()
Origin commit data
------------------
Commit: 7cee5d3b2e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-10 (Thu, 10 Jul 2014)
2014-07-17 17:02:32 +04:00
[CST] Focus
958139cd31 merge neutrino-mp menu/buttons/icons changes, (C) martii
Origin commit data
------------------
Commit: cf91f2eccb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-17 (Thu, 17 Jul 2014)
2014-07-17 17:02:25 +04:00
Thilo Graf
03914a6687 CMenuWidget: add member to suppress paint of details line
In some situations is it more senseful to suppress painting of details line.
Required if menu window is painted over another window.
The hide() functionality of detailsline paints only an empty background on screen so we have
blank parts on screen. That looks bad. For example, this is to observe
on context menu in channellist.

We should see this as a workaround. It is not certain whether the
details line is really needed in the future.


Origin commit data
------------------
Commit: 793230e9a7
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-06-09 (Mon, 09 Jun 2014)
2014-06-23 18:43:47 +02:00
Thilo Graf
de71f1f361 CMenuWidget: implement CComponentsFooter, remove paintButtons
Origin commit data
------------------
Commit: d87807af67
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-05-02 (Fri, 02 May 2014)
2014-05-22 21:50:51 +02:00
vanhofen
d7545ddf1f menu: add possibility to add a footer to the menus; fix alignment of menus
add footer-keys to testmenu

 (some of this code is based on code by martii; thx)


Origin commit data
------------------
Commit: 4fba818cc2
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-04-11 (Fri, 11 Apr 2014)

Origin message was:
------------------
- menu: add possibility to add a footer to the menus; fix alignment of menus

 add footer-keys to testmenu

 (some of this code is based on code by martii; thx)
2014-04-11 00:26:52 +02:00
Thilo Graf
f25a2d58df /gui/widget/menue.cpp: rework constructors, use methodes for init
Many redundant code lines were never been refactored or reduced,
but instead came many in with some of last changes e.g. 1918153c0a


Origin commit data
------------------
Commit: 5f7f453bd7
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-04-07 (Mon, 07 Apr 2014)
2014-04-09 19:02:38 +02:00
Michael Liebmann
0da9d7bd7f CMenuOptionChooser: Remove bad function getOptionName()
- Please use getName() as replacement.

Signed-off-by: Thilo Graf <dbt@novatux.de>

partial revert of b6b44d9088


Origin commit data
------------------
Commit: e07af686f0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-04-09 (Wed, 09 Apr 2014)
2014-04-09 19:02:37 +02:00
[CST] Focus
8b880a8221 gui/widget/menue.cpp: add CMenuOptionChooser::setOptions
Origin commit data
------------------
Commit: b36a66db34
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-21 (Fri, 21 Mar 2014)
2014-03-21 17:18:21 +04:00
Thilo Graf
5c8006256e CMenuItem: remove redundant member for background paint
It seems this method came with more functionality in past,
but it's currently not required in that Form.


Origin commit data
------------------
Commit: 8a39f01a79
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-02-26 (Wed, 26 Feb 2014)
2014-03-03 08:54:10 +01:00
martii
8aa16fc376 gui/widget/menue, gui/osdlang_setup: drop CMenuOptionLanguageChooser class
Origin commit data
------------------
Commit: eb206ae523
Author: martii <m4rtii@gmx.de>
Date: 2014-03-02 (Sun, 02 Mar 2014)
2014-03-02 21:31:26 +01:00
Michael Liebmann
f45ae5cab4 CMenuForwarder: Fix options handling
Origin commit data
------------------
Commit: 08130328a0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-30 (Thu, 30 Jan 2014)
2014-01-30 09:13:51 +01:00
vanhofen
756bf71fab CLuaInstance::MenuAddItem: add 'next' and 'cancel' items
Origin commit data
------------------
Commit: 6a821fe2a5
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-27 (Mon, 27 Jan 2014)

Origin message was:
------------------
- CLuaInstance::MenuAddItem: add 'next' and 'cancel' items
2014-01-27 21:10:41 +01:00
Michael Liebmann
2056b4ed80 Add a --enable-lua switch to enable LUA support
Origin commit data
------------------
Commit: 82d4832013
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-21 (Tue, 21 Jan 2014)
2014-01-21 17:05:24 +01:00
Michael Liebmann
01de5acc30 Preparing the input classes for Lua
- Add non locale variants for CExtendedInput, CStringInput,
 CStringInputSMS, CPINInput
 THX Martii


Origin commit data
------------------
Commit: 31842369cc
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-18 (Sat, 18 Jan 2014)

Origin message was:
------------------
Preparing the input classes for Lua

- Add non locale variants for CExtendedInput, CStringInput,
 CStringInputSMS, CPINInput
 THX Martii
2014-01-19 20:57:38 +01:00
Michael Liebmann
b6b44d9088 Preparing the menu classes for Lua Part #3
- Add non locale variants for CMenuOptionNumberChooser and
 CMenuOptionChooser
- Adaptation of CMenuOptionStringChooser, CChangeObserver
 THX Martii


Origin commit data
------------------
Commit: afbd87083b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-18 (Sat, 18 Jan 2014)

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

- Add non locale variants for CMenuOptionNumberChooser and
 CMenuOptionChooser
- Adaptation of CMenuOptionStringChooser, CChangeObserver
 THX Martii
2014-01-19 20:57:37 +01:00
Michael Liebmann
1918153c0a Preparing the menu classes for Lua Part #2
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii


Origin commit data
------------------
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
2014-01-19 20:57:37 +01:00
Michael Liebmann
37e4b0bda8 Preparing the menu classes for Lua Part #1
- Remove CNonLocalizedMenuSeparator
- Add overloaded function CMenuSeparator for non local
 THX Martii


Origin commit data
------------------
Commit: 2c9c9debcc
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 #1

- Remove CNonLocalizedMenuSeparator
- Add overloaded function CMenuSeparator for non local
 THX Martii
2014-01-19 20:57:37 +01:00