Commit Graph

127 Commits

Author SHA1 Message Date
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
7991e183c5 CComponentsHeader: add missing check for null pointer
Origin commit data
------------------
Commit: 5221769840
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
2017-08-28 12:16:45 +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
Thilo Graf
d646080ee3 CComponentsHeader: disable permanent clock paint on interval.
Origin commit data
------------------
Commit: 8e17eadb6a
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-02 (Wed, 02 Aug 2017)
2017-08-08 14:25:12 +02:00
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
Jacek Jendrzej
da7d2ce50f Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 2ddad19873
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-21 (Wed, 21 Jun 2017)
2017-06-21 13:54:49 +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
Jacek Jendrzej
6eebe6055b Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: a70f3cb025
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-16 (Fri, 16 Jun 2017)
2017-06-16 14:19:26 +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
Jacek Jendrzej
4cfcd65da4 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 05e8d727bd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-28 (Sun, 28 May 2017)
2017-05-28 22:30:05 +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
Jacek Jendrzej
c498d7a32b Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 152c4e3fe4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-11 (Thu, 11 May 2017)
2017-05-11 16:44:05 +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
Jacek Jendrzej
e6f3ee9c94 Merge branch 'master' into pu/mp
except 3e0a8d3ff0 2d4130dab8


Origin commit data
------------------
Commit: fb23ac0126
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-10 (Wed, 10 May 2017)
2017-05-10 15:37:31 +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
Jacek Jendrzej
36e33154a1 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 0b2f2afe01
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-05 (Fri, 05 May 2017)
2017-05-05 13:27:14 +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
Jacek Jendrzej
d41ab9d3e3 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 4ae57d1567
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-02 (Tue, 02 May 2017)
2017-05-02 22:35:18 +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
Jacek Jendrzej
66cf4d88cd Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: d8ba9c822a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-04-29 (Sat, 29 Apr 2017)
2017-04-29 19:03:17 +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
Jacek Jendrzej
ad27563c6a Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 0ef6e3fe98
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-04-27 (Thu, 27 Apr 2017)
2017-04-27 14:27:27 +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
Jacek Jendrzej
650f68d43c Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: de7847f096
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-04-25 (Tue, 25 Apr 2017)
2017-04-25 13:43:33 +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
Jacek Jendrzej
a76208e0a3 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: f292ba6b69
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-04-24 (Mon, 24 Apr 2017)
2017-04-24 21:33:15 +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
vanhofen
486beee495 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 0b2eb4bfb3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-22 (Sat, 22 Apr 2017)
2017-04-22 16:13:02 +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
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
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
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
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
Stefan Seyfried
706a5ba010 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Commit: 8b47699447
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-11 (Sat, 11 Feb 2017)
2017-02-11 11:18:45 +01: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
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
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