Commit Graph

256 Commits

Author SHA1 Message Date
vanhofen
5892f863e5 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/movieplayer.cpp


Origin commit data
------------------
Commit: 461f9f046d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-06 (Tue, 06 Dec 2016)
2016-12-06 13:02:25 +01:00
vanhofen
fef2ade749 eventlist: fix icon-alignment ...
some small text-alignment fixes; use OFFSET defines


Origin commit data
------------------
Commit: 9d949c7074
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-06 (Tue, 06 Dec 2016)

Origin message was:
------------------
- eventlist: fix icon-alignment ...

some small text-alignment fixes; use OFFSET defines
2016-12-06 09:54:56 +01:00
vanhofen
6a100f9625 eventlist: fix button_label size
Origin commit data
------------------
Commit: 72c1445825
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)

Origin message was:
------------------
- eventlist: fix button_label size
2016-11-21 00:14:45 +01:00
vanhofen
cc7ad7ce1a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/lua/lua_misc.cpp
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: 3420991007
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)
2016-11-19 21:11:54 +01:00
Thilo Graf
dc607fd1df Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Commit: 97006c6615
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)
2016-11-11 21:33:12 +01:00
vanhofen
e47b64d4aa eventlist: show left/right buttons in footer
Origin commit data
------------------
Commit: 8fab6e7212
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- eventlist: show left/right buttons in footer
2016-11-11 01:11:02 +01:00
vanhofen
1bc70fc18f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: d271a8999b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)
2016-11-11 00:51:58 +01:00
vanhofen
269dd731f7 eventlist: allow windows size changes w/o neutrino restart
Origin commit data
------------------
Commit: e3306076de
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- eventlist: allow windows size changes w/o neutrino restart
2016-11-11 00:51:32 +01:00
Thilo Graf
373c2967dd Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Commit: 96ffa4778a
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)
2016-11-11 00:51:20 +01:00
vanhofen
7ee61c7038 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 6e36759695
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)
2016-11-11 00:26:49 +01:00
vanhofen
62015ccfbf eventlist: allow gradient/radius changes w/o neutrino restart
Origin commit data
------------------
Commit: c056b56d12
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- eventlist: allow gradient/radius changes w/o neutrino restart
2016-11-11 00:25:25 +01:00
vanhofen
48ebbedeb5 eventlist: fix right textbox in header; last char was not displayed
Origin commit data
------------------
Commit: 00ad1ecd1c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- eventlist: fix right textbox in header; last char was not displayed
2016-11-11 00:18:43 +01:00
Thilo Graf
d34322b568 Merge branch 'master' into pu/msgbox
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Commit: 3efaac5725
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-10 (Thu, 10 Nov 2016)
2016-11-10 10:27:22 +01:00
vanhofen
98e986dafc Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Commit: f0d9adbe46
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)
2016-11-08 22:07:57 +01:00
vanhofen
e99fb12c00 eventlist: use small vertical offset around channellogo
Origin commit data
------------------
Commit: c9be160f20
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)

Origin message was:
------------------
- eventlist: use small vertical offset around channellogo
2016-11-08 22:02:08 +01:00
Thilo Graf
5d9e739abf Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Commit: 9b9d2542e6
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-28 (Fri, 28 Oct 2016)
2016-10-28 08:05:34 +02:00
vanhofen
75d4dd6fac Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: ecd3951b7d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-27 (Thu, 27 Oct 2016)
2016-10-27 23:12:05 +02:00
Jacek Jendrzej
0afaff4210 src/gui/eventlist.cpp supplement to f1e25395ca, fix chanel_id in search-mode
Origin commit data
------------------
Commit: a71c71edcc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-10-27 (Thu, 27 Oct 2016)
2016-10-27 18:56:13 +02:00
Thilo Graf
11b3307251 CMsgBox: rework msgbox classes with Window class implementation
Replacing messagebox, hintbox_ext and some derivated parts with
basic class hintbox and derivated class CMsgBox. This should unify
window handling and avoids maintain of multiple classes with quasi
same purpose and adds more functionality.

TODO: fix and optimize details


