Commit Graph

632 Commits

Author SHA1 Message Date
svenhoefer
4c33c7a7d4 - channellist: show display mode in header (next/primetime only)
Signed-off-by: Thilo Graf <dbt@novatux.de>
2019-03-10 15:00:20 +01:00
svenhoefer
b9b8ca752b - channellist: show event description per default in primetime mode only
Signed-off-by: Thilo Graf <dbt@novatux.de>
2019-03-09 22:45:58 +01:00
svenhoefer
c3d1af3171 - channellist: respect g_settings.channellist_show_numbers in history mode too (first quick'n'dirty version)
Signed-off-by: Thilo Graf <dbt@novatux.de>
2019-03-09 17:11:28 +01:00
TangoCash
7426845feb - channellist: set beginning of primetime to 20:00 2019-03-07 06:25:40 +01:00
svenhoefer
3229ee387d - channellist: use OFFSET defines in showdescription() function
Signed-off-by: Thilo Graf <dbt@novatux.de>
2019-03-06 21:20:45 +01:00
svenhoefer
acb7a002b2 - channellist: show event description in primetime mode
Signed-off-by: Thilo Graf <dbt@novatux.de>
2019-03-06 21:20:24 +01:00
svenhoefer
590796dd87 fix commit 7bb694c remove unnecessary
Signed-off-by: Thilo Graf <dbt@novatux.de>
2019-03-06 21:19:57 +01:00
TangoCash
b24bdd3126 fix logic 2019-03-06 21:14:25 +01:00
TangoCash
4aeb1db919 show tomorrows events after todays primetime 2019-03-06 21:14:13 +01:00
svenhoefer
22ebe30144 - channellist: rework behaviour of green and blue button; ...
* blue key: switches now/next/primetime
* green key: switches eventlist/description (in favorites mode)

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

 Conflicts:
	data/locale/english.locale
	src/gui/channellist.cpp
2019-03-05 06:34:47 +01:00
svenhoefer
e6d94bda27 - channellist: fix formatation of new code from "add primetime feature to channellist"
Conflicts:
	src/gui/channellist.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
2019-03-04 10:20:11 +01:00
TangoCash
83124d283f add primetime feature to channellist
use green button in favorites to show whats showing on primetime

 Conflicts:
	data/locale/english.locale
	src/gui/channellist.cpp
2019-03-04 10:14:43 +01:00
svenhoefer
6e46005ca0 - timeshift: unify config keywords and locales
Signed-off-by: Thilo Graf <dbt@novatux.de>
2019-02-11 10:25:15 +01:00
svenhoefer
1dd01cef5f - use new edit icon in several headers
Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-12-31 11:47:44 +01:00
GetAway
99a6ab267d add lcd4linux support, ported from
defans and vanhofen, modded by TangoCash
2018-12-26 20:04:32 +01:00
svenhoefer
561cadfa4d - channellist: re-allow switching bouquets in zaphistory/current_transponder mode
see https://www.neutrino-images.de/board/viewtopic.php?f=61&t=2728

Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-08-19 16:45:24 +02:00
svenhoefer
c129312235 - channellist: move avoid-zap-in-movieplayer-mode-message ...
... to a global reachable place to avoid all zap tries

Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-07-30 21:28:46 +02:00
svenhoefer
759504d149 - epgplus: signalize zap tries while movie playback
Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-07-28 14:34:49 +02:00
svenhoefer
a7ab3ce70f - channellist: fix display of very long channelnames
Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-07-18 11:54:48 +02:00
svenhoefer
999610dcd1 - channellist: allow to show resolution icons
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/locals.h
	src/system/locals_intern.h

Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-07-18 11:54:16 +02:00
FlatTV
1652faecff OSD Menu: Add progressbar color
Signed-off-by: Thilo Graf <dbt@novatux.de>

- themes/Makefile.am unchanged, build was broken
- whitespace errors fixed
- unnecessary comments removed
- bump lua api version, was missed
2018-04-11 15:58:20 +02:00
Thilo Graf
f9b4aeef8c infobar timout: add member to get current timeout modes
Avoids  multiple code in some source files.
2018-04-10 10:29:39 +02:00
Thilo Graf
557805bc40 infobar: rework infobar timeout behavior
Options were sometimes described ambiguously and previous behavior was no longer available.
Now the descriptions should be more plausible for current behavior.
2018-04-10 10:29:38 +02:00
svenhoefer
4b12086438 - channellist: signalize zap tries while movie playback
Signed-off-by: Thilo Graf <dbt@novatux.de>

Conflicts:
	data/locale/english.locale
