Commit Graph

29 Commits

Author SHA1 Message Date
martii
03d91b7b1a gui/components/cc_frm_clock: simplify; setClockFormat/setClockBlink has now impact on running thread
Conflicts:
	src/gui/components/cc_frm_clock.cpp
	src/gui/timeosd.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 13118c1148
Author: martii <m4rtii@gmx.de>
Date: 2014-01-10 (Fri, 10 Jan 2014)



------------------
This commit was generated by Migit
2014-09-11 18:12:51 +04:00
[CST] Focus
4a1f16e456 gui/timeosd.cpp: show negative time for MODE_DESC
Origin commit data
------------------
Branch: ni/coolstream
Commit: da5be5860f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-11 (Thu, 11 Sep 2014)


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

------------------
This commit was generated by Migit
2014-09-11 18:12:51 +04:00
martii
0f526252dd gui/timeosd: set progressbar to timescale style
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3eb867ebf8
Author: martii <m4rtii@gmx.de>
Date: 2014-07-06 (Sun, 06 Jul 2014)


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

------------------
This commit was generated by Migit
2014-09-11 18:12:51 +04:00
martii
f9c8a5ddf9 gui/timeosd: don't instantiate CComponentsFrmClock in active mode
Conflicts:
	src/gui/timeosd.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a70560ea58
Author: martii <m4rtii@gmx.de>
Date: 2014-01-12 (Sun, 12 Jan 2014)



------------------
This commit was generated by Migit
2014-09-11 18:12:51 +04:00
[CST] Focus
1613427042 merge neutrino-mp progressbar code, (C) martii
Origin commit data
------------------
Branch: ni/coolstream
Commit: 416646bbff
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-17 (Thu, 17 Jul 2014)


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

------------------
This commit was generated by Migit
2014-07-17 17:02:37 +04:00
Thilo Graf
7c70aaa6df CComponents: add new parameter 'parent'
Use strictly CComponentsForm as parent parameter in constructors.
Some parts have been cleaned up (Constructors, init methodes removed)

New parameter makes it possible already add current item in constructor.
So in mostly situations is it not necessary to use explicit addCCItem(),
but addCCItem()is still valid and necessary in certain situations.

Affected are all cc-classes and their derivates.
Some classes must or can be adapted later. The function is
not currently restricted, because usage of parent parameter is not explicit
defined in constructors, see CImageInfo, here yet are used addCCItem()
methodes.

Generally this parameter is located in the constructors before bool has_shadow,
but it is not sure whether it would be better to use this parameter as the first.
That remains to be clarified.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 23d7b62cf0
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-03-03 (Mon, 03 Mar 2014)



------------------
This commit was generated by Migit
2014-03-03 09:43:39 +01:00
Thilo Graf
7e077e1f8f CTimeOSD: use class konform member names
CTimeOSD is inherited from CComponentsForm/Item.
Therefore, it is usual to keep the functional layout.
Overwritable virtual members should be used with same
functionality. kill() is similar with paintBackground() known from
CFrameBuffer, hide(bool) do restore saved background and expects a
parameter.

TODO: It works, but class layout of CTimeOSD is currently not conform
with Components, because the functionalities are partially undermined
and must be reworked.
For Example: timescale and clock object not used as sub objects
in a parent form object.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7403aa2d46
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-01-07 (Tue, 07 Jan 2014)



