Commit Graph

97 Commits

Author SHA1 Message Date
Thilo Graf
c68fe9024e CComponentsHeader: rework and simplified logo handling
This should fix some issues with possible overlapps
of logos with title. With some Conditions with text
alignment on the right side needs a fix.
There is an issue with size and position of text object, but is stll not
used at the moment. For all other conditions of logo and text alignments now
it should be not a problem (I hope) and have more code clarity.


Origin commit data
------------------
Commit: 356719cf3a
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-02 (Wed, 02 Aug 2017)
2017-08-08 14:25:12 +02:00
vanhofen
0c076425eb cc_frm_header: remove CComponentsHeaderLocalized() subclass
use another constructor of CComponentsHeader() instead

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

Good idea, this I had already in mind too.


Origin commit data
------------------
Commit: 980e293517
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-21 (Wed, 21 Jun 2017)

Origin message was:
------------------
- cc_frm_header: remove CComponentsHeaderLocalized() subclass

use another constructor of CComponentsHeader() instead

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

Good idea, this I had already in mind too.
2017-06-21 10:31:22 +02:00
Thilo Graf
7068900ab9 CComponentsHeader: fix corner type comparison
Origin commit data
------------------
Commit: f46a174155
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-16 (Fri, 16 Jun 2017)
2017-06-16 10:10:48 +02:00
Thilo Graf
5d3a4c402b CComponentsHeader: ensure reset of icon object
Origin commit data
------------------
Commit: 1f8007c50c
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-27 (Sat, 27 May 2017)
2017-05-27 02:51:36 +02:00
Thilo Graf
653c5af07c cc_frm_header.cpp/h: remove CTextBox types for title allignment
Title object has only width of current text content. This causes CTextBox
types have not a really visible effect. Now we have only three align types for title
and these are related to cc-text object position.

Involved classes adjusted too.


Origin commit data
------------------
Commit: 942a27e3ef
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-11 (Thu, 11 May 2017)
2017-05-11 12:15:16 +02:00
Thilo Graf
e2fce7a702 CComponentsHeader: fix brace error
suggest explicit braces to avoid ambiguous ‘else’


Origin commit data
------------------
Commit: 1b2f1d320d
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-11 (Thu, 11 May 2017)
2017-05-11 08:39:20 +02:00
Thilo Graf
908e23005d CComponentsHeader: Try to adopt different logo/title alignments
Not all constellations are tested. Please report.


Origin commit data
------------------
Commit: 5b541571f9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-10 (Wed, 10 May 2017)
2017-05-10 10:42:08 +02:00
Thilo Graf
8d11ff178f CComponentsHeader: fix centering of header title
Origin commit data
------------------
Commit: 178bf6f596
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-10 (Wed, 10 May 2017)
2017-05-10 10:42:08 +02:00
Thilo Graf
83784f3cd4 CComponentsHeader: remove double text color assignment
Origin commit data
------------------
Commit: c320dbf8ec
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-10 (Wed, 10 May 2017)
2017-05-10 10:42:08 +02:00
Thilo Graf
783d2efe04 CComponentsHeader: fix order of width calculation
Required for following position calculation


Origin commit data
------------------
Commit: 107db09299
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-10 (Wed, 10 May 2017)
2017-05-10 10:42:08 +02:00
Thilo Graf
639a56b845 CComponentsHeader: optimize logo size/position handling
Prevent oversized paint with stupid screen and/or font size settings


Origin commit data
------------------
Commit: 18fb99688c
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-03 (Wed, 03 May 2017)
2017-05-03 21:29:41 +02:00
Thilo Graf
fd43f9e123 Revert "-cc_form_header: add max caption width"
This reverts commit 9bbc06f3ae.


Origin commit data
------------------
Commit: cb02d6253d
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-03 (Wed, 03 May 2017)
2017-05-03 21:29:41 +02:00
TangoCash
9bbc06f3ae cc_form_header: add max caption width
picked from:	https://github.com/TangoCash/neutrino-mp-cst-next
commit:	4ff6c9f89b194c5fffdc4ee4e4eb744829be975f

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


Origin commit data
------------------
Commit: c482dd139f
Author: TangoCash <eric@loxat.de>
Date: 2017-05-01 (Mon, 01 May 2017)

Origin message was:
------------------
-cc_form_header: add max caption width

