Commit Graph

499 Commits

Author SHA1 Message Date
Stefan Seyfried
d41f19b667 add comments to suppres -Wimplicit-fallthrough warnings
Origin commit data
------------------
Commit: 971f3703a6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)
2017-09-26 12:41:05 +02:00
vanhofen
2f674ed6c0 menue: add missing delete
Origin commit data
------------------
Commit: 8277f9f931
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)

Origin message was:
------------------
- menue: add missing delete
2017-09-25 22:27:26 +02:00
vanhofen
0fafaec36d menue: fix coordinates for savescreen function
Origin commit data
------------------
Commit: fd3a6a4ab0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)

Origin message was:
------------------
- menue: fix coordinates for savescreen function
2017-09-25 13:51:56 +02:00
Stefan Seyfried
1c4ac9a0e2 CMenuWidget: simplify menu_left_exit code, add missing break
Origin commit data
------------------
Commit: 3ae33950eb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
2017-09-25 11:25:51 +02:00
Stefan Seyfried
0e185cdc08 add comments to suppres -Wimplicit-fallthrough warnings
Origin commit data
------------------
Commit: 0ea72b9d51
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
2017-09-25 11:25:50 +02:00
vanhofen
ee8b8fe002 menue: user smaller vertical offset for hintboxes to keep it in sync with other vertical offsets
* get bottom menu offset from CMenuSeparator()->getHeight()


Origin commit data
------------------
Commit: 7071ae0852
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)

Origin message was:
------------------
- menue: user smaller vertical offset for hintboxes to keep it in sync with other vertical offsets

* get bottom menu offset from CMenuSeparator()->getHeight()
2017-09-25 08:44:21 +02:00
Michael Liebmann
e137542efe Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: abfb02aa47
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-09-21 (Thu, 21 Sep 2017)
2017-09-21 09:07:15 +02:00
vanhofen
402c567fe7 add and use FRAME_WIDTH defines; ...
replace other fixed frame widths with OFFSET defines

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


Origin commit data
------------------
Commit: 6ee3e54741
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-20 (Wed, 20 Sep 2017)

Origin message was:
------------------
- 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
vanhofen
619342d89d add and use FRAME_WIDTH defines; ...
replace other fixed frame widths with OFFSET defines


Origin commit data
------------------
Commit: 6d58a3b1c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-20 (Wed, 20 Sep 2017)

Origin message was:
------------------
- add and use FRAME_WIDTH defines; ...

replace other fixed frame widths with OFFSET defines
2017-09-20 13:46:31 +02:00
gixxpunk
2723dbdcba Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 1875ced1c5
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-09-19 (Tue, 19 Sep 2017)
2017-09-19 18:37:22 +02:00
Jacek Jendrzej
c0f1dd3454 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: ef0154a89b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-19 (Tue, 19 Sep 2017)
2017-09-19 18:16:14 +02:00
vanhofen
955f1e2afa menue: use getItemColors() to get item colors
Origin commit data
------------------
Commit: 57a17472a6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)

Origin message was:
------------------
- menue: use getItemColors() to get item colors
2017-09-19 18:10:56 +02:00
Jacek Jendrzej
42c8775883 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 74be1f7b5b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-19 (Tue, 19 Sep 2017)
2017-09-19 16:24:38 +02:00
max_10
b780215fad mediaplayer: fixes form Duckbox git
Origin commit data
------------------
Commit: af3a61cb96
Author: max_10 <max_10@gmx.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)
2017-09-19 15:12:53 +02:00
vanhofen
6ea00bb502 menue: use getItemColors() to get item colors
Origin commit data
------------------
Commit: 477ece6ece
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)

Origin message was:
------------------
- menue: use getItemColors() to get item colors
2017-09-18 22:53:27 +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
Jacek Jendrzej
c8b3cee9cb Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: a23737a626
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)
2017-09-18 10:53:42 +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
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
vanhofen
87fa51f50f menue: don't move menu in centered mode to the right; ...
when hintboxes do overlay the menu it looks crooked


Origin commit data
------------------
Commit: 221722bc9e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)

Origin message was:
------------------
- menue: don't move menu in centered mode to the right; ...

when hintboxes do overlay the menu it looks crooked
2017-09-15 18:23:31 +02:00
vanhofen
75212a5c31 menue: always show frame around the hintbox
Origin commit data
------------------
Commit: 38237f07b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)

Origin message was:
------------------
- menue: always show frame around the hintbox
2017-09-15 18:23:31 +02:00
vanhofen
0a5d4a6bdb rename SLIDER defines
Origin commit data
------------------
Commit: 978d72ac00
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- rename SLIDER defines
2017-09-14 22:00:41 +02:00
vanhofen
eb679c54ec 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: 5c22aa7058
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-14 21:37:44 +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
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
vanhofen
50c8b5cdba menu: fix right offset for very long right texts
Origin commit data
------------------
Commit: c11ac03b4f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- menu: fix right offset for very long right texts
2017-09-12 22:30:35 +02:00
vanhofen
d3bd8b5725 menue: fix my stupid typo that avoids scrollbars
Origin commit data
------------------
Commit: 8115f33948
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-08 (Fri, 08 Sep 2017)

Origin message was:
------------------
- menue: fix my stupid typo that avoids scrollbars
2017-09-08 12:15:11 +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
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
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
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
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
851752300e menu: fix icon for CGenericMenuNext forwarder
Origin commit data
------------------
Commit: 27b111820f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-01 (Tue, 01 Aug 2017)

Origin message was:
------------------
- menu: fix icon for CGenericMenuNext forwarder
2017-08-01 14:44:21 +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
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