mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,531 Commits 1 Branch 51 Tags
04e840366a2336feddbcb05dc9480cbb62bfc022
Commit Graph

150 Commits

Author SHA1 Message Date
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
Jacek Jendrzej
8023a6317b neutrino use check empty() instead of length() or size() 2015-01-03 17:51:08 +01: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
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
TangoCash
dfc7a1d304 - movieplayer: add playlist_manager 
NOTE: This is a merge of several patches by TangoCash
      for neutrino-mp aligned to neutrino-hd.
      We use 'play' key to open playlist_manager.
 2014-11-26 10:23:21 +01:00
[CST] Focus
713820a1c0 gui/filebrowser.cpp: cleanup, simplify footer 2014-10-01 17:15:57 +04:00
[CST] Focus
2c3256bacf gui/filebrowser.cpp: change OK button behavior: 
always return marked list, if there are marked files;
always change dir, if there are no marked files;
to recursive add dir, use mark
 2014-09-30 14:07:38 +04:00
[CST] Focus
f3e57a224d gui/filebrowser.cpp: change checkBD() to static 2014-09-27 16:21:43 +04:00
martii
81ca577fb8 overload access(2) 
Conflicts:
	src/driver/pictureviewer/pictureviewer.cpp
	src/gui/components/cc_item_picture.cpp
	src/gui/movieplayer.cpp
	src/gui/osdlang_setup.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.h
	src/system/setting_helpers.cpp
 2014-09-24 19:50:35 +04:00
[CST] Focus
d83d519c86 gui/movieplayer.cpp: add support for marked file list to play (file playback) and repeat modes, 
original code (C) martii <m4rtii@gmx.de>
 2014-09-17 20:13:49 +04:00
martii
f63c3da37c gui/filebrowser: fix page up/down 
Conflicts:
	src/gui/filebrowser.cpp
 2014-09-15 12:48:54 +04:00
martii
b4ca0290a3 gui/filebrowser: rework page-up/-down 
Conflicts:
	src/gui/filebrowser.cpp
 2014-09-15 12:46:38 +04:00
martii
805a1232cf gui/filebrowser: don't crash when fonts are changed (untested) 2014-09-15 12:26:43 +04:00
martii
e98336658d gui/filebrowser: don't show progressbar unless directories were added 2014-08-26 17:31:28 +04:00
svenhoefer
649d1b1f9d - change RenderString() default to UTF8 2014-06-11 23:07:13 +02:00
svenhoefer
8b91cda918 - change getRenderWidth() default to UTF8 2014-06-11 23:07:00 +02:00
svenhoefer
dc39bde14a - filebrowser: fix paint of SMSKey in footer and ... 
... align both buttonlines in footer to same width
 2014-05-31 17:54:29 +02:00
svenhoefer
f22a8ee1c6 - filebrowser: paintFoot() at every ChangeDir() 
this fixes the empty footer when parentDir was empty
 2014-05-31 15:23:46 +02:00
Stefan Seyfried
add688bbb8 Merge remote-tracking branch 'check/next-cc' 
broken, needs buildfixing
 2014-02-23 15:17:48 +01:00
[CST] Focus
628de1f68c gui/filebrowser.cpp: return directory in player mode (Hide_records is true) 
if BDMV/index.bdmv found in dir
 2014-02-21 20:01:14 +04:00
Stefan Seyfried
78f51baf66 Merge remote-tracking branch 'check/next-cc-fixed' 2014-01-26 00:33:08 +01:00
Thilo Graf
5ea7ec48df CComponentsHeader: rework constructors, add CComponentsHeaderLocalized 
Member initVarHeader() now used with parameters, so it's  possible
to remove multiple code in constructors, but some class must be
renamed to CComponentsHeaderLocalized.
 2014-01-24 23:09:56 +01:00
Stefan Seyfried
b414474323 Merge remote-tracking branch 'check/next-cc' 
compiles, nothing else.

