Commit Graph

1183 Commits

Author SHA1 Message Date
vanhofen
5ffe34cea9 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 98ed3d9448
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-19 (Mon, 19 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-19 17:23:28 +01:00
vanhofen
75fdcc5b1b icons: add and use pictureviewer icon
Origin commit data
------------------
Branch: ni/coolstream
Commit: a19a5df9ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-19 (Mon, 19 Dec 2016)

Origin message was:
------------------
- icons: add and use pictureviewer icon

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

------------------
This commit was generated by Migit
2016-12-19 17:21:51 +01:00
vanhofen
f96b09926e personalize: pluralize 'usermenu' item; these are 'usermenus'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e6ee0c3fb
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-19 (Mon, 19 Dec 2016)

Origin message was:
------------------
- personalize: pluralize 'usermenu' item; these are 'usermenus'

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

------------------
This commit was generated by Migit
2016-12-19 17:21:51 +01:00
vanhofen
133edf4688 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e1aa8d0d1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-16 (Fri, 16 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-16 23:18:57 +01:00
vanhofen
c0c795ee67 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a1ed6bb721
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-16 (Fri, 16 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-16 22:38:01 +01:00
vanhofen
1474434304 locale: right names for timerlist repeat-hints
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4fc60600f7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-16 (Fri, 16 Dec 2016)

Origin message was:
------------------
- locale: right names for timerlist repeat-hints

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

------------------
This commit was generated by Migit
2016-12-16 20:32:09 +01:00
vanhofen
421080e258 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1c47a38c87
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)



------------------
This commit was generated by Migit
2016-12-15 15:06:21 +01:00
vanhofen
42a7ef830b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac


Origin commit data
------------------
Branch: ni/coolstream
Commit: 624691ea0d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)



------------------
This commit was generated by Migit
2016-12-15 14:12:33 +01:00
vanhofen
8ac19456e1 yWeb: move data from /src to /data
Origin commit data
------------------
Branch: ni/coolstream
Commit: 29847283ad
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)

Origin message was:
------------------
- yWeb: move data from /src to /data

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

------------------
This commit was generated by Migit
2016-12-15 14:00:45 +01:00
vanhofen
36741264b0 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/Makefile.am
	src/gui/user_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 79a2dc262b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)



------------------
This commit was generated by Migit
2016-12-15 11:49:05 +01:00
vanhofen
f673e1c62b usermenu: allow testmenu in usermenu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7fcf19b967
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)

Origin message was:
------------------
- usermenu: allow testmenu in usermenu

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

------------------
This commit was generated by Migit
2016-12-12 20:35:29 +01:00
vanhofen
995b0d3f1b add our new "Material-Design" icons
Origin commit data
------------------
Branch: ni/coolstream
Commit: 845aba1cbe
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)

Origin message was:
------------------
- add our new "Material-Design" icons

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

------------------
This commit was generated by Migit
2016-12-12 13:13:30 +01:00
vanhofen
6f91f2ccc5 iconsets: rename pkg0-iconset to "Material-Design"
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a60150076
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)

Origin message was:
------------------
- iconsets: rename pkg0-iconset to "Material-Design"

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

------------------
This commit was generated by Migit
2016-12-12 12:21:40 +01:00
vanhofen
a6d2a92aa9 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3ead60b3fd
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-07 12:35:53 +01:00
vanhofen
c98eab8e52 fix last commit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9bcdd3487a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)

Origin message was:
------------------
- fix last commit

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

------------------
This commit was generated by Migit
2016-12-07 11:24:30 +01:00
vanhofen
1244d7f99a icons: move NI icons into categorized subdirectories
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7ada0f42ac
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)

Origin message was:
------------------
- icons: move NI icons into categorized subdirectories

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

------------------
This commit was generated by Migit
2016-12-07 11:14:14 +01:00
vanhofen
e3154ef43b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac
	data/Makefile.am
	data/icons/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1b9b466bc1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)



------------------
This commit was generated by Migit
2016-12-07 10:55:25 +01:00
vanhofen
ffcdb41b84 icons: move icons into categorized subdirectories
Origin commit data
------------------
Branch: ni/coolstream
Commit: d5ca9aa0bd
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)

