mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 02:11:04 +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
Stefan Seyfried
de3b644e30 fix parentallock for "bouquets default locked" case 
in case of "default locked" bouquets, the "whole bouquet unlock"
did not work, because of the inverted logic in this case


Origin commit data
------------------
Commit: 6e9496b18f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-08 (Sun, 08 Feb 2015)
 2015-02-09 13:47:32 +01:00
Stefan Seyfried
c0a3d4d757 channellist: fix 2 forgotten cases of fixed plock_zaptime 
Origin commit data
------------------
Commit: ec12b704cb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-08 (Sun, 08 Feb 2015)
 2015-02-08 17:35:01 +01:00
Stefan Seyfried
610647d04b fix parentallock for "bouquets default locked" case 
in case of "default locked" bouquets, the "whole bouquet unlock"
did not work, because of the inverted logic in this case


Origin commit data
------------------
Commit: ab7b08e40e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-08 (Sun, 08 Feb 2015)
 2015-02-08 17:33:25 +01:00
Stefan Seyfried
a968a12b8d Merge remote-tracking branch 'check/cst-next' 
*needs buildfixing*

Conflicts:
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/driver/vfd.cpp
	src/gui/bedit/Makefile.am
	src/gui/components/Makefile.am
	src/gui/luainstance.cpp
	src/gui/widget/Makefile.am
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am


Origin commit data
------------------
Commit: b5a64e6887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)
 2015-01-26 17:26:26 +01:00
Janus
f0fb26664d api4: upgrade channel and bouquet edit (testing) 
Origin commit data
------------------
Commit: df1db3cfad
Author: Janus <janus@debian>
Date: 2015-01-22 (Thu, 22 Jan 2015)
 2015-01-22 13:08:03 +01:00
[CST] Focus
e545bee7c5 gui/channellist.cpp: disable timeshift stop while timeshift playback in progress 
Origin commit data
------------------
Commit: c6424534e8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-21 (Wed, 21 Jan 2015)
 2015-01-21 17:54:11 +03:00
[CST] Focus
e9a9b9abb3 neutrino: try to prevent using chanellist/bouquetlist while channels init in progress 
Origin commit data
------------------
Commit: 3da439030b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-13 (Tue, 13 Jan 2015)
 2015-01-13 16:10:24 +03:00
Stefan Seyfried
d1e2143fd6 Merge remote-tracking branch 'check/cst-next' 
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: d37b3c0f9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-28 (Sun, 28 Dec 2014)
 2014-12-28 12:32:12 +01:00
Stefan Seyfried
21b3a55ffa channellist is a pointer now 
Origin commit data
------------------
Commit: 894e21174d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)
 2014-12-25 18:21:56 +01:00
Stefan Seyfried
ec1a9fce17 Merge remote-tracking branch 'check/cst-next' 
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)
 2014-12-25 18:03:08 +01:00
[CST] Focus
763f79a584 gui/channellist.cpp: bug fix, default copy constructor is danger, if class have pointers 
Origin commit data
------------------
Commit: 36b14e31ef
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-11-26 (Wed, 26 Nov 2014)
 2014-11-26 10:45:29 +03:00
Jacek Jendrzej
1f023d3994 CChannelList::updateEvents fix history list event update 
Origin commit data
------------------
Commit: 6e08417d40
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-11-13 (Thu, 13 Nov 2014)
 2014-11-13 10:51:27 +01:00
[CST] Focus
cfeb0036dc neutrino: try to fix parental bypass by 
quit from audio player / picture viewer / movie player and starting channel in PiP


Origin commit data
------------------
Commit: 5bd14ea4b8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-11-11 (Tue, 11 Nov 2014)
 2014-11-11 14:40:52 +03:00
martii
fca89727ca parental protection: make zaptime configurable 
Conflicts:
	data/locale/english.locale
	src/gui/channellist.cpp
	src/gui/parentallock_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: a12f4c0274
Author: martii <m4rtii@gmx.de>
Date: 2013-06-23 (Sun, 23 Jun 2013)
 2014-11-11 14:40:52 +03:00
[CST] Focus
7ac423fda6 gui/channellist.cpp: add channel move to bouquet 
Origin commit data
------------------
Commit: 121d2f6339
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-28 (Tue, 28 Oct 2014)
 2014-10-28 15:13:22 +03:00
[CST] Focus
214b476dc5 gui/channellist.cpp: disable 'other' bouquet edit 
Origin commit data
------------------
Commit: e099cd4413
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-27 (Mon, 27 Oct 2014)
 2014-10-27 14:02:34 +03:00
[CST] Focus
8e236b7468 gui/miscsettings_menu.cpp: add option to enable/disable empty favorites in bouquet list 
Origin commit data
------------------
Commit: 8772d219f1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-27 (Mon, 27 Oct 2014)
 2014-10-27 13:52:23 +03:00
[CST] Bas
8f536ee896 neutrino: add support for CST new simple frontpanel with LED segment display. (c) focus and adjusted by me. 
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/channellist.cpp


