Commit Graph

71 Commits

Author SHA1 Message Date
Thilo Graf
801e94d938 Merge branch 'master' into pu/fb-setmode
# Conflicts:
#	src/gui/components/cc_frm_window.h


Origin commit data
------------------
Commit: aaa34d8887
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-11 (Thu, 11 May 2017)
2017-05-11 12:18:38 +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
Michael Liebmann
99c2dfe92f Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: b46f566e2a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-04-17 (Mon, 17 Apr 2017)
2017-04-17 18:12:39 +02:00
Thilo Graf
7af9377262 CComponentsWindow: try to fix header and footer arrangement
Header and footer were placed too much on left side.


Origin commit data
------------------
Commit: e1f51050b2
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-17 (Mon, 17 Apr 2017)
2017-04-17 15:18:45 +02:00
Thilo Graf
8effbfe1cf CComponentsWindow: use negative values for discret percental dimensions
Also add possibility to use placeholder for better readability and
better compatibilty with previous implementations.
See doc in source files for more details


Origin commit data
------------------
Commit: cf9a953b59
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)
2017-03-03 09:22:08 +01:00
Thilo Graf
a0d00bb34d CComponentsWindow: use percentage conversion for dimension values
Dimension values for windows below a certain size are often not really
useful, even with regard to different resolutions.
Usage of percent values could be easier to handle.
In the constructor, the argument values für dimesions must be only
between 1 and 100 to achieve this.

TODO: behavior inside parents


Origin commit data
------------------
Commit: 055fef8b58
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-25 (Sat, 25 Feb 2017)
2017-02-26 21:29:53 +01:00
Jacek Jendrzej
542ba9679a fix uninitialised values
Origin commit data
------------------
Commit: f76dda36df
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-01-29 (Sun, 29 Jan 2017)
2017-01-29 20:54:35 +01:00
Thilo Graf
7072471b76 CComponentsWindow: use FONT_TYPE_BUTTON_TEXT instead FONT_TYPE_MENU_FOOT
Buttton text is not the same like footer text.


Origin commit data
------------------
Commit: 6a3b07152f
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)
2016-12-30 20:33:26 +01:00
Thilo Graf
7fc8a13b2f CComponentsWindow: fix window body color
Color parameter was not passed to body. Parameters in constructor and
setters had no effect.


Origin commit data
------------------
Commit: c1ec746321
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-01 (Thu, 01 Dec 2016)
2016-12-01 22:42:21 +01:00
Thilo Graf
5474e555a8 CComponentsWindow: remove default values from internal init method
Is not really required for this private member.


Origin commit data
------------------
Commit: 4e1a3a89dc
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-23 (Wed, 23 Nov 2016)
2016-11-23 10:04:50 +01:00
Thilo Graf
77f953cdbb CComponentsWindow: prepare possibility to change footer height
Origin commit data
------------------
Commit: 013cd1f2cc
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-14 (Fri, 14 Oct 2016)
2016-10-24 10:31:27 +02:00
Thilo Graf
95ab3ea943 CComponentsWindow: remove wrong corner assignment
Overwrites corner mode for already assigned corner type for body object and
previous statement is canceled. This should avoid this.


Origin commit data
------------------
Commit: f90440e0f1
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-07 (Fri, 07 Oct 2016)
2016-10-07 14:25:59 +02:00
Thilo Graf
e371ec3383 CComponentsWindow: fix possible holes between frame and footer
One line was to much


Origin commit data
------------------
Commit: 90866b232a
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-22 (Mon, 22 Aug 2016)
2016-08-22 21:17:02 +02:00
Thilo Graf
27f527bb45 CComponentsWindow: simplify statements
Origin commit data
------------------
Commit: ca5702acf4
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-21 (Sun, 21 Aug 2016)
2016-08-22 21:16:50 +02:00
Jacek Jendrzej
46b77c77e6 src/gui/components/cc_frm_window.cpp dont paint over screen size
Origin commit data
------------------
Commit: 912017621b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-08-20 (Sat, 20 Aug 2016)
2016-08-20 16:20:16 +02:00
vanhofen
e49ee18fb3 fonts: add and use own font for all footers
Origin commit data
------------------
Commit: 54f2ac510f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)

Origin message was:
------------------
- fonts: add and use own font for all footers
2016-08-15 19:02:42 +02:00
vanhofen
70abfb3339 colors: make footer background color configurable
TODO: footer text color and maybe footer font


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

Origin message was:
------------------
- colors: make footer background color configurable

TODO: footer text color and maybe footer font
2016-08-15 00:14:47 +02:00
vanhofen
78230ead13 colors: some internal renamings
* INFOBAR_SHADOW to SHADOW because it's not only used in infoviewer
* INFOBAR_SHADOW_TEXT to MENUFOOT_TEXT because it's the proper name

This is in preparation to make footer colors configurable


Origin commit data
------------------
Commit: bc39d1e14e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-14 (Sun, 14 Aug 2016)