Origin message was:
------------------
- icons: move icons into categorized subdirectories

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

------------------
This commit was generated by Migit
2016-12-07 10:36:47 +01:00
vanhofen
43e7aa77b2 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 38f17cd88b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-06 (Tue, 06 Dec 2016)



------------------
This commit was generated by Migit
2016-12-06 20:46:37 +01:00
vanhofen
dc58fffbea Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/movieplayer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 461f9f046d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-06 (Tue, 06 Dec 2016)



------------------
This commit was generated by Migit
2016-12-06 13:02:25 +01:00
Michael Liebmann
3b858ecd22 Sort locales
Origin commit data
------------------
Branch: ni/coolstream
Commit: fd21f57406
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-12-02 (Fri, 02 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-05 15:54:56 +01:00
vanhofen
34033b62a8 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a7553aad1b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-05 (Mon, 05 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-05 12:50:53 +01:00
vanhofen
1f9ff72365 locale: typo; we shouldn't open Manu XD
Origin commit data
------------------
Branch: ni/coolstream
Commit: ca53cbeb53
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-05 (Mon, 05 Dec 2016)

Origin message was:
------------------
- locale: typo; we shouldn't open Manu XD

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

------------------
This commit was generated by Migit
2016-12-05 12:46:01 +01:00
vanhofen
8e4b9462f2 locale: more movieplayer additional help text
Origin commit data
------------------
Branch: ni/coolstream
Commit: 69e34a3020
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-05 (Mon, 05 Dec 2016)

Origin message was:
------------------
- locale: more movieplayer additional help text

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

------------------
This commit was generated by Migit
2016-12-05 12:46:01 +01:00
vanhofen
d81874eb61 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 87da827b30
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-05 (Mon, 05 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-05 00:52:33 +01:00
vanhofen
40eb7f2667 movieplayer: rework help; use rc_help to show help
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ad794e004
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-05 (Mon, 05 Dec 2016)

Origin message was:
------------------
- movieplayer: rework help; use rc_help to show help

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

------------------
This commit was generated by Migit
2016-12-05 00:50:39 +01:00
vanhofen
6494a1278f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e22dcefea
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-04 22:48:16 +01:00
vanhofen
92008d0b7c moviebrowser: rework help ...
* remove from menu; this breakes menu's logic (rc_help is to switch hints)
* use rc_help to show help window
* rework content


Origin commit data
------------------
Branch: ni/coolstream
Commit: 21ed22cb6e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)

Origin message was:
------------------
- moviebrowser: rework help ...

* remove from menu; this breakes menu's logic (rc_help is to switch hints)
* use rc_help to show help window
* rework content


------------------
This commit was generated by Migit
2016-12-04 22:44:44 +01:00
vanhofen
510bce444c themes: make Material Gray (dark) theme a bit darker
Origin commit data
------------------
Branch: ni/coolstream
Commit: bab36f5c6b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)

Origin message was:
------------------
- themes: make Material Gray (dark) theme a bit darker

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

------------------
This commit was generated by Migit
2016-12-04 00:41:17 +01:00
vanhofen
3db60ff17f themes: add Material Gray (Medium) theme
Origin commit data
------------------
Branch: ni/coolstream
Commit: 236e6541f2
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)

Origin message was:
------------------
- themes: add Material Gray (Medium) theme

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

