Commit Graph

9369 Commits

Author SHA1 Message Date
vanhofen
ca5c4b00d7 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
------------------
Branch: ni/coolstream
Commit: 7135aac394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)



------------------
This commit was generated by Migit
2016-10-10 17:27:55 +02:00
vanhofen
0546f9fcf3 colors: re-use our framecolor
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b3dc76d75
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- colors: re-use our framecolor

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 16:46:14 +02:00
vanhofen
3739b4de04 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
------------------
Branch: ni/coolstream
Commit: 5a70a3f78e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)



------------------
This commit was generated by Migit
2016-10-10 16:45:30 +02:00
vanhofen
bb756163b1 rename customcolor.h -> color_custom.h; reduce unneeded inludes
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
vanhofen
1e6590f696 cc_frm_button: use same framecolor as used in messagebox/msgbox
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
vanhofen
515240fd48 settings.h: add some definitions to use in future
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7782dcde01
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- settings.h: add some definitions to use in future

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
vanhofen
aa65a615f9 add and use OFFSET_INTER definition
Origin commit data
------------------
Branch: ni/coolstream
Commit: 98500fdeb6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- add and use OFFSET_INTER definition

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
vanhofen
b59278067e rename SHADOW_OFFSET -> OFFSET_SHADOW
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5d450c60d3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- rename SHADOW_OFFSET -> OFFSET_SHADOW

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
vanhofen
b9174571ca infoviewer: align progressbar/sigbox code to latest changes
Origin commit data
------------------
Branch: ni/coolstream
Commit: d77858683b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- infoviewer: align progressbar/sigbox code to latest changes

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
vanhofen
ed72292d58 colors: add COL_PROGRESSBAR wrapper
Origin commit data
------------------
Branch: ni/coolstream
Commit: be40e67b70
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- colors: add COL_PROGRESSBAR wrapper

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
vanhofen
9b0fb43e39 channellist: add small frame to mono progressbars w/o gradient
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3284484300
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- channellist: add small frame to mono progressbars w/o gradient

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
vanhofen
a5bbab073c audioplayer: fix connectline paint
Origin commit data
------------------
Branch: ni/coolstream
Commit: 02e07e4d7e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- audioplayer: fix connectline paint

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
vanhofen
121c669393 ccomponents: fix frame color
Origin commit data
------------------
Branch: ni/coolstream
Commit: 01f32241e4
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- ccomponents: fix frame color

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
vanhofen
473c0cdc0f infoclock: use default colors
Origin commit data
------------------
Branch: ni/coolstream
Commit: 73d7575f5f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- infoclock: use default colors

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
vanhofen
cfef53dbe7 timeosd: use default colors
Origin commit data
------------------
Branch: ni/coolstream
Commit: 93f92e3a3b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- timeosd: use default colors

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
vanhofen
70c0d4cec5 keyboard_input: fix shadow color
Origin commit data
------------------
Branch: ni/coolstream
Commit: 06e7d1b952
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- keyboard_input: fix shadow color

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
vanhofen
50bf7adb79 stringinput: fix shadow color
Origin commit data
------------------
Branch: ni/coolstream
Commit: e65a7dfdd5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- stringinput: fix shadow color

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
vanhofen
062a637bb2 timerlist: fix shadow color
Origin commit data
------------------
Branch: ni/coolstream
Commit: 74040e7ef5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- timerlist: fix shadow color

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
vanhofen
7f19812d17 colors: add COL_SCROLLBAR_PASSIVE wrapper
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6629b64d6c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- colors: add COL_SCROLLBAR_PASSIVE wrapper

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 14:19:54 +02:00
vanhofen
e13c700904 colors: add COL_SCROLLBAR_ACTIVE wrapper
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e7d4e5fc1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- colors: add COL_SCROLLBAR_ACTIVE wrapper

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 14:19:54 +02:00
vanhofen
b30174a112 channellist: remove color-mess in progressbar code; don't change colors when moving cursor
Origin commit data
------------------
Branch: ni/coolstream
Commit: abd3f97e9d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- channellist: remove color-mess in progressbar code; don't change colors when moving cursor

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 14:19:54 +02:00
vanhofen
093234e5f1 channellist: more highlight tuned channel under cursor
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4598e320a6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- channellist: more highlight tuned channel under cursor

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 14:19:54 +02:00
vanhofen
cb33a79bdf timeosd: fix shadow color
Origin commit data
------------------
Branch: ni/coolstream
Commit: a8f9903544
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- timeosd: fix shadow color

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 14:19:54 +02:00
vanhofen
c35bef2caf infoclock: fix shadow color; use SHADOW_OFFSET definition
Origin commit data
------------------
Branch: ni/coolstream
Commit: 340d4882bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- infoclock: fix shadow color; use SHADOW_OFFSET definition

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 14:19:54 +02:00
vanhofen
6ddff3dcaf ccomponents: just code cosmetics; formatting
Origin commit data
------------------
Branch: ni/coolstream
Commit: e8c77b6b7f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- ccomponents: just code cosmetics; formatting

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 14:19:54 +02:00
vanhofen
5987637998 colors: add COL_FRAME wrapper
Origin commit data
------------------
Branch: ni/coolstream
Commit: 75fe6e407d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- colors: add COL_FRAME wrapper

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 14:19:54 +02:00
vanhofen
bc79592586 Merge branch 'ni/cst-next' of bitbucket.org:neutrino-images/ni-neutrino-hd into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c4741adcf
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 12:10:16 +02:00
Thilo Graf
a65478437e Moviebrowser: outsource help class
Origin commit data
------------------
Branch: ni/coolstream
Commit: c4827704ac
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-07 (Fri, 07 Oct 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-07 17:38:25 +02:00
FlatTV
65514ec91d capmt.cpp: try to support AC-Modul
Origin commit data
------------------
Branch: ni/coolstream
Commit: e24cb3ec3e
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-10-07 (Fri, 07 Oct 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-07 14:40:50 +02:00
FlatTV
d311955d1d zapit.cpp: delete duplicate header
Origin commit data
------------------
Branch: ni/coolstream
Commit: 47e9045215
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-10-07 (Fri, 07 Oct 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-07 14:39:00 +02:00
FlatTV
44e237af23 ServiceManager: Add funktion GetCurrentChannel()
Origin commit data
------------------
Branch: ni/coolstream
Commit: b407e3a48b
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-10-07 (Fri, 07 Oct 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-07 14:38:25 +02:00
FlatTV
8188f332ac Cam Menu: Allow switching to all or same transponder channels
while CI recording


Origin commit data
------------------
Branch: ni/coolstream
Commit: fe69787b0a
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-10-07 (Fri, 07 Oct 2016)



------------------
This commit was generated by Migit
2016-10-07 14:37:37 +02:00
Thilo Graf
c1bbfc85ae 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
------------------
Branch: ni/coolstream
Commit: f90440e0f1
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-07 (Fri, 07 Oct 2016)



------------------
This commit was generated by Migit
2016-10-07 14:25:59 +02:00
FlatTV
dbeb1aec2c Merge branch 'ni/cst-next' of bitbucket.org:neutrino-images/ni-neutrino-hd into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 05b760c284
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-10-07 (Fri, 07 Oct 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-07 14:04:11 +02:00
vanhofen
1475434ee5 imageinfo_ni: align fade code to other fade code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 25147a0828
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-06 (Thu, 06 Oct 2016)

Origin message was:
------------------
- imageinfo_ni: align fade code to other fade code

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-06 21:25:49 +02:00
vanhofen
e4656e148b 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
------------------
Branch: ni/coolstream
Commit: 6c8ea9793f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-06 (Thu, 06 Oct 2016)



------------------
This commit was generated by Migit
2016-10-06 21:18:48 +02:00
Thilo Graf
e236578f8d Moviebrowser: complete licence texts
Origin commit data
------------------
Branch: ni/coolstream
Commit: fe8e3896a0
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-05 (Wed, 05 Oct 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-05 17:48:25 +02:00
Thilo Graf
9fcaeb6745 CImageInfo: using "DATADIR" instead fixed path
Origin commit data
------------------
Branch: ni/coolstream
Commit: b8e1d0ebbd
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-04 (Tue, 04 Oct 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-04 20:40:30 +02:00
Thilo Graf
1b46dbc39f CImageInfo: fix initial height of first info item
On first view of imageinfo window, no image name was visibla.
Height for this item was not assigned.
Height was only assigned at the second attempt.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5fcd45b633
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-03 (Mon, 03 Oct 2016)



------------------
This commit was generated by Migit
2016-10-03 21:38:22 +02:00
Thilo Graf
17f82311be CImageInfo: fix possible item height calculation
Calculation of height was ok on first paint, but on next time was broken.


Origin commit data
------------------
Branch: ni/coolstream
Commit: dae88708ee
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-03 (Mon, 03 Oct 2016)



------------------
This commit was generated by Migit
2016-10-03 15:06:02 +02:00
Thilo Graf
d721443490 CImageInfo: use matched fontsize for informations
This window contains many lines and it's possible that some lines are
truncated. if users have changed to extreme font sizes,
So it is hopefully solved.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 95735f6faf
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-03 (Mon, 03 Oct 2016)



------------------
This commit was generated by Migit
2016-10-03 13:15:57 +02:00
Thilo Graf
f1846549c2 CImageInfo: add yweb version info
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7355ebb883
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-03 (Mon, 03 Oct 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-03 01:54:06 +02:00
Thilo Graf
e8a63cd109 Imageinfo: add lua API info
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6b88cea7bf
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-02 (Sun, 02 Oct 2016)



------------------
This commit was generated by Migit
2016-10-03 01:54:06 +02:00
Thilo Graf
c5a0795b82 CImageInfo: enable fade for image info window
Origin commit data
------------------
Branch: ni/coolstream
Commit: c9314e4bd1
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-02 (Sun, 02 Oct 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-03 01:52:32 +02:00
Thilo Graf
07f4ba0bc3 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
------------------
Branch: ni/coolstream
Commit: ac58c8c016
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-03 (Mon, 03 Oct 2016)



------------------
This commit was generated by Migit
2016-10-03 01:45:14 +02:00
Thilo Graf
78cac3e91f CComponentsExtTextForm: add missed parameter font_text
Origin commit data
------------------
Branch: ni/coolstream
Commit: 80753c75d1
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-03 (Mon, 03 Oct 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-03 01:45:09 +02:00
Thilo Graf
715968ee52 lua api: fix broken build with --disable-lua
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1d74379981
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-02 (Sun, 02 Oct 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-03 01:44:54 +02:00
vanhofen
e6ea52135d pictureviewer: don't darken every second entry
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6b237c3166
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-01 (Sat, 01 Oct 2016)

Origin message was:
------------------
- pictureviewer: don't darken every second entry

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-01 22:40:52 +02:00
vanhofen
5487d5d99e audioplayer: don't darken every second entry
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5c8e9f7fd3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-01 (Sat, 01 Oct 2016)

Origin message was:
------------------
- audioplayer: don't darken every second entry

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-01 22:40:16 +02:00
vanhofen
6d470dcdd2 filebrowser: smoother colors
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9ec9aa13c6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-01 (Sat, 01 Oct 2016)

Origin message was:
------------------
- filebrowser: smoother colors

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-01 22:39:49 +02:00