Commit Graph

521 Commits

Author SHA1 Message Date
[CST] Focus
c1f45572f8 gui/infoviewer.cpp: restore channel id in showMovieTitle(),
else infoviewer do not process some events after playback stop


Origin commit data
------------------
Branch: ni/coolstream
Commit: e8be660b09
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-04 (Tue, 04 Feb 2014)



------------------
This commit was generated by Migit
2014-02-04 17:42:42 +04:00
[CST] Focus
b3e8fb8ffb gui/infoviewer.cpp: update movieplayer position also in timeshift mode;
fix messages in timeshift mode: while infobar is visible, all but key events was dropped,
preventing ie record timer stop etc.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5135e30773
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-01-29 (Wed, 29 Jan 2014)



------------------
This commit was generated by Migit
2014-01-29 17:26:45 +04: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
ae8cfd7dc2 adapt ShowHint handling from martii's neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6995e1a765
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-22 (Wed, 22 Jan 2014)

Origin message was:
------------------
- adapt ShowHint 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:11:52 +01:00
Stefan Seyfried
6fae9a0db4 Merge remote-tracking branch 'check/next-cc'
untested, probably needs some buildfixing


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



------------------
This commit was generated by Migit
2013-12-22 21:25:05 +01:00
Michael Liebmann
f28bf35c8a CInfoViewer: Not start clock thread
Origin commit data
------------------
Branch: ni/coolstream
Commit: 78bdef9c0a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-12-11 (Wed, 11 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-11 15:55:14 +01:00
Stefan Seyfried
2c48d93e05 Merge remote-tracking branch 'check/next-cc'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5976f03ca2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-07 (Sat, 07 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-07 18:28:56 +01:00
vanhofen
970e5375c1 - infoviewer: use space instead of dot as seperator for clock
Origin commit data
------------------
Branch: ni/coolstream
Commit: ce7bad6e16
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-12-03 (Tue, 03 Dec 2013)

Origin message was:
------------------
 - infoviewer: use space instead of dot as seperator for clock

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

------------------
This commit was generated by Migit
2013-12-03 12:41:41 +01:00
Thilo Graf
a4b1d4dee6 CInfoViewer: use correct corners and text color for time display
Assigning of these properties are required after theme or color changes.


Origin commit data
------------------
Branch: ni/coolstream
Commit: fcb7b88ff0
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-12-01 (Sun, 01 Dec 2013)



------------------
This commit was generated by Migit
2013-12-01 22:37:43 +01:00
Stefan Seyfried
ea50f5f7bc Merge branch 'check/next-cc'
Only compile-tested.


Origin commit data
------------------
Branch: ni/coolstream
Commit: b5e736e81b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-30 (Sat, 30 Nov 2013)



------------------
This commit was generated by Migit
2013-11-30 20:17:31 +01:00
Stefan Seyfried
2b6a033d8e Revert "Revert "global.h: Use forward-declarations to reduce number of dependencies""
This reverts commit 65cbab0307.

No Idea why this was reverted, so revert again :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: bf8ec4d89e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-30 (Sat, 30 Nov 2013)



------------------
This commit was generated by Migit
2013-11-30 18:26:47 +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
Thilo Graf
862a1e7fec CInfoViewer: add missing color type for time display
On changed theme colors, it's required to set the current color values
otherwise the old values remain, this does not look so good.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8a2185c32e
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-11-29 (Fri, 29 Nov 2013)



------------------
This commit was generated by Migit
2013-11-29 10:08:19 +01:00
Michael Liebmann
e000305768 Adapting certain files to the changed font handling of info clock
Origin commit data
------------------
Branch: ni/coolstream
Commit: 90985f11d2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-11-26 (Tue, 26 Nov 2013)


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

------------------
This commit was generated by Migit
2013-11-28 16:07:48 +01:00
Thilo Graf
545699763c CInfoViewer: show time with CComponentsFrmClock object
This replaces old code that displayed time in infobar.


Origin commit data
------------------
Branch: ni/coolstream
Commit: ef374d7f8d
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-11-26 (Tue, 26 Nov 2013)



------------------
This commit was generated by Migit
2013-11-26 11:56:23 +01:00
martii
e02dcc8dae gui/infoviewer: disable infoclock if radiotext is active
Origin commit data
------------------
Branch: ni/coolstream
Commit: c83263d5cd
Author: martii <m4rtii@gmx.de>
Date: 2013-11-23 (Sat, 23 Nov 2013)


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

------------------
This commit was generated by Migit
2013-11-25 13:11:08 +01:00
vanhofen
c195e50bd1 movieplayer: show channellogo in infobar
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ce5730f84
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-15 (Fri, 15 Nov 2013)

Origin message was:
------------------
- movieplayer: show channellogo in infobar

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

------------------
This commit was generated by Migit
2013-11-15 09:22:12 +01:00
vanhofen
65cbab0307 Revert "global.h: Use forward-declarations to reduce number of dependencies"
This reverts commit c266f96560.


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



------------------
This commit was generated by Migit
2013-11-13 23:40:16 +01:00
Stefan Seyfried
c266f96560 global.h: Use forward-declarations to reduce number of dependencies
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4bc6e43ad4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)


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

------------------
This commit was generated by Migit
2013-11-13 10:40:03 +01:00
martii
f43b9f7e12 global.h: Use forward-declarations to reduce number of dependencies
[seife: amended to fix build]

Signed-off-by: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4eb66ba4b2
Author: martii <m4rtii@gmx.de>
Date: 2013-11-09 (Sat, 09 Nov 2013)



------------------
This commit was generated by Migit
2013-11-09 17:03:03 +01:00
Thilo Graf
f47146c6ea revert e813d9f32b
Was bad idea to rename. Other Classes can also inherit this. See CMenuTarget


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6dd1da0628
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-25 (Fri, 25 Oct 2013)



------------------
This commit was generated by Migit
2013-10-26 23:25:59 +02:00
Thilo Graf
e813d9f32b CComponents: rename hide() to hideCC()
There are too many name conflicts with hide-members in other classes.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6ee7fac1a5
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-24 (Thu, 24 Oct 2013)



------------------
This commit was generated by Migit
2013-10-24 21:39:04 +02:00
Stefan Seyfried
971d575b78 Merge branch 'check/next-cc'
Compiles on most platforms, starts. Not really tested.

Conflicts:
	acinclude.m4
	lib/libdvbsub/Makefile.am
	lib/libtriple/Makefile.am
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/create_rcsim_h.sh
	src/daemonc/Makefile.am
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/streaminfo2.h
	src/gui/update.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/rcsim.c
	src/system/Makefile.am
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)



