Commit Graph

66 Commits

Author SHA1 Message Date
Thilo Graf
234d1d785f cc: expand cc-type with name
Required for internal operations where it is useful to have object
names and for better debugging.


Origin commit data
------------------
Commit: fd55de0ff4
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)
2018-01-03 22:35:01 +01:00
Thilo Graf
4f19bd2aba CComponentsPicture: remove benchmark lines
Was only for debugging.


Origin commit data
------------------
Commit: f07a27825d
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
2017-08-28 12:16:45 +02:00
Thilo Graf
beac8c69aa CComponentsPicture: add methode to get real image size
Origin commit data
------------------
Commit: 0aae491ccc
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-25 (Tue, 25 Apr 2017)
2017-04-25 11:38:30 +02:00
Thilo Graf
984728a11c CComponentsPicture: Change order of called base methodes setWidth/Height
Calls of base methods should come after internal method calls.
Values could be changed unintentionally.


Origin commit data
------------------
Commit: ed5e79440a
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-21 (Fri, 21 Apr 2017)
2017-04-21 22:47:23 +02:00
Thilo Graf
eca35b1bcb CComponentsPicture: add explicit methodes to set image position
Origin commit data
------------------
Commit: 5361296ff4
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-16 (Sun, 16 Apr 2017)
2017-04-16 16:53:06 +02:00
Thilo Graf
a0f75e05e5 CComponentsPicture: init missing vars for old dimension dimensions
Origin commit data
------------------
Commit: f499d3d387
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-16 (Sun, 16 Apr 2017)
2017-04-16 16:53:06 +02:00
Thilo Graf
f00b4d78cb CComponentsChannelLogo: use separat var for pic name inside setChannel()
picname is a class attribut and should not be touched here till new content
exists. Btw. setChannel() is eqiuvalent to setPicture() from base class, so
it makes sense to use setPicture() inside setChannel() after
picname is known. Explicit call of initCCTitem() is not required.


Origin commit data
------------------
Commit: 29a01bd2d8
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-16 (Sun, 16 Apr 2017)
2017-04-16 16:53:06 +02:00
Thilo Graf
302fd7bc86 CComponentsChannelLogo: add missing type
Origin commit data
------------------
Commit: f4762f78a5
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-16 (Sun, 16 Apr 2017)
2017-04-16 16:53:06 +02:00
Stefan Seyfried
ee986e0e2f remove hardware specific code from gui
Use the framebuffer's getWidth4FB_HW_ACC() instead of system/helpers.
The use in cc_item_picture was guarded by a hardware #ifdef, use
needAlign4Blit() instead.

This needs testing on the affected hardware, which I do not have :-)


Origin commit data
------------------
Commit: c9e1072b94
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-14 (Tue, 14 Feb 2017)
2017-02-14 20:01:55 +01:00
Michael Liebmann
3b018febe6 Merge branch 'master' into pu/fb-modules
Origin commit data
------------------
Commit: 0cb26e6e98
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)
2017-02-12 09:24:08 +01:00
Michael Liebmann
7e9107c8a8 neutrino: Rename hardware defined macros for coolstream stb
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2


Origin commit data
------------------
Commit: 0d66899cbd
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
neutrino: Rename hardware defined macros for coolstream stb

 BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2
2017-02-12 09:21:04 +01:00
Stefan Seyfried
f8d62bdf40 reduce impact of driver/pictureviewer.h header file
before, more than 175 files depended on it, now it's about 35


Origin commit data
------------------
Commit: 47b1a8b642
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-06 (Mon, 06 Feb 2017)
2017-02-07 18:38:45 +01:00
Jacek Jendrzej
794fb2d032 some inits
Origin commit data
------------------
Commit: 0056a53321
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-01-30 (Mon, 30 Jan 2017)
2017-01-30 19:04:17 +01:00
Jacek Jendrzej
c30af8edf8 some inits
Origin commit data
------------------
Commit: f4f351e9ba
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-01-30 (Mon, 30 Jan 2017)
2017-01-30 17:22:41 +01:00
Thilo Graf
c35d8b0c26 CCDraw: add function for blink effect for cc items
NOTE: experimental, for examples see CTestMenu class


Origin commit data
------------------
Commit: 717dec02c5
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)
2016-11-20 14:09:19 +01:00
Thilo Graf
d9b71722a5 Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Commit: 5394f4b2e1
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
2016-11-12 22:31:11 +01:00
vanhofen
9533a9ba4e cc_item_picture: reset keep_aspect variables after use
Origin commit data
------------------
Commit: 73b97ecd4d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)

