Commit Graph

98 Commits

Author SHA1 Message Date
vanhofen
73c370ab33 Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Conflicts:
	src/gui/components/cc_frm_footer.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: fd25630d53
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-30 (Wed, 30 Aug 2017)
2017-08-30 18:11:59 +02:00
Jacek Jendrzej
a23840bc0c Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 23797d29c0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-29 (Tue, 29 Aug 2017)
2017-08-29 11:26:54 +02:00
Thilo Graf
4b4e48ecf3 CComponentsFooter: fix possible error with non-POD element type
affected is struct type 'button_label_cc'


Origin commit data
------------------
Commit: 16dac64ed2
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
2017-08-28 12:16:45 +02:00
Thilo Graf
2e4b222438 CComponentsFooter: fix possible conversion warning
For platform compatibility. eg. with neutrino-pc on it is possible
that size_t is long unsigned ini, for others unsinged int


Origin commit data
------------------
Commit: 27995b19fa
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
2017-08-28 12:16:45 +02:00
vanhofen
99901ced0b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 6f8b855b07
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-30 (Fri, 30 Jun 2017)
2017-06-30 14:41:42 +02:00
vanhofen
e4fdbbaa80 cc_frm_footer: avoid division by 0
Origin commit data
------------------
Commit: f7a95bd3ac
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-30 (Fri, 30 Jun 2017)

Origin message was:
------------------
- cc_frm_footer: avoid division by 0
2017-06-30 10:41:24 +02:00
Michael Liebmann
043e374b4a Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 542626c0da
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-29 (Thu, 29 Jun 2017)
2017-06-29 15:06:39 +02:00
vanhofen
8646201d78 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 37f6b7a963
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)
2017-06-28 22:51:27 +02:00
vanhofen
25e1efbc73 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: 3f812037a5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)
2017-06-28 22:49:34 +02:00
Thilo Graf
1203bd054a CComponentsFooter: remove FIXME tag
fixed since 428788c8a4
Obsolete wrong types caused this.


Origin commit data
------------------
Commit: 47f7426aa7
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)
2017-06-28 20:36:51 +02:00
vanhofen
c8cba2e151 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 98edb55233
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)
2017-06-26 22:51:58 +02:00
vanhofen
1f8d52be0d cc_frm_footer: re-add auto-calc label_width by default
Origin commit data
------------------
Commit: bd5602c050
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)

Origin message was:
------------------
- cc_frm_footer: re-add auto-calc label_width by default
2017-06-26 22:43:36 +02:00
vanhofen
2ed4784333 Revert "- cc_frm_footer: auto-calc label_width by default"
This reverts commit e259a9dd07.


Origin commit data
------------------
Commit: 5cbdf990fb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)
2017-06-26 15:32:32 +02:00
vanhofen
99130d47ab Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: e5cf06ec8a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-19 (Mon, 19 Jun 2017)
2017-06-19 23:08:41 +02:00
vanhofen
e259a9dd07 cc_frm_footer: auto-calc label_width by default
Origin commit data
------------------
Commit: b4fffee31b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-19 (Mon, 19 Jun 2017)

Origin message was:
------------------
- cc_frm_footer: auto-calc label_width by default
2017-06-19 21:36:10 +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
b162e3d2aa Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/components/cc_frm_footer.cpp


Origin commit data
------------------
Commit: c68ae57571
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
2017-06-15 11:07:32 +02:00
Thilo Graf
802381c6a0 CCButtonSelect: rename chain to btn_container
more plausible name


Origin commit data
------------------
Commit: 4146a461c1
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
2017-06-15 01:01:54 +02:00
Thilo Graf
222317bbad CCButtonSelect: outsource button select handling into own class
Origin commit data
------------------
Commit: 4d753d7437
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
2017-06-15 01:01:54 +02:00
vanhofen
31724507a8 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 292d7a2d5d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-19 (Wed, 19 Apr 2017)
2017-04-19 23:24:19 +02:00
vanhofen
4ad063d3f5 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 11a28c07d6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-19 (Wed, 19 Apr 2017)
2017-04-19 21:35:56 +02:00
Thilo Graf
90531ed90b CComponentsFooter: avoid crash because possible divisions by 0
Origin commit data
------------------
Commit: fb0dc47e35
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-13 (Thu, 13 Apr 2017)
2017-04-13 23:36:29 +02:00
vanhofen
692b8dd7f5 Merge branch 'master' into pu/mp
Conflicts:
	src/gui/epgplus.cpp