Origin message was:
------------------
- colors: some internal renamings

* INFOBAR_SHADOW to SHADOW because it's not only used in infoviewer
* INFOBAR_SHADOW_TEXT to MENUFOOT_TEXT because it's the proper name

This is in preparation to make footer colors configurable
2016-08-14 21:55:18 +02:00
Thilo Graf
88622a07b4 CComponentsWindow: change order of items
Add header and footer items as first and body as last item.
Render of items occurs in listed order. So it's better for performance
while render of window.
This is something more advantageously because all other items are
contained inside body. So we avoid possible delay while rendering
of base items. It looks better on screen.


Origin commit data
------------------
Commit: 29d723a97b
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-06-21 (Tue, 21 Jun 2016)

Origin message was:
------------------
CComponentsWindow: change order of items

Add header and footer items as first and body as last item.
Render of items occurs in listed order. So it's better for performance
while render of window.
This is something more advantageously because all other items are
contained inside body. So we avoid possible delay while rendering
of base items. It looks better on screen.
2016-06-26 15:32:36 +02:00
Thilo Graf
338e29a392 CComponentsWindow: try to fix reduce of item height on enabled frame
The lower part of the window frame was always painted over.


Origin commit data
------------------
Commit: 0a1d687b35
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-05-16 (Mon, 16 May 2016)
2016-06-26 15:32:35 +02:00
Thilo Graf
de5cef653c CComponentsWindow: use only body as background
Should provide more performance


Origin commit data
------------------
Commit: 775e5c73a4
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-05-17 (Tue, 17 May 2016)
2016-06-26 15:32:34 +02:00
Thilo Graf
67e645be25 CComponentsWindow: ensure default disable background paint on window
Only basic items should have enabled background paint as default.
Should be better for performance.


Origin commit data
------------------
Commit: 0f64aff1dc
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-02-24 (Wed, 24 Feb 2016)
2016-06-26 15:32:33 +02:00
Thilo Graf
3d71c20504 CComponentsWindow: add member to set button font and use infobar font as default
Origin commit data
------------------
Commit: 74e08ddb50
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-04-07 (Thu, 07 Apr 2016)
2016-04-07 17:29:10 +02:00
Thilo Graf
e55632ee66 CComponentsWindow: fix default header color
Origin commit data
------------------
Commit: 63533b6dbd
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-02-24 (Wed, 24 Feb 2016)
2016-02-26 14:57:05 +01:00
Thilo Graf
306bd00eeb CComponentsWindow: add return value to addWindowCCItem(), fix footer color
- return value of addWindowCCItem() = current id of added body item
- assignment of footer color was missing


Origin commit data
------------------
Commit: 4bd3173d41
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-12-28 (Mon, 28 Dec 2015)
2015-12-28 18:13:21 +01:00
Thilo Graf
751a661d23 CComponentsWindow: add member setWindowHeaderTextColor()
To modifiy header text color.


Origin commit data
------------------
Commit: 7659dd4642
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-11-29 (Sun, 29 Nov 2015)
2015-12-27 14:42:30 +01:00
Thilo Graf
7454ede224 CComponentsWindow: add method to set header color
Origin commit data
------------------
Commit: 8e99559d90
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-11-29 (Sun, 29 Nov 2015)
2015-12-27 14:42:30 +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
def1a3c5b9 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
------------------
Commit: 64c84fb490
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-09-20 (Sat, 20 Sep 2014)
2014-09-25 11:07:45 +04:00
Thilo Graf
68e23a1720 CComponentsWindow, CMenuWidget: apply gradiant settings to header
Origin commit data
------------------
Commit: c1f70dbbb8
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-09-20 (Sat, 20 Sep 2014)
2014-09-25 11:07:28 +04:00
Thilo Graf
91c254dc16 CComponentsForm/CComponentsWindow: add page scroll handling
This provides page scroll with up/down, left/right or combined.
Usage of exec() methods with implemented signals allows a
generic implematation of button or other message handling with
signal/slot solutions.

still to do: page cache


Origin commit data
------------------
Commit: 88ce62ea84
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-09-07 (Sun, 07 Sep 2014)
2014-09-25 11:02:55 +04:00
Thilo Graf
3224594375 CComponents: implement scroll functionality into CComponentsForm
CComponentsForm provides page scroll if found more
than one pre defined page and is working with all derivated sub classes from CComponentsForm .

Pages are defined with setPageNumber(0...n) in items (1st page = 0). The item page number property is
defined in variable cc_page_number. The highest page number sets the
count of pages inside container to required value. Thats compellingly!

To show a page, we can use setCurrentPage(0...n ) and paintCurPage() or use directly paintPage(0...n).
Note: global paint() will show the current page. Default page is 0 (as first).
Use setCurrentPage(0...n) to change this before first call of paint().
Note: In CComponentsWindow class, these methods are applied to window body.