picked from:	https://github.com/TangoCash/neutrino-mp-cst-next
commit:	4ff6c9f89b194c5fffdc4ee4e4eb744829be975f

Signed-off-by: Thilo Graf <dbt@novatux.de>
review reqiured
2017-05-02 21:07:59 +02:00
Thilo Graf
5092893334 CComponentsHeader: adjust context button offset
Origin commit data
------------------
Commit: c8326af0df
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-29 (Sat, 29 Apr 2017)
2017-04-29 18:00:03 +02:00
Thilo Graf
84b4032c9a CComponentsHeader: rectification for 'optimize auto size mode for logos'
see commit: 35f867b611

Additional variable was required.
Values were overwritten and had no effect.


Origin commit data
------------------
Commit: 71606d0860
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-27 (Thu, 27 Apr 2017)
2017-04-27 09:27:45 +02:00
Thilo Graf
8ec580d8a6 CComponentsHeader: fix logo position with clock
This reverts "fix logo position with clock",
commit 9a6fed158c.
Was not the right way.

Id's are not in visual order, therefore it's better to calculate direct
with the ''width"" properties of possible following items clock
and context buttons.


Origin commit data
------------------
Commit: c2bc8b4f8f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-26 (Wed, 26 Apr 2017)
2017-04-26 12:24:21 +02:00
Jacek Jendrzej
9a6fed158c fix logo position with clock
Origin commit data
------------------
Commit: b696007ec8
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-04-25 (Tue, 25 Apr 2017)
2017-04-25 16:38:47 +02:00
Thilo Graf
35f867b611 CComponentsHeader: optimize auto size mode for logos
With very large font size settings it is possible
that header is too large for reasonable display of logos, because of
possible bad upscale effects (eg. step effects).
So it seems it's better to use original size as largest possible size.


Origin commit data
------------------
Commit: 76cd93555d
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-25 (Tue, 25 Apr 2017)
2017-04-25 11:38:30 +02:00
Thilo Graf
0093ff1d3c CComponentsHeader: unifiy init value for logo align
Origin commit data
------------------
Commit: 220829ffaa
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-24 (Mon, 24 Apr 2017)
2017-04-25 11:36:49 +02:00
Thilo Graf
c9f16f1b30 CComponentsHeader: use previous offset to fit logo
Was OFFSET_INNER_MIN in older versions, not OFFSET_INNER_SMALL.


Origin commit data
------------------
Commit: 330171c90b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-23 (Sun, 23 Apr 2017)
2017-04-23 17:01:15 +02:00
Thilo Graf
e04455c5d5 CComponentsHeader: add fallback if title and logo are overlapping
Logo is now general centered on screen, not as before between title and clock


Origin commit data
------------------
Commit: 1413f296ae
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-23 (Sun, 23 Apr 2017)
2017-04-23 17:01:08 +02:00
Thilo Graf
100032e7d4 CComponentsHeader: add possibility to show channellogo
Contains methode setChannelLogo() with parameters
for channel id, channel name and optional
alignment (primary between title and clock). Default
alignment is centered.
Optional parameter to set logo height is available too.

Hope it works on first try. To see how it works, take look
at channellist class.


Origin commit data
------------------
Commit: 68835056c3
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-21 (Fri, 21 Apr 2017)
2017-04-21 22:47:23 +02:00
Thilo Graf
191bb586b6 CComponentsFrmClock: remove unnecessary call of cch_cl_obj->setYPos()
Origin commit data
------------------
Commit: cbba7b78f4
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-17 (Mon, 17 Apr 2017)
2017-04-17 16:44:57 +02:00
Thilo Graf
87ecc7a58d CComponentsHeader: Reduce offset between clock and right border.
Was too large


Origin commit data
------------------
Commit: 42db55e61d
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-17 (Mon, 17 Apr 2017)
2017-04-17 16:44:53 +02:00
Thilo Graf
abdf32c639 CComponentsHeader: add methode initRepaintSlot() and considered parent
Required in sub classes. Considering of parent ensures usage of
required background color in sub classes.


