Commit Graph

16 Commits

Author SHA1 Message Date
[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
Thilo Graf
fa485068e7 CTimeOsd: remove unused var timescale
Conflicts:
	src/gui/timeosd.cpp


Origin commit data
------------------
Commit: 211f85966a
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-01 (Mon, 01 Apr 2013)
2013-04-08 10:01:04 +04:00
Michael Liebmann
dde336facd Fix order of colors for some progress bars
Origin commit data
------------------
Commit: adfbfe079c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-05 (Fri, 05 Apr 2013)

Origin message was:
------------------
* Fix order of colors for some progress bars
2013-04-05 19:43:50 +01:00
Thilo Graf
9c2de0fdf4 CTimeOsd: remove unused var timescale
Origin commit data
------------------
Commit: c4d9f76b6b
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-01 (Mon, 01 Apr 2013)
2013-04-04 09:56:51 +02:00
Thilo Graf
03b22f2d23 CComponents: add progressbar class to cc-items
CProgressbar moved into components sub directory and adapt includes.
Progressbar objects are now usable as cc-item

TODO:
-some color and size corrections
-found some dub codes for sig and snr-bars, needs rework


Origin commit data
------------------
Commit: 860be9a412
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-01 (Mon, 01 Apr 2013)
2013-04-02 09:31:05 +02:00
Jacek Jendrzej
9868a4308b remove doubles include
Origin commit data
------------------
Commit: a3bfab0bcd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-11 (Tue, 11 Sep 2012)
2012-09-11 20:31:33 +02:00
[CST] Focus
63aec64d7c Movieplayer cleanup: remove unused code, move all time realted to CTimeOSD
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1964 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 2be4e1e21f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-12-10 (Sat, 10 Dec 2011)
2011-12-10 12:09:10 +00:00
Jacek Jendrzej
7aa1c6d768 fix possible errors
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1069 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 27cd2c802f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2011-01-26 (Wed, 26 Jan 2011)

Origin message was:
------------------
-fix possible errors

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1069 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-01-26 19:13:05 +00:00
Jacek Jendrzej
3baba27374 fix clock osd
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1039 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 80f321484a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2011-01-22 (Sat, 22 Jan 2011)

Origin message was:
------------------
-fix clock osd

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1039 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-01-22 10:00:25 +00:00
Jacek Jendrzej
5a65f7bb9f fix clock osd
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1038 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 970b0ac6a3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2011-01-22 (Sat, 22 Jan 2011)

Origin message was:
------------------
-fix clock osd

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1038 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-01-22 09:06:38 +00:00
Jacek Jendrzej
3367460bda fix clock position & corner
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@403 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: dca2980e30
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-02-24 (Wed, 24 Feb 2010)

Origin message was:
------------------
 fix clock position & corner

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@403 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-02-24 09:32:21 +00:00
[CST] Focus
71dd47a155 Fix black color corruption after scan; Change progressbar logic to follow progressbar_color setting, if bar created with blink enabled
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@333 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: e642e6f345
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-02-13 (Sat, 13 Feb 2010)
2010-02-13 10:52:19 +00:00
Jacek Jendrzej
01fb944e27 add change blink
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@182 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 0efa0ba641
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-01-18 (Mon, 18 Jan 2010)
2010-01-18 15:37:10 +00:00
Stefan Seyfried
a35d9f9087 neutrino: make blinkenlights runtime configurable
Get rid of "--disable-blinkenlights" configure switch. Colored
progress bars can be disabled with "neutrino -noblink" now.
Unfortunately CProgressBar had to be touched again to avoid
ambiguities in the constructor, but should be done for now.

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


Origin commit data
------------------
Commit: 691811695a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2010-01-03 (Sun, 03 Jan 2010)
2010-01-03 12:06:13 +00:00
Stefan Seyfried
9a1513bee7 neutrino: consolidate CScale and CProgressBar code
Add code for coloured progressbars to CProgressBar class. This
allows to deprecate the CScale code completely (is not used anymore)
and, in a follow-up step, make the progress bar style runtime configurable.

TODO: documentation ;)
 check if all progressbars still behave the same

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


Origin commit data
------------------
Commit: 697e3c6756
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2010-01-03 (Sun, 03 Jan 2010)

Origin message was:
------------------
neutrino: consolidate CScale and CProgressBar code

Add code for coloured progressbars to CProgressBar class. This
allows to deprecate the CScale code completely (is not used anymore)
and, in a follow-up step, make the progress bar style runtime configurable.

TODO: documentation ;)
   check if all progressbars still behave the same

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@131 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-01-03 10:39:40 +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