Origin commit data
------------------
Commit: dde298b1b7
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-04-04 (Mon, 04 Apr 2016)
2016-10-24 10:31:24 +02:00
vanhofen
f374f6652f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/cst-next
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/filebrowser.cpp
	src/gui/pictureviewer.cpp


Origin commit data
------------------
Commit: 42d1c25a8b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-19 (Wed, 19 Oct 2016)
2016-10-19 10:22:43 +02:00
vanhofen
e30efc009c eventlist: use getItemColors function
Origin commit data
------------------
Commit: fcd4246d9a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-19 (Wed, 19 Oct 2016)

Origin message was:
------------------
- eventlist: use getItemColors function
2016-10-19 10:06:36 +02:00
vanhofen
0974f07672 Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/driver/framebuffer.cpp


Origin commit data
------------------
Commit: c0e452856a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-13 (Thu, 13 Oct 2016)
2016-10-13 09:42:27 +02:00
vanhofen
9d5ac51786 eventlist: remove obsolete bool show from CEventList::showFunctionBar
Origin commit data
------------------
Commit: f04493b7e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-12 (Wed, 12 Oct 2016)

Origin message was:
------------------
- eventlist: remove obsolete bool show from CEventList::showFunctionBar
2016-10-12 20:55:28 +02:00
vanhofen
2780957ba0 eventlist: remove unnecessary hide of footer
Origin commit data
------------------
Commit: 4b0b32833f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-12 (Wed, 12 Oct 2016)

Origin message was:
------------------
- eventlist: remove unnecessary hide of footer
2016-10-12 20:55:28 +02:00
vanhofen
248b6c8684 Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/components/cc_detailsline.h
	src/gui/components/cc_item_infobox.h
	src/gui/infoviewer.cpp
	src/gui/upnpbrowser.cpp
	src/gui/widget/keyboard_input.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: 5a70a3f78e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)
2016-10-10 16:45:30 +02:00
vanhofen
af3e39a47d colors: add COL_SCROLLBAR_PASSIVE wrapper
Origin commit data
------------------
Commit: 6629b64d6c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- colors: add COL_SCROLLBAR_PASSIVE wrapper
2016-10-10 14:19:54 +02:00
vanhofen
4b3b25ca7a colors: add COL_SCROLLBAR_ACTIVE wrapper
Origin commit data
------------------
Commit: 7e7d4e5fc1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- colors: add COL_SCROLLBAR_ACTIVE wrapper
2016-10-10 14:19:54 +02:00
vanhofen
91fc1e2528 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Commit: e419a5c3b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)
2016-09-09 10:45:45 +02:00
vanhofen
fa2686a90e add listModeKey() function to simplify these calls
Origin commit data
------------------
Commit: 2911e638c7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- add listModeKey() function to simplify these calls
2016-09-09 10:42:46 +02:00
vanhofen
57dd1c7712 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Commit: 3a43baac7b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-06 (Tue, 06 Sep 2016)
2016-09-06 15:41:28 +02:00
Thilo Graf
b0c0c3bd05 Moviebrowser: start outsourcing moviebrowser code
Origin commit data
------------------
Commit: 64053c1758
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-11 (Thu, 11 Aug 2016)
2016-09-06 11:32:41 +02:00
vanhofen
ed1a6bc916 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Commit: 38ca43dde0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-14 (Sun, 14 Aug 2016)
2016-08-14 22:05:07 +02:00
vanhofen
78230ead13 colors: some internal renamings
* INFOBAR_SHADOW to SHADOW because it's not only used in infoviewer
* INFOBAR_SHADOW_TEXT to MENUFOOT_TEXT because it's the proper name

This is in preparation to make footer colors configurable


Origin commit data
------------------
Commit: bc39d1e14e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-14 (Sun, 14 Aug 2016)

Origin message was:
------------------
- colors: some internal renamings

* INFOBAR_SHADOW to SHADOW because it's not only used in infoviewer
* INFOBAR_SHADOW_TEXT to MENUFOOT_TEXT because it's the proper name

