Commit Graph

77 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
Thilo Graf
dba17b359c CComponentsFooter: add member enableButtonShadow()
Possibility to pass button properties into button objects


Origin commit data
------------------
Commit: 363cf101d1
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-21 (Sun, 21 Aug 2016)
2016-10-24 10:31:25 +02:00
Thilo Graf
a6f28430c5 CComponentsFooter: reduced button height for better optical view into footer
Origin commit data
------------------
Commit: 779c51bd00
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-21 (Sun, 21 Aug 2016)
2016-10-24 10:31:25 +02:00
Thilo Graf
36d6eeea06 CMsgBox: add option to enable/disable button background
replaces var name btn_contour for better plausibility


Origin commit data
------------------
Commit: be740c1552
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-18 (Thu, 18 Aug 2016)
2016-10-24 10:31:24 +02:00
Thilo Graf
11b3307251 CMsgBox: rework msgbox classes with Window class implementation
Replacing messagebox, hintbox_ext and some derivated parts with
basic class hintbox and derivated class CMsgBox. This should unify
window handling and avoids maintain of multiple classes with quasi
same purpose and adds more functionality.

TODO: fix and optimize details


Origin commit data
------------------
Commit: dde298b1b7
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-04-04 (Mon, 04 Apr 2016)
2016-10-24 10:31:24 +02:00
Stefan Seyfried
54189f271a Merge remote-tracking branch 'tuxbox/master'
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
2016-10-22 11:37:40 +02:00
vanhofen
892603fe68 rename customcolor.h -> color_custom.h; reduce unneeded inludes
Origin commit data
------------------
Commit: 104d21e784
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- rename customcolor.h -> color_custom.h; reduce unneeded inludes
2016-10-10 14:19:55 +02:00
vanhofen
897dc6ae8c colors: add COL_FRAME wrapper
Origin commit data
------------------
Commit: 75fe6e407d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- colors: add COL_FRAME wrapper
2016-10-10 14:19:54 +02:00
Thilo Graf
e1c928520d CComponentsFooter: remove defined font from footer
cch_font has nothing to do with button font and is already
inherited and defined from header class and can be redefined with
setCaptionFont() methode if required.


Origin commit data
------------------
Commit: 3af698701b
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-09-24 (Sat, 24 Sep 2016)
2016-09-24 01:08:08 +02:00
Thilo Graf
84b40fcffb CComponentsFooter: rename var for btn icon
is more plausible


Origin commit data
------------------
Commit: 2de3a167e5
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-09-13 (Tue, 13 Sep 2016)
2016-09-13 09:04:53 +02:00
Thilo Graf
5a24dc1ce5 CComponentsFooter: don't use default parameters for privat member
Passed init values are better to see here.
This should fix wrong footer color too. See UPNP-Browser, color was not
applied here.


Origin commit data
------------------
Commit: 9b9a8d1a78
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-23 (Tue, 23 Aug 2016)
2016-08-23 16:00:48 +02:00
Thilo Graf
cdd40d98b0 CComponentsFooter: use background color of footer inside chain object
Ensure pass of bg color from parent into chain object and button objects.
Required by embedded button objects. This prevents "holes" on screen.


Origin commit data
------------------
Commit: a92757697f
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-20 (Sat, 20 Aug 2016)
2016-08-22 21:15:28 +02:00
vanhofen
e49ee18fb3 fonts: add and use own font for all footers
Origin commit data
------------------
Commit: 54f2ac510f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)

Origin message was:
------------------
- fonts: add and use own font for all footers
2016-08-15 19:02:42 +02:00
vanhofen
9196e2208c cc_frm_footer: overload font option with old familiar font
Origin commit data
------------------
Commit: 13966c519b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-14 (Sun, 14 Aug 2016)

Origin message was:
------------------
- cc_frm_footer: overload font option with old familiar font
2016-08-14 22:17:59 +02:00
vanhofen
78230ead13 colors: some internal renamings
* INFOBAR_SHADOW to SHADOW because it's not only used in infoviewer
* INFOBAR_SHADOW_TEXT to MENUFOOT_TEXT because it's the proper name