Origin commit data
------------------
Commit: 5f3872b5dd
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
 2014-10-22 16:14:05 +04:00
[CST] Focus
b593257dc1 gui/channellist.cpp: allow to edit provider bouquet 
Origin commit data
------------------
Commit: 00ead6aa95
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-14 (Tue, 14 Oct 2014)
 2014-10-14 16:45:08 +04:00
[CST] Focus
d0cc70751b gui/channellist.cpp: add per-channel lock in editor 
Origin commit data
------------------
Commit: b1ba52b754
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-14 (Tue, 14 Oct 2014)
 2014-10-14 12:15:49 +04:00
[CST] Focus
d681bd7c8c gui/channellist.cpp: fix key pass to neutrino, 
after commit 1c606efdae


Origin commit data
------------------
Commit: e61a66e4d6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-11 (Sat, 11 Oct 2014)
 2014-10-11 15:49:43 +04:00
[CST] Focus
e3b87925fa gui/channellist.cpp: add channels reinit, if target bouquet was empty (hidden), 
or empty after edit (to hide)


Origin commit data
------------------
Commit: 2878b34141
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-11 (Sat, 11 Oct 2014)
 2014-10-11 13:23:09 +04:00
[CST] Focus
1c606efdae gui/channellist.cpp: add inline list editor; 
add to favorite bouquets without channels re-init;
cleanup


Origin commit data
------------------
Commit: fa4333f948
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-10 (Fri, 10 Oct 2014)
 2014-10-10 15:26:32 +04:00
Michael Liebmann
5a7cfe7452 CChannelList: Fix OSD error when exit the zap history 
Origin commit data
------------------
Commit: 2ae4e4819b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-09-28 (Sun, 28 Sep 2014)
 2014-09-28 12:51:58 +04:00
Michael Liebmann
621dd2c051 Fix background paint header clock in channellist 
Origin commit data
------------------
Commit: 862a724a3d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-09-25 (Thu, 25 Sep 2014)
 2014-09-26 14:22:30 +04:00
Michael Liebmann
8163ae35be CChannelList: Rework drawing channel logo... 
...for use color gradients in header


Origin commit data
------------------
Commit: 617eece227
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-09-20 (Sat, 20 Sep 2014)
 2014-09-25 11:10:02 +04:00
martii
69f917f16d drop explicit CMenuForwarder icon assignments 
Conflicts:
	src/gui/3dsetup.cpp
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/keybind_setup.cpp
	src/gui/mediaplayer.cpp
	src/gui/mediaplayer_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/network_setup.cpp
	src/gui/nfs.cpp
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/parentallock_setup.cpp
	src/gui/personalize.cpp
	src/gui/proxyserver_setup.cpp
	src/gui/record_setup.cpp
	src/gui/scan_setup.cpp
	src/gui/screensetup.cpp
	src/gui/settings_manager.cpp
	src/gui/timerlist.cpp
	src/gui/update_menue.cpp
	src/gui/vfd_setup.cpp
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: e84782bc4c
Author: martii <m4rtii@gmx.de>
Date: 2014-02-22 (Sat, 22 Feb 2014)
 2014-09-15 11:44:08 +04:00
martii
547d900fee system/settings: move theme colors to dedicated struct 
Conflicts:
	src/driver/pictureviewer/pictureviewer.cpp
	src/gui/epgview.cpp
	src/gui/osd_setup.cpp
	src/gui/pluginlist.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: b21cb152b5
Author: martii <m4rtii@gmx.de>
Date: 2014-01-06 (Mon, 06 Jan 2014)
 2014-09-12 18:29:21 +04:00
[CST] Focus
34d2776109 neutrino: sync keybind and usermenu code with neutrino-mp, code (C) martii 
Origin commit data
------------------
Commit: 420af7a4dc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)
 2014-09-05 17:49:11 +04:00
[CST] Focus
8f7f3f9e4d webtv channels integration port, 
initial code (C) martii,
initial patch from jacek


Origin commit data
------------------
Commit: a473fe8194
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-08-27 (Wed, 27 Aug 2014)
 2014-08-27 17:32:26 +04:00
martii
6593a7a8bd gui/channellist: make displaying channel numbers optional 
Conflicts:
	data/locale/deutsch.locale
	src/gui/channellist.cpp
	src/gui/osd_setup.cpp


Origin commit data
------------------
Commit: 94e6cf9a25
Author: martii <m4rtii@gmx.de>
Date: 2014-07-19 (Sat, 19 Jul 2014)
 2014-07-23 11:57:05 +04:00
[CST] Focus
fcbb131003 gui/channellist.cpp: show empty progressbar for channels without epg, too 
Origin commit data
------------------
Commit: 477f1eaa32
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-18 (Fri, 18 Jul 2014)
 2014-07-18 13:26:48 +04:00
[CST] Focus
fa1be7a360 Revert "CChannelList/COsdSetup: use showOsdChanlistSetup() from OSD-Setup" 
commit has problems: bad looking, if fade is ON, menu missed channel list fonts config

This reverts commit 5c9adb6180.


