mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity
13,692 Commits 1 Branch 51 Tags
bccecb30589191406c79f57ca3b5130fe20e8692
Commit Graph

610 Commits

Author SHA1 Message Date
Thilo Graf
a58f1621b4 Merge branch 'cst-next.pre' into cst-next 2015-04-30 09:20:43 +02:00
Thilo Graf
01516cf943 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
15e9663608 channellist.cpp; fix kill dline 2015-04-16 22:24:13 +02:00
svenhoefer
09adc177d8 - record.h: remove include of vfd.h; use display.h instead 2015-04-16 13:39:35 +02:00
Stefan Seyfried
5ab6b53054 global.h: Use forward-declarations to reduce number of dependencies 2015-04-16 13:39:35 +02:00
svenhoefer
7f35a67426 - channellist: allow show/hide bottom infobox 2015-04-14 11:08:24 +02:00
Thilo Graf
388ab3aa02 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.
 2015-04-04 23:32:48 +02:00
Thilo Graf
e631559555 CChannelList: fix paint of unscaled images 
Unscaled images were never painted.
 2015-03-29 22:40:15 +02:00
Thilo Graf
1cb885dfe9 CChannelList/CNeutrinoEventList/CMovieBrowser: fix logo scale 
Downscale was broken.
 2015-03-29 22:40:08 +02:00
Thilo Graf
f499efa208 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.
 2015-03-29 22:39:53 +02:00
Stefan Seyfried
92fcc879b4 Merge remote-tracking branch 'test/cst-next' 2015-03-07 20:09:44 +01:00
[CST] Focus
e846eb141e gui/channellist.cpp: optimize channel list appear time 2015-03-06 14:14:00 +03:00
Stefan Seyfried
3a222fb5f3 channellist: fix lock icon for default-locked bouquets 2015-02-14 14:31:12 +01:00
Stefan Seyfried
b325268123 channellist: remove bogus (char *) casts 2015-02-14 14:31:11 +01:00
Stefan Seyfried
a846cb1a97 channellist: fix lock icon for default-locked bouquets 2015-02-12 16:38:42 +01:00
Stefan Seyfried
8503bf3bc7 channellist: remove bogus (char *) casts 2015-02-10 14:54:48 +01:00
Stefan Seyfried
dc637ca68e channellist: fix 2 forgotten cases of fixed plock_zaptime 2015-02-09 13:47:32 +01:00
Stefan Seyfried
6e9496b18f 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
 2015-02-09 13:47:32 +01:00
Stefan Seyfried
ec12b704cb channellist: fix 2 forgotten cases of fixed plock_zaptime 2015-02-08 17:35:01 +01:00
Stefan Seyfried
ab7b08e40e 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
 2015-02-08 17:33:25 +01:00
Stefan Seyfried
b5a64e6887 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
 2015-01-26 17:26:26 +01:00
Janus
df1db3cfad api4: upgrade channel and bouquet edit (testing) 2015-01-22 13:08:03 +01:00
[CST] Focus
c6424534e8 gui/channellist.cpp: disable timeshift stop while timeshift playback in progress 2015-01-21 17:54:11 +03:00
[CST] Focus
3da439030b neutrino: try to prevent using chanellist/bouquetlist while channels init in progress 2015-01-13 16:10:24 +03:00
Stefan Seyfried
d37b3c0f9a 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
 2014-12-28 12:32:12 +01:00
Stefan Seyfried
894e21174d channellist is a pointer now 2014-12-25 18:21:56 +01:00
Stefan Seyfried
69c4dbbdba 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
 2014-12-25 18:03:08 +01:00
[CST] Focus
36b14e31ef gui/channellist.cpp: bug fix, default copy constructor is danger, if class have pointers 2014-11-26 10:45:29 +03:00
Jacek Jendrzej
6e08417d40 CChannelList::updateEvents fix history list event update 2014-11-13 10:51:27 +01:00
[CST] Focus
5bd14ea4b8 neutrino: try to fix parental bypass by 
quit from audio player / picture viewer / movie player and starting channel in PiP
 2014-11-11 14:40:52 +03:00
martii
a12f4c0274 parental protection: make zaptime configurable 
Conflicts:
	data/locale/english.locale
	src/gui/channellist.cpp
	src/gui/parentallock_setup.cpp
	src/neutrino.cpp
 2014-11-11 14:40:52 +03:00
[CST] Focus
121d2f6339 gui/channellist.cpp: add channel move to bouquet 2014-10-28 15:13:22 +03:00
[CST] Focus
e099cd4413 gui/channellist.cpp: disable 'other' bouquet edit 2014-10-27 14:02:34 +03:00
[CST] Focus
8772d219f1 gui/miscsettings_menu.cpp: add option to enable/disable empty favorites in bouquet list 2014-10-27 13:52:23 +03:00
[CST] Bas
5f3872b5dd 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
 2014-10-22 16:14:05 +04:00
[CST] Focus
00ead6aa95 gui/channellist.cpp: allow to edit provider bouquet 2014-10-14 16:45:08 +04:00
[CST] Focus
b1ba52b754 gui/channellist.cpp: add per-channel lock in editor 2014-10-14 12:15:49 +04:00
[CST] Focus
e61a66e4d6 gui/channellist.cpp: fix key pass to neutrino, 
after commit fa4333f948
 2014-10-11 15:49:43 +04:00
[CST] Focus
2878b34141 gui/channellist.cpp: add channels reinit, if target bouquet was empty (hidden), 
or empty after edit (to hide)
 2014-10-11 13:23:09 +04:00
[CST] Focus
fa4333f948 gui/channellist.cpp: add inline list editor; 
add to favorite bouquets without channels re-init;
cleanup
 2014-10-10 15:26:32 +04:00
M. Liebmann
2ae4e4819b CChannelList: Fix OSD error when exit the zap history 2014-09-28 12:51:58 +04:00
M. Liebmann
862a724a3d Fix background paint header clock in channellist 2014-09-26 14:22:30 +04:00
M. Liebmann
617eece227 CChannelList: Rework drawing channel logo... 
...for use color gradients in header
 2014-09-25 11:10:02 +04:00
martii
e84782bc4c 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
 2014-09-15 11:44:08 +04:00
martii
b21cb152b5 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
 2014-09-12 18:29:21 +04:00
[CST] Focus
420af7a4dc neutrino: sync keybind and usermenu code with neutrino-mp, code (C) martii 2014-09-05 17:49:11 +04:00
[CST] Focus
a473fe8194 webtv channels integration port, 
initial code (C) martii,
initial patch from jacek
 2014-08-27 17:32:26 +04:00
martii
94e6cf9a25 gui/channellist: make displaying channel numbers optional 
Conflicts:
	data/locale/deutsch.locale
	src/gui/channellist.cpp
	src/gui/osd_setup.cpp
 2014-07-23 11:57:05 +04:00
[CST] Focus
477f1eaa32 gui/channellist.cpp: show empty progressbar for channels without epg, too 2014-07-18 13:26:48 +04:00
[CST] Focus
0cda142ba7 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 253579909f.
 2014-07-17 17:02:43 +04:00