mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity
14,195 Commits 1 Branch 51 Tags
64edf98da417e1616a259c3dcff59072201d0473
Commit Graph

173 Commits

Author SHA1 Message Date
Stefan Seyfried
ecd62d81d1 Merge remote-tracking branch 'check/next-cc' 
...only build-tested, needs fixes
 2014-02-15 20:22:07 +01:00
M. Liebmann
ddc826ab51 CComponentsFrmClock: Fix thread handling 
- Set clock activ = false for default
 2014-02-13 18:26:04 +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
M. Liebmann
0a5a7b3146 CScanSettings: convert char[...] configuration values to std::string 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
b5e736e81b Merge branch 'check/next-cc' 
Only compile-tested.
 2013-11-30 20:17:31 +01:00
M. Liebmann
90985f11d2 Adapting certain files to the changed font handling of info clock 2013-11-28 16:07:48 +01:00
svenhoefer
633278a532 Revert "CTestMenu: fix build, add missing include" 
This reverts commit 25909c10b6.
 2013-11-13 23:39:37 +01:00
Stefan Seyfried
548448456a Merge branch 'check/next-cc' 
Only compile-tested.
 2013-11-13 14:04:15 +01:00
Thilo Graf
25909c10b6 CTestMenu: fix build, add missing include 
supplement to 3845feb0e4

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2013-11-13 11:54:31 +01:00
Thilo Graf
ac6f547d0f CTestMenu: add buildinfo as menu entry 
Buildinfo also exists in infomenu, but is outcommented, so it is
prepared just for testings.
 2013-11-11 00:20:10 +01:00
Thilo Graf
29abd4f1dd CTestMenu: add sample code for CComponentsExtTextForm 2013-11-11 00:19:46 +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
6f700d80c0 CTestMenu: add configure option --enable-testmenu 2013-11-05 13:22:28 +01:00
Thilo Graf
6dd1da0628 revert 6ee7fac1a5 
Was bad idea to rename. Other Classes can also inherit this. See CMenuTarget
 2013-10-26 23:25:59 +02:00
Thilo Graf
6ee7fac1a5 CComponents: rename hide() to hideCC() 
There are too many name conflicts with hide-members in other classes.
 2013-10-24 21:39:04 +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
Thilo Graf
2ed9357222 CTestMenu: add sample code for channel logo item 2013-10-06 17:14:31 +02:00
Thilo Graf
740e7e8129 CTestMenu: fix build of test menu, name of member was changed 2013-09-21 00:24:13 +02:00
Stefan Seyfried
7cfe54dc2f Merge branch 'check/next-cc' 
again: it compiles, but is not really tested...

Conflicts:
	acinclude.m4
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/osd_setup.cpp
	src/gui/start_wizard.cpp
	src/zapit/src/getservices.cpp
 2013-07-06 19:01:15 +02:00
Thilo Graf
03ef18cdb9 CComponentsFrmClock: set font only with fontrender object 2013-06-18 19:33:34 +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
Thilo Graf
b7e5121001 CTestMenu: add some sample codes for window and button handling, 2013-06-16 00:34:08 +02:00
[CST] Focus
1d3ec8c7af gui/test_menu.cpp: change tuner test params again 2013-06-13 19:24:10 +04:00
[CST] Focus
25dc8bc10f gui/test_menu.cpp: change scan test params, add mmc mount check 2013-06-13 13:14:26 +04:00
Michael Liebmann
6409cc8a19 CComponentsFrmClock: Move thread start/stop to constructor/destructor 2013-06-12 01:32:24 +02:00
Michael Liebmann
c5e0552438 CTestMenu: Fix memleak 2013-06-12 01:32:24 +02:00
[CST] Focus
23c387755c gui/test_menu.cpp: change tuner test code to support more than 2 and cable 2013-06-10 15:57:33 +04:00
Thilo Graf
fc3829d695 CTestMenu: add sample code for footer buttons, disable debug spam 2013-06-03 22:12:49 +02:00
Thilo Graf
e665ab18ab CComponentsFooter: add new class CComponentsFooter 2013-06-03 22:06:03 +02:00
Thilo Graf
8e46f63900 CComponentsHeader: rename some members for plausible usage in subclasses 
Some members are usable in subclasses, but  current names could be not
suitable or not  plausible with respect to the name of subclass.
 2013-05-27 11:58:05 +02:00
Thilo Graf
9d52071c39 CComponentsFrmClock: add new class CComponentsFrmClock 2013-05-25 23:29:49 +02:00
Stefan Seyfried
a7f1e0e25e Merge remote-tracking branch 'check/next-cc' 
needs buildfixing in framebuffer class...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fontrenderer.cpp
	src/driver/volume.cpp
	src/gui/audiomute.cpp
	src/gui/audioplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
 2013-05-24 20:24:39 +02:00
Michael Liebmann
2244e418b7 * CTestMenu: Add widget id's 
- Return menu result, to close all menus
 2013-05-21 19:34:52 +02:00
Stefan Seyfried
6b72095f5a neutrino: explicitly include vfd/lcd header 
Instead of including it everywhere through global.h, just include
the lcd/vfd header where needed. Add a tiny helper header "display.h"
to divert between vfd.h (coolstream) and lcdd.h (everything else).
 2013-05-11 17:17:33 +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
Thilo Graf
b0846842f3 CTestMenu: add sample code for CComponentsButtonRed 2013-04-20 12:53:25 +02: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
[CST] Focus
2cc3c213b5 gui/test_menu.cpp: fix compile 2013-04-16 12:53:54 +04:00
Stefan Seyfried
88fde35e52 test_menu: fix path to demo picture 2013-04-08 10:35:43 +02:00
Stefan Seyfried
6cabfb0a71 test_menu: fix path to demo picture 2013-04-07 17:26:53 +02:00
Stefan Seyfried
4d2f580af0 test_menu: fix build 2013-04-06 11:46:50 +02:00
Thilo Graf
c17e2e5d6c CTestMenu: remove minitv sample 
Can not be displayed here nicely.
 2013-03-18 12:04:42 +01:00
Thilo Graf
2b41601d11 CTestMenu: modifie some samples to call header 2013-03-18 12:04:32 +01:00
Thilo Graf
de330ac39c CComponentsWindow: remove refresh() 
initCCWItems() does the same, but is private
 2013-03-18 12:04:16 +01:00
Thilo Graf
fa9ffdd46e CComponentsWindow: add sub class CComponentsWindow 2013-03-06 11:28:16 +01:00
Thilo Graf
14393b36d9 CTestMenu: add sample code for removeHeaderButtons() 2013-03-06 11:28:15 +01:00
Thilo Graf
264f4bb951 CTestMenu: add example to exchange text with an image-item, for header 2013-03-06 11:28:14 +01:00
Thilo Graf
189ba5b5e6 CTestMenu: add sample code CComponentsHeader 2013-03-06 11:28:13 +01:00