mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 10:21:10 +02:00
Code Issues Packages Projects Releases Wiki Activity
13,988 Commits 1 Branch 51 Tags
5f9a39a96b76121e2dbc30f45a9ee015be431379
Commit Graph

494 Commits

Author SHA1 Message Date
svenhoefer
e529bd011b - usermenu: cleanup from unused code 2014-01-02 22:57:01 +01:00
svenhoefer
419cff8c8a - usermenu: add file player 2014-01-02 22:36:42 +01:00
svenhoefer
47a2cf0e54 - usermenu: add youtube player 2014-01-02 21:52:33 +01:00
Stefan Seyfried
7d379dcb30 Merge remote-tracking branch 'check/next-cc' 2013-12-29 22:12:09 +01:00
svenhoefer
9fb63a20d9 - channellist: channellogos can be disabled 2013-12-28 23:39:51 +01:00
Stefan Seyfried
cdd065fc2e Merge remote-tracking branch 'check/next-cc' 
Lightly tested only...
 2013-12-25 22:51:23 +01:00
M. Liebmann
025295b6b4 CInfoClock: menu item for setting color of the digit added 2013-12-25 18:32:01 +01:00
martii
b45511b196 system/settings: store epg times in integers 
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>
 2013-12-25 12:08:14 +01:00
martii
d125301ede system/settings: use integers for shutdown_count/_min 
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>
 2013-12-25 12:08:14 +01:00
martii
cbc9299df8 convert most char[...] configuration values to std::string 
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>
 2013-12-25 12:08:14 +01:00
Stefan Seyfried
7d87ce9c54 Merge remote-tracking branch 'check/next-cc' 
untested, probably needs some buildfixing
 2013-12-22 21:25:05 +01:00
martii
697b1a75b3 gui/osd_setup, gui/record_setup: use CMenuOptionNumberChooser ... 
... instead of CStringInput to enter numbers

* neutrino.cpp: drop SetupTiming method
* system/settings: use integers for timing values#
* system/setting_helpers: drop CTimingSettingsNotifier
 2013-12-22 21:13:45 +01:00
martii
dc61c83103 gui/keybind_setup: use CMenuOptionNumberChooser instead of CStringInput 2013-12-22 16:36:13 +01:00
martii
da0142eb0d gui/pictureviewer_setup, gui/audioplayer_setup: use CMenuOptionNumberChooser instead of CStringInput 2013-12-22 16:36:13 +01:00
martii
e41f122970 driver/audiodec: don't encode utf8 to utf8 2013-12-15 14:40:53 +04:00
svenhoefer
e97e33532b - infoclock: add some features 
* add shadow to infoclock
* rename some locals
* change default height of clock
* add option to switch bachground on/off (default off)
* add option to switch seconds on/off (default on)
 2013-12-10 02:38:43 +01:00
Stefan Seyfried
b5e736e81b Merge branch 'check/next-cc' 
Only compile-tested.
 2013-11-30 20:17:31 +01:00
M. Liebmann
435d25c0ce CInfoClock: Use dynamic font for display 2013-11-28 16:07:49 +01:00
Jacek Jendrzej
4f387ae87f CEventFinderMenu -add epg search history 2013-11-26 16:23:24 +01:00
Stefan Seyfried
b93a372b54 Merge branch 'check/next-cc' 
Compiles on most platforms, starts. Not really tested.
 2013-11-10 16:55:53 +01:00
[CST] Focus
1eb658fc21 neutrino.cpp: add window width/height settings 2013-11-07 17:23:40 +04:00
[CST] Focus
067891fe52 move tuner setup to Service menu 2013-10-25 14:27:38 +04:00
[CST] Focus
606bd01878 as requested, implement 'easy' menu mode for novice users; 
default behavior should not be changed, easy mode forced by /var/etc/.easymenu file inside image;
at the moment switch between modes is done by main menu -> 'stop' button -> enter pin code,
restart needed after mode switch
 2013-10-25 13:03:26 +04: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
