Commit Graph

436 Commits

Author SHA1 Message Date
M. Liebmann
abfb02aa47 Merge branch 'master' into pu/mp 2017-09-21 09:07:15 +02:00
svenhoefer
6ee3e54741 - add and use FRAME_WIDTH defines; ...
replace other fixed frame widths with OFFSET defines

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-20 21:29:53 +02:00
Jacek Jendrzej
ef0154a89b Merge branch 'master' into pu/mp 2017-09-19 18:16:14 +02:00
vanhofen
57a17472a6 - menue: use getItemColors() to get item colors 2017-09-19 18:10:56 +02:00
Jacek Jendrzej
74be1f7b5b Merge branch 'master' into pu/mp 2017-09-19 16:24:38 +02:00
max_10
af3a61cb96 mediaplayer: fixes form Duckbox git 2017-09-19 15:12:53 +02:00
Jacek Jendrzej
a23737a626 Merge branch 'master' into pu/mp 2017-09-18 10:53:42 +02:00
Thilo Graf
f0660dc66c CMenuItem: add members set/get info icon inside menu items 2017-09-17 13:52:43 +02:00
Jacek Jendrzej
e3998c1ced Merge branch 'master' into pu/mp 2017-09-15 20:44:49 +02:00
vanhofen
d873aef1e8 - rename SLIDER defines 2017-09-15 20:17:48 +02:00
vanhofen
0a748de445 - menu: rework slider; ...
* rename some variables
* use paintBoxFrame() instead of background-icon; this avoids scaling
  issues on higher resolutions; scaled icons are ugly
2017-09-15 20:16:13 +02:00
Jacek Jendrzej
2ebb47f519 Merge branch 'master' into pu/mp 2017-09-14 13:54:04 +02:00
Thilo Graf
5678da177e CMenuWidget: replace paintBoxRel() calls with single PaintBoxRel()
Paints background and shadow at once. Shadow is painted only on
reqiured parts of screen. This avoids possible flicker effects e.g.
with footer paint, on changing buttons, was to see with opkg_manager.
2017-09-14 12:14:41 +02:00
Thilo Graf
7f7054018b CMenuWidget: use CComponentsFooter for paint footers in menues
Another step for more unified window designs.
2017-09-14 12:14:41 +02:00
svenhoefer
f2ec46311c - 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
svenhoefer
cd5fc80ebe - 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
Jacek Jendrzej
ed416416cd Merge branch 'master' into pu/mp 2017-08-14 16:26:49 +02:00
svenhoefer
944ad7cb63 Revert "neutrino: disable some menus in upnp & ts mode"
This reverts commit 90de51de38.

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-08-12 14:05:17 +02:00
Jacek Jendrzej
1763bb9e64 Merge branch 'master' into pu/mp 2017-08-08 20:06:40 +02:00
svenhoefer
8c4fe6df2f - menu: fix icon for CGenericMenuNext forwarder
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-08-08 14:25:12 +02:00
GetAway
90de51de38 neutrino: disable some menus in upnp & ts mode
to prevent inoperability of neutrino
2017-08-07 07:52:41 +02:00
Jacek Jendrzej
d612fbc05f Merge branch 'master' into pu/mp 2017-06-18 12:21:18 +02:00
Thilo Graf
326a9634e1 CMenuSeparator: clean up multiple code parts 2017-06-18 00:04:40 +02:00
Thilo Graf
f2e8f95e66 CMenuOptionNumberChooser: clean up multiple code parts 2017-06-18 00:04:40 +02:00
Thilo Graf
7b3ce6f330 CMenuForwarder: clean up multiple code parts 2017-06-18 00:04:40 +02:00
Thilo Graf
284dba8c25 CMenuOptionStringChooser: clean up multiple code parts 2017-06-18 00:04:40 +02:00
Thilo Graf
8899660dad CMenuOptionChooser: clean up multiple code parts 2017-06-18 00:04:40 +02:00
Jacek Jendrzej
4c3002cb26 Merge branch 'master' into pu/mp 2017-06-15 12:32:31 +02:00
svenhoefer
5c783a5c50 - menue: replace last fixed values ...
... with OFFSET defines and scale2Res()-calculations

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

- removed TODO for height of hint calculation
2017-06-15 01:01:55 +02:00
Jacek Jendrzej
ca83324763 Merge branch 'master' into pu/mp 2017-06-07 16:20:47 +02:00
M. Liebmann
2677543cc4 Merge branch 'master' into pu/fb-setmode 2017-03-13 21:55:50 +01:00
svenhoefer
8bdb16cec6 Merge remote-tracking branch 'neutrino-mp/master' into pu/mp
Conflicts:
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp
2017-03-13 16:14:33 +01:00
svenhoefer
5b0faeab8c - unify DetailsLine-names; move define to settings.h 2017-03-13 12:40:04 +01:00
M. Liebmann
d0b02a9752 CMenuWidget::calcSize: Add forgotten 'wi' 2017-03-13 10:34:37 +01:00
M. Liebmann
2ed30486c4 CMenuWidget::calcSize: Use scale2Res() to adjust fixed sizes 2017-03-13 09:55:58 +01:00
M. Liebmann
30db40da1a CMenuWidget::calcSize: Recalculation of min_width ...
... for adjustment to the osd resolution
2017-03-13 09:55:58 +01: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
8b47699447 Merge remote-tracking branch 'tuxbox/master' 2017-02-11 11:18:45 +01:00
Thilo Graf
0435ca20a3 CMenuWidget: remove dub code from init 2017-02-09 16:35:03 +01:00
Thilo Graf
2dda93ed2b CMenuWidget: use only nameString as container for widget name
neutrino_locale_t	name could be transformed always to real string to
unify this container
2017-02-09 15:52:39 +01:00
Thilo Graf
a2f9d4b462 Revert "CMenuWidget: ensure repaint of all header content if it is already painted"
This reverts commit 97ed7cdaf7.
2017-02-02 11:18:27 +01:00
Stefan Seyfried
7497722646 Merge remote-tracking branch 'tuxbox/master' 2017-02-01 22:03:40 +01:00
Thilo Graf
97ed7cdaf7 CMenuWidget: ensure repaint of all header content if it is already painted
TODO: 	This should be controlled inside header base class.
	paint() method seems suitable.
	I Will try to implement it soon.
2017-01-31 16:36:43 +01:00
Thilo Graf
76008371ff CMenuWidget: add missing hide() for details line
Details_line was not removed in all constellations when menu was closed.
Sample: open main menue and select an entry with connect-line, eg. plugins,
press key to come into submenu, then go back to main menue and close
menu with home key, result: it's possible that line is still on screen.
2017-01-31 16:36:42 +01:00
Stefan Seyfried
48ff7b36a2 Merge remote-tracking branch 'tuxbox/master' 2017-01-30 21:36:09 +01:00
Thilo Graf
6a3778ba93 CMenuWidget: Forcing removal of details line during removing of hint box. 2017-01-30 11:27:55 +01:00
Jacek Jendrzej
f76dda36df fix uninitialised values 2017-01-29 20:54:35 +01:00
Stefan Seyfried
a409047714 Merge remote-tracking branch 'tuxbox/master' 2017-01-22 22:59:39 +01:00
Thilo Graf
114bba2ab7 CMenuWidget: add menu name reinit
Ensures correct display of menu name while runtime.
For example: it's required on changed language settings, otherwise we have
old language in menu head.
2016-12-22 23:49:01 +01:00