Commit Graph

421 Commits

Author SHA1 Message Date
Christian Schuett
468cdc0835 CChannelList: mark current channel if not selected
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 32ca9b848c
Author: Christian Schuett <Gaucho316@hotmail.com>
Date: 2013-09-19 (Thu, 19 Sep 2013)



------------------
This commit was generated by Migit
2013-09-19 09:28:42 +02:00
Thilo Graf
6d90cc0a5c CComponents: remove member setCornerRadius(),
setCorner() replaces this function, 2nd parameter sets type


Origin commit data
------------------
Branch: ni/coolstream
Commit: 33ec56ad6f
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-09-15 (Sun, 15 Sep 2013)



------------------
This commit was generated by Migit
2013-09-19 08:24:40 +02:00
[CST] Focus
66c5c51b0e channel list: restrict adding channels to favorits only,
show empty bouquets only in channel add mode


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8a8f996ca0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-18 (Wed, 18 Sep 2013)



------------------
This commit was generated by Migit
2013-09-18 12:57:56 +04:00
Jacek Jendrzej
d1889b0052 channellist: disable scale window size with miniTV
Origin commit data
------------------
Branch: ni/coolstream
Commit: be74a66d7b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-09-05 (Thu, 05 Sep 2013)


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

------------------
This commit was generated by Migit
2013-09-05 20:42:16 +02:00
[CST] Focus
a10c18d3e1 gui/channellist.cpp: disable show bouquet name on VFD
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0e72bf5905
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-03 (Tue, 03 Sep 2013)


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

------------------
This commit was generated by Migit
2013-09-03 18:23:20 +04:00
Michael Liebmann
20da0c47fa src/gui/channellist.cpp: Fix OSD (headerclock)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 83ee284269
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-02 (Mon, 02 Sep 2013)


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

------------------
This commit was generated by Migit
2013-09-02 23:50:12 +02:00
vanhofen
9906e3f32e channellist: disable miniTV in movieplayer-mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: ebd5f54753
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-09-02 (Mon, 02 Sep 2013)

Origin message was:
------------------
- channellist: disable miniTV in movieplayer-mode

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

------------------
This commit was generated by Migit
2013-09-02 22:37:07 +02:00
Jacek Jendrzej
bfd2b2da05 CChannelList::paintItem:-fix description width with scrambled icon
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4c8e32101c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-09-01 (Sun, 01 Sep 2013)


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

------------------
This commit was generated by Migit
2013-09-01 17:03:32 +02:00
[CST] Focus
d75cb5824d gui/channellist.cpp: fix quick zap and virtual zap, when
empty bouquets present and zap cycle in current bouquet is disabled


Origin commit data
------------------
Branch: ni/coolstream
Commit: 853baa6f29
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)



------------------
This commit was generated by Migit
2013-07-30 11:13:50 +04:00
[CST] Focus
e5e653b417 gui/channellist.cpp: fix selected after direct record
Origin commit data
------------------
Branch: ni/coolstream
Commit: 291a990be3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)


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

------------------
This commit was generated by Migit
2013-07-30 11:13:50 +04:00
Jacek Jendrzej
7cf4b52977 CChannelList::paint(): reduce background paint in miniTV mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: d5876963e7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-07-23 (Tue, 23 Jul 2013)


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

------------------
This commit was generated by Migit
2013-07-23 19:24:42 +02:00
Thilo Graf
1c7d6df290 CChannelList: use matching datatype for color
Origin commit data
------------------
Branch: ni/coolstream
Commit: 72c4deb17c
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-07-15 (Mon, 15 Jul 2013)


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

------------------
This commit was generated by Migit
2013-07-21 22:04:10 +02:00
Michael Liebmann
221b6ee8b4 Replace color indexes of the text colors by real color values for RenderString()
- If necessary, Correct data types of the color values


Origin commit data
------------------
Branch: ni/coolstream
Commit: c60c5c5ce3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-11 (Thu, 11 Jul 2013)



------------------
This commit was generated by Migit
2013-07-21 22:00:58 +02:00
Thilo Graf
68eb06a387 CComponentsFrmClock: set font only with fontrender object
Origin commit data
------------------
Branch: ni/coolstream
Commit: 03ef18cdb9
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-06-18 (Tue, 18 Jun 2013)


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

------------------
This commit was generated by Migit
2013-06-18 19:33:34 +02:00
Michael Liebmann
b9e207f268 CChannelList: Use one instance of CComponentsFrmClock for multiple instances of CChannelList
Origin commit data
------------------
Branch: ni/coolstream
Commit: f0de4567ae
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-12 (Wed, 12 Jun 2013)


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

------------------
This commit was generated by Migit
2013-06-12 01:32:24 +02:00
Michael Liebmann
a27bcc6d3b CChannelList: using CComponentsHeader to paint header
- using CComponentsFrmClock to paint clock in header


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0128a61708
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-01 (Sat, 01 Jun 2013)

Origin message was:
------------------
* CChannelList: using CComponentsHeader to paint header

- using CComponentsFrmClock to paint clock in header


