mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 17:31:20 +02:00
Code Issues Packages Projects Releases Wiki Activity
6,117 Commits 1 Branch 51 Tags
d1eebea38173f2649a84b8c23ddeb44a2370b41b
Commit Graph

108 Commits

Author SHA1 Message Date
Stefan Seyfried
3bf5e760a2 set background of start/shutdown image to black 2014-01-05 20:04:54 +01:00
Stefan Seyfried
d244a5991a Merge branch 'check/next-cc' 
Compiles on most platforms, starts. Not really tested.

Conflicts:
	acinclude.m4
	lib/libdvbsub/Makefile.am
	lib/libtriple/Makefile.am
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/create_rcsim_h.sh
	src/daemonc/Makefile.am
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/streaminfo2.h
	src/gui/update.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/rcsim.c
	src/system/Makefile.am
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp
 2013-10-21 22:58:55 +02:00
Thilo Graf
252c1925d8 icons.h: add larger audio icon 
Taken from GNU/GPL icon package "Dark Glass" by  Alessandro Rei

http://www.mentalrey.it/
 2013-10-02 10:21:01 +02:00
Stefan Seyfried
d5d5a60261 Merge branch 'check/next-cc' 
it compiles, but is not really tested...

Conflicts:
	src/driver/netfile.cpp
	src/driver/volume.cpp
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/bouquetlist.cpp
	src/gui/eventlist.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/scan.cpp
	src/gui/test_menu.h
	src/gui/timerlist.cpp
	src/gui/update.cpp
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/femanager.cpp
 2013-06-16 21:22:14 +02:00
[CST] Focus
6f8ef9ec46 Merge branch 'next' into next-cc 
Conflicts:
	data/locale/english.locale
	src/driver/framebuffer.cpp
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/moviebrowser.cpp
 2013-06-02 10:46:42 +04:00
