Commit Graph

686 Commits

Author SHA1 Message Date
Stefan Seyfried
770e405c50 Merge remote-tracking branch 'check/cst-next'
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp


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



------------------
This commit was generated by Migit
2014-12-28 12:32:12 +01:00
Stefan Seyfried
10d04cf304 channellist is a pointer now
Origin commit data
------------------
Branch: ni/coolstream
Commit: 894e21174d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)


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

------------------
This commit was generated by Migit
2014-12-25 18:21:56 +01:00
Stefan Seyfried
c8e3ec41a9 Merge remote-tracking branch 'check/cst-next'
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp


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



------------------
This commit was generated by Migit
2014-12-25 18:03:08 +01:00
[CST] Focus
e5a6d55619 gui/channellist.cpp: bug fix, default copy constructor is danger, if class have pointers
Origin commit data
------------------
Branch: ni/coolstream
Commit: 36b14e31ef
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-11-26 (Wed, 26 Nov 2014)


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

------------------
This commit was generated by Migit
2014-11-26 10:45:29 +03:00
Jacek Jendrzej
cfeb94de70 CChannelList::updateEvents fix history list event update
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e08417d40
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-11-13 (Thu, 13 Nov 2014)


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

------------------
This commit was generated by Migit
2014-11-13 10:51:27 +01:00
[CST] Focus
0af6089483 neutrino: try to fix parental bypass by
quit from audio player / picture viewer / movie player and starting channel in PiP


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5bd14ea4b8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-11-11 (Tue, 11 Nov 2014)



------------------
This commit was generated by Migit
2014-11-11 14:40:52 +03:00
martii
2df91f2e87 parental protection: make zaptime configurable
Conflicts:
	data/locale/english.locale
	src/gui/channellist.cpp
	src/gui/parentallock_setup.cpp
	src/neutrino.cpp


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



------------------
This commit was generated by Migit
2014-11-11 14:40:52 +03:00
[CST] Focus
b621a29fa9 gui/channellist.cpp: add channel move to bouquet
Origin commit data
------------------
Branch: ni/coolstream
Commit: 121d2f6339
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-28 (Tue, 28 Oct 2014)


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

------------------
This commit was generated by Migit
2014-10-28 15:13:22 +03:00
[CST] Focus
a919920aa1 gui/channellist.cpp: disable 'other' bouquet edit
Origin commit data
------------------
Branch: ni/coolstream
Commit: e099cd4413
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-27 (Mon, 27 Oct 2014)


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

------------------
This commit was generated by Migit
2014-10-27 14:02:34 +03:00
[CST] Focus
07d6899667 gui/miscsettings_menu.cpp: add option to enable/disable empty favorites in bouquet list
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8772d219f1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-27 (Mon, 27 Oct 2014)


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

------------------
This commit was generated by Migit
2014-10-27 13:52:23 +03:00
[CST] Bas
683e1c9095 neutrino: add support for CST new simple frontpanel with LED segment display. (c) focus and adjusted by me.
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/channellist.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5f3872b5dd
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)



------------------
This commit was generated by Migit
2014-10-22 16:14:05 +04:00
[CST] Focus
2930d7e4bc gui/channellist.cpp: allow to edit provider bouquet
Origin commit data
------------------
Branch: ni/coolstream
Commit: 00ead6aa95
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-14 (Tue, 14 Oct 2014)


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

------------------
This commit was generated by Migit
2014-10-14 16:45:08 +04:00
[CST] Focus
8799019701 gui/channellist.cpp: add per-channel lock in editor
Origin commit data
------------------
Branch: ni/coolstream
Commit: b1ba52b754
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-14 (Tue, 14 Oct 2014)


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

------------------
This commit was generated by Migit
2014-10-14 12:15:49 +04:00
[CST] Focus
5554be03d0 gui/channellist.cpp: fix key pass to neutrino,
after commit 14b5dda71c


Origin commit data
------------------
Branch: ni/coolstream
Commit: e61a66e4d6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-11 (Sat, 11 Oct 2014)



------------------
This commit was generated by Migit
2014-10-11 15:49:43 +04:00
[CST] Focus
fecc5baa55 gui/channellist.cpp: add channels reinit, if target bouquet was empty (hidden),
or empty after edit (to hide)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2878b34141
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-11 (Sat, 11 Oct 2014)



------------------
This commit was generated by Migit
2014-10-11 13:23:09 +04:00
[CST] Focus
14b5dda71c gui/channellist.cpp: add inline list editor;
add to favorite bouquets without channels re-init;
cleanup


Origin commit data
------------------
Branch: ni/coolstream
Commit: fa4333f948
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-10 (Fri, 10 Oct 2014)