2018-04-09 23:44:57 +02:00
svenhoefer
10ae3aaf51 - channellist: try to respect users timeout settings when hiding infobar
Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-04-09 23:41:00 +02:00
Thilo Graf
25b99c4c49 src/gui/channellist.cpp: use channellist object on stack
Heap not required here.
2018-04-01 19:18:23 +02:00
svenhoefer
167039c1f9 - channellist: re-add list of recordable channels (while recording) to key_current_transponder
Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-03-22 21:20:18 +01:00
svenhoefer
ef99e41f93 - channellist: move zaphistory/current_transponder handling into sepatate function
Conflicts:
	src/neutrino.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-03-22 21:20:16 +01:00
svenhoefer
1bf83a035f - channellist: avoid switching bouquets in zaphistory/current_transponder mode
Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-03-22 21:20:13 +01:00
svenhoefer
f833778b32 - channellist: simplify key_zaphistory/key_current_transponder handling
* Remove strange list of "zapable" channels while recording. Channellist
(RC_ok) has same feature ... not avalable channels are marked inactive.

* Add hint, when no zapping histoty is available to confirm user's keypress

 Conflicts:
	data/locale/english.locale

Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-03-22 21:20:12 +01:00
svenhoefer
f26175a8b4 - channellist: show choosen channelnumber on vfd while numeric zapping
Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-03-12 08:55:04 +01:00
svenhoefer
9bf5ca63a8 - channellist/infoviewer: align calculations for "since-time" of current event
Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-03-12 08:55:04 +01:00
TangoCash
00f29acad4 fix channellist footer 2018-02-04 20:02:35 +01:00
svenhoefer
9ffbf84ce1 - channelist: small reworks in numericZap() function; use OFFSET defines
Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-01-26 23:37:02 +01:00
svenhoefer
3b65251e00 - framebuffer: better name for getWindowWidth/Height() functions
getScreenWidth/HeightRel() was confusing because it depends on users window settings.
Replace names in old unused framebuffer code too.

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

 Conflicts:
	gui/channellist.cpp
2018-01-22 19:19:08 +01:00
svenhoefer
55e70cd4e9 Revert "channellist: use "classic" width if minitv is unused"
This reverts commit 901b7cbd38

Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-01-22 19:19:02 +01:00
svenhoefer
db478f2699 - channellist: use more new marker icons
Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-01-05 00:52:58 +01:00
svenhoefer
b8bb940445 - channellist: use new marker icons
Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-01-05 00:52:58 +01:00
Stefan Seyfried
b0bd8fdbae Channellist: only show lock icon if parental lock is active
additionally, remove the icon on change to an unlocked bouquet
2017-12-28 00:07:23 +01:00
svenhoefer
3d5aa5977a - neutrino: add more RC_playpause handling
Conflicts:
	src/gui/movieplayer.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-12-21 11:28:30 +01:00
svenhoefer
889c996624 - channellist: fix segfault while virtual zapping and bouquets are empty
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-12-11 17:12:17 +01:00
svenhoefer
0fc3e793a4 - neutrino: unify modes handling; ...
remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-22 15:42:09 +01:00
svenhoefer
0b78ac9e3f - rename LIST_MODE_WEBTV => LIST_MODE_WEB
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-16 19:43:26 +01:00
svenhoefer
740fd3ac0d - rename IS_WEBTV => IS_WEBCHAN
Conflicts:
	src/zapit/src/capmt.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-16 19:43:26 +01:00
svenhoefer
3fd544737a - add webradio; first steps
Conflicts:
	data/Makefile.am
	data/scripts/backup.sh
	src/neutrino.cpp
	src/zapit/include/zapit/zapit.h

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-16 19:43:26 +01:00
svenhoefer
c14e9f8256 - channellist: add separator item to menu for a smoother view
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-10-29 21:34:47 +01:00
Jacek Jendrzej
7ad4a0e6cc Merge branch 'master' into pu/mp 2017-10-02 13:56:25 +02:00
Stefan Seyfried
0d9139054a remove "using namespace std" from header files
"using namespace std" in headers is considered bad practice, so move it
either into the respective cpp files or (for files which have lots of
other std::xxx usage anyway) just write it out explicitly.
Looking at the headers and the affected cpp files, one can actually see
why it is bad practice, as it's spreading very far ;-)
2017-10-02 13:43:57 +02:00
Jacek Jendrzej
4fc73acffc Merge branch 'master' into pu/mp 2017-09-29 10:49:27 +02:00
svenhoefer
99cc7f850a - rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now 2017-09-29 10:34:23 +02:00