Conflicts:
	configure.ac
	src/Makefile.am
	src/gui/Makefile.am
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan_setup.cpp
	src/gui/start_wizard.cpp
	src/gui/test_menu.cpp
	src/gui/user_menue.cpp
	src/gui/widget/hintboxext.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/messagebox.cpp
	src/gui/widget/stringinput.cpp
 2014-01-23 14:08:37 +01:00
svenhoefer
53f5801d6f - adapt ShowMsg handling from martii's neutrino-mp 2014-01-22 12:37:21 +01:00
Stefan Seyfried
56a7262d5d Merge remote-tracking branch 'check/next-cc' 2014-01-05 18:31:31 +01:00
martii
f953cd07b3 gui/filebrowser: don't segv when removing files with small names 2014-01-04 14:25:54 +01:00
Stefan Seyfried
7d379dcb30 Merge remote-tracking branch 'check/next-cc' 2013-12-29 22:12:09 +01:00
martii
8baab17dda gui/filebrowser: SMS input: fix RC_7, rewrite handler 2013-12-26 13:35:01 +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
[CST] Focus
8358e5921e gui/filebrowser.cpp: fix color for marked files; 
do not add selected file on OK press, if there are marked files
 2013-12-15 14:40:55 +04:00
[CST] Focus
d69f8d507a gui/filebrowser.cpp: add AAC file type 2013-12-15 14:40:54 +04:00
martii
bf694d32f1 drop #ifdef ENABLE_FLAC 2013-12-15 14:40:54 +04:00
svenhoefer
014dd3ac7b Revert "- add missing include of vfd header" 
This reverts commit 3845feb0e4.
 2013-11-13 23:39:55 +01:00
svenhoefer
3845feb0e4 - add missing include of vfd header 2013-11-13 10:40:18 +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
Thilo Graf
f7798affc6 CComponents: add unfied header file for general include of cc classes 
Provides a unified header file, so it is not required to select a
certain header file.
 2013-10-24 21:19:07 +02: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
Jacek Jendrzej
6f07cbe3dd CUpdateSettings:: allow choose tmp(ramfs,TMPFS_MAGIC) as update dir 2013-10-08 10:10:10 +02:00
Stefan Seyfried
c68ffa2155 remove all fb->blit() calls 
TODO: check if plugins etc. need extra treatment
 2013-09-28 13:01:03 +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
c60c5c5ce3 Replace color indexes of the text colors by real color values for RenderString() 
- If necessary, Correct data types of the color values
 2013-07-21 22:00:58 +02:00
[CST] Focus
cc115a3615 gui/filebrowser.cpp: restore selection, 
remove double paint on exec(),
remember selected to restore on dir enter with OK button
 2013-07-18 14:51:59 +04: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
Stefan Seyfried
a33086568b neutrino: fix possible div-by-zero in scrollbar calculation 2013-05-30 11:19:39 +02:00
Stefan Seyfried
6a48922350 neutrino: fix possible div-by-zero in scrollbar calculation 2013-05-29 15:33:21 +02:00
Jacek Jendrzej
a549b97924 fix comma at end of enumerator list 2013-05-28 15:52:31 +02:00
svenhoefer
13398c4e0f - filebrowser: stay with FONT_TYPE_MENU_TITLE in header ... 
... to keep gui as uniformly as possible
 2013-05-28 10:48:18 +02:00
svenhoefer
6c41ffbe47 - neutrino: don't save screen while paint headers 2013-05-28 10:42:39 +02:00
svenhoefer
29b3d66f3d - filebrowser: use FONT_TYPE_MENU_TITLE for header 
CComponentsHeader doesn't support several fonts yet.
  FONT_TYPE_MENU_TITLE is the used font.
  so we have to use FONT_TYPE_MENU_TITLE here to get
  the correct render-widths in paintHead() methode.
 2013-05-28 08:41:43 +02:00
svenhoefer
1830ccd8ab - filebrowser: using CComponentsHeader to paint header 2013-05-28 01:51:18 +02:00