Origin message was:
------------------
- cc_item_picture: reset keep_aspect variables after use
2016-11-12 22:00:12 +01:00
Thilo Graf
5d9e739abf Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Commit: 9b9d2542e6
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-28 (Fri, 28 Oct 2016)
2016-10-28 08:05:34 +02:00
vanhofen
7764cfac0a cc_item_picture: fix wrong operator in width calculation
Origin commit data
------------------
Commit: 874f54af4b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-27 (Thu, 27 Oct 2016)

Origin message was:
------------------
- cc_item_picture: fix wrong operator in width calculation
2016-10-27 23:11:43 +02:00
Thilo Graf
fcb732f839 CComponentsPicture: use body color as default clean up color
Origin commit data
------------------
Commit: 9668f89db1
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-05 (Wed, 05 Oct 2016)
2016-10-24 10:31:26 +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
vanhofen
f21851aec0 rename SHADOW_OFFSET -> OFFSET_SHADOW
Origin commit data
------------------
Commit: 5d450c60d3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- rename SHADOW_OFFSET -> OFFSET_SHADOW
2016-10-10 14:19:55 +02:00
Thilo Graf
3fd0290be3 CComponentsChannelLogo: rework logic of inital statement in setChannel()
This should fix missing logos on existant chnannellogo instances.
For example, this was to see if user has opened eventlist and
opens timerlist with button '0'. After closed timerlist logos were lost.


Origin commit data
------------------
Commit: 69ab25e111
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-06-02 (Thu, 02 Jun 2016)
2016-06-02 16:48:35 +02:00
Jacek Jendrzej
c1aa2509a3 avoid division by zero and fix segfault
Origin commit data
------------------
Commit: 9f20b27890
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-05-23 (Mon, 23 May 2016)
2016-05-23 14:17:25 +02:00
Thilo Graf
f2890c0051 CComponentsPicture: allow image cache only for scaled images
Origin commit data
------------------
Commit: 8be980b621
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-02-16 (Tue, 16 Feb 2016)
2016-02-16 10:29:06 +01:00
Thilo Graf
862b4cec54 CComponentsPicture: move resize to end of methode
Origin commit data
------------------
Commit: 96f9eaf287
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-02-08 (Mon, 08 Feb 2016)
2016-02-16 10:28:57 +01:00
Thilo Graf
486cc04a53 CComponentsPicture: add more comments an debug lines, remove useless init
Origin commit data
------------------
Commit: 7ed5b5b886
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-02-07 (Sun, 07 Feb 2016)
2016-02-16 10:28:05 +01:00
Thilo Graf
bcbd30325d CComponentsPicture: try to rework init behavior inside object
need_init var shoul help to avoid not required inits.
Size of cached image are packed into own vars, should avoid possible
overwriting with current dimensions.


Origin commit data
------------------
Commit: 93777853f0
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-02-05 (Fri, 05 Feb 2016)
2016-02-16 10:27:50 +01:00
Thilo Graf
e57763b959 CComponentsPicture: add some debug messages to track caching
Origin commit data
------------------
Commit: 82e2a168f1
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-02-03 (Wed, 03 Feb 2016)
2016-02-16 10:22:48 +01:00
Thilo Graf
7bcb7eb06c CComponentsPicture: ensure cache cleanup on missing image while runtime
Origin commit data
------------------
Commit: 9e4ad83305
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-31 (Sun, 31 Jan 2016)
2016-02-16 10:22:33 +01:00
Michael Liebmann
1db2e30241 CComponentsPicture: Align pictures at 4 byte boundary...
...for hw blit on apollo/kronos hardware


Origin commit data
------------------
Commit: 346b28556f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-26 (Tue, 26 Jan 2016)
2016-01-26 09:51:48 +01:00
Thilo Graf
eb98cfb3ee CComponentsPicture: fix missing dimension values on wrong image location
In some constellations we can't get dimensions from getIconSize(),
so it is useful to fall back to g_PicViewer->getSize().

Cache cleanup removed, can be done at runtime if required.


Origin commit data
------------------
Commit: 0c67739074
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-19 (Tue, 19 Jan 2016)
2016-01-19 15:33:05 +01:00
Stefan Seyfried
ad28aac339 fix debug output printf type warnings
Origin commit data
------------------
Commit: fa05d6a415
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-28 (Mon, 28 Dec 2015)
2016-01-14 22:28:59 +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
bc4a8cc364 CComponentsPicture: fix and simplify image scale handling
Aspect ratio was not considered in some constallations, To see on button
icons and oversized custom channellogos in channllist.
Now this is handeled on init of image object and setters for width and height.


Origin commit data
------------------
Commit: 53a350d5af
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-07-11 (Sat, 11 Jul 2015)
2015-07-17 15:35:18 +02:00
Thilo Graf
37dd574464 CComponentsPicture: fix internal value for dimension vars
The values contained not values from the scaled image file.


