Commit Graph

1171 Commits

Author SHA1 Message Date
Jacek Jendrzej
ebb4b89d93 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: ea89db1ec2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-16 (Sat, 16 Sep 2017)
2017-09-16 13:26:53 +02:00
Jacek Jendrzej
6a908d7228 remove unused locale
Origin commit data
------------------
Commit: be671bcdc9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-16 (Sat, 16 Sep 2017)
2017-09-16 12:53:03 +02:00
Jacek Jendrzej
678fa9560f Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: e3998c1ced
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-15 (Fri, 15 Sep 2017)
2017-09-15 20:44:49 +02:00
vanhofen
c846cceba5 icons: rename slider icons to more logical names
Origin commit data
------------------
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
2017-09-15 20:18:26 +02:00
vanhofen
1af6786518 icons: new slider icons with material colors
Origin commit data
------------------
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
2017-09-15 20:17:07 +02:00
vanhofen
b6d05461a8 keychooser: strip unneeded code; use hintbox instead of handcrafted paints
Origin commit data
------------------
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
2017-09-15 16:34:23 +02:00
Jacek Jendrzej
805ed42dc4 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 2ebb47f519
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-14 (Thu, 14 Sep 2017)
2017-09-14 13:54:04 +02:00
vanhofen
e66aaeca77 get sure we have the logo-dir, even if it's empty
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
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>
2017-09-14 12:14:41 +02:00
vanhofen
9299fe4fb7 locale: small changes; unify save/load locales
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
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>
2017-09-14 12:14:41 +02:00
vanhofen
23713174bc yWeb: align cifs-mounts to new automount-syntax
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
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>
2017-09-14 12:14:41 +02:00
vanhofen
7c822ed2ca y-web: show hostname as page-title
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
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>
2017-09-14 12:14:41 +02:00
vanhofen
481d3d7017 y-web: remove white background from favicon
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
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>
2017-09-14 12:14:41 +02:00
vanhofen
dd2db83543 locale: small changes in update locales
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
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>
2017-09-14 12:14:41 +02:00
Jacek Jendrzej
ecf78ec322 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 98a31ea821
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)
2017-09-13 15:53:42 +02:00
vanhofen
ea1be5ae2a rework multimedia-menu code; cleanup from many unused code
Origin commit data
------------------
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
2017-09-13 15:52:19 +02:00
Jacek Jendrzej
c44f82f12a Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 2c5bf73006
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)
2017-09-13 13:40:40 +02:00
vanhofen
6310efb007 remove unused nkplay stuff
Origin commit data
------------------
Commit: 932a535b6a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- remove unused nkplay stuff
2017-09-13 13:35:23 +02:00
vanhofen
9db42a7d2b drop easymenu
Origin commit data
------------------
Commit: 816de89898
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop easymenu
2017-09-13 13:35:23 +02:00
Jacek Jendrzej
b01bf9414d Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 1763bb9e64
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-08 (Tue, 08 Aug 2017)
2017-08-08 20:06:40 +02:00
Thilo Graf
22fdfc0484 english.locale: corrections in channellist locales
Consideration of rules for capitalization of headings, titles and labels.


Origin commit data
------------------
Commit: 57e410c052
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-07 (Mon, 07 Aug 2017)
2017-08-08 14:25:12 +02:00
Thilo Graf
22ed88a072 Colorsettings: add possibility to change shadow color
Shadow color was bound to infobar color and it's not really
understandable why, because with some colors eg. black, the shadow is
grey or with other colors it is exaggerated colored and seems to be
not realistically and looks unusual if shadow is brighter or colorful
than foreground. Some themes will thank it.

TODO: update theme files with matching values if required


Origin commit data
------------------
Commit: c600b4c416
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-02 (Wed, 02 Aug 2017)
2017-08-08 14:25:12 +02:00
Jacek Jendrzej
da7d2ce50f Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 2ddad19873
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-21 (Wed, 21 Jun 2017)
2017-06-21 13:54:49 +02:00
vanhofen
8d10fdd53b moviebrowser: clearify deletion-locale; add movie-title to menu
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 37f9306862
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-21 (Wed, 21 Jun 2017)

Origin message was:
------------------
- moviebrowser: clearify deletion-locale; add movie-title to menu

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-21 10:31:22 +02:00
Jacek Jendrzej
7cf343f927 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: d612fbc05f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-18 (Sun, 18 Jun 2017)
2017-06-18 12:21:18 +02:00
vanhofen
e6bcd7ab14 audioplayer: small design reworks ...
* use OFFSET defines
* use CComponentsScrollbar
* rename some variables
* many, many position calculation fixes
* re-format code

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


Origin commit data
------------------
Commit: 4c21971b4a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)

Origin message was:
------------------
- audioplayer: small design reworks ...

* use OFFSET defines
* use CComponentsScrollbar
* rename some variables
* many, many position calculation fixes
* re-format code

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-18 00:04:40 +02:00
Jacek Jendrzej
9159d45c90 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 4c3002cb26
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-15 (Thu, 15 Jun 2017)
2017-06-15 12:32:31 +02:00
vanhofen
88dcf0ea99 locale: minor changes in audioplayer's and pictureviewer's locales
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: ddb027a006
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- locale: minor changes in audioplayer's and pictureviewer's locales

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-15 01:01:55 +02:00
Thilo Graf
e56217190d icon: add missing pictureviewer icon
Origin commit data
------------------
Commit: d78e132ba2
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
2017-06-15 01:01:55 +02:00
vanhofen
93b1e05e4a vfd-setup: fix brightness setup for CST's boxmodel "Link" ...
and hide the brightness menu for all "Trinity" models. There's no display.

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


