Commit Graph

45 Commits

Author SHA1 Message Date
vanhofen
087e90e83f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a32d348e32
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-28 12:40:40 +02:00
Thilo Graf
ba35604b8d comments: fix copy paste errors
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e310a8157
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-28 12:16:45 +02:00
vanhofen
aa022d1ee4 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fb_generic.cpp
	src/gui/components/cc_frm_header.h
	src/gui/osd_setup.cpp
	src/gui/themes.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 644a634f3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-08 (Tue, 08 Aug 2017)



------------------
This commit was generated by Migit
2017-08-08 15:54:12 +02:00
Thilo Graf
af5abcccf9 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
------------------
Branch: ni/coolstream
Commit: 356719cf3a
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-02 (Wed, 02 Aug 2017)



------------------
This commit was generated by Migit
2017-08-08 14:25:12 +02:00
vanhofen
0449efa2d3 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
------------------
Branch: ni/coolstream
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.


------------------
This commit was generated by Migit
2017-06-21 10:31:22 +02:00
vanhofen
4b7badf315 cc_frm_header: remove CComponentsHeaderLocalized() subclass
use another constructor of CComponentsHeader() instead


Origin commit data
------------------
Branch: ni/coolstream
Commit: 92ceac6a5d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-20 (Tue, 20 Jun 2017)

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

use another constructor of CComponentsHeader() instead


------------------
This commit was generated by Migit
2017-06-20 15:55:42 +02:00
gixxpunk
1dc592af4c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 43bdc2be1c
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-06-16 (Fri, 16 Jun 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-06-16 13:13:03 +02:00
Thilo Graf
1ba0a9b971 CCDraw: precise function for kill handler
This should fix possible artefacts or holes in some rendered boxes.
Was especially striking at HD1 Hardware.
e.g. was observed while right/left switching on channel list at header
and without rounded corners and at certain footers.


Origin commit data
------------------
Branch: ni/coolstream
Commit: ef4467b6da
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-16 (Fri, 16 Jun 2017)



------------------
This commit was generated by Migit
2017-06-16 11:49:32 +02:00
vanhofen
8e6aebc8d4 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/icons/headers/pictureviewer.png
	data/locale/english.locale
	src/global.h
	src/gui/components/cc_frm_footer.h
	src/gui/eventlist.cpp
	src/gui/pictureviewer.cpp
	src/gui/widget/icons.h
	src/gui/widget/menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a8ef409ff6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)



------------------
This commit was generated by Migit
2017-06-15 10:37:41 +02:00
Thilo Graf
48e82d6dac CComponentsHeader: remove virtual declararion from getClockObject()
Not required.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 86af640fae
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
CComponentsHeader: remove virtual declararion from getClockObject()

Not required.


------------------
This commit was generated by Migit
2017-06-15 01:01:54 +02:00
vanhofen
8ddf219272 cc_frm_header.h: change default logo alignment; center => right
Origin commit data
------------------
Branch: ni/coolstream
Commit: 19e1f370df
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)

Origin message was:
------------------
- cc_frm_header.h: change default logo alignment; center => right

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-05-23 17:58:53 +02:00
Thilo Graf
064b2cc588 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
------------------
Branch: ni/coolstream
Commit: 942a27e3ef
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-11 (Thu, 11 May 2017)



------------------
This commit was generated by Migit
2017-05-11 12:15:16 +02:00
Thilo Graf
ff1c39231f Revert "-cc_form_header: add max caption width"
This reverts commit 90226e9a46.


Origin commit data
------------------
Branch: ni/coolstream
Commit: cb02d6253d
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-03 (Wed, 03 May 2017)



------------------
This commit was generated by Migit
2017-05-03 21:29:41 +02:00
TangoCash
90226e9a46 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
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2017-05-02 21:07:59 +02:00
Thilo Graf
041b5e778b CComponentsForm: add member hideCCItems()
In case of items with cached background it is useful to have
possibility to restore their background. (eg. items are painted
outside of form).


Origin commit data
------------------
Branch: ni/coolstream
Commit: 19fc8c6d3b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-27 (Thu, 27 Apr 2017)



