Commit Graph

862 Commits

Author SHA1 Message Date
vanhofen
89ecafc611 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 49b9be599b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)
2017-02-13 23:16:26 +01:00
vanhofen
89d74444cf set new osd-presets closer to old values; auto-calc screenEnd-values
Origin commit data
------------------
Commit: 145c0d41b4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)

Origin message was:
------------------
- set new osd-presets closer to old values; auto-calc screenEnd-values
2017-02-13 22:50:48 +01:00
vanhofen
913fcbeb07 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 5506a6c290
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)
2017-02-13 21:41:11 +01:00
vanhofen
8704cb914a Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/osd_setup.cpp
	src/neutrino.cpp
	src/neutrino.h
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: ba8bdde8c8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)
2017-02-13 21:41:04 +01:00
vanhofen
66861f155d fix keywords in strange try-to-detect-bad-config-file if-statement
Origin commit data
------------------
Commit: 6964b62c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)

Origin message was:
------------------
- fix keywords in strange try-to-detect-bad-config-file if-statement
2017-02-13 21:34:01 +01:00
vanhofen
789fdb6d86 migrate users settings; screen_StartX_crt/lcd -> screen_StartX_crt/lcd_0
Origin commit data
------------------
Commit: 9792b47666
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)

Origin message was:
------------------
- migrate users settings; screen_StartX_crt/lcd -> screen_StartX_crt/lcd_0
2017-02-13 21:21:11 +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
Michael Liebmann
c9958d4e6b CFbAccelCSHD2::setMode: Update for new framebuffer driver (full hd)
Origin commit data
------------------
Commit: 33125aed06
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-13 (Mon, 13 Feb 2017)
2017-02-13 12:51:14 +01:00
vanhofen
999b2cf2ce Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: af8c4b8d97
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
2017-02-12 23:01:15 +01:00
Stefan Seyfried
948f29ed4d neutrino: move start of standby epgscan forward
this avoids that cpufreq is set to standby value before epgscan is
started, resulting in poor performance


Origin commit data
------------------
Commit: 7384e2155e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
2017-02-12 22:57:52 +01:00
vanhofen
e97d93f824 NI-code: Rename hardware defined macros for coolstream stb
Origin commit data
------------------
Commit: f02c3dc1db
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
- NI-code: Rename hardware defined macros for coolstream stb
2017-02-12 21:57:06 +01:00
vanhofen
5df8b0409e 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
------------------
Commit: 5db35f49c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
2017-02-12 21:54:48 +01:00
Michael Liebmann
3b018febe6 Merge branch 'master' into pu/fb-modules
Origin commit data
------------------
Commit: 0cb26e6e98
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)
2017-02-12 09:24:08 +01:00
Michael Liebmann
7e9107c8a8 neutrino: Rename hardware defined macros for coolstream stb
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2


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

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

 BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2
2017-02-12 09:21:04 +01:00
vanhofen
bc099cfd08 neutrino: fix build
Origin commit data
------------------
Commit: eef7c4c867
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)

Origin message was:
------------------
- neutrino: fix build
2017-02-09 20:58:44 +01:00
vanhofen
4d15c4d61b Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp
	src/system/settings.h


Origin commit data
------------------
Commit: 25f1346ad7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 20:22:37 +01:00
vanhofen
e994f66c6f avoid configuration mismatch in screen settings
Origin commit data
------------------
Commit: ad8e6180aa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-13 (Fri, 13 Jan 2017)

Origin message was:
------------------
- avoid configuration mismatch in screen settings
2017-02-09 18:13:19 +01:00
vanhofen
252208b058 remove screen_width/height from neutrino.conf; ...
it's just for internal usage


Origin commit data
------------------
Commit: abb76c2efb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-12 (Thu, 12 Jan 2017)

Origin message was:
------------------
- remove screen_width/height from neutrino.conf; ...

it's just for internal usage
2017-02-09 18:13:19 +01:00
vanhofen
54af49f2d0 rename screen_x/yres to font_scaling_x/y
Origin commit data
------------------
Commit: aeec37af89
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-12 (Thu, 12 Jan 2017)

Origin message was:
------------------
- rename screen_x/yres to font_scaling_x/y
2017-02-09 18:13:19 +01:00
vanhofen
49762424a6 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 221e4b5c04
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 08:35:14 +01:00
GetAway
21345ecf59 make the webtv directory configurable
Origin commit data
------------------
Commit: a62d5b7c8e
Author: GetAway <get-away@t-online.de>
Date: 2017-02-07 (Tue, 07 Feb 2017)
2017-02-09 08:22:43 +01:00
Michael Liebmann
a4326eaf79 Remove obsolete 'contrast_fonts' code from osd menu
Origin commit data
------------------
Commit: 6803a8dff3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-24 (Tue, 24 Jan 2017)
2017-01-31 16:36:40 +01:00
vanhofen
07d4f472a6 neutrino: move infoicons start to infoclock start; again ...
Origin commit data
------------------
Commit: 0ed26def10
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)

Origin message was:
------------------
- neutrino: move infoicons start to infoclock start; again ...
2017-01-30 16:48:28 +01:00
vanhofen
e28f6df00a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/components/cc_detailsline.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: 609d466302
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)
2017-01-30 16:32:43 +01:00
Michael Liebmann
8300ae9620 CMoviePlayerGui: Bind enable/disable FileTime to enableInfoClock()
Origin commit data
------------------
Commit: dc4ce280ed
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-30 (Mon, 30 Jan 2017)
2017-01-30 07:15:46 +01:00
vanhofen
ae640b35c1 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 4ace56d488
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)
2017-01-29 21:30:01 +01:00
GetAway
511a31dffc neutrino: fix umount of netfs-drives in ExitRun() function
Origin commit data
------------------
Commit: 17b8e684e0
Author: GetAway <get-away@t-online.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)

