Commit Graph

158 Commits

Author SHA1 Message Date
vanhofen
cdc8b19eb5 epgplus: fix shadow for scrollbar
Origin commit data
------------------
Commit: 6bb604756f
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-05-08 (Tue, 08 May 2018)

Origin message was:
------------------
- epgplus: fix shadow for scrollbar
2018-05-08 23:14:36 +02:00
Thilo Graf
c9dd0d5336 src/gui/epgplus.cpp: add missing home handling
Window was not closed with exit button.


Origin commit data
------------------
Commit: 59a9572535
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-05-08 (Tue, 08 May 2018)
2018-05-08 22:45:11 +02:00
vanhofen
ec95250a62 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.


Origin commit data
------------------
Commit: 86cdc12c8f
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-22 (Mon, 22 Jan 2018)

Origin message was:
------------------
- 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.
2018-01-22 12:06:15 +01:00
vanhofen
9351a0bf31 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/gui/bookmarkmanager.cpp


Origin commit data
------------------
Commit: 537ea51fcf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)
2017-09-29 08:35:05 +02:00
vanhofen
1776ae664d rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
Origin commit data
------------------
Commit: ebc621f3b2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)

Origin message was:
------------------
- rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
2017-09-29 08:27:42 +02:00
vanhofen
25804788d3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: b718ddff50
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)
2017-09-27 10:48:51 +02:00
vanhofen
7eefaebe15 fix some timout-off-bugs in epgplus, epgview, eventlist and filebrowser
Origin commit data
------------------
Commit: 5b8f7b86bf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- fix some timout-off-bugs in epgplus, epgview, eventlist and filebrowser
2017-09-27 08:53:13 +02:00
vanhofen
55f23341f2 Revert "epgplus: restore old KEY_epg behaviour"
This reverts commit 77f71f0ce4.


Origin commit data
------------------
Commit: ec105df737
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-27 (Sun, 27 Aug 2017)
2017-08-27 23:56:32 +02:00
vanhofen
8d6a5b449d Revert "epgplus: restore white grid lines instead of invisible dark ones"
This reverts commit 7ff442ac08.


Origin commit data
------------------
Commit: c709184e31
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-27 (Sun, 27 Aug 2017)
2017-08-27 23:56:17 +02:00
vanhofen
25a4911df4 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	configure.ac
	src/driver/screenshot.cpp
	src/driver/streamts.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: a4fd09ecc2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-27 (Sun, 27 Aug 2017)
2017-08-27 23:55:53 +02:00
Stefan Seyfried
7ff442ac08 epgplus: restore white grid lines instead of invisible dark ones
Origin commit data
------------------
Commit: 1df104ecc9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-26 (Sat, 26 Aug 2017)
2017-08-26 13:10:12 +02:00
Stefan Seyfried
77f71f0ce4 epgplus: restore old KEY_epg behaviour
Origin commit data
------------------
Commit: 5944db95dd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-26 (Sat, 26 Aug 2017)
2017-08-26 13:09:32 +02:00
vanhofen
96e6ac6462 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	acinclude.m4
	lib/hardware/coolstream/hardware_caps.cpp
	src/Makefile.am
	src/driver/screenshot.cpp
	src/gui/epgplus.cpp
	src/gui/scan_setup.cpp
	src/neutrino.cpp
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Commit: bb00f9f2e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-25 (Fri, 25 Aug 2017)
2017-08-25 14:29:45 +02:00
TangoCash
dac472f809 fix epgplus detailsline hide bug (thx dbo)
Signed-off-by: Thilo Graf <dbt@novatux.de>

dline was not removed after called epg info.

btw. Small request:
It would be nice if a short brief justification would be included.
That would be make some things easier to track and saves unnecessary questions.
Thx!


Origin commit data
------------------
Commit: d7e196c58a
Author: TangoCash <eric@loxat.de>
Date: 2017-07-02 (Sun, 02 Jul 2017)
2017-07-04 12:22:53 +02:00
TangoCash
4cc14d335b fix epgplus detailsline hide bug (thx dbo)
Origin commit data
------------------
Commit: eecc1b6af3
Author: TangoCash <eric@loxat.de>
Date: 2017-07-02 (Sun, 02 Jul 2017)
2017-07-03 10:42:40 +02:00
vanhofen
bb5ecea8f0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/timerlist.cpp


