Commit Graph

72 Commits

Author SHA1 Message Date
TangoCash
9675f6ed41 fix possible segfault
Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-09-01 15:33:41 +02:00
svenhoefer
55c01d5934 - personalize: use new marker icons
Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-01-05 00:52:58 +01:00
Jacek Jendrzej
a23737a626 Merge branch 'master' into pu/mp 2017-09-18 10:53:42 +02:00
Thilo Graf
7c0d0b06d0 CPersonalizeGui: fix visualize of passive and active locked items 2017-09-17 13:52:54 +02:00
Jacek Jendrzej
2c5bf73006 Merge branch 'master' into pu/mp 2017-09-13 13:40:40 +02:00
vanhofen
816de89898 - drop easymenu 2017-09-13 13:35:23 +02:00
Stefan Seyfried
abec1c311b Merge remote-tracking branch 'tuxbox/master' 2017-03-04 19:32:30 +01:00
svenhoefer
856c676430 - rename g_PluginList to g_Plugins; this isn't a list of plugins 2017-03-01 13:03:50 +01:00
Stefan Seyfried
a409047714 Merge remote-tracking branch 'tuxbox/master' 2017-01-22 22:59:39 +01:00
svenhoefer
8faaec552a - personalize: pluralize 'usermenu' item; these are 'usermenus' 2016-12-18 22:20:12 +01:00
Stefan Seyfried
c6d7968381 Merge remote-tracking branch 'tuxbox/master' 2016-12-04 18:02:51 +01:00
Thilo Graf
87a9a69578 CPersonalizeGui: remove centered text alignment fro helptext 2016-10-24 10:31:27 +02:00
Thilo Graf
dde298b1b7 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
2016-10-24 10:31:24 +02:00
Stefan Seyfried
b837d8697b Merge remote-tracking branch 'uncool/cst-next' 2015-12-28 16:15:14 +01:00
Thilo Graf
4875f81491 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.
2015-12-27 14:42:32 +01:00
Thilo Graf
f3d624b2bc 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.
2015-12-27 14:42:31 +01:00
Stefan Seyfried
880115fa98 Merge remote-tracking branch 'uncool/cst-next' 2015-12-25 16:28:39 +01:00
Thilo Graf
aec64e8c6c personalize.cpp: add doc for disable conditions 2015-12-22 13:14:18 +01:00
Thilo Graf
1f95f38d32 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
Stefan Seyfried
33676d28bf Merge remote-tracking branch 'uncool/cst-next' 2015-12-21 14:38:26 +01:00
svenhoefer
520660296b - personalize: add deactivated items too; ...
... visibility is controlled in personalization itself
2015-12-19 18:06:23 +01:00
Stefan Seyfried
eeee5bacab Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...
2015-12-13 17:41:55 +01:00
svenhoefer
9041bff59c - 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
Stefan Seyfried
b5a64e6887 Merge remote-tracking branch 'check/cst-next'
*needs buildfixing*

Conflicts:
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/driver/vfd.cpp
	src/gui/bedit/Makefile.am
	src/gui/components/Makefile.am
	src/gui/luainstance.cpp
	src/gui/widget/Makefile.am
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
2015-01-26 17:26:26 +01:00
Jacek Jendrzej
2b5e7b5ba3 use empty to check string 2015-01-09 17:15:11 +01:00
Stefan Seyfried
d37b3c0f9a 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
2014-12-28 12:32:12 +01:00
Stefan Seyfried
69c4dbbdba 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
2014-12-25 18:03:08 +01:00
Jacek Jendrzej
5b58992de2 CPersonalizeGui::addPersonalizedItems() fix digikey shortcut after use Personalize-Menu 2014-11-11 21:28:03 +01:00
M. Liebmann
940a41aab2 CMenuWidget: Add function getNextShortcut()/setNextShortcut()
for setting of direktkey in the plugin integration
2014-10-16 09:49:18 +02:00
martii
e84782bc4c 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
2014-09-15 11:44:08 +04:00
[CST] Focus
d2c836049b gui/personalize.cpp: try to fix usermenu delete 2014-09-09 15:28:35 +04:00
svenhoefer
fafb7399d1 - personalize.cpp: add shortcut to pluginSelectionMenu 2014-09-08 21:20:15 +02:00
svenhoefer
7792a9658e - personalize.cpp: remove non-working colored hotkeys 2014-09-08 21:02:52 +02:00
svenhoefer
c80f73c2c5 - personalize.cpp: resort usermenu 2014-09-08 17:42:10 +02:00
[CST] Focus
420af7a4dc neutrino: sync keybind and usermenu code with neutrino-mp, code (C) martii 2014-09-05 17:49:11 +04:00
[CST] Focus
cf91f2eccb merge neutrino-mp menu/buttons/icons changes, (C) martii 2014-07-17 17:02:25 +04:00
Stefan Seyfried
44ba8fafca 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
2014-04-27 19:14:06 +02:00
M. Liebmann
ee99902be3 CPersonalizeGui: Replaces CMenuOptionChooser::getOptionName() by getName()
Signed-off-by: Thilo Graf <dbt@novatux.de>

partial revert of afbd87083b
2014-04-09 19:02:38 +02:00
M. Liebmann
8f5f6fa0b3 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
2014-04-09 19:02:38 +02:00
martii
eb206ae523 gui/widget/menue, gui/osdlang_setup: drop CMenuOptionLanguageChooser class 2014-03-02 21:31:26 +01:00
Stefan Seyfried
add688bbb8 Merge remote-tracking branch 'check/next-cc'
broken, needs buildfixing
2014-02-23 15:17:48 +01:00
svenhoefer
70f61217f7 - personalizing: show menuhints in plugin type selection menu 2014-02-21 23:59:45 +01:00
Stefan Seyfried
1d4025d3be 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
2014-02-18 14:02:54 +01:00
Stefan Seyfried
44e127a8dd revert the split into lots of plugin types
* present the user with only two types of extensions: games and
  everything else (lua, script, binary .so)
* use lua locale, right now it is translated to just "Plugins" :-)
2014-02-16 18:38:03 +01:00
Stefan Seyfried
eba76a4f47 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
2014-02-16 13:10:16 +01:00
svenhoefer
e97ea955c9 - plugins: type for listed plugins on blue key is more selectable 2014-02-06 22:51:18 +01:00
svenhoefer
f9ad30f183 - 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
svenhoefer
53f5801d6f - adapt ShowMsg handling from martii's neutrino-mp 2014-01-22 12:37:21 +01:00
M. Liebmann
31842369cc 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
M. Liebmann
afbd87083b 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