Commit Graph

376 Commits

Author SHA1 Message Date
gixxpunk
34c98e23c4 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1875ced1c5
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-09-19 (Tue, 19 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-19 18:37:22 +02:00
vanhofen
257d3f3cfb menue: use getItemColors() to get item colors
Origin commit data
------------------
Branch: ni/coolstream
Commit: 57a17472a6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)

Origin message was:
------------------
- menue: use getItemColors() to get item colors

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

------------------
This commit was generated by Migit
2017-09-19 18:10:56 +02:00
max_10
7f09367d74 mediaplayer: fixes form Duckbox git
Origin commit data
------------------
Branch: ni/coolstream
Commit: af3a61cb96
Author: max_10 <max_10@gmx.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-19 15:12:53 +02:00
vanhofen
0412a5aa23 menue: use getItemColors() to get item colors
Origin commit data
------------------
Branch: ni/coolstream
Commit: 477ece6ece
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)

Origin message was:
------------------
- menue: use getItemColors() to get item colors

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

------------------
This commit was generated by Migit
2017-09-18 22:53:27 +02:00
gixxpunk
570ba4305b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 315a87f2be
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-18 16:31:55 +02:00
Thilo Graf
94fe4513e1 CMenuItem: add members set/get info icon inside menu items
Origin commit data
------------------
Branch: ni/coolstream
Commit: f0660dc66c
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-09-17 (Sun, 17 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-17 13:52:43 +02:00
vanhofen
3f1a3ed531 rename SLIDER defines
Origin commit data
------------------
Branch: ni/coolstream
Commit: d873aef1e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- rename SLIDER defines

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

------------------
This commit was generated by Migit
2017-09-15 20:17:48 +02:00
vanhofen
f5bdb499cb menu: rework slider; ...
* rename some variables
* use paintBoxFrame() instead of background-icon; this avoids scaling
 issues on higher resolutions; scaled icons are ugly


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0a748de445
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- menu: rework slider; ...

* rename some variables
* use paintBoxFrame() instead of background-icon; this avoids scaling
 issues on higher resolutions; scaled icons are ugly


------------------
This commit was generated by Migit
2017-09-15 20:16:13 +02:00
vanhofen
ed0a6297c9 menue: don't move menu in centered mode to the right; ...
when hintboxes do overlay the menu it looks crooked


Origin commit data
------------------
Branch: ni/coolstream
Commit: 221722bc9e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)

Origin message was:
------------------
- menue: don't move menu in centered mode to the right; ...

when hintboxes do overlay the menu it looks crooked


------------------
This commit was generated by Migit
2017-09-15 18:23:31 +02:00
vanhofen
51dde95a4e menue: always show frame around the hintbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 38237f07b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)

Origin message was:
------------------
- menue: always show frame around the hintbox

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

------------------
This commit was generated by Migit
2017-09-15 18:23:31 +02:00
vanhofen
81aff7eebd rename SLIDER defines
Origin commit data
------------------
Branch: ni/coolstream
Commit: 978d72ac00
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- rename SLIDER defines

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

------------------
This commit was generated by Migit
2017-09-14 22:00:41 +02:00
vanhofen
68f37aaddd menu: rework slider; ...
* rename some variables
* use paintBoxFrame() instead of background-icon; this avoids scaling
 issues on higher resolutions; scaled icons are ugly


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5c22aa7058
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- menu: rework slider; ...

* rename some variables
* use paintBoxFrame() instead of background-icon; this avoids scaling
 issues on higher resolutions; scaled icons are ugly


------------------
This commit was generated by Migit
2017-09-14 21:37:44 +02:00
vanhofen
4dc0113a94 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/info_menue.cpp
	src/gui/widget/menue.cpp
	src/nhttpd/yconfig.h
	src/system/helpers.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9152c228ed
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)



------------------
This commit was generated by Migit
2017-09-14 16:23:15 +02:00
Thilo Graf
b9b48fd6e9 CMenuWidget: replace paintBoxRel() calls with single PaintBoxRel()
Paints background and shadow at once. Shadow is painted only on
reqiured parts of screen. This avoids possible flicker effects e.g.
with footer paint, on changing buttons, was to see with opkg_manager.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5678da177e
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-13 (Sun, 13 Aug 2017)



------------------
This commit was generated by Migit
2017-09-14 12:14:41 +02:00
Thilo Graf
eb670a1935 CMenuWidget: use CComponentsFooter for paint footers in menues
Another step for more unified window designs.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7f7054018b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-13 (Sun, 13 Aug 2017)



------------------
This commit was generated by Migit
2017-09-14 12:14:41 +02:00
vanhofen
07923a9799 plugin-code: cleanup from many unused code; ...
* remove intergration conversion because we can use the integer as it is
* update headers

 Do we need /src/plugin.h anymore? Maybe this code could be merged into src/gui/plugins.h.

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: f2ec46311c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-08 (Fri, 08 Sep 2017)