Origin commit data
------------------
Commit: 94d3ba6d1e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-21 (Wed, 21 Jun 2017)
2017-06-21 11:43:58 +02:00
Thilo Graf
5961fcc0a7 EpgPlus: fix wrong shadow parameter for scrollbar
Origin commit data
------------------
Commit: 579a73f91b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-21 (Wed, 21 Jun 2017)
2017-06-21 10:31:22 +02:00
vanhofen
916e2e1c5a epgplus: add shadow to gui-elements
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 7e89096c4e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-19 (Mon, 19 Jun 2017)

Origin message was:
------------------
- epgplus: add shadow to gui-elements

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-20 09:55:34 +02:00
vanhofen
53d44a9360 epgplus: add shadow to gui-elements
Origin commit data
------------------
Commit: 7a9eeaac74
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-19 (Mon, 19 Jun 2017)

Origin message was:
------------------
- epgplus: add shadow to gui-elements
2017-06-19 16:07:25 +02:00
vanhofen
e4950b6336 epgplus: use getScrollBarData() function
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- epgplus: use getScrollBarData() function

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-15 01:01:55 +02:00
vanhofen
e5b68550fb epgplus: use getScrollBarData() function
Origin commit data
------------------
Commit: 1e0378a877
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-14 (Wed, 14 Jun 2017)

Origin message was:
------------------
- epgplus: use getScrollBarData() function
2017-06-14 14:57:09 +02:00
TangoCash
ff97eee187 epgplus: fix possible segfault (thx dbo)
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 866f5c37b8
Author: TangoCash <eric@loxat.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)

Origin message was:
------------------
-epgplus: fix possible segfault (thx dbo)

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-07 14:17:12 +02:00
TangoCash
f1f0683e20 epgplus: fix segfault (thx dbo)
Origin commit data
------------------
Commit: a56e3f8111
Author: TangoCash <eric@loxat.de>
Date: 2017-05-29 (Mon, 29 May 2017)

Origin message was:
------------------
-epgplus: fix segfault (thx dbo)
2017-05-30 07:48:14 +02:00
gixxpunk
cd39eb364b Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: ad61c7e183
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-12 (Fri, 12 May 2017)
2017-05-12 08:42:16 +02:00
Thilo Graf
9a0a266f27 EpgPlus: use default parameter for titel arrangement
Origin commit data
------------------
Commit: 100a1606f0
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-11 (Thu, 11 May 2017)
2017-05-11 11:28:06 +02:00
vanhofen
9e75ed21f8 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/epgplus.cpp


Origin commit data
------------------
Commit: 429d510ef1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)
2017-05-08 16:23:25 +02:00
vanhofen
7664c683ac epgplus: fix progressbar's type
Origin commit data
------------------
Commit: 7b9f8e9720
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)

Origin message was:
------------------
- epgplus: fix progressbar's type
2017-05-08 08:41:28 +02:00
gixxpunk
c4f66cd900 Merge branch 'master' of github.com:tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 8f3783987a
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-04-26 (Wed, 26 Apr 2017)
2017-04-26 11:17:46 +02:00
Thilo Graf
19c0fa0a39 EpgPlus: update license text
Origin commit data
------------------
Commit: 8e3390687c
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-11 (Tue, 11 Apr 2017)
2017-04-25 11:36:49 +02:00
Thilo Graf
53e30f4675 EpgPlus: simplify calls of logo attributes and logo instance
Origin commit data
------------------
Commit: 7b19ea1fd1
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-24 (Mon, 24 Apr 2017)
2017-04-25 11:36:49 +02:00
vanhofen
f62416b41a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 91bfe2f0e3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-22 (Sat, 22 Apr 2017)
2017-04-22 16:15:03 +02:00
vanhofen
092455ca7d epgplus: add channellogo to header
Origin commit data
------------------
Commit: e74db896bb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-22 (Sat, 22 Apr 2017)

Origin message was:
------------------
- epgplus: add channellogo to header
2017-04-22 16:11:55 +02:00
vanhofen
44cefd60f3 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 633c0c44f9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-13 (Thu, 13 Apr 2017)
2017-04-13 11:21:59 +02:00
vanhofen
765871fe52 epgplus: get sure we have enough space for detailsline
Origin commit data
------------------
Commit: cf229bb3af
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-13 (Thu, 13 Apr 2017)