For examples, take a look into CTestMenu


Origin commit data
------------------
Commit: 672757606c
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-06-26 (Thu, 26 Jun 2014)
2014-06-27 20:49:41 +02:00
Thilo Graf
34362f3b4b CComponentsWindow: add possibilty to add sidebars in window objects
This allows to add objects in to window on left or right site. eg. for
navigation icons or other similar stuff. Default this feature is disabled.
to enable with methode enableSidebar(TYPE); With parameter
CC_WINDOW_LEFT_SIDEBAR, CC_WINDOW_RIGHT_SIDEBAR or both.
Width of sidebar can be changed with methode setWidthSidebar(int)


Origin commit data
------------------
Commit: f21c119517
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-06-01 (Sun, 01 Jun 2014)
2014-06-23 18:43:47 +02:00
Thilo Graf
8b6c92681e 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
------------------
Commit: 6fe7b452c1
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-03-22 (Sat, 22 Mar 2014)
2014-04-02 08:40:21 +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
cc24c195ee CComponentsItem: move/rename doCenter()to base class CComponentsItem
So it's possible to use this method for all cc-items.
setCenterPos() comes now with parameter 'along_mode' (CC_ALONG_X, CC_ALONG_Y).
So it's possible to center in x or y direction. As default are
both directions predefined.


Origin commit data
------------------
Commit: 8a897103ac
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-02-27 (Thu, 27 Feb 2014)
2014-03-03 08:54:10 +01:00
Thilo Graf
caf0d7db19 CComponentsWindow: fix missing define of header position
Position is strictly top and left within of Window


Origin commit data
------------------
Commit: c6221581ed
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-02-07 (Fri, 07 Feb 2014)
2014-02-07 09:31:30 +01:00
Thilo Graf
0781fc000b CComponentsWindow: remove redundant init of header and footer
Origin commit data
------------------
Commit: a6eb67d456
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-02-05 (Wed, 05 Feb 2014)
2014-02-05 11:56:48 +01:00
Thilo Graf
10289e5d36 CComponentsWindowMax: add missing parameters to constructors
Origin commit data
------------------
Commit: 9482613d4c
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-01-31 (Fri, 31 Jan 2014)
2014-02-05 11:56:47 +01:00
Thilo Graf
1cc801f931 CComponentsWindow: fix handling of window size
On some several cases it's possible that full resulution is not
visible on SD output or video-out modes like 576i/p.
So it's makes more sense to use current osd-settings for max size and
position.
This fixes also current behavior of Imageinfo.


Origin commit data
------------------
Commit: 9d3febd080
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-01-31 (Fri, 31 Jan 2014)
2014-02-05 11:56:47 +01:00
Thilo Graf
e9c5308a3c CComponentsWindow: cleanup
Origin commit data
------------------
Commit: d35da1afb6
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-01-24 (Fri, 24 Jan 2014)
2014-01-24 23:38:19 +01:00
Thilo Graf
c75a306cdd CComponentsWindow: adapt header and footer corners for parent window
Corners of header and footer were not adapted to parent form.
It's unsightly, if these elements are not using the same corner types
like the parent window.


Origin commit data
------------------
Commit: 66ae096372
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-01-24 (Fri, 24 Jan 2014)
2014-01-24 23:13:49 +01:00
Thilo Graf
50250176c8 CComponentsWindow: add member doCenter()
Allows centering of window on screen, mostly senseful for
window objects without parent


Origin commit data
------------------
Commit: 8cad2a3ca5
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-01-18 (Sat, 18 Jan 2014)
2014-01-24 23:13:41 +01:00
Thilo Graf
c3216202f6 CComponentsWindow: rework constructors, add CComponentsWindowMax
Member initVarWindow() now used with parameters, so it's possible
to remove multiple code in constructors, but some class must be
renamed to CComponentsWindowMax.


Origin commit data
------------------
Commit: 21e0321c53
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-01-24 (Fri, 24 Jan 2014)

Origin message was:
------------------
CComponentsWindow: rework constructors, add CComponentsWindowMax

Member initVarWindow() now used with parameters, so it's possible
to remove multiple code in constructors, but some class must be
renamed to CComponentsWindowMax.
2014-01-24 23:12:51 +01:00
Thilo Graf
e2587b12cd CComponents: split some header files
Should bring more overview and less susceptibility to conflicts (merge etc)

License texts updated.


Origin commit data
------------------
Commit: 04574fc6eb
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-01-06 (Mon, 06 Jan 2014)
2014-01-06 22:27:59 +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
b476a667c6 components: remove initVarForm calls in classes derived from CComponentsForm
Origin commit data
------------------
Commit: 062b10be2a
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
69182af8f6 CComponentsWindow: add missing member paint()
This is a partial revert of b9fc266721


Origin commit data
------------------
Commit: 0ae3d34ceb
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-11-17 (Sun, 17 Nov 2013)
2013-11-17 20:53:45 +01:00