This is in preparation to make footer colors configurable
2016-08-14 21:55:18 +02:00
vanhofen
41083ff567 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: afb6e0d4a1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-04 (Thu, 04 Aug 2016)
2016-08-04 12:02:35 +02:00
vanhofen
e3daec4e2d eventlist: allow to disable epgplus
Origin commit data
------------------
Commit: 5837b922b1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-04 (Thu, 04 Aug 2016)

Origin message was:
------------------
- eventlist: allow to disable epgplus
2016-08-04 09:44:36 +02:00
vanhofen
21b7299720 Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/Makefile.am
	src/neutrino.h


Origin commit data
------------------
Commit: 0d42384f0d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-01 (Fri, 01 Jul 2016)
2016-07-01 15:28:37 +02:00
martii
f1e25395ca followscreenings: port code from martiis-neutrino-mp
Origin commit data
------------------
Commit: 61105699d4
Author: martii <m4rtii@gmx.de>
Date: 2016-07-01 (Fri, 01 Jul 2016)

Origin message was:
------------------
- followscreenings: port code from martiis-neutrino-mp
2016-07-01 15:26:06 +02:00
vanhofen
cc0f541291 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: 796bd79e0e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-06-02 (Thu, 02 Jun 2016)
2016-06-02 21:42:10 +02:00
vanhofen
2c239533a6 record_setup: add check existing recordings before set new timers
Origin commit data
------------------
Commit: 6dddaff0d2
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-06-02 (Thu, 02 Jun 2016)

Origin message was:
------------------
- record_setup: add check existing recordings before set new timers
2016-06-02 21:37:33 +02:00
vanhofen
5e86e01527 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Commit: 283cd4640f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-06-02 (Thu, 02 Jun 2016)
2016-06-02 21:13:16 +02:00
Jacek Jendrzej
d67420b77a src/gui/eventlist.cpp restore channel name after call search if not used
Origin commit data
------------------
Commit: be2417068e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-06-01 (Wed, 01 Jun 2016)
2016-06-01 15:41:08 +02:00
vanhofen
4cf2b60722 NI \o/
Origin commit data
------------------
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)
2016-05-19 22:59:54 +02:00
[CST] Focus
38ede6dfb0 neutrino: add webtv channel list mode
Origin commit data
------------------
Commit: 302642cee7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-23 (Wed, 23 Mar 2016)
2016-03-23 16:36:00 +03:00
Thilo Graf
363d521343 CEventList: hold header instance to reduce flicker effects
Origin commit data
------------------
Commit: 65f4b82f62
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-03-22 (Tue, 22 Mar 2016)
2016-03-22 13:15:19 +01:00
Jacek Jendrzej
56ea25c2f8 src/gui/eventlist.cpp use CComponentsChannelLogoScalable
Origin commit data
------------------
Commit: 5100b3d6ae
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-02-16 (Tue, 16 Feb 2016)
2016-02-16 19:47:20 +01:00
Jacek Jendrzej
192e734f6b (performance) Prefer prefix ++/-- operators for non-primitive types
Origin commit data
------------------
Commit: 7db16952f6
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-02-16 (Tue, 16 Feb 2016)
2016-02-16 13:02:10 +01:00
Stefan Seyfried
a4ee00841a eventlist: use CListHelpers::UpDownKey
Origin commit data
------------------
Commit: 99453de557
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-16 (Sat, 16 Jan 2016)
2016-01-18 08:10:16 +01:00
Thilo Graf
c6905d2f03 Colors: init global color gradient implementation
Origin commit data
------------------
Commit: 523b273af8
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-11-19 (Thu, 19 Nov 2015)
2015-12-27 14:42:27 +01:00
vanhofen
73801bf251 eventlist: use real channel-id in webtv-mode to set timers
Origin commit data
------------------
Commit: 9b78404d19
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-10-09 (Fri, 09 Oct 2015)

Origin message was:
------------------
- eventlist: use real channel-id in webtv-mode to set timers
2015-10-09 19:00:03 +02:00
[CST] Focus
271c73fc4c gui/eventlist.cpp: use epg id to get events
Origin commit data
------------------
Commit: ad153ed851
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-06-02 (Tue, 02 Jun 2015)
2015-09-24 12:25:58 +03:00