mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 10:21:04 +02:00
Code Issues Packages Projects Releases Wiki Activity
13,190 Commits 2 Branches 9 Tags
8c24feb848fd6183e204d96626e20cdd007d583b
Commit Graph

1345 Commits

Author SHA1 Message Date
vanhofen
317c73efcc cc_frm_header: show left button before the right one 
Origin commit data
------------------
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
 2016-12-07 15:24:45 +01:00
vanhofen
984b4378c1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 3ead60b3fd
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)
 2016-12-07 12:35:53 +01:00
vanhofen
453a8a9a3e cc_frm_header: try to fix clock; e.g. in timerlist 
Origin commit data
------------------
Commit: c661f3f07d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-06 (Tue, 06 Dec 2016)

Origin message was:
------------------
- cc_frm_header: try to fix clock; e.g. in timerlist
 2016-12-06 20:59:35 +01:00
vanhofen
5b39f17403 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox 
Conflicts:
	configure.ac
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/start_wizard.cpp
	src/system/settings.h


Origin commit data
------------------
Commit: 39bb565210
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-06 (Tue, 06 Dec 2016)
 2016-12-06 20:50:02 +01:00
vanhofen
73ca7cf0c8 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 38f17cd88b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-06 (Tue, 06 Dec 2016)
 2016-12-06 20:46:37 +01:00
vanhofen
5892f863e5 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/movieplayer.cpp


Origin commit data
------------------
Commit: 461f9f046d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-06 (Tue, 06 Dec 2016)
 2016-12-06 13:02:25 +01:00
TangoCash
0aac3d7949 cc_frm correct scroll direction if more than 2 pages (thx dbo) 
Signed-off-by: Thilo Graf <dbt@novatux.de>

picked from:
	github.com/TangoCash/neutrino-mp-cst-next
commit:
	abce1c6be4bae17f343d3ff878670184708aa185


Origin commit data
------------------
Commit: 0c4c90bf2e
Author: TangoCash <eric@loxat.de>
Date: 2016-12-06 (Tue, 06 Dec 2016)
 2016-12-06 11:34:59 +01:00
Stefan Seyfried
7893941b8a CCFooter::setButtonLabels: fix format-string warning 
Origin commit data
------------------
Commit: f6c183931f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)
 2016-12-04 18:03:32 +01:00
Stefan Seyfried
eab48f2ed9 Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: c6d7968381
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)
 2016-12-04 18:02:51 +01:00
vanhofen
9086c24617 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 87fe81b890
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-02 (Fri, 02 Dec 2016)
 2016-12-02 23:39:21 +01:00
vanhofen
56273f6a56 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: bd9aa1b199
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-02 (Fri, 02 Dec 2016)
 2016-12-02 00:39:36 +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
vanhofen
db891d18c9 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 1e48d0c60b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-30 (Wed, 30 Nov 2016)
 2016-11-30 09:17:51 +01:00
Thilo Graf
b79c87dcfe CComponentsFooter: fix wrong text color with single button in footers 
* remove size compare

If only one button exists, possible new text color would be ignored
and wrong Text color was visible with one item.
This behavior was observed in message boxes with
single buttons (eg OK, or Cancel).


Origin commit data
------------------
Commit: 8bf6b7fb3a
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-29 (Tue, 29 Nov 2016)
 2016-11-29 16:13:47 +01:00
Thilo Graf
b2e71497d8 CComponentsFooter: disable gradient for footers 
This is not really completly implemented for footer at the momemnt, because
button objects are still not prepared or tuned for that.

If it is enabled, currently it could occur unintentionally background behavior
eg.: flickereffects or background display errors in button objects.

NOTE: anyway users can enable gradient in theme files and could override this setting.
Now here it is globally disabled for footers. If it works right,
it will be enabled in future.


Origin commit data
------------------
Commit: 427b65813d
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-27 (Sun, 27 Nov 2016)

Origin message was:
------------------
CComponentsFooter: disable gradient for footers

This is not really completly implemented for footer at the momemnt, because
button objects are still not prepared or tuned for that.

If it is enabled, currently it could occur unintentionally background behavior
eg.: flickereffects or background display errors in button objects.

NOTE: anyway users can enable gradient in theme files and could override this setting.
Now here it is globally disabled for footers. If it works right,
it will be enabled in future.
 2016-11-28 21:44:05 +01:00
Thilo Graf
fb0f85365a CComponentsExtTextForm: rework class overloading 
class CComponentsExtTextFormLocalized is not required.


Origin commit data
------------------
Commit: 31bfb1b383
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-27 (Sun, 27 Nov 2016)
 2016-11-28 21:43:33 +01:00
Thilo Graf
ef014b2112 CComponentsText: revert inheritition of CBox, useage as object 
It has shown, that the positioning and
Dimensions calculations are not correct. CBox object must be embedded
with frame properties.


Origin commit data
------------------
Commit: 9331c59b0e
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-28 (Mon, 28 Nov 2016)
 2016-11-28 21:42:50 +01:00
vanhofen
b238e2c5b5 cc_frm_footer.h: use proven COL_SHADOW_PLUS_0 for button frames 
Origin commit data
------------------
Commit: 02db4fe81a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-28 (Mon, 28 Nov 2016)

Origin message was:
------------------
- cc_frm_footer.h: use proven COL_SHADOW_PLUS_0 for button frames
 2016-11-28 00:13:48 +01:00
