Commit Graph

515 Commits

Author SHA1 Message Date
Thilo Graf
0053151415 CChannelList: fix and simplify paint of custom channellogos
paint was probably broken since 0ca753dbca


Origin commit data
------------------
Branch: ni/coolstream
Commit: 18fa153389
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-07-11 (Sat, 11 Jul 2015)



------------------
This commit was generated by Migit
2015-07-17 16:01:19 +02:00
Jacek Jendrzej
8ed12ffc0f src/gui/channellist.cpp: show epg info1 if info2 empty (THX bazi98)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4cb0870b9b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-07-05 (Sun, 05 Jul 2015)


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

------------------
This commit was generated by Migit
2015-07-05 13:20:47 +02:00
[CST] Focus
ed646c5b78 gui/channellist.cpp: use getChannelID() in place of channel_id
Origin commit data
------------------
Branch: ni/coolstream
Commit: 64eda8566c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-06-01 (Mon, 01 Jun 2015)


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

------------------
This commit was generated by Migit
2015-06-02 12:26:34 +03:00
Michael Liebmann
84d05b6a93 Clock on infoviewer and channellist: Fix background paint...
...when switching between OneColor und ColorToColor


Origin commit data
------------------
Branch: ni/coolstream
Commit: 95a27ebb31
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-05-09 (Sat, 09 May 2015)



------------------
This commit was generated by Migit
2015-05-09 10:38:51 +02:00
vanhofen
d248f4b7c4 themes: move colored_events settings to themes setup
Origin commit data
------------------
Branch: ni/coolstream
Commit: cb5f052e83
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-04 (Mon, 04 May 2015)

Origin message was:
------------------
- themes: move colored_events settings to themes setup

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

------------------
This commit was generated by Migit
2015-05-05 11:43:17 +02:00
Thilo Graf
946c0e8bc4 Merge branch 'cst-next.pre' into cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: a58f1621b4
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-04-30 (Thu, 30 Apr 2015)


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

------------------
This commit was generated by Migit
2015-04-30 09:20:43 +02:00
Thilo Graf
cefb8f9594 themes: use hintbox and header gradient option in theme settings
Color gradient feature was originally intended for use
inside theme settings and it's not really suitable for
generally use as default in all themes at the moment, so it makes more
sense to have options in theme settings and let the user decide
to customize this, unless enough other gui parts can use this feature.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 01516cf943
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-04-29 (Wed, 29 Apr 2015)

Origin message was:
------------------
themes: use hintbox and header gradient option in theme settings

Color gradient feature was originally intended for use
inside theme settings and it's not really suitable for
generally use as default in all themes at the moment, so it makes more
sense to have options in theme settings and let the user decide
to customize this, unless enough other gui parts can use this feature.


------------------
This commit was generated by Migit
2015-04-29 10:16:55 +02:00
Jacek Jendrzej
ef24b7063b channellist.cpp; fix kill dline
Origin commit data
------------------
Branch: ni/coolstream
Commit: 15e9663608
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-04-16 (Thu, 16 Apr 2015)


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

------------------
This commit was generated by Migit
2015-04-16 22:24:13 +02:00
vanhofen
098e322feb record.h: remove include of vfd.h; use display.h instead
Origin commit data
------------------
Branch: ni/coolstream
Commit: 09adc177d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-16 (Thu, 16 Apr 2015)

Origin message was:
------------------
- record.h: remove include of vfd.h; use display.h instead

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

------------------
This commit was generated by Migit
2015-04-16 13:39:35 +02:00
Stefan Seyfried
189e55ec30 global.h: Use forward-declarations to reduce number of dependencies
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ab6b53054
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-04-16 (Thu, 16 Apr 2015)


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

------------------
This commit was generated by Migit
2015-04-16 13:39:35 +02:00
vanhofen
21b3e320aa channellist: allow show/hide bottom infobox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7f35a67426
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-14 (Tue, 14 Apr 2015)

Origin message was:
------------------
- channellist: allow show/hide bottom infobox

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

------------------
This commit was generated by Migit
2015-04-14 11:08:24 +02:00
Thilo Graf
89fb6d23ad CChannelList: use class for scalable channel logos
Previous class used limited scale handling mainly with the
member paintIcon() by framebuffer class.
Because of many possible channel logo files, the icon cache was
filled very fast. That was never considered in
paintIcon() and caused strange behavior at screen, as no image data
were assigned correctly.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 388ab3aa02
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-04-04 (Sat, 04 Apr 2015)



------------------
This commit was generated by Migit
2015-04-04 23:32:48 +02:00
Thilo Graf
965e731300 CChannelList: fix paint of unscaled images
Unscaled images were never painted.


Origin commit data
------------------
Branch: ni/coolstream
Commit: e631559555
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-03-19 (Thu, 19 Mar 2015)



