mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-06 21:28:32 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,330 Commits 1 Branch 51 Tags
b5a64e6887e61f99ebc7df89f66e800e3c180432
Commit Graph

171 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
svenhoefer
026c8b4389 - osd_setup: improve/clarify screensaver off option 2015-01-08 20:01:15 +01:00
svenhoefer
b85aa43d87 - screensaver: allow no screensaver_timeout to show first pic only 
Thats usefull when you have just one plain black pic in your
  screensaver directory. So you'll get a blank screen w/o pic changes.
 2014-12-29 23:50:18 +01:00
svenhoefer
df18f1f4e5 - screensaver: remove audioplayer_screensaver; add screensaver_delay 2014-12-29 23:50:18 +01:00
vanhofen
3206e35e20 - screensaver: move configuration to own submenu 2014-12-29 22:13:02 +01:00
svenhoefer
153e7dba91 - screensaver: add GUI option to change timeout 2014-12-29 22:13:02 +01:00
vanhofen
cbed13ecd0 - screensaver: add GUI option to change screensaver directory 2014-12-29 22:13:02 +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
49f3516f47 osd_setup: remove g_settings.progressbar_design leftovers 
needs more checking throughout the code base...
 2014-12-25 18:32:21 +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
M. Liebmann
8c3b26fc76 CColorChooser: Preview color gradient for header color 2014-11-26 09:42:44 +01:00
M. Liebmann
c7908c87f4 Switches color gradients on/off 2014-09-25 11:08:29 +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
martii
7c15db185f add thread for determining free hdd (recording dir) space, enable hdd usage icons on vfd (untested) 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/simple_display.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/moviebrowser.cpp
	src/gui/record_setup.cpp
	src/neutrino.cpp
	src/system/ytcache.h
 2014-09-11 17:58:19 +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
4b3be3c313 src/gui/osd_progressbar_setup.cpp: move infoviewer progressbar position config to osd_setup.cpp 2014-07-18 12:28:30 +04:00
[CST] Focus
c8b33f6bda gui/osd_setup.cpp: re-use common channel list settings in context menu 2014-07-17 17:02:47 +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
[CST] Focus
416646bbff merge neutrino-mp progressbar code, (C) martii 2014-07-17 17:02:37 +04:00
svenhoefer
8887767141 - osd_setup: don't show colored progress bar option in channellist ... 
... when colored progress bar is disabled
 2014-06-27 18:26:13 +02:00
Thilo Graf
253579909f CChannelList/COsdSetup: use showOsdChanlistSetup() from OSD-Setup 
This removes multiple code parts from COsdSetup without
loss of functionality.
 2014-06-23 18:43:47 +02:00
svenhoefer
df1c8ac00d - channellist: add colored progressbars 
* thx to bazi98, martii and benny
 2014-06-23 17:05:44 +02:00
svenhoefer
da7f3b9cb1 - drop obsolete code around FONT_TYPE_GAMELIST 
these fonts are not needed since gamelist/scriptlist
  are painted with menu-widget
 2014-05-02 22:28:36 +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
29617ba843 gui/osd_setup.cpp: add 'other' font sizes group, 
add subtitles font size setup
 2014-02-21 20:01:13 +04: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
M. Liebmann
31842369cc Preparing the input classes for Lua 
- Add non locale variants for CExtendedInput, CStringInput,
  CStringInputSMS, CPINInput
  THX Martii
 2014-01-19 20:57:38 +01:00
M. Liebmann
b41819190d Preparing the menu classes for Lua Part #2 
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
  THX Martii
 2014-01-19 20:57:37 +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
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
svenhoefer
798e926f3f - osd-setup: use a more suitable value for maximal osd-timeout 2013-12-22 21:38:51 +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
svenhoefer
4b4ef281a4 - osd-setup: fix e97e33532b 2013-12-10 03:02:44 +01: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
svenhoefer
25b1b35872 - osd-setup: add option to switch clock on or off 2013-12-10 02:22:27 +01:00
svenhoefer
52f51e7f27 - infoclock: cleanup (remove unneeded stuff) 2013-12-09 23:12:23 +01:00
Stefan Seyfried
b5e736e81b Merge branch 'check/next-cc' 
Only compile-tested.
 2013-11-30 20:17:31 +01:00
Stefan Seyfried
bf8ec4d89e Revert "Revert "global.h: Use forward-declarations to reduce number of dependencies"" 
This reverts commit 3c8d47fa49.

No Idea why this was reverted, so revert again :-)
 2013-11-30 18:26:47 +01:00
[CST] Focus
98fb57d924 gui/osd_setup.cpp: fix memleak 2013-11-29 17:27:10 +04:00
M. Liebmann
435d25c0ce CInfoClock: Use dynamic font for display 2013-11-28 16:07:49 +01:00
svenhoefer
3c8d47fa49 Revert "global.h: Use forward-declarations to reduce number of dependencies" 
This reverts commit 4bc6e43ad4.
 2013-11-13 23:40:16 +01:00
Stefan Seyfried
4bc6e43ad4 global.h: Use forward-declarations to reduce number of dependencies 2013-11-13 10:40:03 +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
martii
4eb66ba4b2 global.h: Use forward-declarations to reduce number of dependencies 
[seife: amended to fix build]

Signed-off-by: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
 2013-11-09 17:03:03 +01:00
[CST] Focus
4e423e2bd7 gui/osd_setup.cpp: fix Window size in menu, snprintf take care about 0 at the end 2013-11-07 18:59:42 +04:00