This is in preparation to make footer colors configurable


Origin commit data
------------------
Commit: bc39d1e14e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-14 (Sun, 14 Aug 2016)

Origin message was:
------------------
- colors: some internal renamings

* INFOBAR_SHADOW to SHADOW because it's not only used in infoviewer
* INFOBAR_SHADOW_TEXT to MENUFOOT_TEXT because it's the proper name

This is in preparation to make footer colors configurable
2016-08-14 21:55:18 +02:00
Thilo Graf
6e9f947b8f CComponentsButton: use full height if no frame available
Origin commit data
------------------
Commit: 95885c4f6e
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-03-17 (Thu, 17 Mar 2016)
2016-03-17 09:14:50 +01:00
Stefan Seyfried
8822421c6b Merge remote-tracking branch 'uncool/cst-next'
Origin commit data
------------------
Commit: b837d8697b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-28 (Mon, 28 Dec 2015)
2015-12-28 16:15:14 +01:00
Thilo Graf
72a289a90c components: rework classes
- outsourced some classes cc_item.cpp/h, cc_draw.cpp/h
- added extra methodes for simple use of some basic components extra.cpp/h
- rework clock handling: use timer class, reworked members for
 enable/disable clock with external timer events,
 tryed to fix some display issues related with infoclock and
 time osd clock in moviebrowser, channellist, menuus
- reworked hide/kill handling, removed parameter for hide(), try to use
 cached backgrounds for other constallations, paint cache, image cache (all beta)
- reworked shadow/frame handling, add shadow modes for left/right
 arrangement, TODO: repaint for existant instances required
- reworked color gradient assignment (beta)

... Note: I had a data crash in my local git tree
and i tryed to restore my historie, but most was lost. Therefore here
the commit is large


Origin commit data
------------------
Commit: 0146511f38
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-11-18 (Wed, 18 Nov 2015)

Origin message was:
------------------
components: rework classes

- outsourced some classes cc_item.cpp/h, cc_draw.cpp/h
- added extra methodes for simple use of some basic components extra.cpp/h
- rework clock handling: use timer class, reworked members for
 enable/disable clock with external timer events,
 tryed to fix some display issues related with infoclock and
 time osd clock in moviebrowser, channellist, menuus
- reworked hide/kill handling, removed parameter for hide(), try to use
 cached backgrounds for other constallations, paint cache, image cache (all beta)
- reworked shadow/frame handling, add shadow modes for left/right
 arrangement, TODO: repaint for existant instances required
- reworked color gradient assignment (beta)

... Note: I had a data crash in my local git tree
and i tryed to restore my historie, but most was lost. Therefore here
the commit is large
2015-12-27 14:42:27 +01:00
Stefan Seyfried
17880c4125 Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...


Origin commit data
------------------
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)
2015-12-13 17:41:55 +01:00
Thilo Graf
c6aa9b8ebf CComponentsFooter: reduce scale factor without button background
Origin commit data
------------------
Commit: 5de4b48a00
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-07-01 (Wed, 01 Jul 2015)
2015-07-01 16:05:42 +02:00
vanhofen
fa19d61637 cc_frm_footer: prepare for c2c gradient
Origin commit data
------------------
Commit: 5599784642
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-04 (Mon, 04 May 2015)

Origin message was:
------------------
- cc_frm_footer: prepare for c2c gradient
2015-05-04 09:41:41 +02:00
Thilo Graf
6261b3b869 themes: use hintbox and header gradient option in theme settings
Color gradient feature was originally intended for use
inside theme settings and it's not really suitable for
generally use as default in all themes at the moment, so it makes more
sense to have options in theme settings and let the user decide
to customize this, unless enough other gui parts can use this feature.


Origin commit data
------------------
Commit: 01516cf943
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-04-29 (Wed, 29 Apr 2015)

Origin message was:
------------------
themes: use hintbox and header gradient option in theme settings

Color gradient feature was originally intended for use
inside theme settings and it's not really suitable for
generally use as default in all themes at the moment, so it makes more
sense to have options in theme settings and let the user decide
to customize this, unless enough other gui parts can use this feature.
2015-04-29 10:16:55 +02:00