------------------
This commit was generated by Migit
2013-06-01 19:37:46 +02:00
Jacek Jendrzej
3013df2296 channllist: fix new_zap_mode handling
Origin commit data
------------------
Branch: ni/coolstream
Commit: daf539b141
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-06-01 (Sat, 01 Jun 2013)

Origin message was:
------------------
- channllist: fix new_zap_mode handling

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

------------------
This commit was generated by Migit
2013-06-01 08:30:37 +02:00
Stefan Seyfried
5f1b5fbdcb neutrino: fix possible div-by-zero in scrollbar calculation
Origin commit data
------------------
Branch: ni/coolstream
Commit: a33086568b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-29 (Wed, 29 May 2013)


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

------------------
This commit was generated by Migit
2013-05-30 11:19:39 +02:00
vanhofen
f8033a3ba2 channellist: using small buttons in buttonbar
Origin commit data
------------------
Branch: ni/coolstream
Commit: e492048eab
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-26 (Sun, 26 May 2013)

Origin message was:
------------------
- channellist: using small buttons in buttonbar

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

------------------
This commit was generated by Migit
2013-05-26 23:06:58 +02:00
Jacek Jendrzej
c9565c9d33 ChannelList::quickZap -record mode- should zap if possible, else display transponderlist
Origin commit data
------------------
Branch: ni/coolstream
Commit: a01551d360
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-25 (Sat, 25 May 2013)

Origin message was:
------------------
ChannelList::quickZap -record mode- should zap if possible, else display transponderlist

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

------------------
This commit was generated by Migit
2013-05-25 13:05:55 +02:00
Michael Liebmann
4bbf0e81cd CChannelList: prevent possible compile error
Origin commit data
------------------
Branch: ni/coolstream
Commit: a48e7fa200
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-05-19 (Sun, 19 May 2013)

Origin message was:
------------------
* CChannelList: prevent possible compile error

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

------------------
This commit was generated by Migit
2013-05-19 08:41:05 +01:00
vanhofen
efdedf8e6a channellist: colored_events to right infobox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 273a83fa3f
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-18 (Sat, 18 May 2013)

Origin message was:
------------------
- channellist: colored_events to right infobox

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

------------------
This commit was generated by Migit
2013-05-18 23:59:06 +02:00
Jacek Jendrzej
c8d82ff694 channellist.cpp fix compil -comparison between signed and unsigned integer expressions
Origin commit data
------------------
Branch: ni/coolstream
Commit: c32266e8f4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-13 (Mon, 13 May 2013)

Origin message was:
------------------
 channellist.cpp fix compil -comparison between signed and unsigned integer expressions

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

------------------
This commit was generated by Migit
2013-05-13 08:48:29 +02:00
vanhofen
826a476888 channellist: disable 'displayNext' when additional infos enabled
* otherwise there is no possibility to disable 'displayNext'
 except exiting the channellist


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2ab63ce14d
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-12 (Sun, 12 May 2013)

Origin message was:
------------------
- channellist: disable 'displayNext' when additional infos enabled

* otherwise there is no possibility to disable 'displayNext'
 except exiting the channellist


------------------
This commit was generated by Migit
2013-05-12 23:41:36 +02:00
vanhofen
7bf34687f8 channellist: show infotext when epg.info2 is empty ...
... and 'description' is selected in additional infos

* fix double paint of infozone


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4277b8e283
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-12 (Sun, 12 May 2013)

Origin message was:
------------------
- channellist: show infotext when epg.info2 is empty ...

... and 'description' is selected in additional infos

* fix double paint of infozone


------------------
This commit was generated by Migit
2013-05-12 23:06:57 +02:00
vanhofen
12186c29cc channellist: show current event in additional info box
Origin commit data
------------------
Branch: ni/coolstream
Commit: e170aec2d9
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-12 (Sun, 12 May 2013)

Origin message was:
------------------
- channellist: show current event in additional info box

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

------------------
This commit was generated by Migit
2013-05-12 22:26:10 +02:00
Jacek Jendrzej
e72c03e5f7 CChannelList::show() call hide only once
Origin commit data
------------------
Branch: ni/coolstream
Commit: 438248bfac
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-09 (Thu, 09 May 2013)


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

------------------
This commit was generated by Migit
2013-05-09 16:32:11 +02:00
Jacek Jendrzej
3fed954162 src/gui/channellist.cpp: skip paint BG for item if firstpaint
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4bf2a4aa19
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-03 (Fri, 03 May 2013)


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

------------------
This commit was generated by Migit
2013-05-03 18:42:35 +02:00
vanhofen
4f3e7a0379 channellist: fix transparent pixels in round corners of detail box
Origin commit data
------------------
Branch: ni/coolstream
Commit: c9a17eda0e
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-02 (Thu, 02 May 2013)

Origin message was:
------------------
- channellist: fix transparent pixels in round corners of detail box

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

------------------
This commit was generated by Migit
2013-05-02 21:08:04 +02:00
vanhofen
2e151da069 channellist: remove some unneeded calculations
Origin commit data
------------------
Branch: ni/coolstream
Commit: e07e2e5264
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-04-18 (Thu, 18 Apr 2013)

Origin message was:
------------------
- channellist: remove some unneeded calculations

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