Origin message was:
------------------
- plugin-code: cleanup from many unused code; ...

* remove intergration conversion because we can use the integer as it is
* update headers

 Do we need /src/plugin.h anymore? Maybe this code could be merged into src/gui/plugins.h.

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-09-14 12:14:41 +02:00
vanhofen
62783625a5 menu: always add an offset to menus; not only in round-border-mode
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: cd5fc80ebe
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)

Origin message was:
------------------
- menu: always add an offset to menus; not only in round-border-mode

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-09-14 12:14:41 +02:00
vanhofen
87f3aa6015 menu: fix right offset for very long right texts
Origin commit data
------------------
Branch: ni/coolstream
Commit: c11ac03b4f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- menu: fix right offset for very long right texts

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

------------------
This commit was generated by Migit
2017-09-12 22:30:35 +02:00
vanhofen
ef1606884b menue: fix my stupid typo that avoids scrollbars
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8115f33948
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-08 (Fri, 08 Sep 2017)

Origin message was:
------------------
- menue: fix my stupid typo that avoids scrollbars

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

------------------
This commit was generated by Migit
2017-09-08 12:15:11 +02:00
vanhofen
7f84346b01 plugin-code: cleanup from many unused code; ...
* remove intergration conversion because we can use the integer as it is
* update headers

 Do we need /src/plugin.h anymore? Maybe this code could be merged into src/gui/plugins.h.


Origin commit data
------------------
Branch: ni/coolstream
Commit: f0f0c1f55d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-08 (Fri, 08 Sep 2017)

Origin message was:
------------------
- plugin-code: cleanup from many unused code; ...

* remove intergration conversion because we can use the integer as it is
* update headers

 Do we need /src/plugin.h anymore? Maybe this code could be merged into src/gui/plugins.h.


------------------
This commit was generated by Migit
2017-09-08 10:53:03 +02:00
vanhofen
061a6e7c6a menu: always add an offset to menus; not only in round-border-mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 65b8a7ae48
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)

Origin message was:
------------------
- menu: always add an offset to menus; not only in round-border-mode

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

------------------
This commit was generated by Migit
2017-09-07 16:18:30 +02:00
vanhofen
e8711e0475 Revert "neutrino: disable some menus in upnp & ts mode"
This reverts commit aaee0baf07.

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 944ad7cb63
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-12 (Sat, 12 Aug 2017)



------------------
This commit was generated by Migit
2017-08-12 14:05:17 +02:00
vanhofen
a0b132d7ff Revert "neutrino: disable some menus in upnp & ts mode"
This reverts commit aaee0baf07.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e04d34a9c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-12 (Sat, 12 Aug 2017)



------------------
This commit was generated by Migit
2017-08-12 12:47:33 +02:00
vanhofen
71d32096c7 menu: fix icon for CGenericMenuNext forwarder
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8c4fe6df2f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-01 (Tue, 01 Aug 2017)

Origin message was:
------------------
- menu: fix icon for CGenericMenuNext forwarder

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-08-08 14:25:12 +02:00
vanhofen
2d6ad62b30 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6d49aee959
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-07 (Mon, 07 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-07 08:20:56 +02:00
GetAway
aaee0baf07 neutrino: disable some menus in upnp & ts mode
to prevent inoperability of neutrino


Origin commit data
------------------
Branch: ni/coolstream
Commit: 90de51de38
Author: GetAway <get-away@t-online.de>
Date: 2017-08-06 (Sun, 06 Aug 2017)



------------------
This commit was generated by Migit
2017-08-07 07:52:41 +02:00
vanhofen
b61adf86d0 menu: fix icon for CGenericMenuNext forwarder
Origin commit data
------------------
Branch: ni/coolstream
Commit: 27b111820f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-01 (Tue, 01 Aug 2017)

Origin message was:
------------------
- menu: fix icon for CGenericMenuNext forwarder

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

------------------
This commit was generated by Migit
2017-08-01 14:44:21 +02:00
vanhofen
e0886a019c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/audioplayer.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5433054b38
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)



------------------
This commit was generated by Migit
2017-06-18 00:52:04 +02:00
Thilo Graf
b295c863d0 CMenuSeparator: clean up multiple code parts
Origin commit data
------------------
Branch: ni/coolstream
Commit: 326a9634e1
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-18 00:04:40 +02:00
Thilo Graf
b0d7a2a488 CMenuOptionNumberChooser: clean up multiple code parts
Origin commit data
------------------
Branch: ni/coolstream
Commit: f2e8f95e66
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-18 00:04:40 +02:00
Thilo Graf
65a2486250 CMenuForwarder: clean up multiple code parts
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7b3ce6f330
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-18 00:04:40 +02:00
Thilo Graf
cd712fe5d5 CMenuOptionStringChooser: clean up multiple code parts
Origin commit data
------------------
Branch: ni/coolstream
Commit: 284dba8c25
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-18 00:04:40 +02:00
Thilo Graf
5f1d85300f CMenuOptionChooser: clean up multiple code parts
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8899660dad
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-18 00:04:40 +02:00
vanhofen
8e6aebc8d4 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/icons/headers/pictureviewer.png
	data/locale/english.locale
	src/global.h
	src/gui/components/cc_frm_footer.h
	src/gui/eventlist.cpp
	src/gui/pictureviewer.cpp
	src/gui/widget/icons.h
	src/gui/widget/menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a8ef409ff6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)



