Commit Graph

157 Commits

Author SHA1 Message Date
vanhofen
9e7da0a837 menu: add condition to enable/disable items in record mode (version 2)
Origin commit data
------------------
Commit: 5246233088
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-08-03 (Fri, 03 Aug 2018)

Origin message was:
------------------
- menu: add condition to enable/disable items in record mode (version 2)
2018-08-03 22:34:14 +02:00
vanhofen
47eb835d7f Revert "- menu: add condition to enable/disable items in record mode"
This reverts commit 76c6584341.
Doesn't work with current disableByCondition-code. This needs more care.


Origin commit data
------------------
Commit: 2154812c84
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-08-02 (Thu, 02 Aug 2018)
2018-08-02 22:00:54 +02:00
vanhofen
76c6584341 menu: add condition to enable/disable items in record mode
Origin commit data
------------------
Commit: 5bc33322c8
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-08-02 (Thu, 02 Aug 2018)

Origin message was:
------------------
- menu: add condition to enable/disable items in record mode
2018-08-02 21:39:17 +02:00
Thilo Graf
8e069bc300 src/gui/widget/menue.h: add plausible alias for disableSaveScreen() method
Origin commit data
------------------
Commit: d2be7e0f4d
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-07-28 (Sat, 28 Jul 2018)
2018-07-28 17:10:23 +02:00
vanhofen
849d77d3c1 menu: fix return value of getSelectedLine() for RC_timeout and RC_setup
This fixes the bahaviour of StartPosSelectionMenu in moviebrowser.
When this menu was closed by its timeout or RC_setup was pressed
the movie starts anyway.


Origin commit data
------------------
Commit: 70cbc65483
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-15 (Sun, 15 Jul 2018)

Origin message was:
------------------
- menu: fix return value of getSelectedLine() for RC_timeout and RC_setup

This fixes the bahaviour of StartPosSelectionMenu in moviebrowser.
When this menu was closed by its timeout or RC_setup was pressed
the movie starts anyway.
2018-07-15 00:41:40 +02:00
Thilo Graf
614badcf9e menu: add optional usage of toggle buttons to visualze options
Origin commit data
------------------
Commit: f0f4698984
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-04-11 (Wed, 11 Apr 2018)
2018-04-11 23:58:16 +02:00
Thilo Graf
adab90ab38 src/gui/widget/menue.h: fix possible compile error with older compliers
avoids possible error with extended initializer lists,
only available with -std=c++11 or -std=gnu++11

supplement to:
'CMenuOptionNumberChooser: expand localize functionality for any number'


Origin commit data
------------------
Commit: dc21b3d5da
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-04-05 (Thu, 05 Apr 2018)
2018-04-05 20:52:45 +02:00
Thilo Graf
74862f6ec3 CMenuOptionNumberChooser: expand localize functionality for any number
Origin commit data
------------------
Commit: 5ab92c41a7
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-04-04 (Wed, 04 Apr 2018)
2018-04-05 20:52:30 +02:00
vanhofen
952c6a58f2 Revert "CMenuOptionNumberChooser: expand localize functionality for any number"
This reverts commit 1a68428f80 because of many
bothering compiler warnings:
extended initializer lists only available with -std=c++11 or -std=gnu++11


Origin commit data
------------------
Commit: adb80290ba
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-04-04 (Wed, 04 Apr 2018)
2018-04-04 23:12:16 +02:00
Thilo Graf
1a68428f80 CMenuOptionNumberChooser: expand localize functionality for any number
Origin commit data
------------------
Commit: 3acd36ba71
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-04-04 (Wed, 04 Apr 2018)
2018-04-04 22:55:52 +02:00
Stefan Seyfried
11826623b7 widget/menue: one more forgotten sys/types.h include
Origin commit data
------------------
Commit: 8ffa2adc5c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2018-01-15 (Mon, 15 Jan 2018)
2018-01-15 19:54:51 +01:00
Stefan Seyfried
cfa463f606 reduce dependencies on driver/rcinput.h
* add new header that only contains neutrino_msg_t and friends, often this
 is all that's needed instead of full rcinput.h