Origin message was:
------------------
- neutrino: fix umount of netfs-drives in ExitRun() function
2017-01-29 21:27:45 +01:00
vanhofen
7fa810e183 Merge branch 'pu/font' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/screensaver.cpp


Origin commit data
------------------
Commit: 47d0b6efb5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-25 (Wed, 25 Jan 2017)
2017-01-25 21:02:22 +01:00
Michael Liebmann
5d96f62893 Remove obsolete 'contrast_fonts' code from osd menu
Origin commit data
------------------
Commit: c741d46b63
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-24 (Tue, 24 Jan 2017)
2017-01-25 16:33:45 +01:00
vanhofen
edb884e756 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: eee55893c6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-05 (Thu, 05 Jan 2017)
2017-01-05 23:07:16 +01:00
Thilo Graf
5afde73788 CNeutrinoApp: try to fix display intro settings message
Message was not really visible on startup. Contents of InitZapper()
seems to have prevented this.


Origin commit data
------------------
Commit: 5014a272e5
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-05 (Thu, 05 Jan 2017)
2017-01-05 22:19:05 +01:00
vanhofen
62772c2c5d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/streaminfo2.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: cc07333926
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-30 (Fri, 30 Dec 2016)
2016-12-30 08:25:42 +01:00
Jacek Jendrzej
bffd81375a some dead assignment
Origin commit data
------------------
Commit: 0ed24632b7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-12-29 (Thu, 29 Dec 2016)
2016-12-29 18:41:25 +01:00
vanhofen
65cf83258c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/themes.cpp
	src/neutrino.cpp
	src/system/settings.h
	version_pseudo.h


Origin commit data
------------------
Commit: 4f2d36fe3e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)
2016-12-29 00:59:00 +01:00
vanhofen
ff22643691 themes: allow progressbar-settings in themes
Origin commit data
------------------
Commit: 888bfb6687
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)

Origin message was:
------------------
- themes: allow progressbar-settings in themes
2016-12-29 00:47:34 +01:00
vanhofen
6fe01bafca Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: dbefbb33a0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)
2016-12-15 11:41:28 +01:00
Thilo Graf
9805b1547d CNeutrinoApp: simplify shutdown message handling
Usage of only one cancel button is more plausible.
'cancel' means cancel this action. And not more!


Origin commit data
------------------
Commit: c5f1a03a31
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-14 (Wed, 14 Dec 2016)
2016-12-14 22:50:37 +01:00
vanhofen
140228cdca Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: d5dee22b19
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)
2016-12-12 21:40:11 +01:00
Thilo Graf
248fdfc34b CNeutrinoApp: use default timeout from settings
Origin commit data
------------------
Commit: 8eae5c5d09
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-09 (Fri, 09 Dec 2016)
2016-12-12 21:37:17 +01:00
vanhofen
b09d7e2cfa don't use casystem frame per default
Origin commit data
------------------
Commit: 521e064d8b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)

Origin message was:
------------------
- don't use casystem frame per default
2016-12-12 13:57:46 +01:00
vanhofen
c2e03bf3ef Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: e57a35f327
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)
2016-12-12 08:53:05 +01:00
GetAway
f199989c9a pzapit: add -lockrc/-unlockrc options; port from martii
I've pulled it from Duckbox-Developers/neutrino-mp-cst-next
and modified it to work


Origin commit data
------------------
Commit: 0330515abc
Author: GetAway <get-away@t-online.de>
Date: 2016-12-11 (Sun, 11 Dec 2016)
2016-12-11 20:20:02 +01:00
vanhofen
5a6c50e0bb Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: a141bafe7f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-08 (Thu, 08 Dec 2016)
2016-12-08 17:57:11 +01:00
Thilo Graf
45b558cec7 Message timeout: try to fix timeout defines
Some parameters were confused.


Origin commit data
------------------
Commit: 4382daf5e4
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)
2016-12-08 12:54:37 +01:00
vanhofen
eae5c01db1 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/system/settings.h


Origin commit data
------------------
Commit: a19fc5532b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-22 (Tue, 22 Nov 2016)
2016-11-22 23:45:32 +01:00
Thilo Graf
97b57a783d Messages: try to fix API message handling
Passed timeout for messeages an popup's fired by yWeb API was not really
ok.
For popups now we have a setting with default value of 6 seconds timeout
Popups fired with ShowHint() use this as default. Value of 0 and -1
are ignored.
Messages fired with ShowMsg() should be fixed and interpret
value 0 or -1 as no timeout and will remain on the screen.


Origin commit data
------------------
Commit: 8b97f72ed1
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-22 (Tue, 22 Nov 2016)
2016-11-22 10:32:10 +01:00
vanhofen
721e348728 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: d065c1f394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)
2016-11-21 00:14:20 +01:00
Thilo Graf
02ae096367 CNeutrinoApp: simplify and fix hintbox calls
Some hints were not closed after delete. Explicit hide()is required.


Origin commit data
------------------
Commit: 5db26ef664
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)
2016-11-20 22:58:30 +01:00
TangoCash
ec132fe91b add option to read saved epg data frequently
Origin commit data
------------------
Commit: 6cd5dd8e23
Author: TangoCash <eric@loxat.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)
2016-11-20 19:24:08 +01:00
vanhofen
bff3c86938 re-add our welcome message to vfd; we're NI \o/
Origin commit data
------------------
Commit: 9d5fb8ee3f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)

Origin message was:
------------------
- re-add our welcome message to vfd; we're NI \o/
2016-11-19 21:30:53 +01:00