Commit Graph

300 Commits

Author SHA1 Message Date
Stefan Seyfried
41a03e3d4f channellist: don't change bouquetmode when adding favs
when adding a channel to favorites from the channellist contextmenu
the favorites bouquet was chosen, which is not helpful if further
favorites should be added


Origin commit data
------------------
Branch: ni/coolstream
Commit: 99e2ff32c9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)



------------------
This commit was generated by Migit
2013-03-11 13:32:06 +01:00
[CST] Focus
717af18b72 gui/channellist.cpp: use zapit client for PiP
Origin commit data
------------------
Branch: ni/coolstream
Commit: e05ab5297d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-08 (Fri, 08 Mar 2013)


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

------------------
This commit was generated by Migit
2013-03-08 14:14:26 +04:00
Thilo Graf
a2e86eb065 CChannelList: fix compile error
clearItem2DetailsLine()candidate expects 1 argument, 2 provided


Origin commit data
------------------
Branch: ni/coolstream
Commit: ba4e026b33
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-02-22 (Fri, 22 Feb 2013)



------------------
This commit was generated by Migit
2013-03-06 11:28:17 +01:00
Thilo Graf
19ce4c4d7c CChannelList: revert of some implementations of CComponents classes
Current state of CChannelList is mostly not compatible with CC-classes and
implementations are to expensive at the moment, because more preparations are necessary.


Origin commit data
------------------
Branch: ni/coolstream
Commit: ce2e95cc5a
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-02-18 (Mon, 18 Feb 2013)

Origin message was:
------------------
CChannelList: revert of some implementations of CComponents classes

Current state of CChannelList is mostly not compatible with CC-classes and
implementations are to expensive at the moment, because more preparations are necessary.


------------------
This commit was generated by Migit
2013-03-06 11:28:17 +01:00
Thilo Graf
1dc39a828b CChannelList: devel_cc fix merge errors
var full_width was lost during merge, this fixes
header and details width


Origin commit data
------------------
Branch: ni/coolstream
Commit: ec0a91813a
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-02-17 (Sun, 17 Feb 2013)



------------------
This commit was generated by Migit
2013-03-06 11:28:16 +01:00
Michael Liebmann
dd48917b6d channellist.cpp: Fix segfault at 'delete Infobox' when changes in bouquet list.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 505d14c0a1
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-09-22 (Sat, 22 Sep 2012)


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

------------------
This commit was generated by Migit
2013-03-06 11:28:05 +01:00
Thilo Graf
e0ac1d2d8e CChannelList: adapt for new functionality in CComponents
Origin commit data
------------------
Branch: ni/coolstream
Commit: d0af8fb7bf
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-03 (Mon, 03 Sep 2012)


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

------------------
This commit was generated by Migit
2013-03-06 11:28:02 +01:00
Thilo Graf
a974ef0652 CChannellist: remove calculateElements()
is already included in print()clHead->paint() and refreshElement()


Origin commit data
------------------
Branch: ni/coolstream
Commit: 936e965909
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-30 (Thu, 30 Aug 2012)



------------------
This commit was generated by Migit
2013-03-06 11:28:00 +01:00
Michael Liebmann
0275686caa Channellist: Use CComponentsTitleBar for paint head
Origin commit data
------------------
Branch: ni/coolstream
Commit: cd4cb6645e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-08-29 (Wed, 29 Aug 2012)


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

------------------
This commit was generated by Migit
2013-03-06 11:28:00 +01:00
Thilo Graf
c3f1761931 CChannelList: use own function to get transponder info
Origin commit data
------------------
Branch: ni/coolstream
Commit: 32f2f8a85d
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-25 (Sat, 25 Aug 2012)


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

------------------
This commit was generated by Migit
2013-03-06 11:27:57 +01:00
Thilo Graf
1e24bf237b CChannelList: adapt for new CComponentsInfoBox functionality
TODO:
paint text into infobox with CComponentsInfoBox


Origin commit data
------------------
Branch: ni/coolstream
Commit: c53a0a7ab4
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-25 (Sat, 25 Aug 2012)



------------------
This commit was generated by Migit
2013-03-06 11:27:57 +01:00
Thilo Graf
545d81dbf8 CChannelList: adapt for last changes in CComponents
Origin commit data
------------------
Branch: ni/coolstream
Commit: d59eb05427
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-16 (Thu, 16 Aug 2012)


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

------------------
This commit was generated by Migit
2013-03-06 11:27:53 +01:00
Michael Liebmann
a04b384a00 channellist.cpp: paint details
- Rework paintItem2DetailsLine()
- Use CComponentsInfoBox for paintDetails()
- Set missing height of down mark


