Commit Graph

528 Commits

Author SHA1 Message Date
vanhofen
48d8583fc8 channellist.cpp: fix shortcuts in submenu and add a seperator line
Origin commit data
------------------
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
2013-02-05 00:30:16 +01:00
vanhofen
9da986e456 channellist: make miniTV switchable
Origin commit data
------------------
Commit: d8bd46e9d1
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-04 (Mon, 04 Feb 2013)

Origin message was:
------------------
- channellist: make miniTV switchable
2013-02-04 22:25:15 +01:00
vanhofen
f6386ce110 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
------------------
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
2013-02-02 02:10:35 +01:00
vanhofen
01644b362f channellist.cpp: change color for infozone
Origin commit data
------------------
Commit: 1e45607ae1
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-01 (Fri, 01 Feb 2013)

Origin message was:
------------------
- channellist.cpp: change color for infozone
2013-02-01 23:26:33 +01:00
vanhofen
563406bf59 channellist.cpp: fix round borders for infozone
Origin commit data
------------------
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
2013-02-01 22:59:07 +01:00
Michael Liebmann
f59b1d029b src/gui/channellist.cpp: miniTV osd fix
- Screen coordinate x could possibly receive a value under 0


Origin commit data
------------------
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
2013-01-31 20:05:03 +01:00
Jacek Jendrzej
58f8dadd0f src/gui/channellist.cpp: fix possible segfault
Origin commit data
------------------
Commit: 2e5b54c509
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)
2013-01-31 16:18:05 +01:00
Jacek Jendrzej
97d55b8e2d src/gui/channellist.cpp: minitv osd fix
Origin commit data
------------------
Commit: 17cfb97f9e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)
2013-01-31 11:14:38 +01:00
Jacek Jendrzej
f1144f8192 src/gui/channellist.cpp: fix minitv gui & segfault
Origin commit data
------------------
Commit: e509f19361
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 23:37:11 +01:00
Jacek Jendrzej
6d3022d182 compil fix for commit eedc2330d9
Origin commit data
------------------
Commit: deeed028d4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 19:31:57 +01:00
TangoCash
eedc2330d9 add optional mini-tv to channellist
Signed-off-by: satbaby <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: 1a425308ed
Author: TangoCash <eric@loxat.de>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 19:17:52 +01:00
Stefan Seyfried
857402e3d4 Merge branch 'uncool/dvbsi++'
Conflicts:
	src/driver/Makefile.am
	src/driver/streamts.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/widget/textbox.h


Origin commit data
------------------
Commit: c480e36746
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-11 (Sun, 11 Nov 2012)
2012-11-11 01:45:22 +01:00
Jacek Jendrzej
0d98f2806b src/gui/channellist.cpp:-add sort by channel number
Origin commit data
------------------
Commit: c47aebdb64
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-09 (Fri, 09 Nov 2012)
2012-11-09 17:32:15 +01:00
Stefan Seyfried
4c7a4f15cc 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
------------------
Commit: e0acbd3ddb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)
2012-11-03 14:05:48 +01:00
Stefan Seyfried
4ea8f88ad8 Merge branch 'uncool/dvbsi++' commit '626f1aabc0a'
...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


Origin commit data
------------------
Commit: 7e23ac7223
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)
2012-11-03 10:45:33 +01:00
[CST] Focus
8b077914b7 gui/channellist.cpp: not allow zap on scroll mode,
if current neutrino mode is mode_ts


Origin commit data
------------------
Commit: 50b17f58f4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-10-22 (Mon, 22 Oct 2012)
2012-10-22 13:30:31 +04:00
[CST] Focus
be9a07dfac gui/channellist.cpp: dont paint channel list,
if event list return menu_return::RETURN_EXIT_ALL


Origin commit data
------------------
Commit: afdf9f30dd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-10-22 (Mon, 22 Oct 2012)
2012-10-22 13:11:54 +04:00
[CST] Focus
a4e4ffe000 gui/channellist.cpp: remove extra showChannelLogo(),
fix channel logo - call paint() after paintHead(),
use enum values for channel list mode


