mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +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
7220c6b265 Merge branch 'ni/cst-next' into ni/mp/cst-next 
Conflicts:
	acinclude.m4
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/epgplus.cpp
	src/gui/plugins.cpp
	src/gui/widget/listbox.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 7135aac394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)
 2016-10-10 17:27:55 +02:00
vanhofen
248b6c8684 Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/components/cc_detailsline.h
	src/gui/components/cc_item_infobox.h
	src/gui/infoviewer.cpp
	src/gui/upnpbrowser.cpp
	src/gui/widget/keyboard_input.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: 5a70a3f78e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)
 2016-10-10 16:45:30 +02:00
vanhofen
892603fe68 rename customcolor.h -> color_custom.h; reduce unneeded inludes 
Origin commit data
------------------
Commit: 104d21e784
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- rename customcolor.h -> color_custom.h; reduce unneeded inludes
 2016-10-10 14:19:55 +02:00
vanhofen
61370ed6c7 cc_frm_button: use same framecolor as used in messagebox/msgbox 
Origin commit data
------------------
Commit: 26e0926586
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- cc_frm_button: use same framecolor as used in messagebox/msgbox
 2016-10-10 14:19:55 +02:00
vanhofen
5889f018c0 add and use OFFSET_INTER definition 
Origin commit data
------------------
Commit: 98500fdeb6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- add and use OFFSET_INTER definition
 2016-10-10 14:19:55 +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
vanhofen
64744ba140 colors: add COL_PROGRESSBAR wrapper 
Origin commit data
------------------
Commit: be40e67b70
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- colors: add COL_PROGRESSBAR wrapper
 2016-10-10 14:19:55 +02:00
vanhofen
58b3052ab5 ccomponents: fix frame color 
Origin commit data
------------------
Commit: 01f32241e4
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- ccomponents: fix frame color
 2016-10-10 14:19:55 +02:00
vanhofen
af3e39a47d colors: add COL_SCROLLBAR_PASSIVE wrapper 
Origin commit data
------------------
Commit: 6629b64d6c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- colors: add COL_SCROLLBAR_PASSIVE wrapper
 2016-10-10 14:19:54 +02:00
vanhofen
4b3b25ca7a colors: add COL_SCROLLBAR_ACTIVE wrapper 
Origin commit data
------------------
Commit: 7e7d4e5fc1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- colors: add COL_SCROLLBAR_ACTIVE wrapper
 2016-10-10 14:19:54 +02:00
vanhofen
1aefa781c1 ccomponents: just code cosmetics; formatting 
Origin commit data
------------------
Commit: e8c77b6b7f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- ccomponents: just code cosmetics; formatting
 2016-10-10 14:19:54 +02:00
vanhofen
897dc6ae8c colors: add COL_FRAME wrapper 
Origin commit data
------------------
Commit: 75fe6e407d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- colors: add COL_FRAME wrapper
 2016-10-10 14:19:54 +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
vanhofen
9b1904e84d Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: 6c8ea9793f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-06 (Thu, 06 Oct 2016)
 2016-10-06 21:18:48 +02:00
Thilo Graf
36247549fb CComponentsExtTextForm: add methode to get current font 
Default font is generated by class it self, so it is useful
to have access to current font if is required by implemenations.


Origin commit data
------------------
Commit: ac58c8c016
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-03 (Mon, 03 Oct 2016)
 2016-10-03 01:45:14 +02:00
Thilo Graf
93ca892022 CComponentsExtTextForm: add missed parameter font_text 
Origin commit data
------------------
Commit: 80753c75d1
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-03 (Mon, 03 Oct 2016)
 2016-10-03 01:45:09 +02:00
vanhofen
7433978a1c Merge branch 'ni/cst-next' into ni/mp/cst-next 
Origin commit data
------------------
Commit: 0d035edb33
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-29 (Thu, 29 Sep 2016)
 2016-09-29 11:59:40 +02:00
vanhofen
22a31dccd6 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Origin commit data
------------------
Commit: f69fdc425b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-29 (Thu, 29 Sep 2016)
 2016-09-29 11:59:21 +02:00
Thilo Graf
43477d076a CComponentsItem: prevent reinit of already initialized parent form 
Origin commit data
------------------
Commit: a4b2e25bf2
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-09-29 (Thu, 29 Sep 2016)
 2016-09-29 10:19:37 +02:00
