Commit Graph

1499 Commits

Author SHA1 Message Date
vanhofen
bee773c61a 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/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4e868c860a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-16 (Sat, 16 Sep 2017)



------------------
This commit was generated by Migit
2017-09-16 13:01:20 +02:00
Jacek Jendrzej
af4f69402f remove unused locale
Origin commit data
------------------
Branch: ni/coolstream
Commit: be671bcdc9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-16 (Sat, 16 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-16 12:53:03 +02:00
Jacek Jendrzej
06ce66bbd8 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: e3998c1ced
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-15 (Fri, 15 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-15 20:44:49 +02:00
vanhofen
7fda7b7b5a icons: rename slider icons to more logical names
Origin commit data
------------------
Branch: ni/coolstream
Commit: cd539af1f7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- icons: rename slider icons to more logical names

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

------------------
This commit was generated by Migit
2017-09-15 20:18:26 +02:00
vanhofen
19e717043e icons: new slider icons with material colors
Origin commit data
------------------
Branch: ni/coolstream
Commit: eb22f29d3d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- icons: new slider icons with material colors

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

------------------
This commit was generated by Migit
2017-09-15 20:17:07 +02:00
vanhofen
db665c0704 keychooser: strip unneeded code; use hintbox instead of handcrafted paints
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5370086103
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)

Origin message was:
------------------
- keychooser: strip unneeded code; use hintbox instead of handcrafted paints

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

------------------
This commit was generated by Migit
2017-09-15 16:34:23 +02:00
vanhofen
62784fee02 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: b4701fdcb5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-15 12:53:19 +02:00
vanhofen
70872b11ac keychooser: strip unneeded code; use hintbox instead of handcrafted paints
Origin commit data
------------------
Branch: ni/coolstream
Commit: 04c1cbe15e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)

Origin message was:
------------------
- keychooser: strip unneeded code; use hintbox instead of handcrafted paints

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

------------------
This commit was generated by Migit
2017-09-15 12:41:06 +02:00
vanhofen
673f1580ec Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: b72cda244d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-14 22:02:00 +02:00
vanhofen
e54707c21c icons: rename slider icons to more logical names
Origin commit data
------------------
Branch: ni/coolstream
Commit: b00caf1c31
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- icons: rename slider icons to more logical names

------------------
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
30dc46a245 icons: new slider icons with material colors
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b09d125fc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- icons: new slider icons with material colors

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

------------------
This commit was generated by Migit
2017-09-14 21:37:44 +02:00
Jacek Jendrzej
e250ac7837 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2ebb47f519
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-14 (Thu, 14 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-14 13:54:04 +02:00
vanhofen
d86625c8b2 get sure we have the logo-dir, even if it's empty
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- get sure we have the logo-dir, even if it's empty

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


------------------
This commit was generated by Migit
2017-09-14 12:14:41 +02:00
vanhofen
dfab273050 locale: small changes; unify save/load locales
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- locale: small changes; unify save/load locales

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


------------------
This commit was generated by Migit
2017-09-14 12:14:41 +02:00
vanhofen
ebfd3462ef yWeb: align cifs-mounts to new automount-syntax
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4097d07942
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- yWeb: align cifs-mounts to new automount-syntax

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


------------------
This commit was generated by Migit
2017-09-14 12:14:41 +02:00
vanhofen
a03ad78142 y-web: show hostname as page-title
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- y-web: show hostname as page-title

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


------------------
This commit was generated by Migit
2017-09-14 12:14:41 +02:00
vanhofen
f5ce8f5842 y-web: remove white background from favicon
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- y-web: remove white background from favicon

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


------------------
This commit was generated by Migit
2017-09-14 12:14:41 +02:00
vanhofen
0a58d1e685 locale: small changes in update locales
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- locale: small changes in update locales

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


------------------
This commit was generated by Migit
2017-09-14 12:14:41 +02:00
Jacek Jendrzej
8333edc0fb Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 98a31ea821
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-13 15:53:42 +02:00
vanhofen
fec79fd522 rework multimedia-menu code; cleanup from many unused code
Origin commit data
------------------
Branch: ni/coolstream
Commit: d23323758c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- rework multimedia-menu code; cleanup from many unused code

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

------------------
This commit was generated by Migit
2017-09-13 15:52:19 +02:00
vanhofen
5de0c243cc Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a0f93d9281
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-13 15:07:03 +02:00
vanhofen
46e5e5e202 rework multimedia-menu code; cleanup from many unused code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 56cdb2dd6c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- rework multimedia-menu code; cleanup from many unused code

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

------------------
This commit was generated by Migit
2017-09-13 14:46:38 +02:00
Jacek Jendrzej
bea20473aa Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c5bf73006
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-13 13:40:40 +02:00
vanhofen
73b2025641 remove unused nkplay stuff
Origin commit data
------------------
Branch: ni/coolstream
Commit: 932a535b6a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- remove unused nkplay stuff

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

------------------
This commit was generated by Migit
2017-09-13 13:35:23 +02:00
vanhofen
9b9e405f04 drop easymenu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 816de89898
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop easymenu

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

------------------
This commit was generated by Migit
2017-09-13 13:35:23 +02:00
vanhofen
fadeac1d43 remove unused nkplay stuff
Origin commit data
------------------
Branch: ni/coolstream
Commit: 93c8768fbf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- remove unused nkplay stuff

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

------------------
This commit was generated by Migit
2017-09-13 13:09:34 +02:00
vanhofen
b6b296939a Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/neutrino_menue.cpp


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



------------------
This commit was generated by Migit
2017-09-13 12:52:23 +02:00
vanhofen
aa1cd4ace0 locale: minor changes; fix typo
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3742ca7dfd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- locale: minor changes; fix typo

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

------------------
This commit was generated by Migit
2017-09-13 10:45:23 +02:00
vanhofen
2097d7e876 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 163a6004fa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)



