Commit Graph

374 Commits

Author SHA1 Message Date
martii
b5a2b02ea4 gui/epgview: replace left/right chars with corresponding icons
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a66db2a07
Author: martii <m4rtii@gmx.de>
Date: 2014-06-15 (Sun, 15 Jun 2014)


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

------------------
This commit was generated by Migit
2014-06-15 22:40:10 +02:00
vanhofen
4f9e0ee544 change RenderString() default to UTF8
Origin commit data
------------------
Branch: ni/coolstream
Commit: 649d1b1f9d
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-11 (Wed, 11 Jun 2014)

Origin message was:
------------------
- change RenderString() default to UTF8

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

------------------
This commit was generated by Migit
2014-06-11 23:07:13 +02:00
vanhofen
108a1c1b93 change getRenderWidth() default to UTF8
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b91cda918
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-11 (Wed, 11 Jun 2014)

Origin message was:
------------------
- change getRenderWidth() default to UTF8

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

------------------
This commit was generated by Migit
2014-06-11 23:07:00 +02:00
vanhofen
e213d6696f styling for EPG view/eventlist (patch from Benny, thanks!) (fixed)
taken from martiis neutrino-mp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6ee9a3a053
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-05-29 (Thu, 29 May 2014)

Origin message was:
------------------
styling for EPG view/eventlist (patch from Benny, thanks!) (fixed)

 taken from martiis neutrino-mp


------------------
This commit was generated by Migit
2014-05-29 22:30:32 +02:00
vanhofen
0945c525ca Revert "styling for EPG view/eventlist (patch from Benny, thanks!)"
This reverts commit 2792c9e945
because this commit seems to need some more affection.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 193c49d55e
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-05-27 (Tue, 27 May 2014)



------------------
This commit was generated by Migit
2014-05-27 17:21:42 +02:00
martii
2792c9e945 styling for EPG view/eventlist (patch from Benny, thanks!)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5809315cc5
Author: martii <m4rtii@gmx.de>
Date: 2014-05-27 (Tue, 27 May 2014)


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

------------------
This commit was generated by Migit
2014-05-27 17:01:49 +02:00
Stefan Seyfried
59b887d87a Merge remote-tracking branch 'check/next-cc'
...only build-tested, needs fixes


Origin commit data
------------------
Branch: ni/coolstream
Commit: ecd62d81d1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-15 (Sat, 15 Feb 2014)



------------------
This commit was generated by Migit
2014-02-15 20:22:07 +01:00
Jacek Jendrzej
69e805c44c epgview remove DD 16:9 icon show
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8ed6f331e3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-02-10 (Mon, 10 Feb 2014)


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

------------------
This commit was generated by Migit
2014-02-10 19:00:25 +01:00
Jacek Jendrzej
02dd8b38cb add pseudo AdZap timertype
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8c7968edc4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-02-07 (Fri, 07 Feb 2014)

Origin message was:
------------------
-add pseudo AdZap timertype

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

------------------
This commit was generated by Migit
2014-02-07 18:05:06 +01:00
Jacek Jendrzej
62fbc05dd8 epgview.cpp: -add adzap
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3818875a80
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-02-04 (Tue, 04 Feb 2014)


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

------------------
This commit was generated by Migit
2014-02-04 19:32:47 +01: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
35830797d6 adapt ShowMsg handling from martii's neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2014-01-22 12:37:21 +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
8fd167433a reduce direct dependencies on timerdclient.h
Include timerdtypes.h instead of timerdclient.h where feasible, add direct instead of indirect includes of timerdclient.h where necessary. This reduces the number of files which depend on timerdclient.h from 134 to 16. Add/update copyright notices in the affected files.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1d0a23dbf3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-13 (Mon, 13 Jan 2014)



------------------
This commit was generated by Migit
2014-01-13 21:01:26 +01:00
Stefan Seyfried
f9a3dffb60 reduce direct dependencies on timerdclient.h
Include timerdtypes.h instead of timerdclient.h where feasible,
add direct instead of indirect includes of timerdclient.h where
necessary. This reduces the number of files which depend on
timerdclient.h from 134 to 16.
Add/update copyright notices in the affected files.


Origin commit data
------------------
Branch: ni/coolstream
Commit: ed818c7c14
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-12 (Sun, 12 Jan 2014)



------------------
This commit was generated by Migit
2014-01-12 16:55:31 +01:00
Stefan Seyfried
464d5ab9b9 Merge remote-tracking branch 'check/next-cc'
Lightly tested only...


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