------------------
This commit was generated by Migit
2014-01-08 08:18:44 +01:00
martii
fff3556873 gui/timeosd: rewrite based on infoclock implementation
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1c53781218
Author: martii <m4rtii@gmx.de>
Date: 2013-12-17 (Tue, 17 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-17 00:11:43 +01:00
Michael Liebmann
80587cd13a CTimeOSD: Restoring infoclock after hiding osdtime
Origin commit data
------------------
Branch: ni/coolstream
Commit: be142c1e4a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-12-03 (Tue, 03 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-03 09:19:20 +01:00
martii
4d800a439d remove widest_number definition and usage, add Font::getMaxDigitWidth() method instead
Signed-off-by: M. Liebmann <tuxcode.bbg@gmail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 15b2b2ec05
Author: martii <m4rtii@gmx.de>
Date: 2013-11-29 (Fri, 29 Nov 2013)



------------------
This commit was generated by Migit
2013-11-29 23:02:50 +01:00
Michael Liebmann
a6137cadce InfoClock: Fix display clock in movie browser, file browser etc.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7466d6f19c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-11-22 (Fri, 22 Nov 2013)


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

------------------
This commit was generated by Migit
2013-11-22 10:01:35 +01:00
Thilo Graf
d5734afd2e CTimeOSD: use matching data type required by updatePos()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 633fbe43dd
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-09-27 (Fri, 27 Sep 2013)


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

------------------
This commit was generated by Migit
2013-10-01 10:09:07 +02:00
Michael Liebmann
221b6ee8b4 Replace color indexes of the text colors by real color values for RenderString()
- If necessary, Correct data types of the color values


Origin commit data
------------------
Branch: ni/coolstream
Commit: c60c5c5ce3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-11 (Thu, 11 Jul 2013)



------------------
This commit was generated by Migit
2013-07-21 22:00:58 +02:00
[CST] Focus
0c3a4fa858 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
------------------
Branch: ni/coolstream
Commit: 8bb70d1ab3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-17 (Wed, 17 Apr 2013)



------------------
This commit was generated by Migit
2013-04-17 13:32:12 +04:00
Thilo Graf
7014ca0c0a CTimeOsd: remove unused var timescale
Conflicts:
	src/gui/timeosd.cpp


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



------------------
This commit was generated by Migit
2013-04-08 10:01:04 +04:00
Michael Liebmann
81953e4bb6 Fix order of colors for some progress bars
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2013-04-05 19:43:50 +01:00
Thilo Graf
f7f29b6c45 CTimeOsd: remove unused var timescale
Origin commit data
------------------
Branch: ni/coolstream
Commit: c4d9f76b6b
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-01 (Mon, 01 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-04 09:56:51 +02:00
Thilo Graf
71248e0dc7 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
------------------
Branch: ni/coolstream
Commit: 860be9a412
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-01 (Mon, 01 Apr 2013)



------------------
This commit was generated by Migit
2013-04-02 09:31:05 +02:00
Jacek Jendrzej
67c5d7c91e remove doubles include
Origin commit data
------------------
Branch: ni/coolstream
Commit: a3bfab0bcd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-11 (Tue, 11 Sep 2012)


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

------------------
This commit was generated by Migit
2012-09-11 20:31:33 +02:00
[CST] Focus
752ac9f921 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
------------------
Branch: ni/coolstream
Commit: 2be4e1e21f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-12-10 (Sat, 10 Dec 2011)



------------------
This commit was generated by Migit
2011-12-10 12:09:10 +00:00
Jacek Jendrzej
b7f7db394f 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
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2011-01-26 19:13:05 +00:00
Jacek Jendrzej
47f042d9ea 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
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2011-01-22 10:00:25 +00:00
Jacek Jendrzej
3586dd5665 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
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2011-01-22 09:06:38 +00:00
Jacek Jendrzej
9274e070c0 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
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2010-02-24 09:32:21 +00:00
[CST] Focus
f789c1e8c6 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
------------------
Branch: ni/coolstream
Commit: e642e6f345
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-02-13 (Sat, 13 Feb 2010)



------------------
This commit was generated by Migit
2010-02-13 10:52:19 +00:00
Jacek Jendrzej
aad921696c 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
------------------
Branch: ni/coolstream
Commit: 0efa0ba641
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-01-18 (Mon, 18 Jan 2010)



------------------
This commit was generated by Migit
2010-01-18 15:37:10 +00:00
Stefan Seyfried
a0c7d1cee5 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
------------------
Branch: ni/coolstream
Commit: 691811695a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2010-01-03 (Sun, 03 Jan 2010)



------------------
This commit was generated by Migit
2010-01-03 12:06:13 +00:00
Stefan Seyfried
80c9969dcd 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
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2010-01-03 10:39:40 +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