Commit Graph

1156 Commits

Author SHA1 Message Date
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
TangoCash
c1bb877834 add unicable2/jess (thx DboxOldie)
Origin commit data
------------------
Commit: f974b56343
Author: TangoCash <eric@loxat.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
2017-03-15 19:51:20 +01:00
vanhofen
e7b2595929 locale: re-add some minor elipses fixes
Origin commit data
------------------
Commit: 530601cd5f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)

Origin message was:
------------------
- locale: re-add some minor elipses fixes
2017-03-15 11:33:54 +01:00
vanhofen
94ec16fa5e pictures: re-add familiar shutdown picture
Origin commit data
------------------
Commit: 4a30321468
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)

Origin message was:
------------------
- pictures: re-add familiar shutdown picture
2017-03-15 09:47:07 +01:00
vanhofen
38b3d6c33f icons: re-add some familiar icons
Origin commit data
------------------
Commit: 696f5ae5f6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)

Origin message was:
------------------
- icons: re-add some familiar icons
2017-03-15 09:47:07 +01:00
max_10
4de1d7dfd6 unicable jess added (thx DboxOldie)
Origin commit data
------------------
Commit: dc9232b7e9
Author: max_10 <max_10@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
2017-03-15 09:47:07 +01:00
Andrej Tobola
1bce68ca08 Update slovak.locale
Origin commit data
------------------
Commit: 9cefe16d4b
Author: Andrej Tobola <andrej.tobola+gifthub@gmail.com>
Date: 2017-03-15 (Wed, 15 Mar 2017)
2017-03-15 09:32:43 +01:00
Michael Liebmann
f9abc1c985 Revert "- allow to force given osd resolution in "videosystem = auto" mode"
This reverts commit b9472250c3.


Origin commit data
------------------
Commit: 5ce34d5cf9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-12 (Sun, 12 Mar 2017)
2017-03-12 06:32:52 +01:00
vanhofen
b9472250c3 allow to force given osd resolution in "videosystem = auto" mode
Origin commit data
------------------
Commit: 6fc24e990b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
- allow to force given osd resolution in "videosystem = auto" mode
2017-03-06 23:50:15 +01:00
Stefan Seyfried
b93f4e419a Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Commit: abec1c311b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)
2017-03-04 19:32:30 +01:00
Michael Liebmann
3a8adb94f0 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: 6c3b5dcd93
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-02 (Thu, 02 Mar 2017)
2017-03-02 23:38:19 +01:00
vanhofen
66b44f2a0f flashtool: localize getType() function
Origin commit data
------------------
Commit: 950f74dd41
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)

Origin message was:
------------------
- flashtool: localize getType() function
2017-03-01 18:16:09 +01:00
vanhofen
8e36032281 yWeb: unify rec/zap timer handling; avoid german umlaut in js-popup
Origin commit data
------------------
Commit: 5edc857122
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)

Origin message was:
------------------
- yWeb: unify rec/zap timer handling; avoid german umlaut in js-popup
2017-03-01 11:51:25 +01:00
Michael Liebmann
0c20bf9af6 neutrino: Add switch osd resolution when supported from hardware
- At the moment supported hardware: CS HD2

 Currently known problems:
 -------------------------
 - Display menus after changing resolution (Reboot required)
 - Display headers after changing resolution hd => fullhd (Reboot required)
 - Display infobar after changing resolution hd => fullhd (Reboot required)
 - Screenshot broken (With new driver and set resolution to 1280x720)


Origin commit data
------------------
Commit: 7b158903f8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-13 (Mon, 13 Feb 2017)

Origin message was:
------------------
neutrino: Add switch osd resolution when supported from hardware

 - At the moment supported hardware: CS HD2

 Currently known problems:
 -------------------------
 - Display menus after changing resolution (Reboot required)
 - Display headers after changing resolution hd => fullhd (Reboot required)
 - Display infobar after changing resolution hd => fullhd (Reboot required)
 - Screenshot broken (With new driver and set resolution to 1280x720)
2017-02-13 12:51:14 +01:00
Stefan Seyfried
c4cc5e62bb Merge remote-tracking branch 'tuxbox/pu/fb-modules'
only compile tested ;-)


Origin commit data
------------------
Commit: 2819e651c3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
2017-02-12 21:29:10 +01:00
Michael Liebmann
61ccbe74d9 configure: Rename hardware defined macros for coolstream stb
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 configure parameter: --with-boxmodel=hd1
 --with-boxmodel=nevis is deprecated, but still valid

 BOXMODEL_APOLLO => BOXMODEL_CS_HD2
 configure parameter: --with-boxmodel=hd2
 --with-boxmodel=apollo is deprecated, but still valid


Origin commit data
------------------
Commit: bb2a848ae1
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
configure: Rename hardware defined macros for coolstream stb

 BOXMODEL_NEVIS => BOXMODEL_CS_HD1
  configure parameter: --with-boxmodel=hd1
  --with-boxmodel=nevis is deprecated, but still valid

 BOXMODEL_APOLLO => BOXMODEL_CS_HD2
  configure parameter: --with-boxmodel=hd2
  --with-boxmodel=apollo is deprecated, but still valid
2017-02-12 09:21:04 +01:00