Commit Graph

164 Commits

Author SHA1 Message Date
Stefan Seyfried
7e23ac7223 Merge branch 'uncool/dvbsi++' commit '7ea3a20a808'
...needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/capmt.cpp
2012-11-03 10:45:33 +01:00
[CST] Focus
50b17f58f4 gui/channellist.cpp: not allow zap on scroll mode,
if current neutrino mode is mode_ts
2012-10-22 13:30:31 +04:00
[CST] Focus
afdf9f30dd gui/channellist.cpp: dont paint channel list,
if event list return menu_return::RETURN_EXIT_ALL
2012-10-22 13:11:54 +04:00
[CST] Focus
9a271191b6 gui/channellist.cpp: remove extra showChannelLogo(),
fix channel logo - call paint() after paintHead(),
use enum values for channel list mode
2012-10-22 12:24:55 +04:00
satbaby
35138088e3 Neutrino: Channel list: add method isEmpty() and use it, ported from tuxbox cvs (THX Gaucho316) 2012-10-20 13:20:49 +02:00
Stefan Seyfried
adb23b23ee Merge branch 'uncool/dvbsi++' commit 'dc95ffa37c6'
...needs buildfixing...

Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	lib/libtuxtxt/tuxtxt.h
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/record.cpp
	src/driver/volume.cpp
	src/gui/audio_setup.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/system/Makefile.am
	src/system/configure_network.cpp
	src/system/httptool.cpp
	src/system/setting_helpers.cpp
	src/timerd/timermanager.cpp
	src/zapit/include/zapit/frontend_c.h
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp
2012-10-14 12:51:07 +02:00
Stefan Seyfried
d806eeb544 fixes for 64bit archs: don't assume a pointer is 32bit wide 2012-10-07 17:09:17 +02:00
Stefan Seyfried
7a4e58e44f channellist: fix parental locking
fix a merge error introduced during  the twin merge (correct
code was in commt 3999e8d0e2)
2012-09-16 23:57:31 +02:00
Stefan Seyfried
2e46d81b88 Merge branch 'neutrino-hd-tripledragon' into neutrino-mp 2012-09-15 12:14:33 +02:00
[CST] Focus
9fdbdbd343 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++ 2012-09-13 11:24:13 +04:00
satbaby
a3bfab0bcd remove doubles include 2012-09-11 20:31:33 +02:00
[CST] Focus
25e4a396d7 gui/channellist.cpp: fix p_requested_channels allocate size 2012-08-30 18:11:14 +04:00
[CST] Focus
3f5a0e5bb1 remove channel_id mask for CEitManager getXXX calls 2012-08-30 14:50:01 +04:00
[CST] Focus
74a761ef50 use CEitManager to get EIT data 2012-08-30 11:40:02 +04:00
satbaby
ec7ed403a1 channellist.cpp: -fix clear background 2012-08-19 19:54:55 +02:00
Stefan Seyfried
3875af11de 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
2012-08-14 11:52:17 +02:00
[CST] Focus
a76d37d072 gui/channellist.cpp: adapt for new GetRecordMode() mask 2012-08-07 12:08:13 +04:00
[CST] Focus
0a8307b8ef gui/channellist.cpp: allow multi-record on channel. should we ask for confirm, if we have sign in list ? 2012-08-05 15:43:45 +04:00
Stefan Seyfried
ae1b98aa38 Merge branch 'uncool/dvbsi++' commit '6e0bc85a6c0'
This is the last commit before the "menu hints" started.
Needs buildfixing...

Conflicts:
	configure.ac
	src/daemonc/remotecontrol.cpp
	src/daemonc/remotecontrol.h
	src/driver/audiodec/basedec.cpp
	src/driver/fb_window.cpp
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/global.h
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/plugins.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/neutrino.cpp
	src/sectionsd/dmx.cpp
	src/sectionsd/dmxapi.cpp
	src/sectionsd/sectionsd.cpp
	src/system/setting_helpers.cpp
	src/zapit/include/zapit/client/zapittypes.h
	src/zapit/include/zapit/frontend_c.h
	src/zapit/include/zapit/satconfig.h
	src/zapit/include/zapit/scan.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/pmt.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/sdt.cpp
	src/zapit/src/zapit.cpp
