Commit Graph

63 Commits

Author SHA1 Message Date
Michael Liebmann
534d1b315e Merge branch 'master' into pu/fb-modules
Origin commit data
------------------
Commit: ef61905a2d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-08 (Wed, 08 Feb 2017)
2017-02-08 20:16:41 +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
Thilo Graf
680970ff29 CComponentsForm: move slots into base classes
Usable for all form classes


Origin commit data
------------------
Commit: 06fa3f2488
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-06 (Mon, 06 Feb 2017)
2017-02-07 17:12:25 +01:00
Thilo Graf
1e3da560ed signals: reduce multiple includes for sigc++/bind.h
Origin commit data
------------------
Commit: e4d0abc7dc
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-06 (Mon, 06 Feb 2017)
2017-02-07 17:12:25 +01:00
Thilo Graf
7647ad58fb CComponentsText: add signal OnBeforePaint into text paint() methode
Origin commit data
------------------
Commit: 53f956c0f9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-27 (Fri, 27 Jan 2017)
2017-01-31 16:36:42 +01:00
Thilo Graf
f0bde87f0c CComponentsText: add missing parameters to kill() methode
Origin commit data
------------------
Commit: f219da23bf
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-27 (Fri, 27 Jan 2017)
2017-01-31 16:36:42 +01:00
Thilo Graf
ddca089698 CComponentsText: add explicit kill methode and add ct_force_text_paint
After hide or kill text will does not paint without ct_force_text_paint,
so it is required to add this.


Origin commit data
------------------
Commit: 4c71edbd3c
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-23 (Mon, 23 Jan 2017)
2017-01-31 16:36:42 +01:00
Thilo Graf
2ffd5ab3d4 CComponentsText: fix order of paint init
Origin commit data
------------------
Commit: 8bd4633cb4
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-24 (Tue, 24 Jan 2017)
2017-01-31 16:36:41 +01:00
Thilo Graf
916f9fb9fe CComponentsText: fix wrong item type
Origin commit data
------------------
Commit: c42f1240f0
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-23 (Mon, 23 Jan 2017)
2017-01-31 16:36:40 +01:00
Thilo Graf
9b76cf01e6 partial revert: "CTextBox: expand parameters of member setTextBorderWidth()"
related commit: 43a759358d

Since this commit, TextBox received a lot of optimizations, so it is possible
we have no described side effects.


Origin commit data
------------------
Commit: fad2adffa2
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-22 (Thu, 22 Dec 2016)
2016-12-22 09:49:40 +01:00
Thilo Graf
ef014b2112 CComponentsText: revert inheritition of CBox, useage as object
It has shown, that the positioning and
Dimensions calculations are not correct. CBox object must be embedded
with frame properties.


Origin commit data
------------------
Commit: 9331c59b0e
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-28 (Mon, 28 Nov 2016)
2016-11-28 21:42:50 +01:00
vanhofen
fc6d74af97 cc_item_text: avoid using INFOBAR_SMALL font; use MENU_INFO instead
it's a small font too


Origin commit data
------------------
Commit: c35414bc56
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)

Origin message was:
------------------
- cc_item_text: avoid using INFOBAR_SMALL font; use MENU_INFO instead

it's a small font too
2016-08-15 19:32:46 +02:00
Thilo Graf
41bef28025 CComponentsText: assign missing dim and pos values inside dimension- and position setters
Origin commit data
------------------
Commit: 3b6e4bfcc0
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-02-22 (Mon, 22 Feb 2016)
2016-02-24 15:09:44 +01:00
Thilo Graf
4fa789eb4f CComponentsText: assign current initialized position values to old var
Origin commit data
------------------
Commit: 5cfe504044
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-02-21 (Sun, 21 Feb 2016)
2016-02-24 15:09:00 +01:00
Thilo Graf
e4fbc51887 text screen save: try to rework screen save behavior for textbox objects
Screen save now always disabled by default and can be controlled
outside of relevant objects.


Origin commit data
------------------
Commit: 9d72b086a2
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-21 (Thu, 21 Jan 2016)
2016-01-21 11:00:38 +01:00
Thilo Graf
c51385b9bc CComponentsText: try to fix mismatching calculation of y pos inside form
Origin commit data
------------------
Commit: 60c9dc8432
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-11 (Mon, 11 Jan 2016)
2016-01-21 11:00:19 +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
Thilo Graf
215d6c1e46 CComponentsText: add switch for utf8 disable/enable
Origin commit data
------------------
Commit: ccdaacb0a0
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-07-12 (Sun, 12 Jul 2015)
2015-07-12 21:08:25 +02:00
Michael Liebmann
705406fdf3 CComponentsText: Fix default font
Origin commit data
------------------
Commit: ae139d4ec2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-03-31 (Tue, 31 Mar 2015)
2015-03-31 12:00:48 +02:00
Thilo Graf
a755b1730d CComponentsText: add possibilty to set font style
Usable with methode setText() and parameter 'style'

