Commit Graph

60 Commits

Author SHA1 Message Date
gixxpunk
abee9b0913 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 315a87f2be
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)
2017-09-18 16:31:55 +02:00
Thilo Graf
7d4e64e8f8 CPersonalizeGui: fix visualize of passive and active locked items
Origin commit data
------------------
Commit: 7c0d0b06d0
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-09-17 (Sun, 17 Sep 2017)
2017-09-17 13:52:54 +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
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
0a8cf7bcc1 personalize: pluralize 'usermenu' item; these are 'usermenus'
Origin commit data
------------------
Commit: 2e6ee0c3fb
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-19 (Mon, 19 Dec 2016)

Origin message was:
------------------
- personalize: pluralize 'usermenu' item; these are 'usermenus'
2016-12-19 17:21:51 +01:00
vanhofen
1847b82611 personalize: pluralize 'usermenu' item; these are 'usermenus'
Origin commit data
------------------
Commit: 8faaec552a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-18 (Sun, 18 Dec 2016)

Origin message was:
------------------
- personalize: pluralize 'usermenu' item; these are 'usermenus'
2016-12-18 22:20:12 +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
12c95b76dd CPersonalizeGui: remove centered text alignment fro helptext
Origin commit data
------------------
Commit: 87a9a69578
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-09 (Sun, 09 Oct 2016)
2016-10-24 10:31:27 +02:00
Thilo Graf
11b3307251 CMsgBox: rework msgbox classes with Window class implementation
Replacing messagebox, hintbox_ext and some derivated parts with
basic class hintbox and derivated class CMsgBox. This should unify
window handling and avoids maintain of multiple classes with quasi
same purpose and adds more functionality.

TODO: fix and optimize details


Origin commit data
------------------
Commit: dde298b1b7
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-04-04 (Mon, 04 Apr 2016)
2016-10-24 10:31:24 +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
Thilo Graf
0737b16c6b CPersonalizeGui: try to fix wrong active mode after changed settings
By treating of notifier methods or generally changed personalization
settings of items, the values of "active" and "current_active" may differ
and although that could be active = true, current_active = false, or
vice versa. After restart of neutrino it would not conspicuous because
activ and current_active will be equated.
Otherwise it can happen, the modified items could be displayed
in wrong mode at runtime.
This try should fix this by writing the values from the current
settings into the current_active variable.


Origin commit data
------------------
Commit: 4875f81491
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-12-26 (Sat, 26 Dec 2015)
2015-12-27 14:42:32 +01:00
Thilo Graf
807a191db1 CPersonalizeGui: try to fix disabled observer item
This should avoid disabling observer items inside personalize menu,
because it's possible to lock out an observer item itself.
In This case it's not possible to
enable this item on runtime. Neutrino restart is required.

This effect was observed in mode_ts if an user has tried to change
settings for tv/radio switch. If all three items were disabled, it was
not possible to enable observed items.

NOTE: I think it's not a good idea to enable certain items in main menu or
full sub menus like settings in mode_ts. ...
What should a user do with that during watch a movie? Play with tuner settings, bouquet-, network-, drive settings etc.?
Some users could cause harm, therefore I can't recommend to hold this current state.


Origin commit data
------------------
Commit: f3d624b2bc
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-12-24 (Thu, 24 Dec 2015)
2015-12-27 14:42:31 +01:00
Thilo Graf
5efa980977 personalize.cpp: add doc for disable conditions
Origin commit data
------------------
Commit: aec64e8c6c
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-12-22 (Tue, 22 Dec 2015)
2015-12-22 13:14:18 +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
vanhofen
bbaf7390ee personalize: add deactivated items too; ...
... visibility is controlled in personalization itself


Origin commit data
------------------
Commit: 520660296b
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-17 (Thu, 17 Dec 2015)

Origin message was:
------------------
- personalize: add deactivated items too; ...

... visibility is controlled in personalization itself
2015-12-19 18:06:23 +01: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
Jacek Jendrzej
6ff2c1b6bd use empty to check string
Origin commit data
------------------
Commit: 2b5e7b5ba3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-01-09 (Fri, 09 Jan 2015)
2015-01-09 17:15:11 +01:00
Jacek Jendrzej
fd7cdb9af7 CPersonalizeGui::addPersonalizedItems() fix digikey shortcut after use Personalize-Menu
Origin commit data
------------------
Commit: 5b58992de2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-11-11 (Tue, 11 Nov 2014)
2014-11-11 21:28:03 +01: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
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
[CST] Focus
0b56e332cb gui/personalize.cpp: try to fix usermenu delete
Origin commit data
------------------
Commit: d2c836049b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-09 (Tue, 09 Sep 2014)
2014-09-09 15:28:35 +04:00
vanhofen
12c2899aeb personalize.cpp: add shortcut to pluginSelectionMenu
Origin commit data
------------------
Commit: fafb7399d1
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-08 (Mon, 08 Sep 2014)