Origin commit data
------------------
Commit: 9a271191b6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-10-22 (Mon, 22 Oct 2012)
2012-10-22 12:24:55 +04:00
Jacek Jendrzej
075dd64e96 Neutrino: Channel list: add method isEmpty() and use it, ported from tuxbox cvs (THX Gaucho316)
Origin commit data
------------------
Commit: 35138088e3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-20 (Sat, 20 Oct 2012)
2012-10-20 13:20:49 +02:00
Stefan Seyfried
345a8a274d Merge branch 'uncool/dvbsi++' commit '890b4f2c0a3'
...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


Origin commit data
------------------
Commit: adb23b23ee
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-14 (Sun, 14 Oct 2012)
2012-10-14 12:51:07 +02:00
Stefan Seyfried
3cf264b99f fixes for 64bit archs: don't assume a pointer is 32bit wide
Origin commit data
------------------
Commit: d806eeb544
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-06 (Sat, 06 Oct 2012)
2012-10-07 17:09:17 +02:00
Stefan Seyfried
6127dbe284 channellist: fix parental locking
fix a merge error introduced during the twin merge (correct
code was in commt 593aba68a4)


Origin commit data
------------------
Commit: 7a4e58e44f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-09-16 (Sun, 16 Sep 2012)

Origin message was:
------------------
channellist: fix parental locking

fix a merge error introduced during the twin merge (correct
code was in commt 593aba68a4)
2012-09-16 23:57:31 +02:00
Stefan Seyfried
28fb511a63 Merge branch 'neutrino-hd-tripledragon' into neutrino-mp
Origin commit data
------------------
Commit: 2e46d81b88
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-09-15 (Sat, 15 Sep 2012)
2012-09-15 12:14:33 +02:00
[CST] Focus
6b6d864e27 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Commit: 9fdbdbd343
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-09-13 (Thu, 13 Sep 2012)
2012-09-13 11:24:13 +04:00
Jacek Jendrzej
9868a4308b remove doubles include
Origin commit data
------------------
Commit: a3bfab0bcd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-11 (Tue, 11 Sep 2012)
2012-09-11 20:31:33 +02:00
[CST] Focus
1109fceb14 gui/channellist.cpp: fix p_requested_channels allocate size
Origin commit data
------------------
Commit: 25e4a396d7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-30 (Thu, 30 Aug 2012)
2012-08-30 18:11:14 +04:00
[CST] Focus
934e6b8c33 remove channel_id mask for CEitManager getXXX calls
Origin commit data
------------------
Commit: 3f5a0e5bb1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-30 (Thu, 30 Aug 2012)
2012-08-30 14:50:01 +04:00
[CST] Focus
8ec523e8cc use CEitManager to get EIT data
Origin commit data
------------------
Commit: 74a761ef50
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-30 (Thu, 30 Aug 2012)
2012-08-30 11:40:02 +04:00
Jacek Jendrzej
3b5d62571f channellist.cpp: -fix clear background
Origin commit data
------------------
Commit: ec7ed403a1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-08-19 (Sun, 19 Aug 2012)
2012-08-19 19:54:55 +02:00
Stefan Seyfried
a52efec252 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: 3875af11de
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-08-14 (Tue, 14 Aug 2012)
2012-08-14 11:52:17 +02:00
[CST] Focus
96fe1f5137 gui/channellist.cpp: adapt for new GetRecordMode() mask
Origin commit data
------------------
Commit: a76d37d072
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-07 (Tue, 07 Aug 2012)
2012-08-07 12:08:13 +04:00
[CST] Focus
5798e02145 gui/channellist.cpp: allow multi-record on channel. should we ask for confirm, if we have sign in list ?
Origin commit data
------------------
Commit: 0a8307b8ef
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-05 (Sun, 05 Aug 2012)
2012-08-05 15:43:45 +04:00
Stefan Seyfried
f8a42bcc53 Merge branch 'uncool/dvbsi++' commit '9578e5da35f'
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


Origin commit data
------------------
Commit: ae1b98aa38
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-07-22 (Sun, 22 Jul 2012)
2012-07-23 01:02:29 +02:00
Thilo Graf
d209e0ec41 neutrino: remove dub code
using class 'CComponentsDetailLine' instead multiple code
details line rendering