Origin message was:
------------------
- epgplus: get sure we have enough space for detailsline
2017-04-13 11:20:10 +02:00
vanhofen
771f62fbb3 epgplus: use user's setting for progressbar color
Origin commit data
------------------
Commit: 86551c38a9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)

Origin message was:
------------------
- epgplus: use user's setting for progressbar color
2017-04-10 22:05:18 +02:00
vanhofen
96ea87ebbb Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 9ccfeb1249
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)
2017-04-10 21:45:07 +02:00
vanhofen
bff144eee5 epgplus: add missing separationline to clearMark() function
Origin commit data
------------------
Commit: a64225c09a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)

Origin message was:
------------------
- epgplus: add missing separationline to clearMark() function
2017-04-10 21:43:01 +02:00
vanhofen
23c4b83f92 epgplus: use enlighten background toggle color
Origin commit data
------------------
Commit: 41394be62e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)

Origin message was:
------------------
- epgplus: use enlighten background toggle color
2017-04-10 21:43:01 +02:00
vanhofen
6681eb04ee epgplus: fix selected handling for channelevents
Origin commit data
------------------
Commit: 25e56bf5df
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)

Origin message was:
------------------
- epgplus: fix selected handling for channelevents
2017-04-10 21:43:01 +02:00
vanhofen
34b8a0cddb epgplus: smoother aligment for channelnumbers
Origin commit data
------------------
Commit: ab4adc92d0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)

Origin message was:
------------------
- epgplus: smoother aligment for channelnumbers
2017-04-10 21:43:01 +02:00
Thilo Graf
d09375f070 EpgPlus: fix missing to disble clock after hided window
btw: rename header->head, for better readability


Origin commit data
------------------
Commit: 46e298823f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)
2017-04-10 13:25:06 +02:00
vanhofen
11d332f464 epgplus: add missing round corner to selected item
Origin commit data
------------------
Commit: e54e112b24
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)

Origin message was:
------------------
- epgplus: add missing round corner to selected item
2017-04-10 13:25:06 +02:00
vanhofen
c51d3214ec epgplus: use getItemColors() to get global item colors
Origin commit data
------------------
Commit: 8f8511a612
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)

Origin message was:
------------------
- epgplus: use getItemColors() to get global item colors
2017-04-10 13:25:06 +02:00
vanhofen
83f3f51038 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 69d3e6ba35
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)
2017-04-10 10:27:25 +02:00
vanhofen
c1ec68b3be epgplus: mark framebuffer pointer in header class as unused
Origin commit data
------------------
Commit: 8e8b95a932
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)

Origin message was:
------------------
- epgplus: mark framebuffer pointer in header class as unused
2017-04-10 10:26:21 +02:00
vanhofen
19b6e4f82b epgplus: add clock and context button to header
Origin commit data
------------------
Commit: 5ae1a6b459
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)

Origin message was:
------------------
- epgplus: add clock and context button to header
2017-04-10 10:26:21 +02:00
vanhofen
1e218dc2f4 epgplus: fix text offsets in secontary timeline
Origin commit data
------------------
Commit: 69e478c195
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)

Origin message was:
------------------
- epgplus: fix text offsets in secontary timeline
2017-04-10 10:26:21 +02:00
vanhofen
ec4ae2a261 epgplus: always show a progressbar in secondary timeline ...
to avoid 'design changes' when cursor is moved left or right


Origin commit data
------------------
Commit: 56302f9eb7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)

Origin message was:
------------------
- epgplus: always show a progressbar in secondary timeline ...

to avoid 'design changes' when cursor is moved left or right
2017-04-10 10:26:21 +02:00
TangoCash
41493ffc35 epgplus: add progressbar for current event
Origin commit data
------------------
Commit: 44a0ec422e
Author: TangoCash <eric@loxat.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)

Origin message was:
------------------
- epgplus: add progressbar for current event
2017-04-10 10:26:21 +02:00
TangoCash
dd0f87ab9b epgplus: bind display of channelnumbers to channelists's setting;
fix position of channelentry


Origin commit data
------------------
Commit: 0b44c162b4
Author: TangoCash <eric@loxat.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)

Origin message was:
------------------
- epgplus: bind display of channelnumbers to channelists's setting;

fix position of channelentry
2017-04-10 10:26:21 +02:00