Origin commit data
------------------
Commit: 0cda142ba7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-17 (Thu, 17 Jul 2014)
 2014-07-17 17:02:43 +04:00
[CST] Focus
17c40a5d6e merge neutrino-mp progressbar code, (C) martii 
Origin commit data
------------------
Commit: 416646bbff
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-17 (Thu, 17 Jul 2014)
 2014-07-17 17:02:37 +04:00
Michael Liebmann
aff3182c3c CChannelList: Use CComponentsChannelLogo for display channellogo 
Origin commit data
------------------
Commit: 2ecd9918cb
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-06-28 (Sat, 28 Jun 2014)
 2014-06-29 13:25:32 +02:00
Thilo Graf
cd0bc99798 CChannelList: disable paint of clock background, it's not required here 
Origin commit data
------------------
Commit: 5670e87d77
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-06-27 (Fri, 27 Jun 2014)
 2014-06-28 01:09:17 +02:00
Thilo Graf
5c9adb6180 CChannelList/COsdSetup: use showOsdChanlistSetup() from OSD-Setup 
This removes multiple code parts from COsdSetup without
loss of functionality.


Origin commit data
------------------
Commit: 253579909f
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-06-07 (Sat, 07 Jun 2014)
 2014-06-23 18:43:47 +02:00
Thilo Graf
f271c801de COSDFader: rename member functions, adapt implementations 
Stop() is not exactly attributable if fader class used as inherited and
Fade() don't tell really what done and related to return value 'bool'...
especially as the fader class members have been not documented.


Origin commit data
------------------
Commit: 69e2debb02
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-05-30 (Fri, 30 May 2014)
 2014-06-23 18:43:47 +02:00
vanhofen
cb734e018f channellist: add colored progressbars 
* thx to bazi98, martii and benny


Origin commit data
------------------
Commit: df1c8ac00d
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-23 (Mon, 23 Jun 2014)

Origin message was:
------------------
- channellist: add colored progressbars

* thx to bazi98, martii and benny
 2014-06-23 17:05:44 +02:00
vanhofen
98c0a441d8 change RenderString() default to UTF8 
Origin commit data
------------------
Commit: 649d1b1f9d
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-11 (Wed, 11 Jun 2014)

Origin message was:
------------------
- change RenderString() default to UTF8
 2014-06-11 23:07:13 +02:00
vanhofen
3bba3094e2 change getRenderWidth() default to UTF8 
Origin commit data
------------------
Commit: 8b91cda918
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-11 (Wed, 11 Jun 2014)

Origin message was:
------------------
- change getRenderWidth() default to UTF8
 2014-06-11 23:07:00 +02:00
martii
76bdfe13e0 zapit/bouquets: rename bAlwaysLocked => bLockCount 
Origin commit data
------------------
Commit: 3a52a97fce
Author: martii <m4rtii@gmx.de>
Date: 2014-05-25 (Sun, 25 May 2014)
 2014-05-25 18:43:46 +02:00
martii
39933ac1dd zapit/bouquets: count locked bouquets a channels is in, and honor lock in all bouquets 
Origin commit data
------------------
Commit: abe03ad749
Author: martii <m4rtii@gmx.de>
Date: 2014-05-25 (Sun, 25 May 2014)
 2014-05-25 18:43:38 +02:00
Thilo Graf
414b54696d CChannelList: ensure erase of clock after stopping 
Origin commit data
------------------
Commit: 4a28d853d2
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-05-06 (Tue, 06 May 2014)
 2014-05-22 20:38:21 +02:00
martii
71d2ec14fe gui/channellist: use localized value for minutes 
Origin commit data
------------------
Commit: 00c1a8af01
Author: martii <m4rtii@gmx.de>
Date: 2014-05-06 (Tue, 06 May 2014)
 2014-05-06 12:21:07 +02:00
Stefan Seyfried
3f36062fe7 Merge remote-tracking branch 'check/next-cc' 
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)
 2014-04-27 19:14:06 +02:00
Thilo Graf
cc8fd42ceb CComponentsPIP: use a default frame with thickness 2 and small corner radius 
Origin commit data
------------------
Commit: a573b02b85
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-03-16 (Sun, 16 Mar 2014)
 2014-04-02 08:40:21 +02:00
Stefan Seyfried
d06c1d8ad6 Merge remote-tracking branch 'check/next-cc' 
...only build-tested, needs fixes


Origin commit data
------------------
Commit: ecd62d81d1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-15 (Sat, 15 Feb 2014)
 2014-02-15 20:22:07 +01:00
Michael Liebmann
c259eb1dc8 CComponentsFrmClock: Fix thread handling 
- Set clock activ = false for default


Origin commit data
------------------
Commit: ddc826ab51
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-02-13 (Thu, 13 Feb 2014)
 2014-02-13 18:26:04 +01:00
Stefan Seyfried
f3f8cf3b56 Merge remote-tracking branch 'check/next-cc-fixed' 
Origin commit data
------------------
Commit: 78f51baf66
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-26 (Sun, 26 Jan 2014)
 2014-01-26 00:33:08 +01:00