------------------
This commit was generated by Migit
2017-06-15 10:37:41 +02:00
vanhofen
fd52e89afb menue: replace last fixed values ...
... with OFFSET defines and scale2Res()-calculations

Signed-off-by: Thilo Graf <dbt@novatux.de>

- removed TODO for height of hint calculation


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5c783a5c50
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- menue: replace last fixed values ...

... with OFFSET defines and scale2Res()-calculations

Signed-off-by: Thilo Graf <dbt@novatux.de>

- removed TODO for height of hint calculation


------------------
This commit was generated by Migit
2017-06-15 01:01:55 +02:00
vanhofen
15c12b8c76 menue: replace last fixed values ...
... with OFFSET defines and scale2Res()-calculations


Origin commit data
------------------
Branch: ni/coolstream
Commit: 57a146f8cf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-09 (Fri, 09 Jun 2017)

Origin message was:
------------------
- menue: replace last fixed values ...

... with OFFSET defines and scale2Res()-calculations


------------------
This commit was generated by Migit
2017-06-09 12:40:08 +02:00
vanhofen
3ba4cfb126 menue: fix lcd4l-support for directly started items; ...
this fixes missing lcd4l-support in mode_upnp


Origin commit data
------------------
Branch: ni/coolstream
Commit: da62cd195b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-26 (Sun, 26 Mar 2017)

Origin message was:
------------------
- menue: fix lcd4l-support for directly started items; ...

this fixes missing lcd4l-support in mode_upnp


------------------
This commit was generated by Migit
2017-03-26 23:21:29 +02:00
Michael Liebmann
10ea5b08d2 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2677543cc4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-13 21:55:50 +01:00
vanhofen
7dcc90f09f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c4fa0eb30e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)



------------------
This commit was generated by Migit
2017-03-13 12:45:30 +01:00
vanhofen
51c85e1c58 unify DetailsLine-names; move define to settings.h
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5b0faeab8c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)

Origin message was:
------------------
- unify DetailsLine-names; move define to settings.h

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

------------------
This commit was generated by Migit
2017-03-13 12:40:04 +01:00
vanhofen
0a75d324ea Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e2cf02f310
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-13 11:40:34 +01:00
Michael Liebmann
94ddefdfd0 CMenuWidget::calcSize: Add forgotten 'wi'
Origin commit data
------------------
Branch: ni/coolstream
Commit: d0b02a9752
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-13 10:34:37 +01:00
Michael Liebmann
671568a19e CMenuWidget::calcSize: Use scale2Res() to adjust fixed sizes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2ed30486c4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-13 09:55:58 +01:00
Michael Liebmann
b5aa38dc56 CMenuWidget::calcSize: Recalculation of min_width ...
... for adjustment to the osd resolution


Origin commit data
------------------
Branch: ni/coolstream
Commit: 30db40da1a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)



------------------
This commit was generated by Migit
2017-03-13 09:55:58 +01:00
vanhofen
9bd8b2b10c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/movieplayer.cpp
	src/nhttpd/tuxboxapi/controlapi.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: f30f4da574
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)



------------------
This commit was generated by Migit
2017-03-01 13:09:50 +01:00
vanhofen
c1140e0c1c rename g_PluginList to g_Plugins; this isn't a list of plugins
Origin commit data
------------------
Branch: ni/coolstream
Commit: 856c676430
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)

Origin message was:
------------------
- rename g_PluginList to g_Plugins; this isn't a list of plugins

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

------------------
This commit was generated by Migit
2017-03-01 13:03:50 +01:00
vanhofen
4ac4e963ad Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac
	data/fonts/Makefile.am
	src/gui/cam_menu.cpp
	src/gui/update.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5db35f49c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
2017-02-12 21:54:48 +01:00
Thilo Graf
e1edcb1187 CMenuWidget: remove dub code from init
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0435ca20a3
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-09 16:35:03 +01:00
Thilo Graf
f6ea40a11e CMenuWidget: use only nameString as container for widget name
neutrino_locale_t	name could be transformed always to real string to
unify this container


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2dda93ed2b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)



------------------
This commit was generated by Migit
2017-02-09 15:52:39 +01:00
vanhofen
adaf63dd74 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e0084d8913
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-02 13:13:34 +01:00