Commit Graph

122 Commits

Author SHA1 Message Date
vanhofen
309a8b3af0 neutrino: press tv/radio key to return to plain tv/radio
Origin commit data
------------------
Commit: 736343d35b
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-14 (Mon, 14 Dec 2015)

Origin message was:
------------------
- neutrino: press tv/radio key to return to plain tv/radio
2015-12-15 08:15:17 +01:00
Stefan Seyfried
17880c4125 Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...


Origin commit data
------------------
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)
2015-12-13 17:41:55 +01:00
Stefan Seyfried
d9354e847f global.h: Use forward-declarations to reduce number of dependencies
Origin commit data
------------------
Commit: 5ab6b53054
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-04-16 (Thu, 16 Apr 2015)
2015-04-16 13:39:35 +02:00
Stefan Seyfried
e76fbcfe5c filebrowser, moviebrowser, pictureviewer: clarify error message
Origin commit data
------------------
Commit: 4e1678c2a3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-06 (Fri, 06 Feb 2015)
2015-02-09 13:47:32 +01:00
Stefan Seyfried
8b5f60928f filebrowser, moviebrowser, pictureviewer: clarify error message
Origin commit data
------------------
Commit: 678a008310
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-06 (Fri, 06 Feb 2015)
2015-02-06 17:26:20 +01:00
Stefan Seyfried
ec1a9fce17 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
------------------
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)
2014-12-25 18:03:08 +01:00
[CST] Focus
8f7f3f9e4d webtv channels integration port,
initial code (C) martii,
initial patch from jacek


Origin commit data
------------------
Commit: a473fe8194
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-08-27 (Wed, 27 Aug 2014)
2014-08-27 17:32:26 +04:00
vanhofen
98c0a441d8 change RenderString() default to UTF8
Origin commit data
------------------
Commit: 649d1b1f9d
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-11 (Wed, 11 Jun 2014)

Origin message was:
------------------
- change RenderString() default to UTF8
2014-06-11 23:07:13 +02:00
Stefan Seyfried
3f36062fe7 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
------------------
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)
2014-04-27 19:14:06 +02:00
Thilo Graf
8b6c92681e CComponentsHeader: rework context button handling
CComponentsHeader uses now CComponentsIconForm, which is now derived
from CComponentsFrmChain. Some methods should be now simplified and
allow to handle some modifications easier.


Origin commit data
------------------
Commit: 6fe7b452c1
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-03-22 (Sat, 22 Mar 2014)
2014-04-02 08:40:21 +02:00
Stefan Seyfried
473b274f4a Merge remote-tracking branch 'check/next-cc'
Origin commit data
------------------
Commit: e9bc524562
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-27 (Mon, 27 Jan 2014)
2014-01-27 21:00:18 +01:00
Thilo Graf
506c56014d revert c20ef7ed23
use an easier solution, based up neutrino-mp


Origin commit data
------------------
Commit: bcf4e4fbf9
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-01-26 (Sun, 26 Jan 2014)
2014-01-26 20:30:41 +01:00
Stefan Seyfried
f3f8cf3b56 Merge remote-tracking branch 'check/next-cc-fixed'
Origin commit data
------------------
Commit: 78f51baf66
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-26 (Sun, 26 Jan 2014)
2014-01-26 00:33:08 +01:00
Stefan Seyfried
6477ba1cb7 Revert "Fix compiler warnings (-Wconversion)"
This reverts commit c20ef7ed23.

I have a different, simpler version in my tree. Keep only the
(unsigned char) cast in timerlist.cpp


Origin commit data
------------------
Commit: f625a18324
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-26 (Sun, 26 Jan 2014)
2014-01-26 00:32:23 +01:00
Michael Liebmann
c20ef7ed23 Fix compiler warnings (-Wconversion)
- THX SatBaby for the info


Origin commit data
------------------
Commit: cd5fd9dab3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-25 (Sat, 25 Jan 2014)
2014-01-25 23:06:27 +01:00
Thilo Graf
5ad73f09aa 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
------------------
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.
2014-01-24 23:09:56 +01:00
Stefan Seyfried
a112e8fb49 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
------------------
Commit: b414474323
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-23 (Thu, 23 Jan 2014)
2014-01-23 14:08:37 +01:00
vanhofen
8d5aa84e20 adapt ShowMsg handling from martii's neutrino-mp
Origin commit data
------------------
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
2014-01-22 12:37:21 +01:00
Stefan Seyfried
ccc691278c Merge remote-tracking branch 'check/next-cc'
Lightly tested only...