------------------
This commit was generated by Migit
2017-04-27 09:27:45 +02:00
Thilo Graf
415c1cb987 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
------------------
Branch: ni/coolstream
Commit: 76cd93555d
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-25 (Tue, 25 Apr 2017)



------------------
This commit was generated by Migit
2017-04-25 11:38:30 +02:00
Thilo Graf
759ecbb4af CComponentsHeader: unifiy init value for logo align
Origin commit data
------------------
Branch: ni/coolstream
Commit: 220829ffaa
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-24 (Mon, 24 Apr 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-04-25 11:36:49 +02:00
Thilo Graf
425c0b40de CComponentsHeader/CChannelList: unify methode names
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9ef6c49a23
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-21 (Fri, 21 Apr 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-04-21 23:07:14 +02:00
Thilo Graf
7c03858f7c 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
------------------
Branch: ni/coolstream
Commit: 68835056c3
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-21 (Fri, 21 Apr 2017)



------------------
This commit was generated by Migit
2017-04-21 22:47:23 +02:00
Thilo Graf
ae01284ad5 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
------------------
Branch: ni/coolstream
Commit: 3e342a7661
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-07 (Fri, 07 Apr 2017)



------------------
This commit was generated by Migit
2017-04-08 08:16:01 +02:00
Thilo Graf
159c7c57ff CComponentsHeader: add missing paramters to kill methode
Origin commit data
------------------
Branch: ni/coolstream
Commit: ba9284fba7
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-24 (Tue, 24 Jan 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-01-31 16:36:42 +01:00
Thilo Graf
624aaed1a8 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
------------------
Branch: ni/coolstream
Commit: b98319cb91
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)



------------------
This commit was generated by Migit
2016-12-30 20:33:26 +01:00
Thilo Graf
5d53e0bf31 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
------------------
Branch: ni/coolstream
Commit: 4cdae3fdf6
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-27 (Tue, 27 Dec 2016)



------------------
This commit was generated by Migit
2016-12-30 20:33:26 +01:00
Thilo Graf
2fa7e372c6 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
------------------
Branch: ni/coolstream
Commit: 239496c207
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-18 (Sun, 18 Dec 2016)



------------------
This commit was generated by Migit
2016-12-18 20:30:41 +01:00
Thilo Graf
c68b3f340e CComponentsHeader: fix font and height handling
Font was not changeable. setCaptionFont() was without effect.


Origin commit data
------------------
Branch: ni/coolstream
Commit: ab8aa77687
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-14 (Wed, 14 Dec 2016)



------------------
This commit was generated by Migit
2016-12-14 16:21:15 +01:00
vanhofen
5428d87a23 rename BUTTON_TOP to BUTTON_UP; it isn't a top-button
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-12-07 15:37:03 +01:00
vanhofen
9d63f0ecad cc_frm_header: show left button before the right one
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-12-07 15:24:45 +01:00
Thilo Graf
5db54fc647 Try to rework footer
* try to fix enableButtonShadow(), seems an init is missing
* shadow fixed


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e631fd0ce
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-09-24 (Sat, 24 Sep 2016)



------------------
This commit was generated by Migit
2016-10-24 10:31:25 +02:00
vanhofen
5987637998 colors: add COL_FRAME wrapper
Origin commit data
------------------
Branch: ni/coolstream
Commit: 75fe6e407d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- colors: add COL_FRAME wrapper

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 14:19:54 +02:00
Thilo Graf
f59ef7fcf6 CComponentsHeader: don't use default parameters for privat member
Unified adaptation related to child class ComponentsFooter.
see: c7fb4c5343


Origin commit data
------------------
Branch: ni/coolstream
Commit: 731cb9c66d
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-30 (Tue, 30 Aug 2016)



------------------
This commit was generated by Migit
2016-08-30 11:19:48 +02:00
vanhofen
9ed55c28e3 ccomponents: use COL_SHADOW for shadows
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1f60557e0b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-16 (Tue, 16 Aug 2016)

Origin message was:
------------------
- ccomponents: use COL_SHADOW for shadows

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-08-16 08:37:54 +02:00
Thilo Graf
a9aa78ca3e 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
------------------
Branch: ni/coolstream
Commit: 9d72b086a2
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-21 (Thu, 21 Jan 2016)



------------------
This commit was generated by Migit
2016-01-21 11:00:38 +01:00
Thilo Graf
9e3882b7bc 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
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2015-12-27 14:42:27 +01:00
Thilo Graf
9e173b0c7e CComponentsItem: move initBodyGradient() into base class
This provides functinality for all sub classes too


Origin commit data
------------------
Branch: ni/coolstream
Commit: 581405e076
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-09-20 (Sat, 20 Sep 2014)



------------------
This commit was generated by Migit
2014-09-25 11:08:04 +04:00
Thilo Graf
404c0e2b94 CComponents: move variable cc_gradientData, paintGradient into base class
Variable now usable via g_settings in all subclasses. enable/disable.
TODO: gradient type handling


Origin commit data
------------------
Branch: ni/coolstream
Commit: 64c84fb490
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-09-20 (Sat, 20 Sep 2014)



------------------
This commit was generated by Migit
2014-09-25 11:07:45 +04:00
Michael Liebmann
222bea4e5a CComponentsHeader: Use color gradient for paint header
Conflicts:
	src/gui/widget/menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: bfc1c04d83
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-09-20 (Sat, 20 Sep 2014)



------------------
This commit was generated by Migit
2014-09-25 11:07:12 +04:00
Thilo Graf
df4184e39c CComponentsHeader: add methode getCaptionFont()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 556b2cccb2
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-07-15 (Tue, 15 Jul 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-07-18 13:31:22 +04:00
Thilo Graf
54215da9ed CComponentsHeader: add member getContextBtnObject()
Allow access directly to methods and properties of context button object.


Origin commit data
------------------
Branch: ni/coolstream
Commit: bed36eab33
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-05-11 (Sun, 11 May 2014)



------------------
This commit was generated by Migit
2014-05-22 21:50:53 +02:00
Thilo Graf
9fd307969f CComponentsHeader: add icons to button collection for use in headers or footers
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9955fa9203
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-04-24 (Thu, 24 Apr 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-05-22 21:50:42 +02:00
Thilo Graf
06a7414a31 CComponentsHeader: rework context button handling
CComponentsHeader uses now CComponentsIconForm, which is now derived
from CComponentsFrmChain. Some methods should be now simplified and
allow to handle some modifications easier.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6fe7b452c1
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-03-22 (Sat, 22 Mar 2014)



------------------
This commit was generated by Migit
2014-04-02 08:40:21 +02:00
Thilo Graf
7c70aaa6df 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
------------------
Branch: ni/coolstream
Commit: 23d7b62cf0
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-03-03 (Mon, 03 Mar 2014)



------------------
This commit was generated by Migit
2014-03-03 09:43:39 +01:00
Thilo Graf
f83e723ca4 CComponentsHeader/CComponentsFooter: move footer class into its own file
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7151608c8b
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-01-28 (Tue, 28 Jan 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-02-05 11:56:46 +01:00
Thilo Graf
4b79914d57 CComponentsHeader: cleanup
-remove variable userHeight, is not used
-change name of parameter in member initCaptionFont(), "font_name" is not a
 suitable name for a type object.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1838a71c20
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-01-24 (Fri, 24 Jan 2014)



------------------
This commit was generated by Migit
2014-01-24 23:38:25 +01:00
Thilo Graf
9585b49365 CComponentsHeader: rework constructors, add CComponentsHeaderLocalized
Member initVarHeader() now used with parameters, so it's possible
to remove multiple code in constructors, but some class must be
renamed to CComponentsHeaderLocalized.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ea7ec48df
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-01-18 (Sat, 18 Jan 2014)

Origin message was:
------------------
CComponentsHeader: rework constructors, add CComponentsHeaderLocalized

Member initVarHeader() now used with parameters, so it's possible
to remove multiple code in constructors, but some class must be
renamed to CComponentsHeaderLocalized.


------------------
This commit was generated by Migit
2014-01-24 23:09:56 +01:00
Thilo Graf
aa65694193 CComponents: split some header files
Should bring more overview and less susceptibility to conflicts (merge etc)

License texts updated.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 04574fc6eb
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-01-06 (Mon, 06 Jan 2014)



------------------
This commit was generated by Migit
2014-01-06 22:27:59 +01:00