------------------
This commit was generated by Migit
2015-03-29 22:40:15 +02:00
Thilo Graf
97add2603e CChannelList/CNeutrinoEventList/CMovieBrowser: fix logo scale
Downscale was broken.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1cb885dfe9
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-01-14 (Wed, 14 Jan 2015)



------------------
This commit was generated by Migit
2015-03-29 22:40:08 +02:00
Thilo Graf
7f7d7e57b5 CChannelList: ensure down scaling if header height is too small
Logo is initialized with width and height, but enforces in most cases
upscaling of logo. Default now disabled scaling but if header too small,
down scaling is enabled.


Origin commit data
------------------
Branch: ni/coolstream
Commit: f499efa208
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-10-12 (Sun, 12 Oct 2014)



------------------
This commit was generated by Migit
2015-03-29 22:39:53 +02:00
Stefan Seyfried
499659677f Merge remote-tracking branch 'test/cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 92fcc879b4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-03-07 (Sat, 07 Mar 2015)


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

------------------
This commit was generated by Migit
2015-03-07 20:09:44 +01:00
[CST] Focus
cbfe8cbdc7 gui/channellist.cpp: optimize channel list appear time
Origin commit data
------------------
Branch: ni/coolstream
Commit: e846eb141e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-03-06 (Fri, 06 Mar 2015)


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

------------------
This commit was generated by Migit
2015-03-06 14:14:00 +03:00
Stefan Seyfried
f400e72a63 channellist: fix lock icon for default-locked bouquets
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3a222fb5f3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-12 (Thu, 12 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-14 14:31:12 +01:00
Stefan Seyfried
8df72acd9c channellist: remove bogus (char *) casts
Origin commit data
------------------
Branch: ni/coolstream
Commit: b325268123
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-14 14:31:11 +01:00
Stefan Seyfried
cad2c43ba2 channellist: fix lock icon for default-locked bouquets
Origin commit data
------------------
Branch: ni/coolstream
Commit: a846cb1a97
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-12 (Thu, 12 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-12 16:38:42 +01:00
Stefan Seyfried
ac81f7d707 channellist: remove bogus (char *) casts
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8503bf3bc7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-10 14:54:48 +01:00
Stefan Seyfried
460b7c25c3 channellist: fix 2 forgotten cases of fixed plock_zaptime
Origin commit data
------------------
Branch: ni/coolstream
Commit: dc637ca68e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-08 (Sun, 08 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-09 13:47:32 +01:00
Stefan Seyfried
fa88bf80ef fix parentallock for "bouquets default locked" case
in case of "default locked" bouquets, the "whole bouquet unlock"
did not work, because of the inverted logic in this case


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e9496b18f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-08 (Sun, 08 Feb 2015)



------------------
This commit was generated by Migit
2015-02-09 13:47:32 +01:00
Stefan Seyfried
07c103a0b5 channellist: fix 2 forgotten cases of fixed plock_zaptime
Origin commit data
------------------
Branch: ni/coolstream
Commit: ec12b704cb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-08 (Sun, 08 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-08 17:35:01 +01:00
Stefan Seyfried
ee4868e80d fix parentallock for "bouquets default locked" case
in case of "default locked" bouquets, the "whole bouquet unlock"
did not work, because of the inverted logic in this case


Origin commit data
------------------
Branch: ni/coolstream
Commit: ab7b08e40e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-08 (Sun, 08 Feb 2015)



------------------
This commit was generated by Migit
2015-02-08 17:33:25 +01:00
Stefan Seyfried
2263c8bd2e Merge remote-tracking branch 'check/cst-next'
*needs buildfixing*

Conflicts:
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/driver/vfd.cpp
	src/gui/bedit/Makefile.am
	src/gui/components/Makefile.am
	src/gui/luainstance.cpp
	src/gui/widget/Makefile.am
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am


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



------------------
This commit was generated by Migit
2015-01-26 17:26:26 +01:00
Janus
b02c54d1b6 api4: upgrade channel and bouquet edit (testing)
Origin commit data
------------------
Branch: ni/coolstream
Commit: df1db3cfad
Author: Janus <janus@debian>
Date: 2015-01-22 (Thu, 22 Jan 2015)


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

------------------
This commit was generated by Migit
2015-01-22 13:08:03 +01:00
[CST] Focus
db4de60b78 gui/channellist.cpp: disable timeshift stop while timeshift playback in progress
Origin commit data
------------------
Branch: ni/coolstream
Commit: c6424534e8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-21 (Wed, 21 Jan 2015)


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

------------------
This commit was generated by Migit
2015-01-21 17:54:11 +03:00
[CST] Focus
300f25e8c3 neutrino: try to prevent using chanellist/bouquetlist while channels init in progress
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3da439030b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-13 (Tue, 13 Jan 2015)


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

------------------
This commit was generated by Migit
2015-01-13 16:10:24 +03:00
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