Origin message was:
------------------
- personalize.cpp: add shortcut to pluginSelectionMenu
2014-09-08 21:20:15 +02:00
vanhofen
fa3c972980 personalize.cpp: remove non-working colored hotkeys
Origin commit data
------------------
Commit: 7792a9658e
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-08 (Mon, 08 Sep 2014)

Origin message was:
------------------
- personalize.cpp: remove non-working colored hotkeys
2014-09-08 21:02:52 +02:00
vanhofen
57b8dcd649 personalize.cpp: resort usermenu
Origin commit data
------------------
Commit: c80f73c2c5
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-08 (Mon, 08 Sep 2014)

Origin message was:
------------------
- personalize.cpp: resort usermenu
2014-09-08 17:42:10 +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
[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
Michael Liebmann
bbdc79c42c CPersonalizeGui: Replaces CMenuOptionChooser::getOptionName() by getName()
Signed-off-by: Thilo Graf <dbt@novatux.de>

partial revert of b6b44d9088


Origin commit data
------------------
Commit: ee99902be3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-04-09 (Wed, 09 Apr 2014)
2014-04-09 19:02:38 +02:00
Michael Liebmann
687ee118e6 CPersonalizeGui::changeNotify: Fix display error
Signed-off-by: Thilo Graf <dbt@novatux.de>

Resolves issue for repaint of observed items in personalize menu.
In this case, text of item 'TV-' and 'Radio-Mode' was not updated
after switched tv/radio mode item


Origin commit data
------------------
Commit: 8f5f6fa0b3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-04-09 (Wed, 09 Apr 2014)
2014-04-09 19:02:38 +02: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
vanhofen
368bfd4fe2 personalizing: show menuhints in plugin type selection menu
Origin commit data
------------------
Commit: 70f61217f7
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-02-21 (Fri, 21 Feb 2014)

Origin message was:
------------------
- personalizing: show menuhints in plugin type selection menu
2014-02-21 23:59:45 +01:00
Stefan Seyfried
0f463aa688 personalize: reduce include impact of plugins.h
use forward declaration of CPlugins instead of including
plugins.h in personalize.h to reduce the massive impact
of this header file


Origin commit data
------------------
Commit: 1d4025d3be
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-16 (Sun, 16 Feb 2014)
2014-02-18 14:02:54 +01:00
vanhofen
e3d12f21e1 plugins: type for listed plugins on blue key is more selectable
Origin commit data
------------------
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
2014-02-06 22:51:18 +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
vanhofen
8d5aa84e20 adapt ShowMsg handling from martii's neutrino-mp
Origin commit data
------------------
Commit: 53f5801d6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-22 (Wed, 22 Jan 2014)

Origin message was:
------------------
- adapt ShowMsg handling from martii's neutrino-mp
2014-01-22 12:37:21 +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
[CST] Focus
4321b8226e gui/personalize.cpp: fix pin change active/enactive,
broken after commit 688222f0ce


Origin commit data
------------------
Commit: 40e3106e53
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-06 (Wed, 06 Nov 2013)
2013-11-06 15:09:58 +04:00
[CST] Focus
6bdbb8d66b gui/personalize.cpp: fix pin access in case personalize pin is off,
but items with enabled pincode present


Origin commit data
------------------
Commit: 3a5d58f139
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-06 (Wed, 06 Nov 2013)
2013-11-06 15:09:58 +04:00
[CST] Focus
688222f0ce gui/personalize.cpp: fix CPinSetupNotifier: return false, menu repaint not needed
Origin commit data
------------------
Commit: 404de5376b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-04 (Mon, 04 Nov 2013)
2013-11-05 11:44:43 +04:00
[CST] Focus
ec6c5e7974 gui/personalize.cpp: fix memleak, fix warnings
Origin commit data
------------------
Commit: 6b58f32c48
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-25 (Fri, 25 Oct 2013)
2013-10-25 13:53:36 +04: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
Thilo Graf
0e9ff3d23c fix license text, sorry, was a c&p error
Origin commit data
------------------
Commit: 0dc4686874
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-03-20 (Wed, 20 Mar 2013)
2013-03-21 11:37:00 +01:00
Thilo Graf
b962280021 user_menu: personalize also yellow and green buttons
Origin commit data
------------------
Commit: 12e778773b
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-28 (Tue, 28 Aug 2012)

Origin message was:
------------------
*user_menu: personalize also yellow and green buttons
2012-11-05 21:26:19 +01:00
Thilo Graf
c6f16544fc personalize: changeNotify - no repaint menu after changed option values
reduces the flicker effect on screen


Origin commit data
------------------
Commit: 24dd74e471
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-06-05 (Tue, 05 Jun 2012)
2012-07-08 22:01:12 +02:00
[CST] Focus
a2125e27bb gui/personalize.cpp: copy hint fields
Origin commit data
------------------
Commit: 1e411cdafd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-08 (Sun, 08 Jul 2012)
2012-07-08 21:40:49 +04:00
[CST] Focus
d1de8e3674 gui/personalize.cpp: remove unused lcdcontroler.h include
Origin commit data
------------------
Commit: f84dab82f2
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-06-13 (Wed, 13 Jun 2012)
2012-06-13 18:24:26 +04:00