mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity
11,963 Commits 2 Branches 9 Tags
383857f8b8419dd1a97d3798a0e5266dfa99ebb7
Commit Graph

593 Commits

Author SHA1 Message Date
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
[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