Origin commit data
------------------
Commit: cdd065fc2e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-25 (Wed, 25 Dec 2013)
2013-12-25 22:51:23 +01:00
martii
ce44d1641a convert most char[...] configuration values to std::string
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: cbc9299df8
Author: martii <m4rtii@gmx.de>
Date: 2013-06-11 (Tue, 11 Jun 2013)
2013-12-25 12:08:14 +01:00
martii
1ad07c0854 gui/pictureviewer_setup, gui/audioplayer_setup: use CMenuOptionNumberChooser instead of CStringInput
Origin commit data
------------------
Commit: da0142eb0d
Author: martii <m4rtii@gmx.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)
2013-12-22 16:36:13 +01:00
Stefan Seyfried
4c7a2f38df Merge branch 'check/next-cc'
Only compile-tested.


Origin commit data
------------------
Commit: b5e736e81b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-30 (Sat, 30 Nov 2013)
2013-11-30 20:17:31 +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
vanhofen
82168342a2 Revert "- add missing include of vfd header"
This reverts commit 81d56f75fc.


Origin commit data
------------------
Commit: 014dd3ac7b
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)
2013-11-13 23:39:55 +01:00
vanhofen
81d56f75fc add missing include of vfd header
Origin commit data
------------------
Commit: 3845feb0e4
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)

Origin message was:
------------------
- add missing include of vfd header
2013-11-13 10:40:18 +01:00
Stefan Seyfried
80b809a370 Merge branch 'check/next-cc'
Compiles on most platforms, starts. Not really tested.


Origin commit data
------------------
Commit: b93a372b54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)
2013-11-10 16:55:53 +01:00
Michael Liebmann
5aa9f6a272 Audioplayer: Remove special handling for display mute icon
Origin commit data
------------------
Commit: bace5ce91b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-11-04 (Mon, 04 Nov 2013)
2013-11-04 17:00:34 +01:00
Thilo Graf
41d131eb32 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
------------------
Commit: f7798affc6
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-24 (Thu, 24 Oct 2013)
2013-10-24 21:19:07 +02:00
Stefan Seyfried
14d73c9280 remove all fb->blit() calls
TODO: check if plugins etc. need extra treatment


Origin commit data
------------------
Commit: c68ffa2155
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-28 (Sat, 28 Sep 2013)
2013-09-28 13:01:03 +02:00
Stefan Seyfried
2c76238007 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
------------------
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)
2013-09-01 19:46:10 +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
Stefan Seyfried
fce4dbbe72 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
------------------
Commit: d5d5a60261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)
2013-06-16 21:22:14 +02:00
Stefan Seyfried
6210ac6726 neutrino: fix possible div-by-zero in scrollbar calculation
Origin commit data
------------------
Commit: a33086568b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-29 (Wed, 29 May 2013)
2013-05-30 11:19:39 +02:00
Stefan Seyfried
512febee25 neutrino: fix possible div-by-zero in scrollbar calculation
Origin commit data
------------------
Commit: 6a48922350
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-29 (Wed, 29 May 2013)
2013-05-29 15:33:21 +02:00
vanhofen
93ffab6c1d neutrino: don't save screen while paint headers
Origin commit data
------------------
Commit: 6c41ffbe47
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-28 (Tue, 28 May 2013)

Origin message was:
------------------
- neutrino: don't save screen while paint headers
2013-05-28 10:42:39 +02:00
vanhofen
05e35bf92e ENABLE_GUI_MOUNT: globalize
Origin commit data
------------------
Commit: ad20474050
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-27 (Mon, 27 May 2013)

Origin message was:
------------------
- ENABLE_GUI_MOUNT: globalize
2013-05-27 23:56:54 +02:00
vanhofen
7ea44be8e0 pictureviewer: using CComponentsHeader to paint header
* rework footer handling (get height from paintButtons methode)


Origin commit data
------------------
Commit: b335a50ef3
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-27 (Mon, 27 May 2013)

Origin message was:
------------------
- pictureviewer: using CComponentsHeader to paint header