Origin commit data
------------------
Branch: ni/coolstream
Commit: 413e224128
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-08-08 (Wed, 08 Aug 2012)

Origin message was:
------------------
* channellist.cpp: paint details

- Rework paintItem2DetailsLine()
- Use CComponentsInfoBox for paintDetails()
- Set missing height of down mark


------------------
This commit was generated by Migit
2013-03-06 11:27:52 +01:00
[CST] Focus
74b6f43d90 use ENABLE_PIP for pip code
Origin commit data
------------------
Branch: ni/coolstream
Commit: cbfa6f88c5
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-05 (Tue, 05 Mar 2013)


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

------------------
This commit was generated by Migit
2013-03-05 18:34:47 +04:00
[CST] Focus
632df4ddb3 Merge branch 'pip' into next
Conflicts:
	src/gui/channellist.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 69b4d366af
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-28 (Thu, 28 Feb 2013)



------------------
This commit was generated by Migit
2013-02-28 16:45:41 +04:00
[CST] Focus
ac4eb12451 gui/channellist.cpp: start/stop PiP for selected channel on play button
Origin commit data
------------------
Branch: ni/coolstream
Commit: 682c3c4f37
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-27 (Wed, 27 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-27 11:02:13 +04:00
Stefan Seyfried
3f900c5587 channellist: initialize values to satisfy valgrind
Origin commit data
------------------
Branch: ni/coolstream
Commit: b0c7ca94a7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-22 (Fri, 22 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-24 13:56:47 +01:00
Thilo Graf
e633da346a CChannelList: fix position of minitv, small cleanups
This is only a provisionally fix. A rework of initialisation for
many member variables seems to be necessary.


Origin commit data
------------------
Branch: ni/coolstream
Commit: f90395b81d
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-02-22 (Fri, 22 Feb 2013)



------------------
This commit was generated by Migit
2013-02-22 09:23:33 +01:00
Stefan Seyfried
0e01a7b32c neutrino: fix 32<->64bit format string warnings
use portable C99 format string macros for 64bit types to
fix many warnings when compiling for 64bit architectures,
add some (int) casts for size_t


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4dbeb3a31e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)



------------------
This commit was generated by Migit
2013-02-21 15:47:18 +01:00
Thilo Graf
2b4cf29743 CComponents: move class into its own source directory
The components could over time become quite large,
so it makes more sense, coming features to split into
multiple files and to do it in a separate directory.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0a961a4cf6
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-02-19 (Tue, 19 Feb 2013)



------------------
This commit was generated by Migit
2013-02-19 11:27:46 +01:00
vanhofen
9bfda4ef80 channellist.cpp: change order of painting to be more liquid
Origin commit data
------------------
Branch: ni/coolstream
Commit: b307f4c8d4
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-18 (Mon, 18 Feb 2013)

Origin message was:
------------------
- channellist.cpp: change order of painting to be more liquid

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

------------------
This commit was generated by Migit
2013-02-18 21:54:52 +01:00
vanhofen
544cec7f7f channellist.cpp: show pic instead of miniTV in radiomode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8a7687abe1
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-18 (Mon, 18 Feb 2013)

Origin message was:
------------------
- channellist.cpp: show pic instead of miniTV in radiomode

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

------------------
This commit was generated by Migit
2013-02-18 21:00:19 +01:00
vanhofen
7add27227a channellist.cpp: fix logo position if new_zap_mode is off
Origin commit data
------------------
Branch: ni/coolstream
Commit: 782c9f107c
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-17 (Sun, 17 Feb 2013)

Origin message was:
------------------
- channellist.cpp: fix logo position if new_zap_mode is off

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

------------------
This commit was generated by Migit
2013-02-17 23:20:04 +01:00
vanhofen
5cb52c38dd channellist.cpp: fix broken display of infobar while zapping
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9632f3bad7
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-17 (Sun, 17 Feb 2013)

Origin message was:
------------------
- channellist.cpp: fix broken display of infobar while zapping

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

------------------
This commit was generated by Migit
2013-02-17 22:57:37 +01:00
vanhofen
119f0c82f6 Revert "Revert '- channellist.cpp: enable to lock new_zap_mode'"
This reverts commit 72fd77bb5f.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 505c4ba80d
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-17 (Sun, 17 Feb 2013)



------------------
This commit was generated by Migit
2013-02-17 22:55:28 +01:00
vanhofen
a44c4bf1b8 channellist.cpp: allow colored events (for time) in right eventlist
Origin commit data
------------------
Branch: ni/coolstream
Commit: ddbac1b248
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-17 (Sun, 17 Feb 2013)

Origin message was:
------------------
- channellist.cpp: allow colored events (for time) in right eventlist

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

------------------
This commit was generated by Migit
2013-02-17 21:55:21 +01:00
vanhofen
72fd77bb5f Revert "- channellist.cpp: enable to lock new_zap_mode"
This reverts commit 8b1b3b1418
because the display of infobar while zapping is broken with
this commit.


Origin commit data
------------------
Branch: ni/coolstream
Commit: fb892d18ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-15 (Fri, 15 Feb 2013)



------------------
This commit was generated by Migit
2013-02-15 22:55:45 +01:00
Michael Liebmann
e98cad9904 channellist.cpp: Show channel list vertically centered
Origin commit data
------------------
Branch: ni/coolstream
Commit: 91d76a9487
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-02-13 (Wed, 13 Feb 2013)

Origin message was:
------------------
* channellist.cpp: Show channel list vertically centered

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

------------------
This commit was generated by Migit
2013-02-13 23:34:55 +01:00
Michael Liebmann
d91211cf74 channellist.cpp: Fix time display in event list
- fix compiler warning


Origin commit data
------------------
Branch: ni/coolstream
Commit: b2f5ca589d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-02-12 (Tue, 12 Feb 2013)

Origin message was:
------------------
* channellist.cpp: Fix time display in event list

- fix compiler warning


------------------
This commit was generated by Migit
2013-02-12 21:34:18 +01:00
tomworld
177ebb4fba channellist.cpp: Use extra font for event list
Origin commit data
------------------
Branch: ni/coolstream
Commit: 105c6b4c70
Author: tomworld <atzeworld@msn.com>
Date: 2013-02-12 (Tue, 12 Feb 2013)

Origin message was:
------------------
* channellist.cpp: Use extra font for event list

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

------------------
This commit was generated by Migit
2013-02-12 15:45:27 +01:00
vanhofen
8b1b3b1418 channellist.cpp: enable to lock new_zap_mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 15d787f79b
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-10 (Sun, 10 Feb 2013)

Origin message was:
------------------
- channellist.cpp: enable to lock new_zap_mode

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

------------------
This commit was generated by Migit
2013-02-10 21:03:43 +01:00
TangoCash
132c4abd78 channellist.cpp: add epg-desc to blue button ...
... if g_settings.channellist_additional is not off.

initially patch by TangoCash with marginal modifications


Origin commit data
------------------
Branch: ni/coolstream
Commit: 31080fa98c
Author: TangoCash <eric@loxat.de>
Date: 2013-02-09 (Sat, 09 Feb 2013)

Origin message was:
------------------
- channellist.cpp: add epg-desc to blue button ...

... if g_settings.channellist_additional is not off.

initially patch by TangoCash with marginal modifications


------------------
This commit was generated by Migit
2013-02-09 10:36:11 +01:00
vanhofen
aba592b157 channellist.cpp: fix restore to fullTV
... when turning miniTV off from the menu inside the channellist


Origin commit data
------------------
Branch: ni/coolstream
Commit: c6155f29b4
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-06 (Wed, 06 Feb 2013)

Origin message was:
------------------
- channellist.cpp: fix restore to fullTV

... when turning miniTV off from the menu inside the channellist


------------------
This commit was generated by Migit
2013-02-06 21:19:49 +01:00
vanhofen
99ceae9f06 channellist.cpp: 'fix' the double determination of dimensions/coordinates
Origin commit data
------------------
Branch: ni/coolstream
Commit: d4635b690f
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-05 (Tue, 05 Feb 2013)

Origin message was:
------------------
- channellist.cpp: 'fix' the double determination of dimensions/coordinates

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

------------------
This commit was generated by Migit
2013-02-05 23:56:48 +01:00
vanhofen
c5de0e7e67 channellist.cpp: determinate startTimeWidth from a fixed value
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6f4ea5baa
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-05 (Tue, 05 Feb 2013)

Origin message was:
------------------
- channellist.cpp: determinate startTimeWidth from a fixed value

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

------------------
This commit was generated by Migit
2013-02-05 17:01:18 +01:00
vanhofen
05945fdeed channellist.cpp: remove time for no further events
thx to TangoCash.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 54ed166d1f
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-05 (Tue, 05 Feb 2013)

Origin message was:
------------------
- channellist.cpp: remove time for no further events

thx to TangoCash.


------------------
This commit was generated by Migit
2013-02-05 01:36:28 +01:00
vanhofen
21694b1d47 channellist.cpp: fix wrong time for no further events
patch by TangoCash. thx!


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3bdb3bbc07
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-05 (Tue, 05 Feb 2013)

Origin message was:
------------------
- channellist.cpp: fix wrong time for no further events

patch by TangoCash. thx!


------------------
This commit was generated by Migit
2013-02-05 00:58:31 +01:00
vanhofen
00d0c54a19 channellist.cpp: fix shortcuts in submenu and add a seperator line
Origin commit data
------------------
Branch: ni/coolstream
Commit: ee0cb25258
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-05 (Tue, 05 Feb 2013)

Origin message was:
------------------
- channellist.cpp: fix shortcuts in submenu and add a seperator line

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

------------------
This commit was generated by Migit
2013-02-05 00:30:16 +01:00
vanhofen
ca1569c428 channellist: make miniTV switchable
Origin commit data
------------------
Branch: ni/coolstream
Commit: d8bd46e9d1
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-04 (Mon, 04 Feb 2013)

Origin message was:
------------------
- channellist: make miniTV switchable

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

------------------
This commit was generated by Migit
2013-02-04 22:25:15 +01:00
vanhofen
5c3119d73f channellist.cpp: rework header and buttonbar
* paint channellogo in mini-tv-mode
* strech the positions of right elements in header marginally
* paint buttonbar over the full width


Origin commit data
------------------
Branch: ni/coolstream
Commit: 77bbdfa0c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-02 (Sat, 02 Feb 2013)

Origin message was:
------------------
- channellist.cpp: rework header and buttonbar

* paint channellogo in mini-tv-mode
* strech the positions of right elements in header marginally
* paint buttonbar over the full width


------------------
This commit was generated by Migit
2013-02-02 02:10:35 +01:00
vanhofen
28a4b5f5d6 channellist.cpp: change color for infozone
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1e45607ae1
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-01 (Fri, 01 Feb 2013)

Origin message was:
------------------
- channellist.cpp: change color for infozone

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

------------------
This commit was generated by Migit
2013-02-01 23:26:33 +01:00
vanhofen
95a719d92e channellist.cpp: fix round borders for infozone
Origin commit data
------------------
Branch: ni/coolstream
Commit: ec4a5bf3c1
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-01 (Fri, 01 Feb 2013)

Origin message was:
------------------
- channellist.cpp: fix round borders for infozone

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

------------------
This commit was generated by Migit
2013-02-01 22:59:07 +01:00
Michael Liebmann
3378aeeb50 src/gui/channellist.cpp: miniTV osd fix
- Screen coordinate x could possibly receive a value under 0


Origin commit data
------------------
Branch: ni/coolstream
Commit: 49667088f7
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)

