Commit Graph

378 Commits

Author SHA1 Message Date
Jacek Jendrzej
678fa9560f Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: e3998c1ced
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-15 (Fri, 15 Sep 2017)
2017-09-15 20:44:49 +02:00
vanhofen
98851fc4e7 rename SLIDER defines
Origin commit data
------------------
Commit: d873aef1e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- rename SLIDER defines
2017-09-15 20:17:48 +02:00
vanhofen
53336e813e menu: rework slider; ...
* rename some variables
* use paintBoxFrame() instead of background-icon; this avoids scaling
 issues on higher resolutions; scaled icons are ugly


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

Origin message was:
------------------
- 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
805ed42dc4 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 2ebb47f519
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-14 (Thu, 14 Sep 2017)
2017-09-14 13:54:04 +02:00
Thilo Graf
bd57ddb2e8 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.


Origin commit data
------------------
Commit: 5678da177e
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-13 (Sun, 13 Aug 2017)
2017-09-14 12:14:41 +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
Jacek Jendrzej
6824f87be8 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: ed416416cd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-14 (Mon, 14 Aug 2017)
2017-08-14 16:26:49 +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
Jacek Jendrzej
b01bf9414d Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 1763bb9e64
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-08 (Tue, 08 Aug 2017)
2017-08-08 20:06:40 +02:00
vanhofen
8b89a1af9d menu: fix icon for CGenericMenuNext forwarder
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 8c4fe6df2f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-01 (Tue, 01 Aug 2017)

Origin message was:
------------------
- menu: fix icon for CGenericMenuNext forwarder

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-08-08 14:25:12 +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
Jacek Jendrzej
7cf343f927 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: d612fbc05f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-18 (Sun, 18 Jun 2017)
2017-06-18 12:21:18 +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
Jacek Jendrzej
9159d45c90 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 4c3002cb26
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-15 (Thu, 15 Jun 2017)
2017-06-15 12:32:31 +02:00
vanhofen
50f63cf847 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


Origin commit data
------------------
Commit: 5c783a5c50
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- 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
4643ac3f51 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: ca83324763
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)
2017-06-07 16:20:47 +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
14f84f0bec Merge remote-tracking branch 'neutrino-mp/master' into pu/mp
Conflicts:
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Commit: 8bdb16cec6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
2017-03-13 16:14:33 +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
a3e6544398 CMenuWidget::calcSize: Add forgotten 'wi'
Origin commit data
------------------
Commit: d0b02a9752
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)
2017-03-13 10:34:37 +01:00
Michael Liebmann
a84f479b62 CMenuWidget::calcSize: Use scale2Res() to adjust fixed sizes
Origin commit data
------------------
Commit: 2ed30486c4
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
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
Stefan Seyfried
b93f4e419a Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Commit: abec1c311b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)
2017-03-04 19:32:30 +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
Stefan Seyfried
706a5ba010 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Commit: 8b47699447
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-11 (Sat, 11 Feb 2017)
2017-02-11 11:18:45 +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
Thilo Graf
eff64072c2 Revert "CMenuWidget: ensure repaint of all header content if it is already painted"
This reverts commit 04cec1bdf4.


Origin commit data
------------------
Commit: a2f9d4b462
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)
2017-02-02 11:18:27 +01:00
Stefan Seyfried
f9341822cf Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Commit: 7497722646
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-01 (Wed, 01 Feb 2017)
2017-02-01 22:03:40 +01:00
Thilo Graf
04cec1bdf4 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.


Origin commit data
------------------
Commit: 97ed7cdaf7
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)
2017-01-31 16:36:43 +01:00
Thilo Graf
686bc2ce6a 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.


Origin commit data
------------------
Commit: 76008371ff
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-27 (Fri, 27 Jan 2017)
2017-01-31 16:36:42 +01:00
Stefan Seyfried
a73e775906 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Commit: 48ff7b36a2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)
2017-01-30 21:36:09 +01:00
Thilo Graf
b29b69a39b CMenuWidget: Forcing removal of details line during removing of hint box.
Origin commit data
------------------
Commit: 6a3778ba93
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)
2017-01-30 11:27:55 +01:00
Jacek Jendrzej
542ba9679a fix uninitialised values
Origin commit data
------------------
Commit: f76dda36df
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-01-29 (Sun, 29 Jan 2017)
2017-01-29 20:54:35 +01:00
Stefan Seyfried
c95aca9252 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Commit: a409047714
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-22 (Sun, 22 Jan 2017)
2017-01-22 22:59:39 +01:00
Thilo Graf
adac232005 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.


Origin commit data
------------------
Commit: 114bba2ab7
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-22 (Thu, 22 Dec 2016)
2016-12-22 23:49:01 +01:00
vanhofen
86adfe9bda menue: use SCROLLBAR_WIDTH define
Origin commit data
------------------
Commit: 97cfb36041
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-20 (Tue, 20 Dec 2016)

Origin message was:
------------------
- menue: use SCROLLBAR_WIDTH define
2016-12-20 10:26:59 +01:00
Thilo Graf
d58e22b4ed CMenuWidget: add external methode to paint scrollbar
Origin commit data
------------------
Commit: 644e8196db
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)
2016-12-17 22:39:14 +01:00
Stefan Seyfried
eab48f2ed9 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Commit: c6d7968381
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)
2016-12-04 18:02:51 +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
561957223c Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Commit: aa40d88300
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)
2016-11-14 20:38:01 +01:00
Jacek Jendrzej
4dbaafb40d src/gui/widget/menue.cpp try fix hide info_box (in channellist)
Origin commit data
------------------
Commit: 99c57d3075
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-14 (Mon, 14 Nov 2016)
2016-11-14 19:27:09 +01:00
Stefan Seyfried
2e7aa7be4a Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Commit: 2c92d112d0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
2016-11-12 18:06:26 +01:00