Commit Graph

1345 Commits

Author SHA1 Message Date
gixxpunk
757ec67292 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 03891b7464
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-04-29 (Sat, 29 Apr 2017)
2017-04-29 18:31:49 +02:00
Thilo Graf
ecab7f1d37 cc_frm_chain.cpp: fix c/p error in comment
Origin commit data
------------------
Commit: 891b2e9ad2
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-29 (Sat, 29 Apr 2017)
2017-04-29 18:11:06 +02:00
Thilo Graf
581669a7ec Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: 1a750df510
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-29 (Sat, 29 Apr 2017)
2017-04-29 18:02:20 +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
6aa573ece2 CComponentsFrmChain: add possibility to assign border offsets
Origin commit data
------------------
Commit: 3dda388c8d
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
vanhofen
d4196e101f Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 7bccd83b07
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-27 (Thu, 27 Apr 2017)
2017-04-27 14:02:32 +02:00
gixxpunk
5607ffbe1c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 8719bddc6a
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-04-27 (Thu, 27 Apr 2017)
2017-04-27 10:38:24 +02:00
Thilo Graf
440333ff79 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
------------------
Commit: 19fc8c6d3b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-27 (Thu, 27 Apr 2017)
2017-04-27 09:27:45 +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
gixxpunk
e90798d036 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: e89d4a9a1a
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-04-26 (Wed, 26 Apr 2017)
2017-04-26 18:14:13 +02:00
gixxpunk
5737875cb2 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 995b30da41
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-04-26 (Wed, 26 Apr 2017)
2017-04-26 17:59:39 +02:00
Michael Liebmann
a98c34567a Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: 76574279a5
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-04-26 (Wed, 26 Apr 2017)
2017-04-26 14:06:44 +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
gixxpunk
c4f66cd900 Merge branch 'master' of github.com:tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 8f3783987a
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-04-26 (Wed, 26 Apr 2017)
2017-04-26 11:17:46 +02:00
Michael Liebmann
9ff65ce0b2 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: c91084aa14
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-04-26 (Wed, 26 Apr 2017)
2017-04-26 04:45:01 +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
3a0e02793f Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: 8554722323
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-25 (Tue, 25 Apr 2017)
2017-04-25 11:46:41 +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
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
e1d1338c0a CProgressBar: add own position methodes
NOTE: not required in branch pu/fb-setmode, remove this after merge!


Origin commit data
------------------
Commit: cffab5f8f9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-25 (Tue, 25 Apr 2017)
2017-04-25 11:38:22 +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
vanhofen
7d84d9d1d6 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: d7044490de
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-23 (Sun, 23 Apr 2017)
2017-04-23 20:29:55 +02:00
Thilo Graf
e7a17485b1 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: a11f5e07c2
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-23 (Sun, 23 Apr 2017)
2017-04-23 17:06:58 +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
2c16a6e06d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/color.h


Origin commit data
------------------
Commit: aaa3757e2e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-22 (Sat, 22 Apr 2017)
2017-04-22 17:07:50 +02:00
vanhofen
2c3d73573b colors: add and use missing COL_SCROLLBAR_PLUS_0 wrapper
Origin commit data
------------------
Commit: 8e50353773
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-22 (Sat, 22 Apr 2017)

Origin message was:
------------------
- colors: add and use missing COL_SCROLLBAR_PLUS_0 wrapper
2017-04-22 17:02:48 +02:00
vanhofen
fb06261771 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 246b45e32d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-22 (Sat, 22 Apr 2017)
2017-04-22 16:15:37 +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
vanhofen
ff91d61bc4 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: 5cc587b8a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-22 (Sat, 22 Apr 2017)
2017-04-22 16:12:33 +02:00
vanhofen
aeaab563e2 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: a7c35a3373
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-22 (Sat, 22 Apr 2017)
2017-04-22 10:35:44 +02:00
Thilo Graf
3aa91ac91f CComponentsHeader/CChannelList: unify methode names
Origin commit data
------------------
Commit: 9ef6c49a23
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-21 (Fri, 21 Apr 2017)
2017-04-21 23:07:14 +02:00
Thilo Graf
82ff77ede5 CComponentsScrollBar: add missing attributes for different visual modes
Origin commit data
------------------
Commit: 324ba258a0
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-21 (Fri, 21 Apr 2017)
2017-04-21 22:47:23 +02:00
Thilo Graf
8f5e8cb5ff CComponentsScrollBar: fix radius for single segment
Radius on top was missed if only one segment is available.


Origin commit data
------------------
Commit: c5451046d4
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-21 (Fri, 21 Apr 2017)
2017-04-21 22:47:23 +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
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
31724507a8 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 292d7a2d5d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-19 (Wed, 19 Apr 2017)
2017-04-19 23:24:19 +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
vanhofen
013d9ab919 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 336e0f4c66
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-19 (Wed, 19 Apr 2017)
2017-04-19 21:29:41 +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
e9f7c0159d CSignalBox: remove CC_APPEND flag
Should be gradually removed in all affected classes


Origin commit data
------------------
Commit: f74724ceb6
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-17 (Mon, 17 Apr 2017)
2017-04-17 17:43:59 +02:00
Thilo Graf
2e471317fc CComponentsForm: use global default width for scrollbar
Origin commit data
------------------
Commit: 0e94c6830b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-17 (Mon, 17 Apr 2017)
2017-04-17 17:43:55 +02:00
Thilo Graf
fc8969cece CSignalBar: use global offsets for init of min height
Origin commit data
------------------
Commit: b8822803d9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-17 (Mon, 17 Apr 2017)
2017-04-17 17:43:48 +02:00
Thilo Graf
b44e362f3d CComponentsFrmClock: use correct setHeight()
Origin commit data
------------------
Commit: 04f9468ddb
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-17 (Mon, 17 Apr 2017)
2017-04-17 16:45:00 +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
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