------------------
This commit was generated by Migit
2014-10-10 15:26:32 +04:00
Michael Liebmann
7072095ead CChannelList: Fix OSD error when exit the zap history
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2ae4e4819b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-09-28 (Sun, 28 Sep 2014)


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

------------------
This commit was generated by Migit
2014-09-28 12:51:58 +04:00
Michael Liebmann
55421883bf Fix background paint header clock in channellist
Origin commit data
------------------
Branch: ni/coolstream
Commit: 862a724a3d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-09-25 (Thu, 25 Sep 2014)


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

------------------
This commit was generated by Migit
2014-09-26 14:22:30 +04:00
Michael Liebmann
30fc50ca71 CChannelList: Rework drawing channel logo...
...for use color gradients in header


Origin commit data
------------------
Branch: ni/coolstream
Commit: 617eece227
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-09-20 (Sat, 20 Sep 2014)



------------------
This commit was generated by Migit
2014-09-25 11:10:02 +04:00
martii
99f9745c97 drop explicit CMenuForwarder icon assignments
Conflicts:
	src/gui/3dsetup.cpp
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/keybind_setup.cpp
	src/gui/mediaplayer.cpp
	src/gui/mediaplayer_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/network_setup.cpp
	src/gui/nfs.cpp
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/parentallock_setup.cpp
	src/gui/personalize.cpp
	src/gui/proxyserver_setup.cpp
	src/gui/record_setup.cpp
	src/gui/scan_setup.cpp
	src/gui/screensetup.cpp
	src/gui/settings_manager.cpp
	src/gui/timerlist.cpp
	src/gui/update_menue.cpp
	src/gui/vfd_setup.cpp
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: e84782bc4c
Author: martii <m4rtii@gmx.de>
Date: 2014-02-22 (Sat, 22 Feb 2014)



------------------
This commit was generated by Migit
2014-09-15 11:44:08 +04:00
martii
bca9371e65 system/settings: move theme colors to dedicated struct
Conflicts:
	src/driver/pictureviewer/pictureviewer.cpp
	src/gui/epgview.cpp
	src/gui/osd_setup.cpp
	src/gui/pluginlist.cpp
	src/neutrino.cpp


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



------------------
This commit was generated by Migit
2014-09-12 18:29:21 +04:00
[CST] Focus
4eb5179286 neutrino: sync keybind and usermenu code with neutrino-mp, code (C) martii
Origin commit data
------------------
Branch: ni/coolstream
Commit: 420af7a4dc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)


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

------------------
This commit was generated by Migit
2014-09-05 17:49:11 +04:00
[CST] Focus
40dae113bc webtv channels integration port,
initial code (C) martii,
initial patch from jacek


Origin commit data
------------------
Branch: ni/coolstream
Commit: a473fe8194
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-08-27 (Wed, 27 Aug 2014)



------------------
This commit was generated by Migit
2014-08-27 17:32:26 +04:00
martii
821c34add7 gui/channellist: make displaying channel numbers optional
Conflicts:
	data/locale/deutsch.locale
	src/gui/channellist.cpp
	src/gui/osd_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 94e6cf9a25
Author: martii <m4rtii@gmx.de>
Date: 2014-07-19 (Sat, 19 Jul 2014)



------------------
This commit was generated by Migit
2014-07-23 11:57:05 +04:00
[CST] Focus
8fd420eb81 gui/channellist.cpp: show empty progressbar for channels without epg, too
Origin commit data
------------------
Branch: ni/coolstream
Commit: 477f1eaa32
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-18 (Fri, 18 Jul 2014)


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

------------------
This commit was generated by Migit
2014-07-18 13:26:48 +04:00
[CST] Focus
c0e8774e52 Revert "CChannelList/COsdSetup: use showOsdChanlistSetup() from OSD-Setup"
commit has problems: bad looking, if fade is ON, menu missed channel list fonts config

This reverts commit 373dbba059.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0cda142ba7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-17 (Thu, 17 Jul 2014)



------------------
This commit was generated by Migit
2014-07-17 17:02:43 +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
Michael Liebmann
c1174ba5ab CChannelList: Use CComponentsChannelLogo for display channellogo
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2ecd9918cb
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-06-28 (Sat, 28 Jun 2014)


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

------------------
This commit was generated by Migit
2014-06-29 13:25:32 +02:00
Thilo Graf
ce26c10328 CChannelList: disable paint of clock background, it's not required here
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5670e87d77
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-06-27 (Fri, 27 Jun 2014)


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

------------------
This commit was generated by Migit
2014-06-28 01:09:17 +02:00
Thilo Graf
373dbba059 CChannelList/COsdSetup: use showOsdChanlistSetup() from OSD-Setup
This removes multiple code parts from COsdSetup without
loss of functionality.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 253579909f
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-06-07 (Sat, 07 Jun 2014)