Origin commit data
------------------
Commit: 064f693bf7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)
2017-04-08 14:36:12 +02:00
vanhofen
d2bd535b8b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 30d4d6e7f0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)
2017-04-08 14:33:53 +02:00
Thilo Graf
43fff4517e CComponentsFooter: add missing member inits
Origin commit data
------------------
Commit: 47fceca188
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-07 (Fri, 07 Apr 2017)
2017-04-08 08:16:05 +02:00
vanhofen
95c6d6c593 Merge branch 'master' into pu/mp
Conflicts:
	acinclude.m4


Origin commit data
------------------
Commit: b1ba85c8c1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-22 (Wed, 22 Mar 2017)
2017-03-22 12:16:01 +01:00
vanhofen
bd2ebb40b4 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 107a8a1b5f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-21 (Tue, 21 Mar 2017)
2017-03-21 14:50:23 +01:00
Thilo Graf
c7fc3dcf34 CComponentsButton: simplify assignment of button message values
Count of alternate message values was limited to 1 value. Now it is
possible to add any count of message values.

directKey and directKeyAlt were removed from struct type 'button_label_cc'
and directKeys was added as container for possible message values.

Some methods of CComponentsFooter had to be adapted for that.


Origin commit data
------------------
Commit: 4eb6a315fc
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-20 (Mon, 20 Mar 2017)
2017-03-20 22:55:05 +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
9d255f3f05 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Commit: 69d8616a91
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)
2017-03-12 22:03:03 +01:00
Thilo Graf
616904958c CComponentsFooter: simplify implementation of button labels
button_label_l and button_label_s are now
merged to button_label_cc with prepared default values for text and locales.This type contains all possible
button label properties. Values for locales and string
are evaluated in setButtonLabels(), so it's possible to remove some
overloaded methodes.


Origin commit data
------------------
Commit: c766a970dc
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-11 (Sat, 11 Mar 2017)
2017-03-11 00:45:25 +01:00
vanhofen
c4de218cb2 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac
	src/driver/Makefile.am
	src/driver/framebuffer.h
	src/gui/bookmarkmanager.cpp
	src/gui/filebrowser.cpp
	src/gui/widget/buttons.cpp
	src/system/httptool.cpp


Origin commit data
------------------
Commit: dd6244f33e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 13:19:03 +01:00
Stefan Seyfried
f6d5a96838 replace fontrenderer.h include with forward declaration
in order to flatten the build dependency tree further, include
fontrenderer.h directly where needed, in header files a forward
declaration is enough


Origin commit data
------------------
Commit: 2303d94300
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-07 17:23:42 +01:00
Stefan Seyfried
84b16a8a24 replace fontrenderer.h include with forward declaration
in order to flatten the build dependency tree further, include
fontrenderer.h directly where needed, in header files a forward
declaration is enough


Origin commit data
------------------
Commit: 9082ddf287
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-05 13:37:53 +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
vanhofen
9f8048b3d1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 6e4c63f289
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-13 (Fri, 13 Jan 2017)
2017-01-13 13:27:49 +01:00
Thilo Graf
8d6fb1e022 CComponentsFooter: optimize button position and size
Buttons are now smaller so it should be enough, to center only, if not
please report.


Origin commit data
------------------
Commit: a9b8b22339
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-05 (Thu, 05 Jan 2017)
2017-01-05 22:53:31 +01:00
vanhofen
8c27915df5 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 2733e0f260
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-02 (Mon, 02 Jan 2017)
2017-01-02 23:55:23 +01:00
Thilo Graf
476641a626 CComponentsHeader/CComponentsFooter: prevent crash on changed font settings
Default fonts for header and footer must be handled too.
After font settings changes these objects could be invalid.
Default fonts have invalid pointers after font changes too. Extra reset is required.