* rework footer handling (get height from paintButtons methode)
2013-05-27 22:25:30 +02:00
Stefan Seyfried
b6e65d0300 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
------------------
Commit: a7f1e0e25e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-24 (Fri, 24 May 2013)
2013-05-24 20:24:39 +02:00
Michael Liebmann
13bd36d779 CAudioPlayerGui: Fix display mute icon
Origin commit data
------------------
Commit: ad7bb42fc6
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-05-22 (Wed, 22 May 2013)

Origin message was:
------------------
* CAudioPlayerGui: Fix display mute icon
2013-05-22 07:48:04 +02:00
Michael Liebmann
287c48a9df Various changes for reworked mute icon handling in some classes
- mute icon disabled for moviebrowser, upnpbrowser, pictureviewer
- extra handling for audioplayer


Origin commit data
------------------
Commit: bf1c7bfdb7
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-05-13 (Mon, 13 May 2013)

Origin message was:
------------------
* Various changes for reworked mute icon handling in some classes

- mute icon disabled for moviebrowser, upnpbrowser, pictureviewer
- extra handling for audioplayer
2013-05-16 11:01:41 +01:00
Stefan Seyfried
748b384771 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
------------------
Commit: 6b72095f5a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-11 (Sat, 11 May 2013)
2013-05-11 17:17:33 +02:00
Stefan Seyfried
f1e664b75e 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
------------------
Commit: 5ad0b6b6dc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 11:21:55 +02:00
Stefan Seyfried
51a9a3b894 neutrino: make button bar use available space intelligently
modify the paintButtons() function, so that it spreads the buttons
over the available width with constant space between them.
Port over all users to the new method and clean up quite some custom
button drawing code on the way.

Conflicts:
	src/gui/audioplayer.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp


Origin commit data
------------------
Commit: e09bc260da
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-10-03 (Mon, 03 Oct 2011)
2013-04-05 14:50:28 +04:00
vanhofen
b659d5c95a strech most windows to full screen
* switchable with existing switch for 'big_windows'
* 'big_windows' default is on

Conflicts:
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bedit/bouqueteditor_chanselect.cpp


Origin commit data
------------------
Commit: 4714a30f83
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)

Origin message was:
------------------
- strech most windows to full screen

* switchable with existing switch for 'big_windows'
* 'big_windows' default is on

Conflicts:
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bedit/bouqueteditor_chanselect.cpp
2013-04-01 15:42:38 +04:00
vanhofen
0df9a58c45 strech most windows to full screen
* switchable with existing switch for 'big_windows'
* 'big_windows' default is on


Origin commit data
------------------
Commit: 759966f935
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)

Origin message was:
------------------
- strech most windows to full screen

* switchable with existing switch for 'big_windows'
* 'big_windows' default is on
2013-03-25 09:45:22 +01:00
Stefan Seyfried
2b4f5306dc Merge branch 'check/dvbsi++' commit 984435d48e
Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/components/cc.h
	src/gui/components/components.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/neutrino.cpp
	src/zapit/src/bouquets.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Commit: 0cf191822a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-21 (Thu, 21 Feb 2013)
2013-02-21 17:07:18 +01:00
vanhofen
927498478a fix terrible typo
Origin commit data
------------------
Commit: fe78bf0580
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-14 (Thu, 14 Feb 2013)

Origin message was:
------------------
- fix terrible typo
2013-02-14 19:16:54 +01:00
Stefan Seyfried
6e17b3f254 Merge branch 'uncool/dvbsi++' commit 610ce926f5
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp


Origin commit data
------------------
Commit: f8f5467fdb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-30 (Sun, 30 Dec 2012)
2012-12-30 21:35:20 +01:00
Michael Liebmann
9cab585c93 Pictureviewer: Remove duplicate locale from help text
Origin commit data
------------------
Commit: c691c242ff
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-12-04 (Tue, 04 Dec 2012)

Origin message was:
------------------
* Pictureviewer: Remove duplicate locale from help text
2012-12-04 22:14:57 +01:00
defans
a95d8ed33d add keys to control the audioplayer from pictureviewer
decode and view pictures in a seperate thread.


Origin commit data
------------------
Commit: 031db7bae1
Author: defans <defans@bluepeercrew.us>
Date: 2012-11-30 (Fri, 30 Nov 2012)

Origin message was:
------------------
- add keys to control the audioplayer from pictureviewer

decode and view pictures in a seperate thread.
2012-11-30 22:06:27 +01:00