Commit Graph

649 Commits

Author SHA1 Message Date
Jacek Jendrzej
06aef234de Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 020f044c07
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-08 (Mon, 08 May 2017)


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

------------------
This commit was generated by Migit
2017-05-08 12:57:22 +02:00
Thilo Graf
0a2db29f3c CChannelList: fix code indentation
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9fd3b27d61
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-08 (Mon, 08 May 2017)


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

------------------
This commit was generated by Migit
2017-05-08 08:26:21 +02:00
vanhofen
56287c8eff Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e2f4afe684
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-07 (Sun, 07 May 2017)


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

------------------
This commit was generated by Migit
2017-05-07 21:29:14 +02:00
gixxpunk
d60bb70533 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4589862ad3
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-07 (Sun, 07 May 2017)


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

------------------
This commit was generated by Migit
2017-05-07 19:05:56 +02:00
Thilo Graf
1fd330008d CChannelList: change scope of bool unlocked
Scope of the variable 'unlocked' can be reduced.


Origin commit data
------------------
Branch: ni/coolstream
Commit: c8f6888d8f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-07 (Sun, 07 May 2017)



------------------
This commit was generated by Migit
2017-05-07 18:33:25 +02:00
Thilo Graf
7693bab58b CChannelList: use enums for additional modes
Readability


Origin commit data
------------------
Branch: ni/coolstream
Commit: 761bac8ca1
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-07 (Sun, 07 May 2017)



------------------
This commit was generated by Migit
2017-05-07 18:33:25 +02:00
Jacek Jendrzej
bcc9e29ffe Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: c926f1ea91
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-07 (Sun, 07 May 2017)


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

------------------
This commit was generated by Migit
2017-05-07 18:27:59 +02:00
Thilo Graf
e9e16b1d8d CChannelList: delete and reset minitv object inside unified scope
Origin commit data
------------------
Branch: ni/coolstream
Commit: cf7a21032c
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-07 (Sun, 07 May 2017)


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

------------------
This commit was generated by Migit
2017-05-07 14:18:47 +02:00
Thilo Graf
5a54326fe2 CChannelList: add connection to ResetModuls()
Ensures re init after font changes.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1359248f72
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-07 (Sun, 07 May 2017)



------------------
This commit was generated by Migit
2017-05-07 14:18:47 +02:00
Thilo Graf
0b75f57eb3 CChannelList: remove init of cc_minitv from constructor.
Is not a member of CChannelList and already inititialized
as static outside of constructor.


Origin commit data
------------------
Branch: ni/coolstream
Commit: d7f839dcc9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-06 (Sat, 06 May 2017)



------------------
This commit was generated by Migit
2017-05-06 23:18:43 +02:00
Thilo Graf
3398b6fb17 CChannelList: add missing compare for existant header object.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 86c18141dd
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-06 (Sat, 06 May 2017)


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

------------------
This commit was generated by Migit
2017-05-06 22:46:20 +02:00
Jacek Jendrzej
9d8a618ef7 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b2f2afe01
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-05 (Fri, 05 May 2017)


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

------------------
This commit was generated by Migit
2017-05-05 13:27:14 +02:00
vanhofen
e1bf616576 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 665e499208
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-03 (Wed, 03 May 2017)


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

------------------
This commit was generated by Migit
2017-05-03 23:08:15 +02:00
vanhofen
43e622513a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/channellist.cpp
	src/gui/epgview.cpp
	src/gui/epgview.h
	src/gui/eventlist.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3210b958a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-03 (Wed, 03 May 2017)



------------------
This commit was generated by Migit
2017-05-03 22:57:24 +02:00
Thilo Graf
694dd0d5e1 CChannelList: rework details line handling, fix hide() after setup
Detailsline is handling hide() by itself.

After channellist setup, eg. switching additional infos and channellist
window has different size, artefacts were possible.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 81001410f3
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-03 (Wed, 03 May 2017)



