Commit Graph

16 Commits

Author SHA1 Message Date
vanhofen
022ceb42c9 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/plugins.cpp
	src/gui/plugins.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: a11e7df409
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-08 (Fri, 08 Sep 2017)



------------------
This commit was generated by Migit
2017-09-08 12:24:32 +02:00
vanhofen
c354051238 rc_lock: use OFFSET defines
Origin commit data
------------------
Branch: ni/coolstream
Commit: 126ef8c3bb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)

Origin message was:
------------------
- rc_lock: use OFFSET defines

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-07 18:19:20 +02:00
vanhofen
6b0e887585 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	data/locale/slovak.locale
	data/locale/unmaintained/czech.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/start_wizard.cpp
	src/gui/widget/msgbox.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fce378f8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)



------------------
This commit was generated by Migit
2016-11-21 12:46:49 +01:00
Thilo Graf
36d8d81fa6 CMsgBox: rework msgbox classes with Window class implementation
Replacing messagebox, hintbox_ext and some derivated parts with
basic class hintbox and derivated class CMsgBox. This should unify
window handling and avoids maintain of multiple classes with quasi
same purpose and adds more functionality.

TODO: fix and optimize details


Origin commit data
------------------
Branch: ni/coolstream
Commit: dde298b1b7
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-04-04 (Mon, 04 Apr 2016)



------------------
This commit was generated by Migit
2016-10-24 10:31:24 +02:00
Michael Liebmann
54c0ce715a Merge branch 'cst-next' into nmp-cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4edc580529
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-21 (Thu, 21 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-21 01:34:58 +01:00
vanhofen
fd0317a21a rc_lock: rework class; switch to singleton; add icon; vfd-support
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2eb0aed5db
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-20 (Wed, 20 Jan 2016)

Origin message was:
------------------
- rc_lock: rework class; switch to singleton; add icon; vfd-support

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-20 20:26:52 +01:00
Stefan Seyfried
5f89c9a312 Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...


Origin commit data
------------------
Branch: ni/coolstream
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)



------------------
This commit was generated by Migit
2015-12-13 17:41:55 +01:00
Stefan Seyfried
189e55ec30 global.h: Use forward-declarations to reduce number of dependencies
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ab6b53054
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-04-16 (Thu, 16 Apr 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-04-16 13:39:35 +02:00
Stefan Seyfried
b7c804fc22 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
------------------
Branch: ni/coolstream
Commit: b414474323
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-23 (Thu, 23 Jan 2014)



------------------
This commit was generated by Migit
2014-01-23 14:08:37 +01:00
vanhofen
35830797d6 adapt ShowMsg handling from martii's neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-01-22 12:37:21 +01:00
vanhofen
3498b687da Revert "- add missing include of vfd header"
This reverts commit 3006c5ff4b.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 014dd3ac7b
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)



------------------
This commit was generated by Migit
2013-11-13 23:39:55 +01:00
vanhofen
3006c5ff4b add missing include of vfd header
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3845feb0e4
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)

Origin message was:
------------------
- add missing include of vfd header

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-11-13 10:40:18 +01:00
Stefan Seyfried
00cfd31e82 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
------------------
Branch: ni/coolstream
Commit: 6b72095f5a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-11 (Sat, 11 May 2013)



------------------
This commit was generated by Migit
2013-05-11 17:17:33 +02:00
Jacek Jendrzej
bb097d5d95 rc_lock: lock for rc_lock, use only once, supplement to b0b4b885ed
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9a2d6aea26
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-22 (Mon, 22 Oct 2012)

Origin message was:
------------------
rc_lock: lock for rc_lock, use only once, supplement to b0b4b885ed

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-10-22 15:52:07 +02:00
Jacek Jendrzej
030f4716ff fix warnings
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@303 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9f87f97094
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-02-08 (Mon, 08 Feb 2010)

Origin message was:
------------------
-fix warnings

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@303 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
2010-02-08 11:23:09 +00:00
mrcolor
bcecfb6585 our current experimental Neutrino branch
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@27 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: bc5bd4154e
Author: mrcolor <mrcolor@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-08 (Tue, 08 Dec 2009)



------------------
This commit was generated by Migit
2009-12-08 11:05:11 +00:00