vanhofen
5d2893e837 Merge branch 'ni/cst-next' into ni/mp/cst-next 
Origin commit data
------------------
Commit: ad25cf2933
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-29 (Thu, 29 Sep 2016)
 2016-09-29 08:11:23 +02:00
vanhofen
d38da117e5 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Origin commit data
------------------
Commit: 39e5880a70
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-28 (Wed, 28 Sep 2016)
 2016-09-28 21:14:17 +02:00
Thilo Graf
c8f5eeea31 CSignalBox: add missing member to set frontend 
Remove double init of sig items; Will be done already by paintScale().
Ensure reset of last sig value on fe change.
Prevent possible segfault if fe is not defined.


Origin commit data
------------------
Commit: f68fd5ac19
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-09-28 (Wed, 28 Sep 2016)
 2016-09-28 21:12:32 +02:00
vanhofen
7eb33a8bae Revert "CSignalBox: Set current tuner as the default frontend" 
This reverts commit 128047f61f.

Conflicts:
	src/gui/components/cc_frm_signalbars.h


Origin commit data
------------------
Commit: 59ac9e57e1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-28 (Wed, 28 Sep 2016)
 2016-09-28 21:12:32 +02:00
vanhofen
9459a704f8 Revert "CSignalBox: add missing member to set frontend" 
This reverts commit 41aeb2aa5b.


Origin commit data
------------------
Commit: 0fbb5326da
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-28 (Wed, 28 Sep 2016)
 2016-09-28 12:55:02 +02:00
vanhofen
889a555c3b Merge branch 'ni/cst-next' into ni/mp/cst-next 
Origin commit data
------------------
Commit: f06fa4d0e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-25 (Sun, 25 Sep 2016)
 2016-09-25 00:24:09 +02:00
vanhofen
6e91038cd2 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: 0288091f69
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-25 (Sun, 25 Sep 2016)
 2016-09-25 00:18:22 +02:00
Thilo Graf
a1f3b5d041 CComponentsButton: use passed shadow parameter 
Shadow was always enabled.


Origin commit data
------------------
Commit: 7c4e1c20b8
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-09-24 (Sat, 24 Sep 2016)
 2016-09-24 01:09:46 +02:00
Thilo Graf
3f514865ac CComponentsHeader: ensure clean object on reinit 
Items were destroyed with simple call of delete
but not removed from item collection.
removeCCItem() does this and destroys item objects too.


Origin commit data
------------------
Commit: b205b0c8d0
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-09-24 (Sat, 24 Sep 2016)
 2016-09-24 01:09:41 +02:00
Thilo Graf
e1c928520d CComponentsFooter: remove defined font from footer 
cch_font has nothing to do with button font and is already
inherited and defined from header class and can be redefined with
setCaptionFont() methode if required.


Origin commit data
------------------
Commit: 3af698701b
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-09-24 (Sat, 24 Sep 2016)
 2016-09-24 01:08:08 +02:00
vanhofen
2752ca2684 Merge branch 'ni/cst-next' into ni/mp/cst-next 
Origin commit data
------------------
Commit: 0cb151e760
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-24 (Sat, 24 Sep 2016)
 2016-09-24 01:06:20 +02:00
Thilo Graf
41aeb2aa5b CSignalBox: add missing member to set frontend 
Origin commit data
------------------
Commit: 0e2623fa54
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-09-21 (Wed, 21 Sep 2016)
 2016-09-21 22:38:12 +02:00
vanhofen
edbbb5ce92 fix merge 
Origin commit data
------------------
Commit: b67876271d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-20 (Tue, 20 Sep 2016)

Origin message was:
------------------
- fix merge
 2016-09-20 08:29:03 +02:00
vanhofen
aebbf96829 Merge branch 'ni/cst-next' into ni/mp/cst-next 
Conflicts:
	src/gui/components/cc_frm_footer.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: fe20c9743f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-20 (Tue, 20 Sep 2016)
 2016-09-20 08:22:22 +02:00
Thilo Graf
a53fcda0c0 CCDraw: add member to get current shadow width 
Origin commit data
------------------
Commit: e66daf256d
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-09-06 (Tue, 06 Sep 2016)
 2016-09-20 08:07:39 +02:00