* directly include rcinput.h in some cpp files instead of relying on
 accidental inclusion in some header
* add class forward declarations to avoid dragging in rcinput indirectly
This could use more work to further reduce the impact; maybe separating
the CRCinput::key_* constants from the rcinput class would be good.


Origin commit data
------------------
Commit: 47fbfbed9b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2018-01-15 (Mon, 15 Jan 2018)

Origin message was:
------------------
reduce dependencies on driver/rcinput.h

* add new header that only contains neutrino_msg_t and friends, often this
 is all that's needed instead of full rcinput.h
* directly include rcinput.h in some cpp files instead of relying on
 accidental inclusion in some header
* add class forward declarations to avoid dragging in rcinput indirectly
This could use more work to further reduce the impact; maybe separating
the CRCinput::key_* constants from the rcinput class would be good.
2018-01-15 19:54:51 +01:00
vanhofen
8e61ad6784 menu: use new marker icons
Origin commit data
------------------
Commit: 7c02d13d2b
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-04 (Thu, 04 Jan 2018)

Origin message was:
------------------
- menu: use new marker icons
2018-01-04 16:07:47 +01:00
GetAway
548eaef43f menue.cpp: dont use one-time init of a variable that could be changed on runtime
Origin commit data
------------------
Commit: c1ce74f776
Author: GetAway <get-away@t-online.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)
2017-11-02 13:25:47 +01:00
vanhofen
28058bfc61 menue: add possibility to add localized values in CMenuOptionNumberChooser seperately
Origin commit data
------------------
Commit: 45040b0e14
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)

Origin message was:
------------------
- menue: add possibility to add localized values in CMenuOptionNumberChooser seperately
2017-09-25 08:44:21 +02:00
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
3c2c889a58 CMenuItem: add members set/get info icon inside menu items
Origin commit data
------------------
Commit: f0660dc66c
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-09-17 (Sun, 17 Sep 2017)
2017-09-17 13:52:43 +02:00
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
Thilo Graf
b257efcc29 CMenuWidget: use CComponentsFooter for paint footers in menues
Another step for more unified window designs.


Origin commit data
------------------
Commit: 7f7054018b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-13 (Sun, 13 Aug 2017)
2017-09-14 12:14:41 +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
54cd0a93e0 menu: always add an offset to menus; not only in round-border-mode
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: cd5fc80ebe
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)

Origin message was:
------------------
- menu: always add an offset to menus; not only in round-border-mode

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +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
23ea286fa9 menu: always add an offset to menus; not only in round-border-mode
Origin commit data
------------------
Commit: 65b8a7ae48
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)

Origin message was:
------------------
- menu: always add an offset to menus; not only in round-border-mode
2017-09-07 16:18:30 +02:00
vanhofen
d36efaeac5 Revert "neutrino: disable some menus in upnp & ts mode"
This reverts commit 552e7c8777.

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


Origin commit data
------------------
Commit: 944ad7cb63
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-12 (Sat, 12 Aug 2017)
2017-08-12 14:05:17 +02:00
vanhofen
4d0a512b6e Revert "neutrino: disable some menus in upnp & ts mode"
This reverts commit 552e7c8777.


Origin commit data
------------------
Commit: 2e04d34a9c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-12 (Sat, 12 Aug 2017)
2017-08-12 12:47:33 +02:00
vanhofen
e21f270c04 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 6d49aee959
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-07 (Mon, 07 Aug 2017)
2017-08-07 08:20:56 +02:00
GetAway
552e7c8777 neutrino: disable some menus in upnp & ts mode
to prevent inoperability of neutrino


Origin commit data
------------------
Commit: 90de51de38
Author: GetAway <get-away@t-online.de>
Date: 2017-08-06 (Sun, 06 Aug 2017)
2017-08-07 07:52:41 +02:00
vanhofen
56c0ac4ef1 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/audioplayer.h


Origin commit data
------------------
Commit: 5433054b38
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)
2017-06-18 00:52:04 +02:00
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