------------------
This commit was generated by Migit
2013-10-21 22:58:55 +02:00
defans
bdd1709cc0 Fix infoviewer global font zoom faktor
Change the zoom factor made ​​time display broken, left side


Origin commit data
------------------
Branch: ni/coolstream
Commit: ab1c33f024
Author: defans <defans@bluepeercrew.us>
Date: 2013-10-03 (Thu, 03 Oct 2013)



------------------
This commit was generated by Migit
2013-10-03 18:01:15 +02:00
Thilo Graf
c61ef05bdb CInfoViewer: fix missing displaying content of infobar.txt
Text from infobar.txt was not painted after channel switch or in
virtual zap mode.
Thx snafed for suggestion.

TODO: many flicker effects in "virtual zap mode"


Origin commit data
------------------
Branch: ni/coolstream
Commit: 648218fc99
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-09-29 (Sun, 29 Sep 2013)



------------------
This commit was generated by Migit
2013-10-01 10:09:08 +02:00
Thilo Graf
1e6206bf27 CInfoViewer: remove unused code
Logo background handling can be done with CComponentsChannelLogo object soon.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 93f177b8aa
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-09-29 (Sun, 29 Sep 2013)



------------------
This commit was generated by Migit
2013-10-01 10:09:07 +02:00
Stefan Seyfried
c4c20a0790 remove all fb->blit() calls
TODO: check if plugins etc. need extra treatment


Origin commit data
------------------
Branch: ni/coolstream
Commit: c68ffa2155
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-28 (Sat, 28 Sep 2013)



------------------
This commit was generated by Migit
2013-09-28 13:01:03 +02:00
Thilo Graf
6d90cc0a5c CComponents: remove member setCornerRadius(),
setCorner() replaces this function, 2nd parameter sets type


Origin commit data
------------------
Branch: ni/coolstream
Commit: 33ec56ad6f
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-09-15 (Sun, 15 Sep 2013)



------------------
This commit was generated by Migit
2013-09-19 08:24:40 +02:00
Stefan Seyfried
2dcc32acd2 Merge remote-tracking branch 'check/next-cc'
needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)



------------------
This commit was generated by Migit
2013-09-01 19:46:10 +02:00
[CST] Focus
5dde59c6d1 gui/infoviewer.cpp: fix shadow
Origin commit data
------------------
Branch: ni/coolstream
Commit: 036ef3399a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)


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

------------------
This commit was generated by Migit
2013-07-30 15:24:51 +04:00
[CST] Focus
74e17a401d gui/infoviewer.cpp: disable EVT_NOEPG_YET in virtual zap mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: bbe63318b8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)


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

------------------
This commit was generated by Migit
2013-07-30 11:13:50 +04: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
Stefan Seyfried
7e692549d3 Merge branch 'check/next-cc'
again: it compiles, but is not really tested...

Conflicts:
	acinclude.m4
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/osd_setup.cpp
	src/gui/start_wizard.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-07-06 (Sat, 06 Jul 2013)



