Commit Graph

326 Commits

Author SHA1 Message Date
Thilo Graf
293b756560 CChannellist: add missig frame for timscale
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6fa592323b
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-06 10:21:22 +02:00
Stefan Seyfried
800d10bfd5 neutrino: do not display expired events in channel list
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6bc2a8a5d8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-01-22 (Sun, 22 Jan 2012)


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

------------------
This commit was generated by Migit
2013-04-05 16:32:43 +04:00
Stefan Seyfried
c8375fc05c channellist: limit context-menu on non-unlocked bouquets
don't allow adding of channels from locked bouquets to favorites
or unlocked bouquets to avoit circumvention of bouquet locks


Origin commit data
------------------
Branch: ni/coolstream
Commit: be1b73b7a0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-08-14 (Tue, 14 Aug 2012)



------------------
This commit was generated by Migit
2013-04-05 15:53:30 +04:00
Stefan Seyfried
d2478aa428 neutrino: add the possibility to lock bouquets by default
This basically inverts the "locked" attribute of bouquets.xml and
allows to selectively enable only favourites or similar.

Conflicts:
	src/gui/channellist.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 27493de2ef
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-10-30 (Sun, 30 Oct 2011)



------------------
This commit was generated by Migit
2013-04-05 15:52:58 +04:00
[CST] Focus
e948052a53 gui/channellist.cpp: move info/menu/zap icons from head to button bar;
add play button icon for PiP;
rework CChannelList::paintButtonBar;
handle PiP key binding in addition to play button


Origin commit data
------------------
Branch: ni/coolstream
Commit: d79d592d27
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-05 (Fri, 05 Apr 2013)



------------------
This commit was generated by Migit
2013-04-05 15:15:44 +04:00
Stefan Seyfried
42e163074f neutrino: make button bar use available space intelligently
modify the paintButtons() function, so that it spreads the buttons
over the available width with constant space between them.
Port over all users to the new method and clean up quite some custom
button drawing code on the way.

Conflicts:
	src/gui/audioplayer.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: e09bc260da
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-10-03 (Mon, 03 Oct 2011)



------------------
This commit was generated by Migit
2013-04-05 14:50:28 +04:00
Thilo Graf
71248e0dc7 CComponents: add progressbar class to cc-items
CProgressbar moved into components sub directory and adapt includes.
Progressbar objects are now usable as cc-item

TODO:
-some color and size corrections
-found some dub codes for sig and snr-bars, needs rework


Origin commit data
------------------
Branch: ni/coolstream
Commit: 860be9a412
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-01 (Mon, 01 Apr 2013)



------------------
This commit was generated by Migit
2013-04-02 09:31:05 +02:00
Jacek Jendrzej
75ef8a2298 src/gui/channellist.cpp: fix to 36e95d7fbcd22dfbb94d03867f10634f7a72df63 if more bouquets empty
Origin commit data
------------------
Branch: ni/coolstream
Commit: 25653df890
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-03-27 (Wed, 27 Mar 2013)


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

------------------
This commit was generated by Migit
2013-04-01 16:19:51 +04:00
Stefan Seyfried
324fd24f55 channellist: refactor to avoid duplicated code
Conflicts:
	src/gui/channellist.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d318fd296
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)



------------------
This commit was generated by Migit
2013-04-01 15:47:10 +04:00
vanhofen
0cad5bca1a strech most windows to full screen
* switchable with existing switch for 'big_windows'
* 'big_windows' default is on

Conflicts:
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bedit/bouqueteditor_chanselect.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4714a30f83
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)

Origin message was:
------------------
- strech most windows to full screen

* switchable with existing switch for 'big_windows'
* 'big_windows' default is on

Conflicts:
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bedit/bouqueteditor_chanselect.cpp


------------------
This commit was generated by Migit
2013-04-01 15:42:38 +04:00
vanhofen
0df9b800da fix my last commit 0064c6c (recalc height)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 39f16c7dc3
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-17 (Sun, 17 Mar 2013)

Origin message was:
------------------
- fix my last commit 0064c6c (recalc height)

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

------------------
This commit was generated by Migit
2013-04-01 14:59:51 +04:00
vanhofen
e6a89d7bec channellist: fix dimensions when using very large fonts
* paint scrollbar over full height of main box


Origin commit data
------------------
Branch: ni/coolstream
Commit: bfd2095dfc
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-16 (Sat, 16 Mar 2013)

Origin message was:
------------------
- channellist: fix dimensions when using very large fonts

