Commit Graph

40 Commits

Author SHA1 Message Date
vanhofen
1a6d4f9fc2 timeosd: use default colors
Origin commit data
------------------
Commit: 93f92e3a3b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- timeosd: use default colors
2016-10-10 14:19:55 +02:00
vanhofen
945e846ce5 timeosd: fix shadow color
Origin commit data
------------------
Commit: a8f9903544
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- timeosd: fix shadow color
2016-10-10 14:19:54 +02:00
vanhofen
897dc6ae8c colors: add COL_FRAME wrapper
Origin commit data
------------------
Commit: 75fe6e407d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- colors: add COL_FRAME wrapper
2016-10-10 14:19:54 +02:00
Thilo Graf
325c549701 CTimeOSD: fix init of display mode
Time was always on screen if user has started to play a movie.


Origin commit data
------------------
Commit: 3a41bb86b3
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-14 (Thu, 14 Jan 2016)
2016-01-14 22:37:57 +01:00
Michael Liebmann
b429bdc415 CTimeOSD: Fix compiler warning "suggest parentheses around '&&' within '||'"
Origin commit data
------------------
Commit: 3dd2ff8a4a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-10 (Sun, 10 Jan 2016)
2016-01-10 23:05:31 +01:00
Thilo Graf
5a90cc0fa5 screensaver: rework timeosd handling
Origin commit data
------------------
Commit: d7ac78c0c2
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-07 (Thu, 07 Jan 2016)
2016-01-10 22:02:00 +01:00
Thilo Graf
9ae93f33e9 CTimeOSD: decouple timeosd from general clock format settings
Origin commit data
------------------
Commit: e50d205574
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-01 (Fri, 01 Jan 2016)
2016-01-01 19:27:42 +01:00
Jacek Jendrzej
2093516363 src/gui/timeosd.cpp init m_mode
Origin commit data
------------------
Commit: fc8cf590c3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-01-01 (Fri, 01 Jan 2016)
2016-01-01 19:07:04 +01:00
Jacek Jendrzej
1fb4e04e27 fix possible segafult, invalid type
Origin commit data
------------------
Commit: 946d64fc37
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-12-29 (Tue, 29 Dec 2015)
2015-12-29 17:58:31 +01:00
Thilo Graf
72a289a90c components: rework classes
- outsourced some classes cc_item.cpp/h, cc_draw.cpp/h
- added extra methodes for simple use of some basic components extra.cpp/h
- rework clock handling: use timer class, reworked members for
 enable/disable clock with external timer events,
 tryed to fix some display issues related with infoclock and
 time osd clock in moviebrowser, channellist, menuus
- reworked hide/kill handling, removed parameter for hide(), try to use
 cached backgrounds for other constallations, paint cache, image cache (all beta)
- reworked shadow/frame handling, add shadow modes for left/right
 arrangement, TODO: repaint for existant instances required
- reworked color gradient assignment (beta)

... Note: I had a data crash in my local git tree
and i tryed to restore my historie, but most was lost. Therefore here
the commit is large


Origin commit data
------------------
Commit: 0146511f38
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-11-18 (Wed, 18 Nov 2015)

Origin message was:
------------------
components: rework classes

- outsourced some classes cc_item.cpp/h, cc_draw.cpp/h
- added extra methodes for simple use of some basic components extra.cpp/h
- rework clock handling: use timer class, reworked members for
 enable/disable clock with external timer events,
 tryed to fix some display issues related with infoclock and
 time osd clock in moviebrowser, channellist, menuus
- reworked hide/kill handling, removed parameter for hide(), try to use
 cached backgrounds for other constallations, paint cache, image cache (all beta)
- reworked shadow/frame handling, add shadow modes for left/right
 arrangement, TODO: repaint for existant instances required
- reworked color gradient assignment (beta)

... Note: I had a data crash in my local git tree
and i tryed to restore my historie, but most was lost. Therefore here
the commit is large
2015-12-27 14:42:27 +01:00
[CST] Focus
6e8920023c gui/timeosd.cpp: enable clock background paint,
set background color depending on clock background option;
fix colors in case theme color changed


Origin commit data
------------------
Commit: ea1c533ef9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-03-06 (Fri, 06 Mar 2015)
2015-03-06 14:14:00 +03:00
martii
10985e7d43 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
------------------
Commit: 13118c1148
Author: martii <m4rtii@gmx.de>
Date: 2014-01-10 (Fri, 10 Jan 2014)
2014-09-11 18:12:51 +04:00
[CST] Focus
16247a7b51 gui/timeosd.cpp: show negative time for MODE_DESC
Origin commit data
------------------
Commit: da5be5860f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-11 (Thu, 11 Sep 2014)
2014-09-11 18:12:51 +04:00
martii
416a22e485 gui/timeosd: set progressbar to timescale style
Origin commit data
------------------
Commit: 3eb867ebf8
Author: martii <m4rtii@gmx.de>
Date: 2014-07-06 (Sun, 06 Jul 2014)
2014-09-11 18:12:51 +04:00
martii
09030380eb gui/timeosd: don't instantiate CComponentsFrmClock in active mode
Conflicts:
	src/gui/timeosd.cpp


Origin commit data
------------------
Commit: a70560ea58
Author: martii <m4rtii@gmx.de>
Date: 2014-01-12 (Sun, 12 Jan 2014)
2014-09-11 18:12:51 +04:00
[CST] Focus
17c40a5d6e merge neutrino-mp progressbar code, (C) martii
Origin commit data
------------------
Commit: 416646bbff
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-17 (Thu, 17 Jul 2014)
2014-07-17 17:02:37 +04:00
Thilo Graf
f33efdbdc4 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
------------------
Commit: 23d7b62cf0
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-03-03 (Mon, 03 Mar 2014)
2014-03-03 09:43:39 +01:00
Thilo Graf
e21759c50d 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
------------------
Commit: 7403aa2d46
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-01-07 (Tue, 07 Jan 2014)
2014-01-08 08:18:44 +01:00
martii
8ce5ae5e9b gui/timeosd: rewrite based on infoclock implementation
Origin commit data
------------------
Commit: 1c53781218
Author: martii <m4rtii@gmx.de>
Date: 2013-12-17 (Tue, 17 Dec 2013)
2013-12-17 00:11:43 +01:00
Michael Liebmann
0abd72b0fe CTimeOSD: Restoring infoclock after hiding osdtime
Origin commit data
------------------
Commit: be142c1e4a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-12-03 (Tue, 03 Dec 2013)
2013-12-03 09:19:20 +01:00
martii
4c2c559da3 remove widest_number definition and usage, add Font::getMaxDigitWidth() method instead
Signed-off-by: M. Liebmann <tuxcode.bbg@gmail.com>


Origin commit data
------------------
Commit: 15b2b2ec05
Author: martii <m4rtii@gmx.de>
Date: 2013-11-29 (Fri, 29 Nov 2013)
2013-11-29 23:02:50 +01:00
Michael Liebmann
c6eeb420d4 InfoClock: Fix display clock in movie browser, file browser etc.
Origin commit data
------------------
Commit: 7466d6f19c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-11-22 (Fri, 22 Nov 2013)
2013-11-22 10:01:35 +01:00
Thilo Graf
30d00dbd3f CTimeOSD: use matching data type required by updatePos()
Origin commit data
------------------
Commit: 633fbe43dd
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-09-27 (Fri, 27 Sep 2013)
2013-10-01 10:09:07 +02:00
Michael Liebmann
7b6498d39f 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
------------------
Commit: c60c5c5ce3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-11 (Thu, 11 Jul 2013)
2013-07-21 22:00:58 +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
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