------------------
This commit was generated by Migit
2013-07-06 19:01:15 +02:00
Michael Liebmann
99e28fe73d Fix paint VolumeBar on InfoViewer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 31e2dae622
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-26 (Wed, 26 Jun 2013)


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

------------------
This commit was generated by Migit
2013-07-03 07:30:09 +02:00
Stefan Seyfried
a2055b2b47 infoviewer: always paint 'no epg...' in the same place
Origin commit data
------------------
Branch: ni/coolstream
Commit: 93a428c817
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-31 (Fri, 31 May 2013)


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

------------------
This commit was generated by Migit
2013-05-31 12:25:58 +02:00
Stefan Seyfried
c1270a762c infoviewer: simplify show_current_next()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 06ea41f003
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-31 (Fri, 31 May 2013)


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

------------------
This commit was generated by Migit
2013-05-31 12:24:54 +02:00
Stefan Seyfried
2fcce66c1a infoviewer: always paint 'no epg...' in the same place
Origin commit data
------------------
Branch: ni/coolstream
Commit: da79e3b205
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-31 (Fri, 31 May 2013)


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

------------------
This commit was generated by Migit
2013-05-31 11:33:47 +02:00
Stefan Seyfried
680b445937 infoviewer: simplify show_current_next()
Origin commit data
------------------
Branch: ni/coolstream
Commit: a579bd092b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-31 (Fri, 31 May 2013)


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

------------------
This commit was generated by Migit
2013-05-31 11:33:04 +02:00
Stefan Seyfried
07ccb9a351 Merge remote-tracking branch 'check/next-cc'
needs buildfixing in framebuffer class...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fontrenderer.cpp
	src/driver/volume.cpp
	src/gui/audiomute.cpp
	src/gui/audioplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a7f1e0e25e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-24 (Fri, 24 May 2013)



------------------
This commit was generated by Migit
2013-05-24 20:24:39 +02: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
Stefan Seyfried
083bc55347 Merge remote-tracking branch 'check/next-cc'
needs some build-fixing and merge errors are likely :-(

Conflicts:
	configure.ac
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/unmaintained/dutch.locale
	lib/libdvbsub/Makefile.am
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/daemonc/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/framebuffer.h
	src/driver/pictureviewer/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/driver/volume.cpp
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/audioplayer.cpp
	src/gui/bedit/Makefile.am
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/keybind_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/test_menu.cpp
	src/gui/test_menu.h
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
	src/system/setting_helpers.cpp
	src/system/settings.h
	src/zapit/include/zapit/client/zapitclient.h
	src/zapit/include/zapit/femanager.h
	src/zapit/include/zapit/getservices.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)



------------------
This commit was generated by Migit
2013-05-10 10:06:47 +02:00
vanhofen
93484713fe infoviewer: get width of timescale from progressbar object ...
.. to remove hardcoded timescale width in showInfoFile()


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d5ecda6e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-10 (Fri, 10 May 2013)

Origin message was:
------------------
- infoviewer: get width of timescale from progressbar object ...

.. to remove hardcoded timescale width in showInfoFile()


------------------
This commit was generated by Migit
2013-05-10 09:33:25 +02:00
Thilo Graf
30a4e4015e CInfoViewer: use correct text color in showInfoFile()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 19f2d556ee
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-26 (Fri, 26 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-27 22:20:10 +02:00
Thilo Graf
58a2d0755f CInfoViewer: add member killInfobarText()
Ensure that no unnecessary instance of Components infobox is generated
and paint only changed text.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 54d0f8b42b
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-26 (Fri, 26 Apr 2013)



------------------
This commit was generated by Migit
2013-04-27 22:20:10 +02:00
Thilo Graf
dadaa268a5 CInfoViewer: ensure hide on deleted info file
Origin commit data
------------------
Branch: ni/coolstream
Commit: e30f4d2764
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-25 (Thu, 25 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-27 22:20:09 +02:00
Jacek Jendrzej
43c78ead77 CInfoViewer::showInfoFile -check file size
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6d088357c3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-24 (Wed, 24 Apr 2013)



------------------
This commit was generated by Migit
2013-04-26 18:31:40 +02:00
Thilo Graf
029f6ed93d CInfoViewer: implement CComponentsInfoBox() to show infobar.txt content
Origin commit data
------------------
Branch: ni/coolstream
Commit: a09d7f4a7e
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-24 (Wed, 24 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-26 18:31:39 +02:00
Stefan Seyfried
37a6550723 infoviewer: remove unneeded blit()
Origin commit data
------------------
Branch: ni/coolstream
Commit: c7a4927b53
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-21 (Sun, 21 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-21 18:07:41 +02:00
Michael Liebmann
f4bf2786de Infoviewer: Fix key handling for PiP
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9e3e8e981b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-19 (Fri, 19 Apr 2013)

Origin message was:
------------------
* Infoviewer: Fix key handling for PiP

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

------------------
This commit was generated by Migit
2013-04-19 00:38:34 +01: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