Commit Graph

258 Commits

Author SHA1 Message Date
Thilo Graf
61837a058f CComponentsFrmClock: set font only with fontrender object
Origin commit data
------------------
Commit: 03ef18cdb9
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-06-18 (Tue, 18 Jun 2013)
2013-06-18 19:33:34 +02:00
Michael Liebmann
04e6326ee8 CChannelList: Use one instance of CComponentsFrmClock for multiple instances of CChannelList
Origin commit data
------------------
Commit: f0de4567ae
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-12 (Wed, 12 Jun 2013)
2013-06-12 01:32:24 +02:00
Michael Liebmann
24393838b7 CChannelList: using CComponentsHeader to paint header
- using CComponentsFrmClock to paint clock in header


Origin commit data
------------------
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
2013-06-01 19:37:46 +02:00
Jacek Jendrzej
836f7be469 channllist: fix new_zap_mode handling
Origin commit data
------------------
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
2013-06-01 08:30:37 +02:00
Stefan Seyfried
6210ac6726 neutrino: fix possible div-by-zero in scrollbar calculation
Origin commit data
------------------
Commit: a33086568b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-29 (Wed, 29 May 2013)
2013-05-30 11:19:39 +02:00
vanhofen
d02607f887 channellist: using small buttons in buttonbar
Origin commit data
------------------
Commit: e492048eab
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-26 (Sun, 26 May 2013)

Origin message was:
------------------
- channellist: using small buttons in buttonbar
2013-05-26 23:06:58 +02:00
Jacek Jendrzej
7d40cd7e9d ChannelList::quickZap -record mode- should zap if possible, else display transponderlist
Origin commit data
------------------
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
2013-05-25 13:05:55 +02:00
Michael Liebmann
22a5af089f CChannelList: prevent possible compile error
Origin commit data
------------------
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
2013-05-19 08:41:05 +01:00
vanhofen
a56adef180 channellist: colored_events to right infobox
Origin commit data
------------------
Commit: 273a83fa3f
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-18 (Sat, 18 May 2013)

Origin message was:
------------------
- channellist: colored_events to right infobox
2013-05-18 23:59:06 +02:00
Jacek Jendrzej
dba03455e3 channellist.cpp fix compil -comparison between signed and unsigned integer expressions
Origin commit data
------------------
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
2013-05-13 08:48:29 +02:00
vanhofen
7bfe1ab4bf channellist: disable 'displayNext' when additional infos enabled
* otherwise there is no possibility to disable 'displayNext'
 except exiting the channellist


Origin commit data
------------------
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
2013-05-12 23:41:36 +02:00
vanhofen
bde183828d channellist: show infotext when epg.info2 is empty ...
... and 'description' is selected in additional infos

* fix double paint of infozone


Origin commit data
------------------
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
2013-05-12 23:06:57 +02:00
vanhofen
f2115ad7f3 channellist: show current event in additional info box
Origin commit data
------------------
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
2013-05-12 22:26:10 +02:00
Jacek Jendrzej
ff88d7a481 CChannelList::show() call hide only once
Origin commit data
------------------
Commit: 438248bfac
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-09 (Thu, 09 May 2013)
2013-05-09 16:32:11 +02:00
Jacek Jendrzej
d7ad90f9a3 src/gui/channellist.cpp: skip paint BG for item if firstpaint
Origin commit data
------------------
Commit: 4bf2a4aa19
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-03 (Fri, 03 May 2013)
2013-05-03 18:42:35 +02:00
vanhofen
1f39bc469f channellist: fix transparent pixels in round corners of detail box
Origin commit data
------------------
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
2013-05-02 21:08:04 +02:00
vanhofen
0b44ef089f channellist: remove some unneeded calculations
Origin commit data
------------------
Commit: e07e2e5264
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-04-18 (Thu, 18 Apr 2013)

Origin message was:
------------------
- channellist: remove some unneeded calculations
2013-04-18 18:09:32 +02:00
vanhofen
df2e4ab12f channellist: use the bigger menu-icon
Origin commit data
------------------
Commit: c87750e66d
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-04-18 (Thu, 18 Apr 2013)

Origin message was:
------------------
- channellist: use the bigger menu-icon
2013-04-18 17:20:43 +02:00
[CST] Focus
1bd0bd8a7b 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
------------------
Commit: 8bb70d1ab3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-17 (Wed, 17 Apr 2013)
2013-04-17 13:32:12 +04:00
Stefan Seyfried
3395fd26af 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
------------------
Commit: c0c008190e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)
2013-04-17 10:21:33 +04:00
Stefan Seyfried
5fe16ac601 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
------------------
Commit: 9eda015afe
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)
2013-04-17 10:21:33 +04:00
Stefan Seyfried
4b7f1e09da 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
------------------
Commit: 057f3a8964
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)
2013-04-15 19:46:27 +02:00
Stefan Seyfried
bc7ffd33b1 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
------------------
Commit: d35835fe8f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)
2013-04-15 19:42:24 +02:00
Jacek Jendrzej
a1b099722c src/gui/channellist.cpp: fix to 1f453938a7
Origin commit data
------------------
Commit: 838cf61a69
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-10 (Wed, 10 Apr 2013)
2013-04-10 20:43:32 +02:00
Jacek Jendrzej
1f453938a7 src/gui/channellist.cpp: fix paint details with different font size
Origin commit data
------------------
Commit: 4a8350c382
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-10 (Wed, 10 Apr 2013)
2013-04-10 19:28:30 +02:00
[CST] Focus
c54a1188b7 neutrino GUI: more places to disable anything record-related, if recording_type is RECORDING_OFF
Origin commit data
------------------
Commit: e14043dbfb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-09 (Tue, 09 Apr 2013)
2013-04-09 18:37:25 +04:00
[CST] Focus
8088afd2d6 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
------------------
Commit: 89423d49b4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-09 (Tue, 09 Apr 2013)
2013-04-09 13:10:56 +04:00
[CST] Focus
0fa4da9c7c gui/channellist.cpp: fix current transponder key
Origin commit data
------------------
Commit: 06372e1856
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-08 (Mon, 08 Apr 2013)
2013-04-08 18:02:03 +04:00
Stefan Seyfried
609b8d88f1 CChannelList: fix "prev bouquet" if empty bouquets are present
also do proper wrap-around when selecting previous / next bouquet