------------------
This commit was generated by Migit
2014-06-23 18:43:47 +02:00
Thilo Graf
5c7441f5d1 COSDFader: rename member functions, adapt implementations
Stop() is not exactly attributable if fader class used as inherited and
Fade() don't tell really what done and related to return value 'bool'...
especially as the fader class members have been not documented.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 69e2debb02
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-05-30 (Fri, 30 May 2014)



------------------
This commit was generated by Migit
2014-06-23 18:43:47 +02:00
vanhofen
0ba1ddf21c channellist: add colored progressbars
* thx to bazi98, martii and benny


Origin commit data
------------------
Branch: ni/coolstream
Commit: df1c8ac00d
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-23 (Mon, 23 Jun 2014)

Origin message was:
------------------
- channellist: add colored progressbars

* thx to bazi98, martii and benny


------------------
This commit was generated by Migit
2014-06-23 17:05:44 +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
martii
8bd99bea8e zapit/bouquets: rename bAlwaysLocked => bLockCount
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3a52a97fce
Author: martii <m4rtii@gmx.de>
Date: 2014-05-25 (Sun, 25 May 2014)


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

------------------
This commit was generated by Migit
2014-05-25 18:43:46 +02:00
martii
ce7cb28d85 zapit/bouquets: count locked bouquets a channels is in, and honor lock in all bouquets
Origin commit data
------------------
Branch: ni/coolstream
Commit: abe03ad749
Author: martii <m4rtii@gmx.de>
Date: 2014-05-25 (Sun, 25 May 2014)


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

------------------
This commit was generated by Migit
2014-05-25 18:43:38 +02:00
Thilo Graf
f2e15fbea7 CChannelList: ensure erase of clock after stopping
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4a28d853d2
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-05-06 (Tue, 06 May 2014)


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

------------------
This commit was generated by Migit
2014-05-22 20:38:21 +02:00
martii
facfe0d839 gui/channellist: use localized value for minutes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 00c1a8af01
Author: martii <m4rtii@gmx.de>
Date: 2014-05-06 (Tue, 06 May 2014)


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

------------------
This commit was generated by Migit
2014-05-06 12:21:07 +02:00
Stefan Seyfried
8df9ff12cc Merge remote-tracking branch 'check/next-cc'
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)



------------------
This commit was generated by Migit
2014-04-27 19:14:06 +02:00
Thilo Graf
0f2a203035 CComponentsPIP: use a default frame with thickness 2 and small corner radius
Origin commit data
------------------
Branch: ni/coolstream
Commit: a573b02b85
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-03-16 (Sun, 16 Mar 2014)


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

------------------
This commit was generated by Migit
2014-04-02 08:40:21 +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
Michael Liebmann
2c93f6538a CComponentsFrmClock: Fix thread handling
- Set clock activ = false for default


Origin commit data
------------------
Branch: ni/coolstream
Commit: ddc826ab51
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-02-13 (Thu, 13 Feb 2014)



------------------
This commit was generated by Migit
2014-02-13 18:26:04 +01:00
Stefan Seyfried
de371a25e8 Merge remote-tracking branch 'check/next-cc-fixed'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 78f51baf66
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-26 (Sun, 26 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-26 00:33:08 +01:00
Thilo Graf
9585b49365 CComponentsHeader: rework constructors, add CComponentsHeaderLocalized
Member initVarHeader() now used with parameters, so it's possible
to remove multiple code in constructors, but some class must be
renamed to CComponentsHeaderLocalized.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ea7ec48df
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-01-18 (Sat, 18 Jan 2014)

Origin message was:
------------------
CComponentsHeader: rework constructors, add CComponentsHeaderLocalized

Member initVarHeader() now used with parameters, so it's possible
to remove multiple code in constructors, but some class must be
renamed to CComponentsHeaderLocalized.


------------------
This commit was generated by Migit
2014-01-24 23:09:56 +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
Stefan Seyfried
0c4ecc191a Merge remote-tracking branch 'check/next-cc'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d379dcb30
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-29 (Sun, 29 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-29 22:12:09 +01:00
vanhofen
af18c89c3d channellist: channellogos can be disabled
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9fb63a20d9
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-12-28 (Sat, 28 Dec 2013)

Origin message was:
------------------
- channellist: channellogos can be disabled

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

------------------
This commit was generated by Migit
2013-12-28 23:39:51 +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
7d7d97d84f CChannelList: Fix display header clock
Origin commit data
------------------
Branch: ni/coolstream
Commit: d591acff42
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
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 08:35:31 +01:00