Origin commit data
------------------
Commit: 261904acd0
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-07-16 (Mon, 16 Jul 2012)

Origin message was:
------------------
*neutrino: remove dub code

using class 'CComponentsDetailLine' instead multiple code
details line rendering
2012-07-16 22:28:02 +02:00
Jacek Jendrzej
c1ea38df61 fix tiny OSD shadow
Origin commit data
------------------
Commit: d2b948933a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
2012-07-12 17:58:32 +02:00
Jacek Jendrzej
bf76b0d1bc channellist.cpp: fix CVFD with history zap
Origin commit data
------------------
Commit: 81e6854dc0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
2012-07-12 15:36:26 +02:00
Jacek Jendrzej
b4cacaa009 fix OSD
Origin commit data
------------------
Commit: 1196a01818
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-07-11 (Wed, 11 Jul 2012)
2012-07-11 15:59:41 +02:00
Thilo Graf
a3dca77c14 channellist: update license text
Origin commit data
------------------
Commit: c213221b4c
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-07-06 (Fri, 06 Jul 2012)
2012-07-08 22:01:12 +02:00
[CST] Focus
12d80a71a0 gui/channellist.cpp: fix detail box comments
Origin commit data
------------------
Commit: f4fa9bdded
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-08 (Sun, 08 Jul 2012)
2012-07-08 16:12:20 +04:00
[CST] Focus
9578e5da35 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Commit: 6e0bc85a6c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-08 (Sun, 08 Jul 2012)
2012-07-08 15:51:51 +04:00
Jacek Jendrzej
c4dfb269fc biggest chan number in list (revised)
Origin commit data
------------------
Commit: 441cba7d4a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-07-07 (Sat, 07 Jul 2012)
2012-07-07 21:10:10 +02:00
[CST] Focus
9e731dfdc7 gui/channellist.cpp: add comments for detail box draw
Origin commit data
------------------
Commit: 9eb22c24c8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
2012-07-02 20:53:20 +04:00
[CST] Focus
73ac1950c2 fix conflict
Origin commit data
------------------
Commit: 5dd54caf54
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-06-18 (Mon, 18 Jun 2012)
2012-06-18 14:56:17 +04:00
Jacek Jendrzej
18a471d92b use empty() instead of size()
Origin commit data
------------------
Commit: c1a1aae4c1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-06-16 (Sat, 16 Jun 2012)

Origin message was:
------------------
 use empty() instead of size()
2012-06-16 10:38:38 +02:00
Jacek Jendrzej
67903dc13b use empty() instead of size()
Origin commit data
------------------
Commit: bc574e9688
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-06-16 (Sat, 16 Jun 2012)

Origin message was:
------------------
 use empty() instead of size()
2012-06-16 09:44:42 +02:00
[CST] Focus
4d152f3088 gui/channellist.cpp: remove direct access to channel->name
Origin commit data
------------------
Commit: 90669b9945
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-06-13 (Wed, 13 Jun 2012)
2012-06-13 17:07:55 +04:00
Jacek Jendrzej
aca2dcf451 add: sort channels in allchannel mode
Origin commit data
------------------
Commit: 71832331d0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-04-24 (Tue, 24 Apr 2012)
2012-04-24 14:14:42 +02:00
no@ma.il
ca80665eb6 channellist.cpp : fix biggest chan number in list
Origin commit data
------------------
Commit: 6cfd4da52e
Author: no@ma.il <one@localhost.(none)>
Date: 2012-04-24 (Tue, 24 Apr 2012)
2012-04-24 12:55:18 +02:00
[CST] Focus
178ba65e9a gui/channellist.cpp: add menu point to remove 'new' channel flag
Origin commit data
------------------
Commit: 67c9e32bd2
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-22 (Sun, 22 Apr 2012)
2012-04-22 15:26:26 +04:00
[CST] Focus
db69cbe6db gui/channellist.cpp: fix last change in setSelected - always set tuned
Origin commit data
------------------
Commit: 28352bcc52
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-21 (Sat, 21 Apr 2012)
2012-04-21 16:52:02 +04:00