Origin commit data
------------------
Commit: b79b13a411
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-08 09:59:18 +04:00
Jacek Jendrzej
26db5ec262 revert commit f4ae5e17ce00575de61daba517f37a4bb9252836
Origin commit data
------------------
Commit: 6d56cc0696
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-08 09:59:04 +04:00
Stefan Seyfried
105fa78aa2 CChannelList: fix "prev bouquet" if empty bouquets are present
also do proper wrap-around when selecting previous / next bouquet


Origin commit data
------------------
Commit: 80e7f9753b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 22:14:06 +02:00
Jacek Jendrzej
07e4bd384d revert commit b212f46c3d
Origin commit data
------------------
Commit: e0facfa2e0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 22:13:47 +02:00
Thilo Graf
1fe3cbe0b3 CChannellist: add missig frame for timscale
Origin commit data
------------------
Commit: 6fa592323b
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 10:21:22 +02:00
Stefan Seyfried
a3bd83cd53 neutrino: do not display expired events in channel list
Origin commit data
------------------
Commit: 6bc2a8a5d8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-01-22 (Sun, 22 Jan 2012)
2013-04-05 16:32:43 +04:00
Stefan Seyfried
1f0eb08e26 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
------------------
Commit: be1b73b7a0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-08-14 (Tue, 14 Aug 2012)
2013-04-05 15:53:30 +04:00
Stefan Seyfried
9ba28c1287 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
------------------
Commit: 27493de2ef
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-10-30 (Sun, 30 Oct 2011)
2013-04-05 15:52:58 +04:00
[CST] Focus
ea33de8f9a 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
------------------
Commit: d79d592d27
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-05 (Fri, 05 Apr 2013)
2013-04-05 15:15:44 +04:00
Stefan Seyfried
51a9a3b894 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
------------------
Commit: e09bc260da
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-10-03 (Mon, 03 Oct 2011)
2013-04-05 14:50:28 +04:00
Thilo Graf
03b22f2d23 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
------------------
Commit: 860be9a412
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-01 (Mon, 01 Apr 2013)
2013-04-02 09:31:05 +02:00
Jacek Jendrzej
30c9a0e022 src/gui/channellist.cpp: fix to 36e95d7fbcd22dfbb94d03867f10634f7a72df63 if more bouquets empty
Origin commit data
------------------
Commit: 25653df890
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-03-27 (Wed, 27 Mar 2013)
2013-04-01 16:19:51 +04:00
Stefan Seyfried
c7be049732 channellist: refactor to avoid duplicated code
Conflicts:
	src/gui/channellist.cpp


Origin commit data
------------------
Commit: 0d318fd296
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)
2013-04-01 15:47:10 +04:00
vanhofen
b659d5c95a 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
------------------
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
2013-04-01 15:42:38 +04:00
vanhofen
83f016b899 fix my last commit 0064c6c (recalc height)
Origin commit data
------------------
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)
2013-04-01 14:59:51 +04:00
vanhofen
f7d31acc74 channellist: fix dimensions when using very large fonts
* paint scrollbar over full height of main box


Origin commit data
------------------
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
2013-04-01 14:59:28 +04:00
[CST] Focus
425389c530 gui/channellist.cpp: adjust channel list mode on numeric zap
Origin commit data
------------------
Commit: f35065b918
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-01 (Mon, 01 Apr 2013)
2013-04-01 14:15:47 +04:00
Jacek Jendrzej
b212f46c3d src/gui/channellist.cpp: fix to eb9cc7950d if more bouquets empty
Origin commit data
------------------
Commit: f4ae5e17ce
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-03-27 (Wed, 27 Mar 2013)
2013-03-27 16:18:32 +01:00
Stefan Seyfried
eb9cc7950d channellist: refactor to avoid duplicated code
Origin commit data
------------------
Commit: 36e95d7fbc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)
2013-03-25 14:06:16 +01:00
vanhofen
0df9a58c45 strech most windows to full screen
* switchable with existing switch for 'big_windows'
* 'big_windows' default is on


Origin commit data
------------------
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
2013-03-25 09:45:22 +01:00
Thilo Graf
db3a5d459e CChannelList: ensure new init of dline
Causes correct paint of details line, if osd settings
have been changed.


Origin commit data
------------------
Commit: deab17dc25
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-03-24 (Sun, 24 Mar 2013)
2013-03-24 21:16:49 +01:00
Thilo Graf
34935b772d CChannelList: remove details line on changing pages
details line was not completely killed changed page.


Origin commit data
------------------
Commit: 407d9fe800
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-03-21 (Thu, 21 Mar 2013)
2013-03-21 11:38:40 +01:00