------------------
This commit was generated by Migit
2017-05-03 21:29:41 +02:00
Jacek Jendrzej
1722b14a6b Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 74c0b58e71
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-02 (Tue, 02 May 2017)


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

------------------
This commit was generated by Migit
2017-05-02 13:18:29 +02:00
vanhofen
a5e28fbced Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7096269f55
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-30 (Sun, 30 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-30 00:21:40 +02:00
Thilo Graf
f47e0837c0 CChannelList: Ensure new initialize of modules on palette changes while runtime.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1e4967e114
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-29 (Sat, 29 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-29 22:46:50 +02:00
gixxpunk
3a2ceba862 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 80faa90fa1
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-04-29 (Sat, 29 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-29 16:06:51 +02:00
Jacek Jendrzej
d699ef40a1 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0ef6e3fe98
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-04-27 (Thu, 27 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-27 14:27:27 +02:00
Jacek Jendrzej
4c2d450c36 src/gui/channellist.cpp remove unused logo_off
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6cb58546d8
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-04-27 (Thu, 27 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-27 14:26:27 +02:00
vanhofen
8af0c9668b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7bccd83b07
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-27 (Thu, 27 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-27 14:02:32 +02:00
vanhofen
70d2aa725d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 022b98cb73
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-27 (Thu, 27 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-27 13:54:59 +02:00
Thilo Graf
f0fd59d57b CChannelList: don't assign logo if disabled
Origin commit data
------------------
Branch: ni/coolstream
Commit: 85f4992ca8
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-27 (Thu, 27 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-27 11:26:36 +02:00
Jacek Jendrzej
229b0d7580 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: f292ba6b69
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-04-24 (Mon, 24 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-24 21:33:15 +02:00
vanhofen
3c5a9a5d88 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a34a8992d4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-24 (Mon, 24 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-24 12:56:51 +02:00
vanhofen
a2cab1dffa scrollbars: avoid usage of COL_SCROLLBAR_PASSIVE_PLUS_0 ...
... outside of CComponentsScrollBar(). Since the color-changes in
cd80e26 the non-CC scrollbars looks weird.


Origin commit data
------------------
Branch: ni/coolstream
Commit: fe5f84c1d0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-24 (Mon, 24 Apr 2017)

Origin message was:
------------------
- scrollbars: avoid usage of COL_SCROLLBAR_PASSIVE_PLUS_0 ...

... outside of CComponentsScrollBar(). Since the color-changes in
cd80e26 the non-CC scrollbars looks weird.


------------------
This commit was generated by Migit
2017-04-24 12:29:52 +02:00
vanhofen
495764fc55 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: d7044490de
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-23 (Sun, 23 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-23 20:29:55 +02:00
Thilo Graf
000595e6b7 CChannelList: remove unused logo object
Not required since
7c03858f7c: add possibility to show channellogo


Origin commit data
------------------
Branch: ni/coolstream
Commit: fbe8889fa9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-23 (Sun, 23 Apr 2017)



------------------
This commit was generated by Migit
2017-04-23 17:15:17 +02:00
Thilo Graf
3d811a3370 CChannelList/CUpnpBrowserGui: add missing reinit for corner modes
Required eg. if corner settings has been changed by user on runtime.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0943c467e2
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-23 (Sun, 23 Apr 2017)



------------------
This commit was generated by Migit
2017-04-23 17:01:05 +02:00
vanhofen
c548a68954 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 246b45e32d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-22 (Sat, 22 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-22 16:15:37 +02:00
vanhofen
4231ff4f8a Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b2eb4bfb3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-22 (Sat, 22 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-22 16:13:02 +02:00
vanhofen
852b6e85e3 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a7c35a3373
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-22 (Sat, 22 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-22 10:35:44 +02:00
Thilo Graf
425c0b40de CComponentsHeader/CChannelList: unify methode names
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9ef6c49a23
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-21 (Fri, 21 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-21 23:07:14 +02:00
Thilo Graf
7c03858f7c 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
------------------
Branch: ni/coolstream
Commit: 68835056c3
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-21 (Fri, 21 Apr 2017)



------------------
This commit was generated by Migit
2017-04-21 22:47:23 +02:00
vanhofen
6850970ff1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 292d7a2d5d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-19 (Wed, 19 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-19 23:24:19 +02:00
vanhofen
cd653ca806 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 11a28c07d6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-19 (Wed, 19 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-19 21:35:56 +02:00
vanhofen
5bc6b7c1a1 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/channellist.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c12bba6e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-13 (Thu, 13 Apr 2017)



------------------
This commit was generated by Migit
2017-04-13 10:02:31 +02:00
vanhofen
09237ad821 channelist: rename bool pig_on_win to minitv_is_active
Origin commit data
------------------
Branch: ni/coolstream
Commit: 42aca4a4c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-12 (Wed, 12 Apr 2017)

Origin message was:
------------------
- channelist: rename bool pig_on_win to minitv_is_active

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

------------------
This commit was generated by Migit
2017-04-12 10:04:04 +02:00
vanhofen
cd40e9c6a7 channellist: one more missing OFFSET define
Origin commit data
------------------
Branch: ni/coolstream
Commit: 31979a4f87
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-12 (Wed, 12 Apr 2017)

Origin message was:
------------------
- channellist: one more missing OFFSET define

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

------------------
This commit was generated by Migit
2017-04-12 10:04:03 +02:00
vanhofen
d1ebb01719 channelist: use OFFSET defines for bottom detailsbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: f4a0e8faf1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-12 (Wed, 12 Apr 2017)

Origin message was:
------------------
- channelist: use OFFSET defines for bottom detailsbox

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

------------------
This commit was generated by Migit
2017-04-12 09:31:21 +02:00
vanhofen
788e238750 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a14dfd8edd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-11 (Tue, 11 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-11 23:28:30 +02:00
vanhofen
f50172b2fb Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/channellist.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fca2de73e7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-11 (Tue, 11 Apr 2017)



------------------
This commit was generated by Migit
2017-04-11 23:14:03 +02:00
vanhofen
c03b2777cd channellist: a bit more offset for item; fix progressbar's width
use OFFSET defines for logo in header and in right infozone


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e6746e2aa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-11 (Tue, 11 Apr 2017)

Origin message was:
------------------
- channellist: a bit more offset for item; fix progressbar's width

use OFFSET defines for logo in header and in right infozone


------------------
This commit was generated by Migit
2017-04-11 23:12:41 +02:00
vanhofen
d291aa3c22 channellist: simplify MaxChanNr() function
Origin commit data
------------------
Branch: ni/coolstream
Commit: 763f16ccca
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-11 (Tue, 11 Apr 2017)

Origin message was:
------------------
- channellist: simplify MaxChanNr() function

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

------------------
This commit was generated by Migit
2017-04-11 23:12:41 +02:00
vanhofen
45f0ad7d7e Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/scan_setup.cpp
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 55743aff0c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)



------------------
This commit was generated by Migit
2017-03-15 23:39:43 +01:00
vanhofen
ae3ecfdcfb Merge remote-tracking branch 'neutrino-mp/master' into pu/mp
Conflicts:
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8bdb16cec6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)



------------------
This commit was generated by Migit
2017-03-13 16:14:33 +01:00
vanhofen
7dcc90f09f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c4fa0eb30e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)



------------------
This commit was generated by Migit
2017-03-13 12:45:30 +01:00
vanhofen
51c85e1c58 unify DetailsLine-names; move define to settings.h
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5b0faeab8c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)

Origin message was:
------------------
- unify DetailsLine-names; move define to settings.h

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

------------------
This commit was generated by Migit
2017-03-13 12:40:04 +01:00
Stefan Seyfried
a5cbcf84af Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: abec1c311b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-04 19:32:30 +01:00