svenhoefer
25e550e9e3 - sleeptimer: add possibilty to preset with a fixed value 2013-10-16 10:37:23 +02:00
Michael Liebmann
d00cb6f8ec Image backup apollo Part #6 
- Menu option for including kernel/uldr/u-boot in the image backup
- Menu option for creating an image with a different erasesize
  Tank <=> Trinity
 2013-09-27 06:44:43 +02:00
Stefan Seyfried
50977ef2f5 Merge branch 'check/next-cc' 2013-09-03 09:36:49 +02:00
svenhoefer
6ed30528f9 - osd_setup: introduce g_settings.window_size to scale some windows 
* remove g_settings.big_windows
* add setup window (use up/down to change size)
 2013-09-02 20:59:26 +02:00
Stefan Seyfried
32de6beef0 Merge remote-tracking branch 'check/next-cc' 
needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.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/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h
 2013-09-01 19:46:10 +02:00
Michael Liebmann
bc069b0a84 Softupdate: Use user-defined file names 
for apply settings and saving partitions from the flash.
 2013-08-20 02:55:54 +02:00
Michael Liebmann
0a0035c2ae Add option to resize the VolumeBar 
- Minimum height: Height of NEUTRINO_ICON_VOLUME + 2 pixels
- Maximum height: 50 pixels
- Setting can be changed with:
  Menu -> Settings -> OSD -> Volume -> Height of display
 2013-07-21 22:06:05 +02:00
[CST] Focus
c31c9d0e7f neutrino.cpp: add buttons backlight settings 2013-07-18 14:52:00 +04:00
tomworld
ea66aaaf8f - keybind_setup: add possibility to disable/enable some special keys 2013-07-12 15:50:30 +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
680f684ce4 gui/miscsettings_menu.cpp: add option to enable/disable epg scan 2013-06-12 18:46:34 +04:00
Michael Liebmann
365661e841 * Software update: Apply the settings in the options menu switchable 2013-06-08 16:20:32 +02:00
Michael Liebmann
d08d18522e * Add volume bar to osd timeouts in the OSD setup 2013-06-04 01:17:39 +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
82721e92e8 system/settings.cpp: add personalize item for youtube feeed playback 2013-05-29 18:07:57 +04:00
Stefan Seyfried
179e8559f5 scansetup: add DVB-T 2013-05-12 02:47:00 +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
6f37b8a7b6 neutrino.cpp, settings: add key for file play subtitle select 2013-04-30 12:10:03 +04:00
[CST] Focus
14191a0c62 system/settings.h: comment unused in next branch FONT_TYPE_EVENTLIST_EVENT 2013-04-30 10:14:13 +04:00
[CST] Focus
8bb70d1ab3 Merge branch 'pu/cc' into next-cc 
Conflicts:
	acinclude.m4
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/volume.cpp
	src/eitd/SIlanguage.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan.h
	src/gui/test_menu.cpp
	src/gui/timeosd.cpp
	src/gui/widget/progressbar.cpp
	src/gui/widget/progressbar.h
	src/neutrino.cpp
	src/nhttpd/yconfig.h
 2013-04-17 13:32:12 +04:00
Stefan Seyfried
5954735ed8 auto-enumerate FONT_TYPE_COUNT instead of defining it 
Conflicts:
	src/system/settings.h
 2013-04-17 10:21:33 +04:00
[CST] Focus
f36200e0fe neutrino.cpp: add ci_ignore_messages settings var 2013-04-16 13:16:16 +04:00
Stefan Seyfried
1f1aa08562 auto-enumerate FONT_TYPE_COUNT instead of defining it 2013-04-15 21:37:43 +02:00
Stefan Seyfried
ee3580214f auto-enumerate FONT_TYPE_COUNT instead of defining it 2013-04-13 17:27:21 +02:00
Stefan Seyfried
61bf95f552 Merge branch 'check/pu-cc' into master 
Conflicts:
	src/gui/osd_setup.cpp
	src/neutrino.cpp
 2013-04-13 17:17:30 +02:00
svenhoefer
473d6f38ba - eventlist: make additional infos switchable 
* new menu 'eventlist' in osd-setup
* fix offset in infozone
* fontsize for infozone adjustable
 2013-04-13 11:13:23 +02:00