------------------
This commit was generated by Migit
2013-12-25 22:51:23 +01:00
martii
7ebfe9959d convert most char[...] configuration values to std::string
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: cbc9299df8
Author: martii <m4rtii@gmx.de>
Date: 2013-06-11 (Tue, 11 Jun 2013)



------------------
This commit was generated by Migit
2013-12-25 12:08:14 +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
Stefan Seyfried
b0077cafc5 Merge branch 'check/next-cc'
Compiles on most platforms, starts. Not really tested.


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



------------------
This commit was generated by Migit
2013-11-10 16:55:53 +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
cbc2b193af CComponents: add unfied header file for general include of cc classes
Provides a unified header file, so it is not required to select a
certain header file.


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



------------------
This commit was generated by Migit
2013-10-24 21:19: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
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
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
4c3c21152b Merge branch 'check/next-cc'
it compiles, but is not really tested...

Conflicts:
	src/driver/netfile.cpp
	src/driver/volume.cpp
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/bouquetlist.cpp
	src/gui/eventlist.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/scan.cpp
	src/gui/test_menu.h
	src/gui/timerlist.cpp
	src/gui/update.cpp
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: d5d5a60261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)



------------------
This commit was generated by Migit
2013-06-16 21:22:14 +02:00
Stefan Seyfried
5f1b5fbdcb neutrino: fix possible div-by-zero in scrollbar calculation
Origin commit data
------------------
Branch: ni/coolstream
Commit: a33086568b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-29 (Wed, 29 May 2013)


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

------------------
This commit was generated by Migit
2013-05-30 11:19:39 +02:00
Stefan Seyfried
29fd5bcdcd neutrino: fix possible div-by-zero in scrollbar calculation
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6a48922350
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-29 (Wed, 29 May 2013)


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

------------------
This commit was generated by Migit
2013-05-29 15:33:21 +02:00
Stefan Seyfried
ea2d8bb34c epgview: don't paint out-of-bounds background box
Origin commit data
------------------
Branch: ni/coolstream
Commit: a5412a0202
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)


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

------------------
This commit was generated by Migit
2013-05-28 20:49:24 +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
Jacek Jendrzej
e431ae2703 CEpgData::show - Latin1_to_UTF8 no need
Origin commit data
------------------
Branch: ni/coolstream
Commit: 09ab981b94
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-24 (Fri, 24 May 2013)


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

------------------
This commit was generated by Migit
2013-05-24 17:38:37 +02:00
Gaucho316
d77e22e271 Neutrino EPG Viewer: don't show empty audio track names
Signed-off-by: Gaucho316 <Gaucho316@hotmail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6215d37e42
Author: Gaucho316 <Gaucho316@hotmail.com>
Date: 2012-12-19 (Wed, 19 Dec 2012)



------------------
This commit was generated by Migit
2013-05-23 21:19:01 +02:00
rhabarber1848
9b259b8e0d Neutrino: Show audio track descriptions and program length in EPG info, patch by Gaucho316: http://www.dbox2-tuning.net/forum/viewtopic.php?f=2&t=49185
Origin commit data
------------------
Branch: ni/coolstream
Commit: 19d47e04a5
Author: rhabarber1848 <rhabarber1848@web.de>
Date: 2010-02-28 (Sun, 28 Feb 2010)


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

------------------
This commit was generated by Migit
2013-05-23 21:08:18 +02:00
vanhofen
8f32bca5be epgview: depend window size on font size
Origin commit data
------------------
Branch: ni/coolstream
Commit: df3d5567a1
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-10 (Fri, 10 May 2013)

Origin message was:
------------------
- epgview: depend window size on font size

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

------------------
This commit was generated by Migit
2013-05-10 10:33:23 +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
Jacek Jendrzej
71da018319 src/gui/epgview.cpp:use paintBackgroundBoxRel only for hide
Origin commit data
------------------
Branch: ni/coolstream
Commit: dfa73458cc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-02 (Thu, 02 May 2013)


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