provided enums are:
	FONT_STYLE_REGULAR
	FONT_STYLE_BOLD
	FONT_STYLE_ITALIC


Origin commit data
------------------
Commit: 341b142aa0
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-02-22 (Sun, 22 Feb 2015)
2015-03-29 22:40:13 +02:00
Thilo Graf
a1f54c9e7d CComponentsText: avoid unintentional overwriting of current property values
If parameters were not explicitly defined, default values of parameters
overwrite current property values.


Origin commit data
------------------
Commit: d2ae57e5b6
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-02-22 (Sun, 22 Feb 2015)
2015-03-29 22:40:13 +02:00
Thilo Graf
bdcc52feba CComponentsText: expand setTextColor() methode
apply color value direct in text box object


Origin commit data
------------------
Commit: 4a0975eb90
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-01-24 (Sat, 24 Jan 2015)
2015-03-29 22:40:10 +02:00
[CST] Focus
ad1e9042d3 gui/components/cc_item_text.cpp: set CTextBox save screen flag
Origin commit data
------------------
Commit: 86a236bc7e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-03-06 (Fri, 06 Mar 2015)
2015-03-06 14:14:00 +03:00
Thilo Graf
b73e09fe81 CComponentsText: move setTextRenderModeFullBG() to text object
This is mostly required here


Origin commit data
------------------
Commit: 11c9d0780a
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-09-20 (Sat, 20 Sep 2014)
2014-09-25 11:08:00 +04:00
Thilo Graf
01c13b89fa CComponentsText: add parameter for text color in member function setText()
Origin commit data
------------------
Commit: 745f7b70f1
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-05-10 (Sat, 10 May 2014)
2014-05-22 21:50:51 +02:00
Thilo Graf
a8175397f3 CComponentsText: fix fit of textbox object inside cc text object dimensions
Position related to parent container was wrong. Some variables were
unused and removed.


Origin commit data
------------------
Commit: f4447b38e0
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-05-04 (Sun, 04 May 2014)
2014-05-16 09:08:26 +02:00
Thilo Graf
e36aba479b CComponentsText: rework constructor
allows usage of parent parameter without another parameter


Origin commit data
------------------
Commit: d21df99ed4
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-03-23 (Sun, 23 Mar 2014)
2014-04-02 08:40:22 +02:00
Thilo Graf
37915b1e2e CComponents: use neutrino debug mode for debug output
Origin commit data
------------------
Commit: 750691fbbf
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-03-08 (Sat, 08 Mar 2014)
2014-04-02 08:40:21 +02:00
Thilo Graf
f33efdbdc4 CComponents: add new parameter 'parent'
Use strictly CComponentsForm as parent parameter in constructors.
Some parts have been cleaned up (Constructors, init methodes removed)

New parameter makes it possible already add current item in constructor.
So in mostly situations is it not necessary to use explicit addCCItem(),
but addCCItem()is still valid and necessary in certain situations.

Affected are all cc-classes and their derivates.
Some classes must or can be adapted later. The function is
not currently restricted, because usage of parent parameter is not explicit
defined in constructors, see CImageInfo, here yet are used addCCItem()
methodes.

Generally this parameter is located in the constructors before bool has_shadow,
but it is not sure whether it would be better to use this parameter as the first.
That remains to be clarified.


Origin commit data
------------------
Commit: 23d7b62cf0
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-03-03 (Mon, 03 Mar 2014)
2014-03-03 09:43:39 +01:00
Thilo Graf
c9d2e43271 CComponents: replace __FUNCTION__ with __func__
__func__ is more suitable for portability


Origin commit data
------------------
Commit: 8442b39c28
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-12-15 (Sun, 15 Dec 2013)
2013-12-18 15:13:19 +01:00
[CST] Focus
d1a54573ae components: cleanup destructors - remove calls to functions,
already called inside base classes destructors


Origin commit data
------------------
Commit: dd7c7fc7ae
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-29 (Fri, 29 Nov 2013)
2013-11-29 17:27:10 +04:00
[CST] Focus
ea03f3c7a5 components: remove initVarBasic and initVarItem calls from derived classes
Origin commit data
------------------
Commit: 93a326e9eb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-27 (Wed, 27 Nov 2013)
2013-11-29 17:27:10 +04:00
Thilo Graf
1f85322357 CComponents: add property to allow/disallow paint of items
This causes initialization of all properties, but
affects the behavior of item paint.
This can be understood as a counterpart to isPainted().


Origin commit data
------------------
Commit: 8ae491a994
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-11-08 (Fri, 08 Nov 2013)
2013-11-11 00:19:48 +01:00
Thilo Graf
3e2fe115de CComponentsExtTextForm: add new class CComponentsExtTextForm
this provides a combining form, that contains a text object with label


Origin commit data
------------------
Commit: d8514b19ee
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-11-01 (Fri, 01 Nov 2013)
2013-11-11 00:19:46 +01:00
Thilo Graf
5f9bb84b28 revert 2649ca147a
Was bad idea to rename. Other Classes can also inherit this. See CMenuTarget