2012-07-23 01:02:29 +02:00
Thilo Graf
261904acd0 *neutrino: remove dub code
using class 'CComponentsDetailLine' instead multiple code
details line rendering
2012-07-16 22:28:02 +02:00
satbaby
d2b948933a fix tiny OSD shadow 2012-07-12 17:58:32 +02:00
satbaby
81e6854dc0 channellist.cpp: fix CVFD with history zap 2012-07-12 15:36:26 +02:00
satbaby
1196a01818 fix OSD 2012-07-11 15:59:41 +02:00
Thilo Graf
c213221b4c channellist: update license text 2012-07-08 22:01:12 +02:00
[CST] Focus
f4fa9bdded gui/channellist.cpp: fix detail box comments 2012-07-08 16:12:20 +04:00
[CST] Focus
6e0bc85a6c Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++ 2012-07-08 15:51:51 +04:00
satbaby
441cba7d4a biggest chan number in list (revised) 2012-07-07 21:10:10 +02:00
[CST] Focus
9eb22c24c8 gui/channellist.cpp: add comments for detail box draw 2012-07-02 20:53:20 +04:00
[CST] Focus
5dd54caf54 fix conflict 2012-06-18 14:56:17 +04:00
satbaby
c1a1aae4c1 use empty() instead of size() 2012-06-16 10:38:38 +02:00
satbaby
bc574e9688 use empty() instead of size() 2012-06-16 09:44:42 +02:00
[CST] Focus
90669b9945 gui/channellist.cpp: remove direct access to channel->name 2012-06-13 17:07:55 +04:00
satbaby
71832331d0 add: sort channels in allchannel mode 2012-04-24 14:14:42 +02:00
no@ma.il
6cfd4da52e channellist.cpp : fix biggest chan number in list 2012-04-24 12:55:18 +02:00
[CST] Focus
67c9e32bd2 gui/channellist.cpp: add menu point to remove 'new' channel flag 2012-04-22 15:26:26 +04:00
[CST] Focus
28352bcc52 gui/channellist.cpp: fix last change in setSelected - always set tuned 2012-04-21 16:52:02 +04:00
[CST] Focus
a3621a73ca gui/channellist.cpp: safe-check in setSelected(), to prevent crash if incorrect selected set 2012-04-20 20:09:25 +04:00
Stefan Seyfried
a029333c1a neutrino: adapt to the framebuffer_spark blitter change
basically add fb->blit() in every widget where necessary to
make sure the framebuffer is updated with current content
2012-04-17 19:33:57 +02:00
Stefan Seyfried
98e8e0f856 channellist: always start video if parental lock is disabled
this fixes an obscure wakeup-from-standby bug if parental locking is
disabled but a bouquet is marked as "locked" anyway
2012-04-17 19:33:54 +02:00
Stefan Seyfried
3f84fb416f neutrino: do not display expired events in channel list 2012-04-17 19:33:52 +02:00
Stefan Seyfried
2f65aea744 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.

Attention: This code is GPL v3+ only for now!
2012-04-17 19:33:49 +02:00
Stefan Seyfried
3999e8d0e2 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.
2012-04-17 19:33:49 +02:00
Stefan Seyfried
a99ff05934 neutrino: port "EPG title in LCD" from tuxbox 2012-04-17 19:33:45 +02:00
[CST] Focus
1c2363cfb4 gui/scan_setup.cpp,
gui/channellist.cpp,
gui/bedit/bouqueteditor_channels.cpp,
gui/bedit/bouqueteditor_chanselect.cpp: use transponder::description to show channel details
2012-04-17 18:42:52 +04:00
[CST] Focus
c14741dcd2 GUI: add support for L/R, use transponder::pol to display polarization 2012-04-16 16:56:26 +04:00
[CST] Focus
9bcc63ea01 gui/channellist.cpp: remove bouquetList checks, it never should be NULL 2012-04-05 20:29:07 +04:00
[CST] Focus
7abc312042 gui/channellist.cpp: remove unused if/else in CChannelList::paintDetails 2012-04-05 19:57:49 +04:00
[CST] Focus
07a250130b gui/channellist.cpp: remove CmpChannel.. 2012-04-05 18:57:50 +04:00
[CST] Focus
2cb3edd0eb gui/channellist.cpp: remove switch(), use CRCInput::getNumericValue 2012-04-04 18:45:40 +04:00
[CST] Focus
3d5d834f3c gui/channellist.cpp: reuse code as updateSelection() 2012-04-04 18:34:51 +04:00