vanhofen
a2f404e939 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 84381644ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-24 (Thu, 24 Nov 2016)
 2016-11-24 00:04:21 +01:00
Thilo Graf
e10e0583ae CComponentsItem: fix possible negativ value for box radius 
If frame width > 0 and radius too small, we have an negative value.
This should prevent this.


Origin commit data
------------------
Commit: ee4a443c8a
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-23 (Wed, 23 Nov 2016)
 2016-11-23 10:33:58 +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
vanhofen
eae5c01db1 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/system/settings.h


Origin commit data
------------------
Commit: a19fc5532b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-22 (Tue, 22 Nov 2016)
 2016-11-22 23:45:32 +01:00
vanhofen
af486d47a0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox 
Conflicts:
	src/system/settings.h


Origin commit data
------------------
Commit: 8bcaeb980d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-22 (Tue, 22 Nov 2016)
 2016-11-22 23:44:23 +01:00
vanhofen
65e0a39980 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	data/locale/slovak.locale
	data/locale/unmaintained/czech.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/start_wizard.cpp
	src/gui/widget/msgbox.cpp


Origin commit data
------------------
Commit: fce378f8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)
 2016-11-21 12:46:49 +01:00
Thilo Graf
3634c26ea1 CComponentsInfoBox: add methode to get internal picture object 
Origin commit data
------------------
Commit: 0d2c612adb
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)
 2016-11-21 10:55:11 +01:00
Thilo Graf
d137ca8969 CComponentsFrmClock: ensure that no radius is defined for inner items 
Radius is not required for inner segments.
TODO: single segment


Origin commit data
------------------
Commit: 02c6df782c
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)
 2016-11-21 10:55:10 +01:00
vanhofen
15205310c6 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Commit: 3caf9e47c1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)
 2016-11-20 18:36:35 +01:00
Thilo Graf
af471915c9 CComponentsFooter: use select/unselect colors from menues as default 
Origin commit data
------------------
Commit: 4b88a244da
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)
 2016-11-20 16:33:53 +01:00
Thilo Graf
33e7afdf8d CComponentsFooter: use minimal frame width as default for buttons 
Origin commit data
------------------
Commit: 7567f7de00
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)
 2016-11-20 16:33:32 +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
2b0b1c9f0f CComponentsFooter: add parameter for frame width for selected buttons 
Frame width was hard coded.


Origin commit data
------------------
Commit: 696989dcf1
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)
 2016-11-20 01:33:57 +01:00
Thilo Graf
5d258a58dd CSignalBar: remove offset for signal name and remove right allignment 
Text have more space, otherwise it's possible it can be truncated.
Indent from left site of text don't looks not so good.


Origin commit data
------------------
Commit: 04a75327dd
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)
 2016-11-19 23:21:06 +01:00
vanhofen
cc7ad7ce1a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/lua/lua_misc.cpp
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: 3420991007
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)
 2016-11-19 21:11:54 +01:00
vanhofen
6b404dbf82 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 2a7ec1a59f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)
 2016-11-13 01:35:07 +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
b21fed6d25 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: e40d4c44b5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
 2016-11-12 22:05:01 +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
Stefan Seyfried
2e7aa7be4a Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: 2c92d112d0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
 2016-11-12 18:06:26 +01:00
vanhofen
2e8117384c Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: d4b9daf01e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)
 2016-11-11 09:16:24 +01:00
Thilo Graf
d34322b568 Merge branch 'master' into pu/msgbox 
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Commit: 3efaac5725
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-10 (Thu, 10 Nov 2016)
 2016-11-10 10:27:22 +01:00
vanhofen
2a769e02ce Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 8d598b3d28
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)
 2016-11-07 22:21:35 +01:00
vanhofen
3449a434d4 cc_frm_header: use OFFSET define 
Origin commit data
------------------
Commit: 15e24a3e66
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- cc_frm_header: use OFFSET define
 2016-11-07 21:08:51 +01:00
vanhofen
398a5d8a2b Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: bf7b22020c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)
 2016-11-07 12:57:58 +01:00
Thilo Graf
e4bc926b72 Merge branch 'master' into pu/msgbox 
Origin commit data
------------------
Commit: 3e7a1943c3
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)
 2016-11-06 23:16:36 +01:00
FlatTV
72d1110d5e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 53016b4818
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)
 2016-11-06 08:15:03 +01:00
vanhofen
ffefe5c75e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 3eca5d6bab
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)
 2016-11-05 21:22:15 +01:00
Thilo Graf
30243eb2b5 CComponentsInfoBox: ensure matching object height after assigned image 
Images are not defined with constructor, so it is possible we must
consider the image height after called setPicture() methode.
This is important if an infobox sould be
added into a cc form object. This avoids overlapping of dynamic added items.


Origin commit data
------------------
Commit: 18695fb0c9
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)
 2016-11-05 21:17:31 +01:00
vanhofen
78d9f348bf Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: e893472e77
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)
 2016-11-05 21:11:37 +01:00
Thilo Graf
eb0224cfc9 Merge branch 'master' into pu/msgbox 
Origin commit data
------------------
Commit: 28a146e0ba
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)
 2016-11-05 00:08:05 +01:00
Thilo Graf
5877fb6a49 CComponentsInfoBox: fix missing calculation of image position with parent 
Origin commit data
------------------
Commit: 90a693a1ec
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-04 (Fri, 04 Nov 2016)
 2016-11-04 23:56:29 +01:00