Origin commit data
------------------
Commit: 3e342a7661
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-07 (Fri, 07 Apr 2017)
2017-04-08 08:16:01 +02:00
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
b0295112ba Forms/header/clock: implement slot into OnBeforeRePaint
Origin commit data
------------------
Commit: 1c217b404f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)
2017-02-02 11:18:27 +01:00
Thilo Graf
93cfff7d2d CComponentsHeader: add missing paramters to kill methode
Origin commit data
------------------
Commit: ba9284fba7
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-24 (Tue, 24 Jan 2017)
2017-01-31 16:36:42 +01:00
Thilo Graf
3bb81b5b73 CComponentsForm: add some usefull slots/signal to help paint backgrounds
Requried to paint form items only on changed contents and on repaint


Origin commit data
------------------
Commit: 5c8aa90e01
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-24 (Tue, 24 Jan 2017)
2017-01-31 16:36:41 +01:00
Thilo Graf
2748077074 Experimental try to rework isPainted()
Origin commit data
------------------
Commit: 26eb4d079b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-19 (Thu, 19 Jan 2017)
2017-01-31 16:36:41 +01:00
Thilo Graf
92d570b18d CComponentsHeader: fix order inside overloaded methode setCaption()
Stop() was never touched with string version of setCaption()


Origin commit data
------------------
Commit: 58316d2091
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-21 (Sat, 21 Jan 2017)
2017-01-31 16:36:40 +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
Thilo Graf
64e72db3a4 CComponentsHeader: declare l_font, s_font as global
Useful for init in header sub classes. So its possible to use
other prefined size mode fonts


Origin commit data
------------------
Commit: 4cdae3fdf6
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-27 (Tue, 27 Dec 2016)
2016-12-30 20:33:26 +01:00
Jacek Jendrzej
542feb926c some dead assignment
Origin commit data
------------------
Commit: c0564ec574
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-12-29 (Thu, 29 Dec 2016)
2016-12-29 18:51:06 +01:00
Thilo Graf
3069495033 CComponentsHeader: ensure to have correct font instances after changed font
On possible changed font settings, font objects can be invalid and
we have a crash. With this fix it's possible, that
CNeutrinoApp::setupFont() method clean up header font object itself.


Origin commit data
------------------
Commit: 239496c207
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-18 (Sun, 18 Dec 2016)
2016-12-18 20:30:41 +01:00
Thilo Graf
c36053860a CComponentsHeader: fix font and height handling
Font was not changeable. setCaptionFont() was without effect.


Origin commit data
------------------
Commit: ab8aa77687
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-14 (Wed, 14 Dec 2016)
2016-12-14 16:21:15 +01:00
vanhofen
8f55c83ce0 rename BUTTON_TOP to BUTTON_UP; it isn't a top-button
Origin commit data
------------------
Commit: 0dc0789de8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)

Origin message was:
------------------
- rename BUTTON_TOP to BUTTON_UP; it isn't a top-button
2016-12-07 15:37:03 +01:00
vanhofen
317c73efcc cc_frm_header: show left button before the right one
Origin commit data
------------------
Commit: 3d78174b8f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)

Origin message was:
------------------
- cc_frm_header: show left button before the right one
2016-12-07 15:24:45 +01:00
vanhofen
3449a434d4 cc_frm_header: use OFFSET define
Origin commit data
------------------
Commit: 15e24a3e66
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- cc_frm_header: use OFFSET define
2016-11-07 21:08:51 +01: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
3f514865ac CComponentsHeader: ensure clean object on reinit
Items were destroyed with simple call of delete
but not removed from item collection.
removeCCItem() does this and destroys item objects too.


Origin commit data
------------------
Commit: b205b0c8d0
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-09-24 (Sat, 24 Sep 2016)
2016-09-24 01:09:41 +02:00
Thilo Graf
ab825c08da CComponentsHeader: don't use default parameters for privat member
Unified adaptation related to child class ComponentsFooter.
see: 5a24dc1ce5


Origin commit data
------------------
Commit: 731cb9c66d
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-30 (Tue, 30 Aug 2016)
2016-08-30 11:19:48 +02:00
Thilo Graf
1af0174ac4 CComponentsHeader: remove reassigned col_body vars
Origin commit data
------------------
Commit: 8500648b7f
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-02-17 (Wed, 17 Feb 2016)
2016-02-17 11:42:29 +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
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
vanhofen
835a2611aa cc_frm_header: prepare for c2c gradient
Origin commit data
------------------
Commit: c05e650a02
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-04 (Mon, 04 May 2015)

Origin message was:
------------------
- cc_frm_header: 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