Jacek Jendrzej
805ed42dc4
Merge branch 'master' into pu/mp
...
Origin commit data
------------------
Commit: 2ebb47f519
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2017-09-14 (Thu, 14 Sep 2017)
2017-09-14 13:54:04 +02:00
vanhofen
61dbf1cb8f
rc_lock: use OFFSET defines
...
Signed-off-by: Thilo Graf <dbt@novatux.de >
Origin commit data
------------------
Commit: ce04716c74
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-09-07 (Thu, 07 Sep 2017)
Origin message was:
------------------
- rc_lock: use OFFSET defines
Signed-off-by: Thilo Graf <dbt@novatux.de >
2017-09-14 12:14:41 +02:00
Stefan Seyfried
eab48f2ed9
Merge remote-tracking branch 'tuxbox/master'
...
Origin commit data
------------------
Commit: c6d7968381
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2016-12-04 (Sun, 04 Dec 2016)
2016-12-04 18:02:51 +01:00
Thilo Graf
11b3307251
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
------------------
Commit: dde298b1b7
Author: Thilo Graf <dbt@novatux.de >
Date: 2016-04-04 (Mon, 04 Apr 2016)
2016-10-24 10:31:24 +02:00
Stefan Seyfried
71e991c1cd
Merge remote-tracking branch 'n/cst-next-fixed'
...
Origin commit data
------------------
Commit: f5c72d35c8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2016-01-24 (Sun, 24 Jan 2016)
2016-01-24 13:15:43 +01:00
vanhofen
2a442ac22f
rc_lock: rework class; switch to singleton; add icon; vfd-support
...
Origin commit data
------------------
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
2016-01-20 20:26:52 +01:00
Stefan Seyfried
17880c4125
Merge remote-tracking branch 'uncool/cst-next'
...
This need buildfixes and some functional updates...
Origin commit data
------------------
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2015-12-13 (Sun, 13 Dec 2015)
2015-12-13 17:41:55 +01:00
Stefan Seyfried
d9354e847f
global.h: Use forward-declarations to reduce number of dependencies
...
Origin commit data
------------------
Commit: 5ab6b53054
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2015-04-16 (Thu, 16 Apr 2015)
2015-04-16 13:39:35 +02:00
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
vanhofen
82168342a2
Revert "- add missing include of vfd header"
...
This reverts commit 81d56f75fc
.
Origin commit data
------------------
Commit: 014dd3ac7b
Author: vanhofen <vanhofen@gmx.de >
Date: 2013-11-13 (Wed, 13 Nov 2013)
2013-11-13 23:39:55 +01:00
vanhofen
81d56f75fc
add missing include of vfd header
...
Origin commit data
------------------
Commit: 3845feb0e4
Author: vanhofen <vanhofen@gmx.de >
Date: 2013-11-13 (Wed, 13 Nov 2013)
Origin message was:
------------------
- add missing include of vfd header
2013-11-13 10:40:18 +01: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
Jacek Jendrzej
0456a04ded
rc_lock: lock for rc_lock, use only once, supplement to 5bc50d70d8
...
Origin commit data
------------------
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 5bc50d70d8
2012-10-22 15:52:07 +02:00
Jacek Jendrzej
b75a14126a
fix warnings
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@303 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
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
2010-02-08 11:23:09 +00:00
mrcolor
cb8dd3394d
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
------------------
Commit: bc5bd4154e
Author: mrcolor <mrcolor@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-08 (Tue, 08 Dec 2009)
2009-12-08 11:05:11 +00:00