Thilo Graf
99dab0b7cb CComponentsFooter: rename var for btn icon 
is more plausible


Origin commit data
------------------
Commit: 4f8fc8662f
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-09-13 (Tue, 13 Sep 2016)
 2016-09-20 08:07:38 +02:00
vanhofen
1020878534 cc_detailsline: fix positions/dimensions of detailsline 
Origin commit data
------------------
Commit: 54e374f7b8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-12 (Mon, 12 Sep 2016)

Origin message was:
------------------
- cc_detailsline: fix positions/dimensions of detailsline
 2016-09-20 08:05:08 +02:00
vanhofen
c817abdf5d Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Origin commit data
------------------
Commit: 6a8f7b4d3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-13 (Tue, 13 Sep 2016)
 2016-09-13 12:26:20 +02:00
Thilo Graf
85a8f0e896 CCDraw: add member to get current shadow width 
Origin commit data
------------------
Commit: 1caa54d6ab
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-09-06 (Tue, 06 Sep 2016)
 2016-09-13 09:09:27 +02:00
Thilo Graf
84b40fcffb CComponentsFooter: rename var for btn icon 
is more plausible


Origin commit data
------------------
Commit: 2de3a167e5
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-09-13 (Tue, 13 Sep 2016)
 2016-09-13 09:04:53 +02:00
vanhofen
564e254b7d Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	src/gui/components/cc_detailsline.cpp


Origin commit data
------------------
Commit: 16fbaaa096
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-12 (Mon, 12 Sep 2016)
 2016-09-12 12:13:43 +02:00
vanhofen
e534457250 cc_detailsline: fix positions/dimensions of detailsline 
Origin commit data
------------------
Commit: 9948649f55
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-12 (Mon, 12 Sep 2016)

Origin message was:
------------------
- cc_detailsline: fix positions/dimensions of detailsline
 2016-09-12 12:10:19 +02:00
vanhofen
b41dd96f56 cc_detailsline: more decent color for detailsline 
Origin commit data
------------------
Commit: e535afccb7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-12 (Mon, 12 Sep 2016)

Origin message was:
------------------
- cc_detailsline: more decent color for detailsline
 2016-09-12 08:22:51 +02:00
vanhofen
c36373040d Merge branch 'ni/cst-next' into ni/mp/cst-next 
Conflicts:
	src/system/helpers.cpp


Origin commit data
------------------
Commit: fda1cda516
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-06 (Tue, 06 Sep 2016)
 2016-09-06 15:24:30 +02:00
vanhofen
dad9337769 cc_detailsline: use a smaller thickness 
Origin commit data
------------------
Commit: fdc2ca37a9
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-06 (Tue, 06 Sep 2016)

Origin message was:
------------------
- cc_detailsline: use a smaller thickness
 2016-09-06 11:04:10 +02:00
vanhofen
a4a96bdc26 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	src/driver/framebuffer.cpp


Origin commit data
------------------
Commit: 22ef37ae12
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-01 (Thu, 01 Sep 2016)
 2016-09-01 08:50:59 +02:00
Thilo Graf
ab825c08da CComponentsHeader: don't use default parameters for privat member 
Unified adaptation related to child class ComponentsFooter.
see: 5a24dc1ce5


Origin commit data
------------------
Commit: 731cb9c66d
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-30 (Tue, 30 Aug 2016)
 2016-08-30 11:19:48 +02:00
vanhofen
bc33663742 Merge branch 'ni/mp' into ni/cst-next 
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)
 2016-08-26 19:13:47 +02:00
Michael Liebmann
9d30a0906d Merge branch 'cst-next' into nmp-cst-next 
Origin commit data
------------------
Commit: f5ad46c5d9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-24 (Wed, 24 Aug 2016)
 2016-08-24 09:54:34 +02:00
vanhofen
234dd9ee3b Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Origin commit data
------------------
Commit: bf9653b4a6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-23 (Tue, 23 Aug 2016)
 2016-08-23 16:05:08 +02:00
Thilo Graf
5a24dc1ce5 CComponentsFooter: don't use default parameters for privat member 
Passed init values are better to see here.
This should fix wrong footer color too. See UPNP-Browser, color was not
applied here.


Origin commit data
------------------
Commit: 9b9a8d1a78
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-23 (Tue, 23 Aug 2016)
 2016-08-23 16:00:48 +02:00