Origin commit data
------------------
Commit: 5e380fa4f8
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-06-30 (Tue, 30 Jun 2015)
2015-07-01 15:56:42 +02:00
Thilo Graf
a828999513 CComponentsPicture: fix icon size/scale handling
Origin commit data
------------------
Commit: e8d46a8a55
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-01-14 (Wed, 14 Jan 2015)
2015-03-29 22:40:07 +02:00
Thilo Graf
02e7e4a685 CComponentsPicture: don't paint image, if is not available
Origin commit data
------------------
Commit: 8929255e9e
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-10-30 (Thu, 30 Oct 2014)
2015-03-29 22:39:54 +02:00
Thilo Graf
0e7495bde4 CComponentsPicture: simplify item init, adapt getHeight/getWidth members
Members getHeight/getWidth returns now image related values dependent of
scale mode


Origin commit data
------------------
Commit: 8227638c06
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-10-12 (Sun, 12 Oct 2014)
2015-03-29 22:39:53 +02:00
Thilo Graf
a82a5a972b CComponentsPicture: rework scale behavior
Scaling mode not longer only dependent from image name.
Now also evaluated parameters.
Image objects with defined dimensions will be scaled.
Icons without defined path and file type, will be scaled as before.


Origin commit data
------------------
Commit: f75f0ed6e3
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-10-07 (Tue, 07 Oct 2014)
2014-10-08 14:14:29 +04:00
Michael Liebmann
1376d2c518 CComponentsPicture: Add parameter 'transparent'...
...to set the transparency of pictures

- Set default transparency for CComponentsChannelLogo to
 CFrameBuffer::TM_BLACK
 (Transparency when black content -> 'pseudo' transparency)

- Set default transparency for CComponentsPicture to
 CFrameBuffer::TM_NONE (No 'pseudo' transparency)


Origin commit data
------------------
Commit: a182fca81f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-07-10 (Thu, 10 Jul 2014)

Origin message was:
------------------
CComponentsPicture: Add parameter 'transparent'...

...to set the transparency of pictures

- Set default transparency for CComponentsChannelLogo to
 CFrameBuffer::TM_BLACK
 (Transparency when black content -> 'pseudo' transparency)

- Set default transparency for CComponentsPicture to
 CFrameBuffer::TM_NONE (No 'pseudo' transparency)
2014-07-10 16:38:09 +02:00
Michael Liebmann
2811ab583b CComponentsChannelLogo: disable paint of logo background, it's not required here
- Fix calculation of logo width & height


Origin commit data
------------------
Commit: 3d805054f4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-06-28 (Sat, 28 Jun 2014)
2014-06-29 13:25:32 +02:00
Thilo Graf
60455587be CComponentsPicture: use current instance of CPictureViewer
reduce precautionary too much unnecessary impact


Origin commit data
------------------
Commit: e6f6931b72
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-06-25 (Wed, 25 Jun 2014)
2014-06-27 20:38:59 +02:00
Thilo Graf
46495cbf40 CComponentsPicture: structure of class highly simplified
It should be now easier to use images as objects. An initialized
picture object should provide all relevant properties and some
functionalities of picture viewer.


Origin commit data
------------------
Commit: 5eb63b9515
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-06-20 (Fri, 20 Jun 2014)

Origin message was:
------------------
CComponentsPicture: structure of class highly simplified

It should be now easier to use images as objects. An initialized
picture object should provide all relevant properties and some
functionalities of picture viewer.
2014-06-23 18:43:47 +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
20782a486c CComponentsInfoBox, CComponentsPicture: add overloaded members setPicture()
Origin commit data
------------------
Commit: c34f25bb7d
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-02-26 (Wed, 26 Feb 2014)
2014-03-03 08:54:09 +01:00
Thilo Graf
1b4e545c5d CComponentsPicture: fix item position
x/y position was not assigned here for internal pic_x/pic_y vars.
Therefore x/y was ignored.


Origin commit data
------------------
Commit: 27c6bdccaf
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-02-14 (Fri, 14 Feb 2014)
2014-02-16 19:11:38 +01:00
Thilo Graf
6327804c8a CComponentsPicture: add debug output for handled item dimensions and pos
Origin commit data
------------------
Commit: 14a3546b5f
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-02-03 (Mon, 03 Feb 2014)
2014-02-05 11:56:48 +01:00
Thilo Graf
83afb37b11 CComponentsPicture: rework constructors, clean ups
Origin commit data
------------------
Commit: 34fcdec276
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-02-03 (Mon, 03 Feb 2014)
2014-02-05 11:56:48 +01:00