------------------
This commit was generated by Migit
2017-09-13 08:36:25 +02:00
vanhofen
274dbc2d1e drop easymenu
Origin commit data
------------------
Branch: ni/coolstream
Commit: b502ed31b9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop easymenu

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

------------------
This commit was generated by Migit
2017-09-12 23:46:22 +02:00
vanhofen
e6d2ba00b3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9e6dc9fbce
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)



------------------
This commit was generated by Migit
2017-09-12 22:32:07 +02:00
vanhofen
f8e1da4418 network-setup: small changes in locales; move npt-at-boot item up
Origin commit data
------------------
Branch: ni/coolstream
Commit: 92a8ee74f9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- network-setup: small changes in locales; move npt-at-boot item up

------------------
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
208270eed9 drop ni-menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7379101512
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop ni-menu

------------------
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
552bb58dbd move netfs-mounts from ni-menu to network-setup
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6c20bc42f8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- move netfs-mounts from ni-menu to network-setup

------------------
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
c5f7500f27 move some more stuff from ni-menu to service-menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: b600bcefa7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- move some more stuff from ni-menu to service-menu

------------------
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
fc30d473e8 miscsettings_menu: add new submenu for plugins
Origin commit data
------------------
Branch: ni/coolstream
Commit: 732172aeb7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- miscsettings_menu: add new submenu for plugins

------------------
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
c69e624170 move infoicons-setup from ni-menu to miscsettings-menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 91d2193126
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- move infoicons-setup from ni-menu to miscsettings-menu

------------------
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
f657208a1d move daemon-control to own sources; now placed in service-menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0ab71dc962
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- move daemon-control to own sources; now placed in service-menu

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

------------------
This commit was generated by Migit
2017-09-12 22:30:34 +02:00
vanhofen
3aabfdbc58 small adds
Origin commit data
------------------
Branch: ni/coolstream
Commit: 547ad8a491
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)

Origin message was:
------------------
- small adds

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

------------------
This commit was generated by Migit
2017-09-09 15:33:46 +02:00
vanhofen
2e5f07ec99 settings_manager_teams: small reworks; unify locales
* cleanup from unused code
* remove RC_help hotkey from menu (this hotkey breaks global hint-switch)
* fix text alignment in help-box


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

Origin message was:
------------------
- settings_manager_teams: small reworks; unify locales

* cleanup from unused code
* remove RC_help hotkey from menu (this hotkey breaks global hint-switch)
* fix text alignment in help-box


------------------
This commit was generated by Migit
2017-09-09 11:03:52 +02:00
vanhofen
88d02d6b60 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4bc4a80094
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-09 08:44:18 +02:00
vanhofen
497db8797b icons: remove leftovers from our old iconsets
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6c558fd4fb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-08 (Fri, 08 Sep 2017)

Origin message was:
------------------
- icons: remove leftovers from our old iconsets

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

------------------
This commit was generated by Migit
2017-09-08 21:10:26 +02:00
vanhofen
022ceb42c9 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/plugins.cpp
	src/gui/plugins.h


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



------------------
This commit was generated by Migit
2017-09-08 12:24:32 +02:00
vanhofen
5bbf27250d get sure we have the logo-dir, even if it's empty
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a3bdd47c7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-08 (Fri, 08 Sep 2017)

Origin message was:
------------------
- get sure we have the logo-dir, even if it's empty

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

------------------
This commit was generated by Migit
2017-09-08 10:53:03 +02:00
vanhofen
c5d81a62c4 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/Makefile.am


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



------------------
This commit was generated by Migit
2017-09-07 16:41:06 +02:00
vanhofen
747566f187 locale: small changes; unify save/load locales
Origin commit data
------------------
Branch: ni/coolstream
Commit: c76b874c70
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)

Origin message was:
------------------
- locale: small changes; unify save/load locales

------------------
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
c412759bf6 yWeb: align cifs-mounts to new automount-syntax
Origin commit data
------------------
Branch: ni/coolstream
Commit: fbb92e23c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- yWeb: align cifs-mounts to new automount-syntax

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

------------------
This commit was generated by Migit
2017-09-05 16:53:34 +02:00
vanhofen
c081e3c1ef icons: fix color of new icon info4_off.png
Origin commit data
------------------
Branch: ni/coolstream
Commit: 43587b1008
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-04 (Mon, 04 Sep 2017)

Origin message was:
------------------
- icons: fix color of new icon info4_off.png

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

------------------
This commit was generated by Migit
2017-09-04 23:23:38 +02:00
vanhofen
660c17ad44 add possibility to signalize available online-updates in infoicons
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3294d9f74d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-04 (Mon, 04 Sep 2017)

Origin message was:
------------------
- add possibility to signalize available online-updates in infoicons

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

------------------
This commit was generated by Migit
2017-09-04 17:17:27 +02:00
vanhofen
d044ada2b2 Makefile.am edited online with Bitbucket
Origin commit data
------------------
Branch: ni/coolstream
Commit: 631efffab8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-01 (Fri, 01 Sep 2017)



------------------
This commit was generated by Migit
2017-09-01 17:42:24 +00:00