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
10,125 Commits 2 Branches 9 Tags
8c27915df5f5f2798cee837cc0140239d74b3579
Commit Graph

518 Commits

Author SHA1 Message Date
[CST] Focus
3c61e156fb gui/channellist.cpp: pass channel epg_id to get events 
Origin commit data
------------------
Commit: 7f4cf3011c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-06-02 (Tue, 02 Jun 2015)
 2015-09-24 12:25:33 +03:00
Jacek Jendrzej
3c9ed9d57c src/gui/channellist.cpp: stop RECMODE_TSHIFT in play mode 
Origin commit data
------------------
Commit: abea6d83d6
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-08-19 (Wed, 19 Aug 2015)
 2015-08-19 17:58:08 +02:00
Jacek Jendrzej
0cae5975ab fix possible segfault if chanellist is empty 
Origin commit data
------------------
Commit: 5bfbae4ca9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-08-13 (Thu, 13 Aug 2015)
 2015-08-13 15:27:25 +02:00
Thilo Graf
db2e6ace74 CChannelList: fix and simplify paint of custom channellogos 
paint was probably broken since 37dd574464


Origin commit data
------------------
Commit: 18fa153389
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-07-11 (Sat, 11 Jul 2015)
 2015-07-17 16:01:19 +02:00
Jacek Jendrzej
db67eda710 src/gui/channellist.cpp: show epg info1 if info2 empty (THX bazi98) 
Origin commit data
------------------
Commit: 4cb0870b9b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-07-05 (Sun, 05 Jul 2015)
 2015-07-05 13:20:47 +02:00
[CST] Focus
7c5ab345fb gui/channellist.cpp: use getChannelID() in place of channel_id 
Origin commit data
------------------
Commit: 64eda8566c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-06-01 (Mon, 01 Jun 2015)
 2015-06-02 12:26:34 +03:00
Michael Liebmann
7bd18649cb Clock on infoviewer and channellist: Fix background paint... 
...when switching between OneColor und ColorToColor


Origin commit data
------------------
Commit: 95a27ebb31
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-05-09 (Sat, 09 May 2015)
 2015-05-09 10:38:51 +02:00
vanhofen
cc9f8c6450 themes: move colored_events settings to themes setup 
Origin commit data
------------------
Commit: cb5f052e83
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-04 (Mon, 04 May 2015)

Origin message was:
------------------
- themes: move colored_events settings to themes setup
 2015-05-05 11:43:17 +02:00
Thilo Graf
61656865d0 Merge branch 'cst-next.pre' into cst-next 
Origin commit data
------------------
Commit: a58f1621b4
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-04-30 (Thu, 30 Apr 2015)
 2015-04-30 09:20:43 +02:00
Thilo Graf
6261b3b869 themes: use hintbox and header gradient option in theme settings 
Color gradient feature was originally intended for use
inside theme settings and it's not really suitable for
generally use as default in all themes at the moment, so it makes more
sense to have options in theme settings and let the user decide
to customize this, unless enough other gui parts can use this feature.


Origin commit data
------------------
Commit: 01516cf943
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-04-29 (Wed, 29 Apr 2015)

Origin message was:
------------------
themes: use hintbox and header gradient option in theme settings

Color gradient feature was originally intended for use
inside theme settings and it's not really suitable for
generally use as default in all themes at the moment, so it makes more
sense to have options in theme settings and let the user decide
to customize this, unless enough other gui parts can use this feature.
 2015-04-29 10:16:55 +02:00
Jacek Jendrzej
57ddca2eba channellist.cpp; fix kill dline 
Origin commit data
------------------
Commit: 15e9663608
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-04-16 (Thu, 16 Apr 2015)
 2015-04-16 22:24:13 +02:00
vanhofen
2f0e76ff67 record.h: remove include of vfd.h; use display.h instead 
Origin commit data
------------------
Commit: 09adc177d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-16 (Thu, 16 Apr 2015)

Origin message was:
------------------
- record.h: remove include of vfd.h; use display.h instead
 2015-04-16 13:39:35 +02:00
Stefan Seyfried
d9354e847f global.h: Use forward-declarations to reduce number of dependencies 
Origin commit data
------------------
Commit: 5ab6b53054
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-04-16 (Thu, 16 Apr 2015)
 2015-04-16 13:39:35 +02:00
vanhofen
bc0984621f channellist: allow show/hide bottom infobox 
Origin commit data
------------------
Commit: 7f35a67426
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-14 (Tue, 14 Apr 2015)

Origin message was:
------------------
- channellist: allow show/hide bottom infobox
 2015-04-14 11:08:24 +02:00
Thilo Graf
3341622426 CChannelList: use class for scalable channel logos 
Previous class used limited scale handling mainly with the
member paintIcon() by framebuffer class.
Because of many possible channel logo files, the icon cache was
filled very fast. That was never considered in
paintIcon() and caused strange behavior at screen, as no image data
were assigned correctly.


Origin commit data
------------------
Commit: 388ab3aa02
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-04-04 (Sat, 04 Apr 2015)
 2015-04-04 23:32:48 +02:00
Thilo Graf
284a3074d3 CChannelList: fix paint of unscaled images 
Unscaled images were never painted.


Origin commit data
------------------
Commit: e631559555
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-03-19 (Thu, 19 Mar 2015)
 2015-03-29 22:40:15 +02:00
Thilo Graf
412889b185 CChannelList/CNeutrinoEventList/CMovieBrowser: fix logo scale 
Downscale was broken.


Origin commit data
------------------
Commit: 1cb885dfe9
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-01-14 (Wed, 14 Jan 2015)
 2015-03-29 22:40:08 +02:00
Thilo Graf
e7b404abb9 CChannelList: ensure down scaling if header height is too small 
Logo is initialized with width and height, but enforces in most cases
upscaling of logo. Default now disabled scaling but if header too small,
down scaling is enabled.


Origin commit data
------------------
Commit: f499efa208
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-10-12 (Sun, 12 Oct 2014)
 2015-03-29 22:39:53 +02:00
Stefan Seyfried
98fe56c38b Merge remote-tracking branch 'test/cst-next' 
Origin commit data
------------------
Commit: 92fcc879b4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-03-07 (Sat, 07 Mar 2015)
 2015-03-07 20:09:44 +01:00
[CST] Focus
5abfce2008 gui/channellist.cpp: optimize channel list appear time 
Origin commit data
------------------
Commit: e846eb141e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-03-06 (Fri, 06 Mar 2015)
 2015-03-06 14:14:00 +03:00
Stefan Seyfried
f9fe188ff7 channellist: fix lock icon for default-locked bouquets 
Origin commit data
------------------
Commit: 3a222fb5f3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-12 (Thu, 12 Feb 2015)
 2015-02-14 14:31:12 +01:00
Stefan Seyfried
ebd1cab3d5 channellist: remove bogus (char *) casts 
Origin commit data
------------------
Commit: b325268123
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)
 2015-02-14 14:31:11 +01:00
Stefan Seyfried
924f77e5a3 channellist: fix lock icon for default-locked bouquets 
Origin commit data
------------------
Commit: a846cb1a97
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-12 (Thu, 12 Feb 2015)
 2015-02-12 16:38:42 +01:00
Stefan Seyfried
ae44701f75 channellist: remove bogus (char *) casts 
Origin commit data
------------------
Commit: 8503bf3bc7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)
 2015-02-10 14:54:48 +01:00
Stefan Seyfried
12826c713a channellist: fix 2 forgotten cases of fixed plock_zaptime 
Origin commit data
------------------
Commit: dc637ca68e
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
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