Origin commit data
------------------
Commit: 6dd1da0628
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-25 (Fri, 25 Oct 2013)
2013-10-26 23:25:59 +02:00
Thilo Graf
2649ca147a CComponents: rename hide() to hideCC()
There are too many name conflicts with hide-members in other classes.


Origin commit data
------------------
Commit: 6ee7fac1a5
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-24 (Thu, 24 Oct 2013)
2013-10-24 21:39:04 +02:00
Michael Liebmann
158a943771 CComponentsText: Add function getTextLinesAutoHeight()
- Function is used for determine the number of lines
 in a text box in AUTO_HIGH mode.

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


Origin commit data
------------------
Commit: ad630c5acb
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-10-23 (Wed, 23 Oct 2013)

Origin message was:
------------------
CComponentsText: Add function getTextLinesAutoHeight()

- Function is used for determine the number of lines
 in a text box in AUTO_HIGH mode.

Signed-off-by: Thilo Graf <dbt@novatux.de>
2013-10-24 21:19:07 +02:00
Thilo Graf
90325927de CComponentsText: use separated function to get text fro a file
Origin commit data
------------------
Commit: a1e5a60184
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-19 (Sat, 19 Oct 2013)
2013-10-19 01:25:22 +02:00
Thilo Graf
fea58b1071 CComponentsText: add missing init in constructor
Origin commit data
------------------
Commit: 2c3b86baa2
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-07-21 (Sun, 21 Jul 2013)
2013-07-21 22:31:10 +02:00
Thilo Graf
feda180ec0 CComponentsText: do also paint text on changed text color
Origin commit data
------------------
Commit: 2cffcf53a3
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-07-20 (Sat, 20 Jul 2013)
2013-07-21 22:05:07 +02:00
Thilo Graf
510240d2b8 CComponentsText: try to use an inherited version of CBox class
It's a partial solution to use full functionality for size handling
of CTextBox in CComponentsText.


Origin commit data
------------------
Commit: a6c43a62bd
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-07-12 (Fri, 12 Jul 2013)
2013-07-21 22:02:43 +02:00
Thilo Graf
e341b576f5 CComponentsText: remove delete of CBox() object
Obtain of one instance of CBox() should working
just as like a new instance.


Origin commit data
------------------
Commit: 25c40a63dd
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-07-07 (Sun, 07 Jul 2013)
2013-07-21 22:02:33 +02:00
Michael Liebmann
7b6498d39f Replace color indexes of the text colors by real color values for RenderString()
- If necessary, Correct data types of the color values


Origin commit data
------------------
Commit: c60c5c5ce3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-11 (Thu, 11 Jul 2013)
2013-07-21 22:00:58 +02:00
FlatTV
43a759358d CTextBox: expand parameters of member setTextBorderWidth()
This allows to use different horizontal and vertical width of borders
in text boxes.

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


Origin commit data
------------------
Commit: 153d2f3c78
Author: FlatTV <FlatTV@gmx.de>
Date: 2013-07-01 (Mon, 01 Jul 2013)
2013-07-07 14:24:02 +02:00
Thilo Graf
8db24d0ab1 CComponentsText: fix position handling in sub forms
Origin commit data
------------------
Commit: 940576f0a0
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)
2013-06-16 00:34:07 +02:00
Michael Liebmann
09355f643a CTextBox: Remove workaround for minimally text_border_width
- Default value is now 1 in CComponentsText


Origin commit data
------------------
Commit: ba1e514747
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-12 (Wed, 12 Jun 2013)
2013-06-12 01:32:24 +02:00
FlatTV
6b933134f1 CComponentsText: add possibility to set a text border
Origin commit data
------------------
Commit: 96da2f95b8
Author: FlatTV <FlatTV@gmx.de>
Date: 2013-06-06 (Thu, 06 Jun 2013)

Origin message was:
------------------
- CComponentsText: add possibility to set a text border
2013-06-06 22:08:46 +02:00
vanhofen
0f01c062ea cc_frm_header: rework positions/dimensions calculations
Origin commit data
------------------
Commit: b318c15895
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-30 (Thu, 30 May 2013)

Origin message was:
------------------
- cc_frm_header: rework positions/dimensions calculations
2013-05-30 21:51:12 +02:00
Thilo Graf
941295e048 CComponents: split some header files
CComponentsInfoBox
CComponentsShapeCircle/Square
CComponentsDetailLine
CComponentsPIP
CComponentsText/CComponentsLabel
CComponentsPicture


Origin commit data
------------------
Commit: d39eaa22fc
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-05-26 (Sun, 26 May 2013)
2013-05-27 09:30:50 +02:00
Thilo Graf
26547cb786 CComponentsText: force text paint after hide
After hide()it was not possible to paint text without forceTextPaint()
and define of ct_old_text in setText() was not enough.


Origin commit data
------------------
Commit: 76a2c44014
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-27 (Sat, 27 Apr 2013)
2013-04-28 16:48:11 +02:00