mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-12 07:53:37 +02:00
Code Issues Packages Projects Releases Wiki Activity
6,205 Commits 2 Branches 9 Tags
a112e8fb4979ee803ccad3ad336a6fa769dc6b9f
Commit Graph

71 Commits

Author SHA1 Message Date
Stefan Seyfried
a112e8fb49 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


Origin commit data
------------------
Commit: b414474323
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-23 (Thu, 23 Jan 2014)
 2014-01-23 14:08:37 +01:00
vanhofen
8d5aa84e20 adapt ShowMsg handling from martii's neutrino-mp 
Origin commit data
------------------
Commit: 53f5801d6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-22 (Wed, 22 Jan 2014)

Origin message was:
------------------
- adapt ShowMsg handling from martii's neutrino-mp
 2014-01-22 12:37:21 +01:00
Michael Liebmann
c7fb87a9a3 CScanSettings: convert char[...] configuration values to std::string 
Origin commit data
------------------
Commit: 0a5a7b3146
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-18 (Sat, 18 Jan 2014)
 2014-01-19 20:57:38 +01:00
Michael Liebmann
1918153c0a Preparing the menu classes for Lua Part #2 
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii


Origin commit data
------------------
Commit: b41819190d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-16 (Thu, 16 Jan 2014)

Origin message was:
------------------
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
4c7a2f38df Merge branch 'check/next-cc' 
Only compile-tested.


Origin commit data
------------------
Commit: b5e736e81b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-30 (Sat, 30 Nov 2013)
 2013-11-30 20:17:31 +01:00
Michael Liebmann
cd77f46e24 Adapting certain files to the changed font handling of info clock 
Origin commit data
------------------
Commit: 90985f11d2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-11-26 (Tue, 26 Nov 2013)
 2013-11-28 16:07:48 +01:00
vanhofen
95578f1aef Revert "CTestMenu: fix build, add missing include" 
This reverts commit 24eaf93c32.


Origin commit data
------------------
Commit: 633278a532
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)
 2013-11-13 23:39:37 +01:00
Stefan Seyfried
261ea85af6 Merge branch 'check/next-cc' 
Only compile-tested.


Origin commit data
------------------
Commit: 548448456a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)
 2013-11-13 14:04:15 +01:00
Thilo Graf
24eaf93c32 CTestMenu: fix build, add missing include 
supplement to 81d56f75fc

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 25909c10b6
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)
 2013-11-13 11:54:31 +01:00
Thilo Graf
b609204685 CTestMenu: add buildinfo as menu entry 
Buildinfo also exists in infomenu, but is outcommented, so it is
prepared just for testings.


Origin commit data
------------------
Commit: ac6f547d0f
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-11-11 (Mon, 11 Nov 2013)
 2013-11-11 00:20:10 +01:00
Thilo Graf
c56f81269d CTestMenu: add sample code for CComponentsExtTextForm 
Origin commit data
------------------
Commit: 29abd4f1dd
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-11-01 (Fri, 01 Nov 2013)
 2013-11-11 00:19:46 +01:00
Stefan Seyfried
80b809a370 Merge branch 'check/next-cc' 
Compiles on most platforms, starts. Not really tested.


Origin commit data
------------------
Commit: b93a372b54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)
 2013-11-10 16:55:53 +01:00
Thilo Graf
adf19708da CTestMenu: add configure option --enable-testmenu 
Origin commit data
------------------
Commit: 6f700d80c0
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-11-04 (Mon, 04 Nov 2013)
 2013-11-05 13:22:28 +01:00
Thilo Graf
5f9bb84b28 revert 2649ca147a 
Was bad idea to rename. Other Classes can also inherit this. See CMenuTarget


Origin commit data
------------------
Commit: 6dd1da0628
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-25 (Fri, 25 Oct 2013)
 2013-10-26 23:25:59 +02:00
Thilo Graf
2649ca147a CComponents: rename hide() to hideCC() 
There are too many name conflicts with hide-members in other classes.


Origin commit data
------------------
Commit: 6ee7fac1a5
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-24 (Thu, 24 Oct 2013)
 2013-10-24 21:39:04 +02:00
Stefan Seyfried
e6cbfe61bc 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


