Commit Graph

205 Commits

Author SHA1 Message Date
Stefan Seyfried
4291671fba channellist: refactor to avoid duplicated code
Origin commit data
------------------
Commit: 8193e52615
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-24 (Sun, 24 Mar 2013)
2013-03-24 19:24:38 +01:00
Stefan Seyfried
241bb43a9a 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
------------------
Commit: a91b58aac4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)
2013-03-10 00:15:46 +01:00
Stefan Seyfried
93fcaf1606 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
------------------
Commit: 21f79f1284
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)
2013-03-10 00:07:26 +01:00
Stefan Seyfried
d8ea026fb3 channellist: initialize values to satisfy valgrind
Origin commit data
------------------
Commit: 94883e0877
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-22 (Fri, 22 Feb 2013)
2013-02-22 17:16:43 +01:00
Stefan Seyfried
b9b4907444 channellist: use "classic" width if minitv is unused
Origin commit data
------------------
Commit: 901b7cbd38
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-22 (Fri, 22 Feb 2013)
2013-02-22 16:21:24 +01:00
Thilo Graf
316d2bb200 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
------------------
Commit: fedb9132d7
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-02-22 (Fri, 22 Feb 2013)
2013-02-22 16:15:03 +01:00
Stefan Seyfried
2b4f5306dc Merge branch 'check/dvbsi++' commit 984435d48e
Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/components/cc.h
	src/gui/components/components.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/neutrino.cpp
	src/zapit/src/bouquets.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Commit: 0cf191822a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-21 (Thu, 21 Feb 2013)
2013-02-21 17:07:18 +01:00
Stefan Seyfried
80a87017f3 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: 4dbeb3a31e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)
2013-02-21 15:47:18 +01:00
Thilo Graf
e244a9c9c2 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
------------------
Commit: 0a961a4cf6
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-02-19 (Tue, 19 Feb 2013)
2013-02-19 11:27:46 +01:00
vanhofen
918e56adf3 channellist.cpp: change order of painting to be more liquid
Origin commit data
------------------
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
2013-02-18 21:54:52 +01:00
vanhofen
069ad2f912 channellist.cpp: show pic instead of miniTV in radiomode
Origin commit data
------------------
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
2013-02-18 21:00:19 +01:00
vanhofen
0acf92b838 channellist.cpp: fix logo position if new_zap_mode is off
Origin commit data
------------------
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
2013-02-17 23:20:04 +01:00
vanhofen
2a2cd1894c channellist.cpp: fix broken display of infobar while zapping
Origin commit data
------------------
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
2013-02-17 22:57:37 +01:00
vanhofen
1451221683 Revert "Revert '- channellist.cpp: enable to lock new_zap_mode'"
This reverts commit fa85dcc867.


Origin commit data
------------------
Commit: 505c4ba80d
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-17 (Sun, 17 Feb 2013)
2013-02-17 22:55:28 +01:00
vanhofen
02695dc19c channellist.cpp: allow colored events (for time) in right eventlist
Origin commit data
------------------
Commit: ddbac1b248
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-17 (Sun, 17 Feb 2013)

Origin message was:
------------------
- channellist.cpp: allow colored events (for time) in right eventlist
2013-02-17 21:55:21 +01:00
Thilo Graf
a505299418 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
------------------
Commit: f3f347bdb3
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-02-12 (Tue, 12 Feb 2013)
2013-02-16 12:13:24 +01:00
vanhofen
fa85dcc867 Revert "- channellist.cpp: enable to lock new_zap_mode"
This reverts commit 06a54ba7ce
because the display of infobar while zapping is broken with
this commit.


Origin commit data
------------------
Commit: fb892d18ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-15 (Fri, 15 Feb 2013)
2013-02-15 22:55:45 +01:00
Michael Liebmann
dd6a964fa5 channellist.cpp: Show channel list vertically centered
Origin commit data
------------------
Commit: 91d76a9487
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-02-13 (Wed, 13 Feb 2013)

Origin message was:
------------------
* channellist.cpp: Show channel list vertically centered
2013-02-13 23:34:55 +01:00
Michael Liebmann
c3d81ac69d channellist.cpp: Fix time display in event list
- fix compiler warning


Origin commit data
------------------
Commit: b2f5ca589d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-02-12 (Tue, 12 Feb 2013)

Origin message was:
------------------
* channellist.cpp: Fix time display in event list

- fix compiler warning
2013-02-12 21:34:18 +01:00
tomworld
51fda1d48f channellist.cpp: Use extra font for event list
Origin commit data
------------------
Commit: 105c6b4c70
Author: tomworld <atzeworld@msn.com>
Date: 2013-02-12 (Tue, 12 Feb 2013)

Origin message was:
------------------
* channellist.cpp: Use extra font for event list
2013-02-12 15:45:27 +01:00
vanhofen
06a54ba7ce channellist.cpp: enable to lock new_zap_mode
Origin commit data
------------------
Commit: 15d787f79b
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-10 (Sun, 10 Feb 2013)

Origin message was:
------------------
- channellist.cpp: enable to lock new_zap_mode
2013-02-10 21:03:43 +01:00
TangoCash
30a218c9ca channellist.cpp: add epg-desc to blue button ...
... if g_settings.channellist_additional is not off.

initially patch by TangoCash with marginal modifications


Origin commit data
------------------
Commit: 31080fa98c
Author: TangoCash <eric@loxat.de>
Date: 2013-02-09 (Sat, 09 Feb 2013)

Origin message was:
------------------
- channellist.cpp: add epg-desc to blue button ...

... if g_settings.channellist_additional is not off.

initially patch by TangoCash with marginal modifications
2013-02-09 10:36:11 +01:00
vanhofen
8391e6c72e channellist.cpp: fix restore to fullTV
... when turning miniTV off from the menu inside the channellist


Origin commit data
------------------
Commit: c6155f29b4
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-06 (Wed, 06 Feb 2013)

Origin message was:
------------------
- channellist.cpp: fix restore to fullTV

... when turning miniTV off from the menu inside the channellist
2013-02-06 21:19:49 +01:00
vanhofen
f0984d714a channellist.cpp: 'fix' the double determination of dimensions/coordinates
Origin commit data
------------------
Commit: d4635b690f
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-05 (Tue, 05 Feb 2013)

Origin message was:
------------------
- channellist.cpp: 'fix' the double determination of dimensions/coordinates
2013-02-05 23:56:48 +01:00
vanhofen
6e469316bf channellist.cpp: determinate startTimeWidth from a fixed value
Origin commit data
------------------
Commit: d6f4ea5baa
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-05 (Tue, 05 Feb 2013)

Origin message was:
------------------
- channellist.cpp: determinate startTimeWidth from a fixed value
2013-02-05 17:01:18 +01:00
vanhofen
57278e418f channellist.cpp: remove time for no further events
thx to TangoCash.


Origin commit data
------------------
Commit: 54ed166d1f
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-05 (Tue, 05 Feb 2013)

Origin message was:
------------------
- channellist.cpp: remove time for no further events

thx to TangoCash.
2013-02-05 01:36:28 +01:00
vanhofen
4d0b4e3f19 channellist.cpp: fix wrong time for no further events
patch by TangoCash. thx!


Origin commit data
------------------
Commit: 3bdb3bbc07
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-05 (Tue, 05 Feb 2013)

Origin message was:
------------------
- channellist.cpp: fix wrong time for no further events

patch by TangoCash. thx!
2013-02-05 00:58:31 +01:00
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