Origin message was:
------------------
* src/gui/channellist.cpp: miniTV osd fix

- Screen coordinate x could possibly receive a value under 0


------------------
This commit was generated by Migit
2013-01-31 20:05:03 +01:00
Jacek Jendrzej
fe38ed371a src/gui/channellist.cpp: fix possible segfault
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e5b54c509
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-31 16:18:05 +01:00
Jacek Jendrzej
141b1b9d65 src/gui/channellist.cpp: minitv osd fix
Origin commit data
------------------
Branch: ni/coolstream
Commit: 17cfb97f9e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-31 11:14:38 +01:00
Jacek Jendrzej
08873a05cc src/gui/channellist.cpp: fix minitv gui & segfault
Origin commit data
------------------
Branch: ni/coolstream
Commit: e509f19361
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-30 23:37:11 +01:00
Jacek Jendrzej
f6f0911121 compil fix for commit 263340cd22
Origin commit data
------------------
Branch: ni/coolstream
Commit: deeed028d4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-30 19:31:57 +01:00
TangoCash
263340cd22 add optional mini-tv to channellist
Signed-off-by: satbaby <crashdvb@googlemail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1a425308ed
Author: TangoCash <eric@loxat.de>
Date: 2013-01-30 (Wed, 30 Jan 2013)



------------------
This commit was generated by Migit
2013-01-30 19:17:52 +01:00
Jacek Jendrzej
0af735aa17 src/gui/channellist.cpp:-add sort by channel number
Origin commit data
------------------
Branch: ni/coolstream
Commit: c47aebdb64
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-09 (Fri, 09 Nov 2012)


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

------------------
This commit was generated by Migit
2012-11-09 17:32:15 +01:00
[CST] Focus
4de110219b gui/channellist.cpp: not allow zap on scroll mode,
if current neutrino mode is mode_ts


Origin commit data
------------------
Branch: ni/coolstream
Commit: 50b17f58f4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-10-22 (Mon, 22 Oct 2012)



------------------
This commit was generated by Migit
2012-10-22 13:30:31 +04:00