Origin commit data
------------------
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)
 2013-10-21 22:58:55 +02:00
Thilo Graf
429eaa76a1 CTestMenu: add sample code for channel logo item 
Origin commit data
------------------
Commit: 2ed9357222
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-05 (Sat, 05 Oct 2013)
 2013-10-06 17:14:31 +02:00
Thilo Graf
63b2094d42 CTestMenu: fix build of test menu, name of member was changed 
Origin commit data
------------------
Commit: 740e7e8129
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-09-21 (Sat, 21 Sep 2013)
 2013-09-21 00:24:13 +02:00
Stefan Seyfried
6830b68cac 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


Origin commit data
------------------
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-07-06 (Sat, 06 Jul 2013)
 2013-07-06 19:01:15 +02:00
Thilo Graf
61837a058f CComponentsFrmClock: set font only with fontrender object 
Origin commit data
------------------
Commit: 03ef18cdb9
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-06-18 (Tue, 18 Jun 2013)
 2013-06-18 19:33:34 +02:00
Stefan Seyfried
fce4dbbe72 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


Origin commit data
------------------
Commit: d5d5a60261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)
 2013-06-16 21:22:14 +02:00
Thilo Graf
c4f59ee308 CTestMenu: add some sample codes for window and button handling, 
Origin commit data
------------------
Commit: b7e5121001
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)
 2013-06-16 00:34:08 +02:00
[CST] Focus
588750c443 gui/test_menu.cpp: change tuner test params again 
Origin commit data
------------------
Commit: 1d3ec8c7af
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-13 (Thu, 13 Jun 2013)
 2013-06-13 19:24:10 +04:00
[CST] Focus
ef64651031 gui/test_menu.cpp: change scan test params, add mmc mount check 
Origin commit data
------------------
Commit: 25dc8bc10f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-13 (Thu, 13 Jun 2013)
 2013-06-13 13:14:26 +04:00
Michael Liebmann
984a1691f9 CComponentsFrmClock: Move thread start/stop to constructor/destructor 
Origin commit data
------------------
Commit: 6409cc8a19
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-12 (Wed, 12 Jun 2013)
 2013-06-12 01:32:24 +02:00
Michael Liebmann
f287ee5d5e CTestMenu: Fix memleak 
Origin commit data
------------------
Commit: c5e0552438
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-06 (Thu, 06 Jun 2013)
 2013-06-12 01:32:24 +02:00
[CST] Focus
aea3e6267d gui/test_menu.cpp: change tuner test code to support more than 2 and cable 
Origin commit data
------------------
Commit: 23c387755c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-10 (Mon, 10 Jun 2013)
 2013-06-10 15:57:33 +04:00
Thilo Graf
d8e4aa483c CTestMenu: add sample code for footer buttons, disable debug spam 
Origin commit data
------------------
Commit: fc3829d695
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-06-03 (Mon, 03 Jun 2013)
 2013-06-03 22:12:49 +02:00
Thilo Graf
f83a9e6b19 CComponentsFooter: add new class CComponentsFooter 
Origin commit data
------------------
Commit: e665ab18ab
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-05-29 (Wed, 29 May 2013)
 2013-06-03 22:06:03 +02:00
Thilo Graf
50d11243b1 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.


Origin commit data
------------------
Commit: 8e46f63900
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-05-27 (Mon, 27 May 2013)

Origin message was:
------------------
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
7222de9168 CComponentsFrmClock: add new class CComponentsFrmClock 
Origin commit data
------------------
Commit: 9d52071c39
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-05-25 (Sat, 25 May 2013)
 2013-05-25 23:29:49 +02:00
Stefan Seyfried
b6e65d0300 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


Origin commit data
------------------
Commit: a7f1e0e25e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-24 (Fri, 24 May 2013)
 2013-05-24 20:24:39 +02:00
Michael Liebmann
1d6f0bc57b CTestMenu: Add widget id's 
- Return menu result, to close all menus


Origin commit data
------------------
Commit: 2244e418b7
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-05-21 (Tue, 21 May 2013)

Origin message was:
------------------
* CTestMenu: Add widget id's

- Return menu result, to close all menus
 2013-05-21 19:34:52 +02:00
Stefan Seyfried
748b384771 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).