------------------
This commit was generated by Migit
2013-05-02 20:13:17 +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
Jacek Jendrzej
5af41fd07f src/gui/epgview.cpp: center window
Origin commit data
------------------
Branch: ni/coolstream
Commit: 95cbeceb83
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-14 (Sun, 14 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-17 10:21:32 +04:00
Jacek Jendrzej
a0ee1a624d src/gui/epgview.cpp: center window
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3731bc4216
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-14 (Sun, 14 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-14 15:09:51 +02:00
Stefan Seyfried
6a3cf1003b Merge branch 'check/pu-cc' into master
Conflicts:
	src/gui/osd_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 61bf95f552
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-13 (Sat, 13 Apr 2013)



------------------
This commit was generated by Migit
2013-04-13 17:17:30 +02:00
Jacek Jendrzej
ab3d050d20 src/gui/epgview.cpp: fixes3 from tuxbox, THX Gaucho316
Origin commit data
------------------
Branch: ni/coolstream
Commit: 72b82a1d0b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-08 (Mon, 08 Apr 2013)

Origin message was:
------------------
src/gui/epgview.cpp: fixes3 from tuxbox, THX Gaucho316

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

------------------
This commit was generated by Migit
2013-04-09 09:54:26 +04:00
Jacek Jendrzej
e8eea47e30 src/gui/epgview.cpp: fixes2 from tuxbox, THX Gaucho316
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5d214c2fe4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-08 (Mon, 08 Apr 2013)

Origin message was:
------------------
src/gui/epgview.cpp: fixes2 from tuxbox, THX Gaucho316

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

------------------
This commit was generated by Migit
2013-04-09 09:54:21 +04:00
Jacek Jendrzej
f65d5892de src/gui/epgview.cpp: fixes from tuxbox, THX Gaucho316 & GetAway
Origin commit data
------------------
Branch: ni/coolstream
Commit: 32909483ef
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-08 (Mon, 08 Apr 2013)

Origin message was:
------------------
src/gui/epgview.cpp: fixes from tuxbox, THX Gaucho316 & GetAway

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

------------------
This commit was generated by Migit
2013-04-09 09:54:16 +04:00
Jacek Jendrzej
14a14a5343 src/gui/epgview.cpp: fixes3 from tuxbox, THX Gaucho316
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6a32e96920
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-08 (Mon, 08 Apr 2013)

Origin message was:
------------------
src/gui/epgview.cpp: fixes3 from tuxbox, THX Gaucho316

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

------------------
This commit was generated by Migit
2013-04-08 21:03:46 +02:00
Jacek Jendrzej
ffc07dc953 src/gui/epgview.cpp: fixes2 from tuxbox, THX Gaucho316
Origin commit data
------------------
Branch: ni/coolstream
Commit: d23bdf7bb8
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-08 (Mon, 08 Apr 2013)

Origin message was:
------------------
src/gui/epgview.cpp: fixes2 from tuxbox, THX Gaucho316

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

------------------
This commit was generated by Migit
2013-04-08 20:41:36 +02:00
Jacek Jendrzej
a125334a1d src/gui/epgview.cpp: fixes from tuxbox, THX Gaucho316 & GetAway
Origin commit data
------------------
Branch: ni/coolstream
Commit: 67e6ed102c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-08 (Mon, 08 Apr 2013)

Origin message was:
------------------
src/gui/epgview.cpp: fixes from tuxbox, THX Gaucho316 & GetAway

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

------------------
This commit was generated by Migit
2013-04-08 17:42:37 +02:00
Michael Liebmann
9c0586ffb7 Supplement to commit 81953e4...
- epgview: Fix colors in progress bar


Origin commit data
------------------
Branch: ni/coolstream
Commit: d4740238dd
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-06 (Sat, 06 Apr 2013)

Origin message was:
------------------
* Supplement to commit 81953e4...

- epgview: Fix colors in progress bar


------------------
This commit was generated by Migit
2013-04-06 15:18:12 +01:00
Stefan Seyfried
ab5760e4de Merge branch 'check/pu-cc' into master
...needs some build- and logical fixing...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/volume.cpp
	src/gui/eventlist.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/gui/timeosd.cpp
	src/gui/widget/progressbar.cpp
	src/gui/widget/progressbar.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b689f4b26
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)



------------------
This commit was generated by Migit
2013-04-06 14:28:16 +02:00
Stefan Seyfried
7254e280e3 Merge branch 'check/pu-cc' into master
needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/framebuffer.h
	src/driver/volume.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/filebrowser.cpp
	src/gui/imageinfo.cpp
	src/gui/infoviewer.cpp
	src/gui/streaminfo2.cpp
	src/gui/widget/textbox.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ad0b6b6dc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)



------------------
This commit was generated by Migit
2013-04-06 11:21:55 +02:00
Thilo Graf
307a8675b6 Progressbars: use default frame thickness
It's unnecessary overhead to set the value everywhere, except it's needed.


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



------------------
This commit was generated by Migit
2013-04-06 08:33:51 +02:00