Origin commit data
------------------
Commit: 4295839526
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- vfd-setup: fix brightness setup for CST's boxmodel "Link" ...

and hide the brightness menu for all "Trinity" models. There's no display.

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-15 01:01:55 +02:00
Jacek Jendrzej
4643ac3f51 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: ca83324763
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)
2017-06-07 16:20:47 +02:00
Michael Liebmann
9767657185 Merge branch 'pu/fb-setmode'
Origin commit data
------------------
Commit: 624f2b3154
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)
2017-06-07 14:18:01 +02:00
vanhofen
0158eabeef icons: move mp3.png from /headers to /filetypes; align icon size
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: a43617dda3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)

Origin message was:
------------------
- icons: move mp3.png from /headers to /filetypes; align icon size

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-07 14:17:12 +02:00
vanhofen
4f55c561d7 icons: add filetype-icon for pictures
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: d8f364ca46
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)

Origin message was:
------------------
- icons: add filetype-icon for pictures

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-07 14:17:11 +02:00
vanhofen
0e082688e7 locale: small changes in filebrowser's sort locales
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 49bd2e9ba7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)

Origin message was:
------------------
- locale: small changes in filebrowser's sort locales

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-07 14:17:11 +02:00
Jacek Jendrzej
4cfcd65da4 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 05e8d727bd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-28 (Sun, 28 May 2017)
2017-05-28 22:30:05 +02:00
Thilo Graf
2de45c33b6 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: c0cc7ef192
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-21 (Sun, 21 May 2017)
2017-05-21 18:09:22 +02:00
vanhofen
3f417116a5 cables.xml: update Antennengemeinschaft "Goeltzschtalbruecke"
Origin commit data
------------------
Commit: b7ef6e47fe
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-17 (Wed, 17 May 2017)

Origin message was:
------------------
- cables.xml: update Antennengemeinschaft "Goeltzschtalbruecke"
2017-05-17 17:23:22 +02:00
Jacek Jendrzej
e6f3ee9c94 Merge branch 'master' into pu/mp
except 3e0a8d3ff0 2d4130dab8


Origin commit data
------------------
Commit: fb23ac0126
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-10 (Wed, 10 May 2017)
2017-05-10 15:37:31 +02:00
Thilo Graf
ccdf4ef3da Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: 60fed9cc02
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-10 (Wed, 10 May 2017)
2017-05-10 10:45:28 +02:00
vanhofen
7db4f0e954 locale: minor changes in EPG-Plus locales
Origin commit data
------------------
Commit: 468fbcd79c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-09 (Tue, 09 May 2017)

Origin message was:
------------------
- locale: minor changes in EPG-Plus locales
2017-05-09 11:40:32 +02:00
vanhofen
692b8dd7f5 Merge branch 'master' into pu/mp
Conflicts:
	src/gui/epgplus.cpp


Origin commit data
------------------
Commit: 064f693bf7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)
2017-04-08 14:36:12 +02:00
Michael Liebmann
4421bc1b5e Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: f0ae55707a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-04-08 (Sat, 08 Apr 2017)
2017-04-08 14:17:34 +02:00
vanhofen
1da8713577 osd_setup: add new epgplus font
Origin commit data
------------------
Commit: 7b7430969a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)

Origin message was:
------------------
- osd_setup: add new epgplus font
2017-04-08 14:11:28 +02:00
vanhofen
67a53b9d53 locale: minor changes
Origin commit data
------------------
Commit: 923daa87da
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-29 (Wed, 29 Mar 2017)

Origin message was:
------------------
- locale: minor changes
2017-03-29 08:11:36 +02:00
Michael Liebmann
7d49a497b5 CStreamInfo2: Add new info items
- Videosystem
 - OSD Resolution


Origin commit data
------------------
Commit: f7cea75f37
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-28 (Tue, 28 Mar 2017)
2017-03-28 23:56:57 +02:00
vanhofen
34db9183e5 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 7dfd4184ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-27 (Mon, 27 Mar 2017)
2017-03-27 18:15:27 +02:00
Michael Liebmann
dee1c05e9c Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: d9ce33a69a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-23 (Thu, 23 Mar 2017)
2017-03-23 18:58:48 +01:00
vanhofen
e7eb5ee437 cables.xml: update WTC SN; thanks to Gorcon
Origin commit data
------------------
Commit: 608c092685
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-23 (Thu, 23 Mar 2017)

Origin message was:
------------------
- cables.xml: update WTC SN; thanks to Gorcon
2017-03-23 12:23:56 +01:00
TangoCash
317bac3394 Merge branch 'pu/mp' of github.com:tuxbox-neutrino/gui-neutrino into pu/mp
Conflicts:
	src/gui/scan_setup.cpp
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Commit: 81fb3b42fa
Author: TangoCash <eric@loxat.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
2017-03-15 22:47:42 +01:00
Michael Liebmann
b02e3e871e Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: b190e0c4ff
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-15 (Wed, 15 Mar 2017)
2017-03-15 21:19:08 +01:00