Origin commit data
------------------
Commit: 6b72095f5a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-11 (Sat, 11 May 2013)
 2013-05-11 17:17:33 +02:00
Stefan Seyfried
f6c0718366 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


Origin commit data
------------------
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)
 2013-05-10 10:06:47 +02:00
Thilo Graf
d6759227fb CTestMenu: add sample code for CComponentsButtonRed 
Origin commit data
------------------
Commit: b0846842f3
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-16 (Tue, 16 Apr 2013)
 2013-04-20 12:53:25 +02:00
[CST] Focus
1bd0bd8a7b 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


Origin commit data
------------------
Commit: 8bb70d1ab3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-17 (Wed, 17 Apr 2013)
 2013-04-17 13:32:12 +04:00
[CST] Focus
2cc610e175 gui/test_menu.cpp: fix compile 
Origin commit data
------------------
Commit: 2cc3c213b5
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-16 (Tue, 16 Apr 2013)
 2013-04-16 12:53:54 +04:00
Stefan Seyfried
3fdff68dff test_menu: fix path to demo picture 
Origin commit data
------------------
Commit: 88fde35e52
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)
 2013-04-08 10:35:43 +02:00
Stefan Seyfried
3c16c08f9d test_menu: fix path to demo picture 
Origin commit data
------------------
Commit: 6cabfb0a71
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)
 2013-04-07 17:26:53 +02:00
Stefan Seyfried
1251002158 test_menu: fix build 
Origin commit data
------------------
Commit: 4d2f580af0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
 2013-04-06 11:46:50 +02:00
Thilo Graf
84a78b23c5 CTestMenu: remove minitv sample 
Can not be displayed here nicely.


Origin commit data
------------------
Commit: c17e2e5d6c
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-03-14 (Thu, 14 Mar 2013)
 2013-03-18 12:04:42 +01:00
Thilo Graf
5bfb9da548 CTestMenu: modifie some samples to call header 
Origin commit data
------------------
Commit: 2b41601d11
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-03-14 (Thu, 14 Mar 2013)
 2013-03-18 12:04:32 +01:00
Thilo Graf
078e3414cc CComponentsWindow: remove refresh() 
initCCWItems() does the same, but is private


Origin commit data
------------------
Commit: de330ac39c
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-03-09 (Sat, 09 Mar 2013)
 2013-03-18 12:04:16 +01:00
Thilo Graf
f4bfcc6657 CComponentsWindow: add sub class CComponentsWindow 
Origin commit data
------------------
Commit: fa9ffdd46e
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-11-30 (Fri, 30 Nov 2012)
 2013-03-06 11:28:16 +01:00
Thilo Graf
38ab110e54 CTestMenu: add sample code for removeHeaderButtons() 
Origin commit data
------------------
Commit: 14393b36d9
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-11-25 (Sun, 25 Nov 2012)
 2013-03-06 11:28:15 +01:00
Thilo Graf
36c82eba41 CTestMenu: add example to exchange text with an image-item, for header 
Origin commit data
------------------
Commit: 264f4bb951
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-11-25 (Sun, 25 Nov 2012)
 2013-03-06 11:28:14 +01:00
Thilo Graf
92d1786f49 CTestMenu: add sample code CComponentsHeader 
Origin commit data
------------------
Commit: 189ba5b5e6
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-11-24 (Sat, 24 Nov 2012)
 2013-03-06 11:28:13 +01:00
Thilo Graf
068cb4c6a2 CComponentsHeader: add parameter buttons onto constructors 
This adds default buttons to header


Origin commit data
------------------
Commit: 3644abec66
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-11-21 (Wed, 21 Nov 2012)
 2013-03-06 11:28:13 +01:00
Thilo Graf
7cedb3a2bc CComponentsHeader: add header buttons to header form 
Use addHeaderButton() to add any button icon ont header form.
The buttons have a right alignment, this means, the first button
is on the right boarder of header.
For existing instances it's recommended to remove old button icons
before add new buttons, otherwise icons will be append.

See also sample code in CTestMenu.


Origin commit data
------------------
Commit: b330d78ff2
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-11-18 (Sun, 18 Nov 2012)
 2013-03-06 11:28:12 +01:00