------------------
This commit was generated by Migit
2013-04-18 18:09:32 +02:00
vanhofen
cbda35d050 channellist: use the bigger menu-icon
Origin commit data
------------------
Branch: ni/coolstream
Commit: c87750e66d
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-04-18 (Thu, 18 Apr 2013)

Origin message was:
------------------
- channellist: use the bigger menu-icon

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

------------------
This commit was generated by Migit
2013-04-18 17:20:43 +02:00
[CST] Focus
0c3a4fa858 Merge branch 'pu/cc' into next-cc
Conflicts:
	acinclude.m4
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/volume.cpp
	src/eitd/SIlanguage.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan.h
	src/gui/test_menu.cpp
	src/gui/timeosd.cpp
	src/gui/widget/progressbar.cpp
	src/gui/widget/progressbar.h
	src/neutrino.cpp
	src/nhttpd/yconfig.h


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



------------------
This commit was generated by Migit
2013-04-17 13:32:12 +04:00
Stefan Seyfried
89d3d162ea neutrino: make g_channel_list_changed private
Add a setter function MarkChannelListChanged() instead for
bouquet/channel list. This avoids sometimes not reloading
channels after changes in the service menu.


Origin commit data
------------------
Branch: ni/coolstream
Commit: c0c008190e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)



------------------
This commit was generated by Migit
2013-04-17 10:21:33 +04:00
Stefan Seyfried
1e2efee1ca channellist: improve add-to-bouquet and remove-new-flag workflow
When adding the current channel to a bouquet or favorites or when
removing the "new" flag from a channel, don't immediately reload the
channels but wait for closing of the channellist.
Additionally, select the next channel after one of the add-to-bouquet or
remove-new-flag actions.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9eda015afe
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)



------------------
This commit was generated by Migit
2013-04-17 10:21:33 +04:00
Stefan Seyfried
917b67d4b7 neutrino: make g_channel_list_changed private
Add a setter function MarkChannelListChanged() instead for
bouquet/channel list. This avoids sometimes not reloading
channels after changes in the service menu.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 057f3a8964
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)



------------------
This commit was generated by Migit
2013-04-15 19:46:27 +02:00
Stefan Seyfried
c2c1400412 channellist: improve add-to-bouquet and remove-new-flag workflow
When adding the current channel to a bouquet or favorites or when
removing the "new" flag from a channel, don't immediately reload the
channels but wait for closing of the channellist.
Additionally, select the next channel after one of the add-to-bouquet or
remove-new-flag actions.


Origin commit data
------------------
Branch: ni/coolstream
Commit: d35835fe8f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)



------------------
This commit was generated by Migit
2013-04-15 19:42:24 +02:00
Jacek Jendrzej
419a440e69 src/gui/channellist.cpp: fix to efc1076eb0
Origin commit data
------------------
Branch: ni/coolstream
Commit: 838cf61a69
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-10 (Wed, 10 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-10 20:43:32 +02:00
Jacek Jendrzej
efc1076eb0 src/gui/channellist.cpp: fix paint details with different font size
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4a8350c382
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-10 (Wed, 10 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-10 19:28:30 +02:00
[CST] Focus
2e5bd433fa neutrino GUI: more places to disable anything record-related, if recording_type is RECORDING_OFF
Origin commit data
------------------
Branch: ni/coolstream
Commit: e14043dbfb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-09 (Tue, 09 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-09 18:37:25 +04:00
[CST] Focus
f84e0a82c6 gui/channellist.cpp: set oldselected to selected on sort mode change,
else wrong selected restored on exit;
store channel to history only if adjustToChannelID called with bToo == true, which means zap


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



------------------
This commit was generated by Migit
2013-04-09 13:10:56 +04:00
[CST] Focus
948ba1373b gui/channellist.cpp: fix current transponder key
Origin commit data
------------------
Branch: ni/coolstream
Commit: 06372e1856
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-08 (Mon, 08 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-08 18:02:03 +04:00
Stefan Seyfried
f2f486606b CChannelList: fix "prev bouquet" if empty bouquets are present
also do proper wrap-around when selecting previous / next bouquet


Origin commit data
------------------
Branch: ni/coolstream
Commit: b79b13a411
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)



------------------
This commit was generated by Migit
2013-04-08 09:59:18 +04:00
Jacek Jendrzej
6f534c2fd6 revert commit f4ae5e17ce00575de61daba517f37a4bb9252836
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6d56cc0696
Author: Jacek Jendrzej <overx300@gmail.com>
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-08 09:59:04 +04:00
Stefan Seyfried
16e7b8bb91 CChannelList: fix "prev bouquet" if empty bouquets are present
also do proper wrap-around when selecting previous / next bouquet


Origin commit data
------------------
Branch: ni/coolstream
Commit: 80e7f9753b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)



------------------
This commit was generated by Migit
2013-04-06 22:14:06 +02:00
Jacek Jendrzej
ee338d72e9 revert commit c4b67751af
Origin commit data
------------------
Branch: ni/coolstream
Commit: e0facfa2e0
Author: Jacek Jendrzej <overx300@gmail.com>
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 22:13:47 +02:00
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