* paint scrollbar over full height of main box


------------------
This commit was generated by Migit
2013-04-01 14:59:28 +04:00
[CST] Focus
fa4ef39db9 gui/channellist.cpp: adjust channel list mode on numeric zap
Origin commit data
------------------
Branch: ni/coolstream
Commit: f35065b918
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-01 (Mon, 01 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-01 14:15:47 +04:00
Jacek Jendrzej
c4b67751af src/gui/channellist.cpp: fix to 06ac21d495 if more bouquets empty
Origin commit data
------------------
Branch: ni/coolstream
Commit: f4ae5e17ce
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-03-27 (Wed, 27 Mar 2013)


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

------------------
This commit was generated by Migit
2013-03-27 16:18:32 +01:00
Stefan Seyfried
06ac21d495 channellist: refactor to avoid duplicated code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 36e95d7fbc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)


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

------------------
This commit was generated by Migit
2013-03-25 14:06:16 +01:00
vanhofen
ed04cfdf36 strech most windows to full screen
* switchable with existing switch for 'big_windows'
* 'big_windows' default is on


Origin commit data
------------------
Branch: ni/coolstream
Commit: 759966f935
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)

Origin message was:
------------------
- strech most windows to full screen

* switchable with existing switch for 'big_windows'
* 'big_windows' default is on


------------------
This commit was generated by Migit
2013-03-25 09:45:22 +01:00
Thilo Graf
9768e4a40b CChannelList: ensure new init of dline
Causes correct paint of details line, if osd settings
have been changed.


Origin commit data
------------------
Branch: ni/coolstream
Commit: deab17dc25
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-03-24 (Sun, 24 Mar 2013)



------------------
This commit was generated by Migit
2013-03-24 21:16:49 +01:00
Thilo Graf
6b95b563d9 CChannelList: remove details line on changing pages
details line was not completely killed changed page.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 407d9fe800
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-03-21 (Thu, 21 Mar 2013)



------------------
This commit was generated by Migit
2013-03-21 11:38:40 +01:00
vanhofen
7a0504a902 fix my last commit a81d99d (recalc height)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3584a11872
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-17 (Sun, 17 Mar 2013)

Origin message was:
------------------
- fix my last commit a81d99d (recalc height)

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

------------------
This commit was generated by Migit
2013-03-17 20:15:17 +01:00
vanhofen
a81d99db69 channellist: fix dimensions when using very large fonts
* paint scrollbar over full height of main box


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0064c6c704
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-16 (Sat, 16 Mar 2013)

Origin message was:
------------------
- channellist: fix dimensions when using very large fonts

* paint scrollbar over full height of main box


------------------
This commit was generated by Migit
2013-03-16 23:47:23 +01:00
[CST] Focus
7dda836636 gui/channellist.cpp: add comment about PiG mode with still image displayed
Origin commit data
------------------
Branch: ni/coolstream
Commit: f57c77bbc3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-14 (Thu, 14 Mar 2013)


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

------------------
This commit was generated by Migit
2013-03-14 19:11:21 +04:00
[CST] Focus
f0f30ada34 gui/channellist.cpp: add 'force' arg to zap functions, to trigger zap
Origin commit data
------------------
Branch: ni/coolstream
Commit: c60b8fc741
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-13 (Wed, 13 Mar 2013)


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

------------------
This commit was generated by Migit
2013-03-13 18:54:30 +04:00
[CST] Focus
a1fd277cc1 gui/channellist.cpp: use CNeutrinoApp::StartPip
Origin commit data
------------------
Branch: ni/coolstream
Commit: d2472e64cf
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-13 (Wed, 13 Mar 2013)


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

------------------
This commit was generated by Migit
2013-03-13 16:26:59 +04:00
Stefan Seyfried
aaa3dc1cec channellist: preset favorite bouquets when adding channels
when adding channels from the channellist context menu, the
useful targets are the favorites bouquets, so pre-select them


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



------------------
This commit was generated by Migit
2013-03-12 16:33:15 +04:00
Stefan Seyfried
0e2e3df4dc 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: 367f6f6559
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)



------------------
This commit was generated by Migit
2013-03-12 16:33:00 +04:00
Stefan Seyfried
993f90e700 channellist: preset favorite bouquets when adding channels
when adding channels from the channellist context menu, the
useful targets are the favorites bouquets, so pre-select them


Origin commit data
------------------
Branch: ni/coolstream
Commit: f8aacb7a10
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
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