------------------
This commit was generated by Migit
2016-12-04 00:40:15 +01:00
vanhofen
e30d9b012a Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 87fe81b890
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-02 (Fri, 02 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-02 23:39:21 +01:00
vanhofen
243909caf8 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: ad1e3beb3d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-02 (Fri, 02 Dec 2016)



------------------
This commit was generated by Migit
2016-12-02 22:00:25 +01:00
Thilo Graf
4f2116df43 Messages: add localized osd timeout option for interactive/static messages
TODO: add locales for hints


Origin commit data
------------------
Branch: ni/coolstream
Commit: d6ecaf855b
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-02 (Fri, 02 Dec 2016)



------------------
This commit was generated by Migit
2016-12-02 21:32:15 +01:00
vanhofen
0b8c62cd41 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: a19fc5532b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-22 (Tue, 22 Nov 2016)



------------------
This commit was generated by Migit
2016-11-22 23:45:32 +01:00
vanhofen
3ace1a4c12 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Conflicts:
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8bcaeb980d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-22 (Tue, 22 Nov 2016)



------------------
This commit was generated by Migit
2016-11-22 23:44:23 +01:00
Michael Liebmann
99b59f1641 Add missing locale
- Supplement to commit 083df328e1
 and ea9be5f37c


Origin commit data
------------------
Branch: ni/coolstream
Commit: ab11919298
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-11-22 (Tue, 22 Nov 2016)

Origin message was:
------------------
Add missing locale

 - Supplement to commit 083df328e1
  and ea9be5f37c


------------------
This commit was generated by Migit
2016-11-22 19:19:30 +01:00
Michael Liebmann
f51b6c1076 Sort locale
Origin commit data
------------------
Branch: ni/coolstream
Commit: b8e314695b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-11-22 (Tue, 22 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-22 19:19:30 +01:00
vanhofen
6b0e887585 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	data/locale/slovak.locale
	data/locale/unmaintained/czech.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/start_wizard.cpp
	src/gui/widget/msgbox.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fce378f8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)



------------------
This commit was generated by Migit
2016-11-21 12:46:49 +01:00
vanhofen
f57041a98b locale: adapt last changes to our locales
Origin commit data
------------------
Branch: ni/coolstream
Commit: 72cd1d51a7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)

Origin message was:
------------------
- locale: adapt last changes to our locales

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

------------------
This commit was generated by Migit
2016-11-21 11:52:30 +01:00
vanhofen
58b51d591e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale


Origin commit data
------------------
Branch: ni/coolstream
Commit: fb596af13d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)



------------------
This commit was generated by Migit
2016-11-21 10:11:08 +01:00
vanhofen
8758c55f75 locale: use german "usw." instead of "etc."
Origin commit data
------------------
Branch: ni/coolstream
Commit: fbb6e4c15f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)

Origin message was:
------------------
- locale: use german "usw." instead of "etc."

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

------------------
This commit was generated by Migit
2016-11-21 09:16:27 +01:00
vanhofen
8a0ae7e26e locale: fix "/" usage
Origin commit data
------------------
Branch: ni/coolstream
Commit: 47a62dd719
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)

Origin message was:
------------------
- locale: fix "/" usage

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

------------------
This commit was generated by Migit
2016-11-21 08:53:26 +01:00
vanhofen
04ead2aa7a locale: remove "CST" strings
Origin commit data
------------------
Branch: ni/coolstream
Commit: d240c625f9
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)

Origin message was:
------------------
- locale: remove "CST" strings

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

------------------
This commit was generated by Migit
2016-11-21 08:40:06 +01:00
vanhofen
9b2b94e830 locale: right case for LEDs
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a39da118d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)

Origin message was:
------------------
- locale: right case for LEDs

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

------------------
This commit was generated by Migit
2016-11-21 08:36:17 +01:00
vanhofen
6cccdfc274 locale: fix usage of ampersand; it's not an "and"-replacement
Origin commit data
------------------
Branch: ni/coolstream
Commit: ed55511778
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)

Origin message was:
------------------
- locale: fix usage of ampersand; it's not an "and"-replacement

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

------------------
This commit was generated by Migit
2016-11-21 08:19:26 +01:00
vanhofen
fc79635fd4 locale: fix usage of ellipses
Origin commit data
------------------
Branch: ni/coolstream
Commit: e836943a4a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)

Origin message was:
------------------
- locale: fix usage of ellipses

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

------------------
This commit was generated by Migit
2016-11-21 07:59:22 +01:00
vanhofen
4af96e1b6d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: d065c1f394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-21 00:14:20 +01:00
TangoCash
083df328e1 add option to read saved epg data frequently
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6cd5dd8e23
Author: TangoCash <eric@loxat.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-20 19:24:08 +01:00
vanhofen
209ca4b776 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3caf9e47c1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)



------------------
This commit was generated by Migit
2016-11-20 18:36:35 +01:00
Thilo Graf
c3ffba3c24 Messages: add option to change size of message text
Include default size and localized setup.

TODO: localize for nederlands and slovak, current english only.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4988df1dd9
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)



------------------
This commit was generated by Migit
2016-11-20 01:08:14 +01:00