[CST] Focus
87032e1438 add hint icon for youtube feeds playback 2013-05-29 18:06:17 +04:00
svenhoefer
40a77ade7c - icons: introducing dummy buttons 2013-05-27 10:48:37 +02:00
Stefan Seyfried
8253c4d67c Merge remote-tracking branch 'check/next-cc' 
needs some build-fixing and merge errors are likely :-(

Conflicts:
	configure.ac
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/unmaintained/dutch.locale
	lib/libdvbsub/Makefile.am
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/daemonc/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/framebuffer.h
	src/driver/pictureviewer/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/driver/volume.cpp
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/audioplayer.cpp
	src/gui/bedit/Makefile.am
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/keybind_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/test_menu.cpp
	src/gui/test_menu.h
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
	src/system/setting_helpers.cpp
	src/system/settings.h
	src/zapit/include/zapit/client/zapitclient.h
	src/zapit/include/zapit/femanager.h
	src/zapit/include/zapit/getservices.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
 2013-05-10 10:06:47 +02:00
[CST] Focus
b126a457c6 data/icons/Makefile.am: add icons for tuner 3/4 2013-03-27 19:41:47 +04:00
[CST] Focus
7da9f2791a data/icons/start.jpg: modified start.jpg, thanks to bazi98 2013-03-27 16:34:29 +04:00
[CST] Focus
83f27e69d8 add icons for tuner 3/4 2013-03-27 15:00:55 +04:00
[CST] Focus
7b17a3f1b5 data/icons/start.jpg: fix, nevis dont decode prev version 2013-03-25 15:55:43 +04:00
[CST] Focus
cdf10ef46e remove 'coolstream' from gui 2013-03-22 10:52:39 +04:00
Stefan Seyfried
8048673dec Merge branch 'check/next' into master 
Conflicts:
	data/locale/english.locale
	src/neutrino.cpp
	src/system/setting_helpers.cpp
 2013-03-07 17:10:11 +01:00
[CST] Focus
69b4d366af Merge branch 'pip' into next 
Conflicts:
	src/gui/channellist.cpp
 2013-02-28 16:45:41 +04:00
svenhoefer
c0959cc5f5 - icons: remove unneeded movieplayer.raw 2013-02-28 09:49:27 +01:00
[CST] Focus
ba25c9ed0f add pip icon 2013-02-26 17:20:32 +04:00
svenhoefer
365300c830 - icons: add missing hint_a_pic.png 2013-02-26 13:30:13 +01:00
Stefan Seyfried
0cf191822a Merge branch 'check/dvbsi++' commit 5db16ee2ff 
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
 2013-02-21 17:07:18 +01:00
svenhoefer
b19bd87580 - icons: remove unneeded ddfill.png 2013-02-17 21:39:10 +01:00
svenhoefer
5357724b4c - icons: remove unneeded radio.jpg 2013-02-16 16:38:05 +01:00
svenhoefer
aa1d9ce450 - icons: add missing multimedia.png 2013-02-16 13:14:50 +01:00
svenhoefer
fe3f4ce863 - icons: add missing hint_restart.png 2013-02-16 10:28:38 +01:00
Stefan Seyfried
f8f5467fdb Merge branch 'uncool/dvbsi++' commit 4965619a79 
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
 2012-12-30 21:35:20 +01:00
svenhoefer
91abca7d30 - icons: introduce new icons 
backward, forward, pause and play
 2012-11-30 13:55:34 +01:00
Stefan Seyfried
e5e7d52fa1 Merge branch 'uncool/dvbsi++' 
Conflicts:
	data/icons/border_lr.png
	data/icons/border_ul.png
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/system/setting_helpers.cpp
 2012-11-23 18:45:22 +01:00
svenhoefer
d63800351e - icons: rework btn_*.png 2012-11-20 21:09:46 +01:00
svenhoefer
8183e41d33 - icons: install hint_mb.png 2012-11-17 11:33:46 +01:00
OneOfNine
51b6928d03 - icons: improve numericpad.png 2012-11-17 10:42:01 +01:00
OneOfNine
6a1aac4c2d - icons: improve border_lr.png, border_ul.png 2012-11-17 10:35:06 +01:00
svenhoefer
58a50668d4 - icons: add hint_mb.png 2012-11-17 10:29:40 +01:00
svenhoefer
a4e480a124 - icons: new mounted.png, not_mounted.png 2012-11-17 09:09:35 +01:00
Stefan Seyfried
7e23ac7223 Merge branch 'uncool/dvbsi++' commit '7ea3a20a808' 
...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
 2012-11-03 10:45:33 +01:00
svenhoefer
f581006d0f - icons: move orphaned icons to a subdir 'orphaned/' 2012-10-24 17:25:16 +02:00
svenhoefer
5cee221e46 - icons: supplement to previous commit 2012-10-24 16:56:28 +02:00
svenhoefer
90e3ad99d8 - icons: supplement to previous commit 2012-10-24 16:51:25 +02:00
svenhoefer
f92eb8e843 - icons: move locale icons to a subdir 'locale/' 2012-10-24 16:39:51 +02:00
Stefan Seyfried
adb23b23ee Merge branch 'uncool/dvbsi++' commit 'dc95ffa37c6' 
...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
 2012-10-14 12:51:07 +02:00
Stefan Seyfried
652f0e596f use classic neutrino startup and shutdown logo for neutrino-mp 2012-10-07 17:34:56 +02:00
Stefan Seyfried
91b2998d68 osd setup: fix OSD area setup 
The PNGs used to mark the upper left and bottom right corners
were both two pixels off, which resulted in the OSD area being
slightly bigger than indicated.
 2012-10-07 17:30:44 +02:00
satbaby
a967cf4f4b optimize jpg,png size 2012-08-08 17:10:12 +02:00
Stefan Seyfried
ae1b98aa38 Merge branch 'uncool/dvbsi++' commit '6e0bc85a6c0' 
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
 2012-07-23 01:02:29 +02:00
svenhoefer
5af87e238b - yes - it's a png 2012-07-19 21:28:47 +02:00
svenhoefer
e391ea7dfd - mainmenu: add an icon for tv-radio-switch 2012-07-19 21:23:53 +02:00
FlatTV
40509697ec icon makefile 2012-07-10 18:35:18 +02:00
[CST] Focus
c0087745fb Some GPL icons for menu hints, incomplete 2012-07-08 21:53:36 +04:00
svenhoefer
3b1d063c04 - infoviewer.cpp: more suitable icons for tuner 2012-05-14 21:56:16 +02:00
Stefan Seyfried
1a61b68644 remove branding 2012-04-17 19:33:53 +02:00
thilo
aaa988db5f *neutrino: port personalize feature from tuxbox 
This is a partial port of original neutrino personalize feature
and includes also moving of user menu settings from key setup into this setup,
but it's not completley yet in some details and so I think it's a lot to do.
I hope it works fine and the many user requests are justifying this feature.

TODO:
- doc into wiki
- adapt for yWeb
- some reworks for user menu settings and plugin management
- add timer and rework tv radio mode switch item(s)
and many more...

please report: http://www.dbox2world.net/board293-coolstream-hd1/board314-coolstream-development/9565-diskussion-neutrino-goes-neutrinohd-welche-features-funktionen-aus-dem-tuxbox-cvs-%C3%BCbernehmen/

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2010 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-12-28 00:19:15 +00:00
micha-bbg
d90b967328 Mute-Zap switch channel list (r1840) 
- Restored the original state with mute button.
- Switched off via the channel list menu, default value is the original state.


git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1845 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-11-13 17:18:33 +00:00