Origin commit data
------------------
Commit: b98319cb91
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)
2016-12-30 20:33:26 +01:00
Stefan Seyfried
7893941b8a CCFooter::setButtonLabels: fix format-string warning
Origin commit data
------------------
Commit: f6c183931f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)
2016-12-04 18:03:32 +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
Thilo Graf
b79c87dcfe CComponentsFooter: fix wrong text color with single button in footers
* remove size compare

If only one button exists, possible new text color would be ignored
and wrong Text color was visible with one item.
This behavior was observed in message boxes with
single buttons (eg OK, or Cancel).


Origin commit data
------------------
Commit: 8bf6b7fb3a
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-29 (Tue, 29 Nov 2016)
2016-11-29 16:13:47 +01:00
Thilo Graf
b2e71497d8 CComponentsFooter: disable gradient for footers
This is not really completly implemented for footer at the momemnt, because
button objects are still not prepared or tuned for that.

If it is enabled, currently it could occur unintentionally background behavior
eg.: flickereffects or background display errors in button objects.

NOTE: anyway users can enable gradient in theme files and could override this setting.
Now here it is globally disabled for footers. If it works right,
it will be enabled in future.


Origin commit data
------------------
Commit: 427b65813d
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-27 (Sun, 27 Nov 2016)

Origin message was:
------------------
CComponentsFooter: disable gradient for footers

This is not really completly implemented for footer at the momemnt, because
button objects are still not prepared or tuned for that.

If it is enabled, currently it could occur unintentionally background behavior
eg.: flickereffects or background display errors in button objects.

NOTE: anyway users can enable gradient in theme files and could override this setting.
Now here it is globally disabled for footers. If it works right,
it will be enabled in future.
2016-11-28 21:44:05 +01:00
Thilo Graf
2b0b1c9f0f CComponentsFooter: add parameter for frame width for selected buttons
Frame width was hard coded.


Origin commit data
------------------
Commit: 696989dcf1
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)
2016-11-20 01:33:57 +01:00
Thilo Graf
9dcee01e69 CComponentsFooter: optimize select buttons, try to assign better contrast
Now it's possible to set parameters for frames and text.
Parameters are prdefined for better contrasts in select or default mode.

TODO: background modes have no effects at the moment. Here are other things need to be done.


Origin commit data
------------------
Commit: 55ac581523
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-23 (Sun, 23 Oct 2016)
2016-10-24 10:31:28 +02:00
Thilo Graf
3534f40441 CComponentsFooter: reduce button height inside footer
TODO: more optimization seems required


Origin commit data
------------------
Commit: 542de648f5
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-17 (Mon, 17 Oct 2016)
2016-10-24 10:31:27 +02:00
Thilo Graf
6f30f1b274 CComponentsFooter: use different select color for button, if count = 1
TODO: 	should be configurable. Not all theme color combinations
	have matched contrasts.


Origin commit data
------------------
Commit: b3e7e49592
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-07 (Fri, 07 Oct 2016)
2016-10-24 10:31:26 +02:00
Thilo Graf
93e0dd143c CComponentsFooter: remove debug spam
Origin commit data
------------------
Commit: ebf2e65b38
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-05 (Wed, 05 Oct 2016)
2016-10-24 10:31:26 +02:00
Thilo Graf
3119fa58e1 cc_frm_button.cpp/cc_frm_footer.cpp: fix passed parameter
were not passed through


Origin commit data
------------------
Commit: e2a1e7dc5b
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-09-30 (Fri, 30 Sep 2016)
2016-10-24 10:31:25 +02:00
Thilo Graf
7179f3d3f0 Try to rework footer
* try to fix enableButtonShadow(), seems an init is missing
* shadow fixed


Origin commit data
------------------
Commit: 2e631fd0ce
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-09-24 (Sat, 24 Sep 2016)
2016-10-24 10:31:25 +02:00