Commit Graph

162 Commits

Author SHA1 Message Date
vanhofen
56879044cb Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/upnpbrowser.cpp


Origin commit data
------------------
Commit: 2f3793fa1d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-24 (Thu, 24 Nov 2016)
2016-11-24 21:45:31 +01:00
vanhofen
cf6c9b99d9 enable epg-scan while audioplayer, movieplayer, pictureviewer and
upnp-browser runs


Origin commit data
------------------
Commit: a5bc693282
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-24 (Thu, 24 Nov 2016)

Origin message was:
------------------
- enable epg-scan while audioplayer, movieplayer, pictureviewer and

upnp-browser runs
2016-11-24 21:41:23 +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
4b15828631 CUpnpBrowserGui: simplify hintbox calls
Origin commit data
------------------
Commit: c47d26637b
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)
2016-11-20 22:56:33 +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
4300865679 Shadow: try to optimize shadow areas
* cleanup inner part of box on round corners, frames considered
* adopt implementations in some gui classes
* some debug lines removed
* test menu adopted
* try to fix corner caluculation to avoid transparent holes


Origin commit data
------------------
Commit: a17d61de8c
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-30 (Tue, 30 Aug 2016)
2016-10-24 10:31:25 +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
e18c48cf31 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/cst-next
Origin commit data
------------------
Commit: 26f5742797
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-19 (Wed, 19 Oct 2016)
2016-10-19 14:39:32 +02:00
vanhofen
7c36bd6884 various: use DARK text color on DARK background
Origin commit data
------------------
Commit: 957b1e05df
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-19 (Wed, 19 Oct 2016)

Origin message was:
------------------
- various: use DARK text color on DARK background
2016-10-19 14:35:38 +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
6424bcc332 upnpbrowser: use getItemColors function
Origin commit data
------------------
Commit: d1eb35569e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-19 (Wed, 19 Oct 2016)

Origin message was:
------------------
- upnpbrowser: use getItemColors function
2016-10-19 10:06:36 +02:00
vanhofen
645b667d3e upnpbrowser: use stopAudio() function; was missing in bbcfd01
Origin commit data
------------------
Commit: 119cb608cf
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-17 (Mon, 17 Oct 2016)

Origin message was:
------------------
- upnpbrowser: use stopAudio() function; was missing in bbcfd01
2016-10-17 11:00:18 +02:00
vanhofen
84d67eb11e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/cst-next
Origin commit data
------------------
Commit: 6bfde8a3f8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-13 (Thu, 13 Oct 2016)
2016-10-13 16:04:30 +02:00
vanhofen
bbcfd01327 upnpbrowser: use OFFSET defines; fix color under cursor; minor cleanups
Origin commit data
------------------
Commit: c915f857d7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-13 (Thu, 13 Oct 2016)

Origin message was:
------------------
- upnpbrowser: use OFFSET defines; fix color under cursor; minor cleanups
2016-10-13 15:14:03 +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
5889f018c0 add and use OFFSET_INTER definition
Origin commit data
------------------
Commit: 98500fdeb6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- add and use OFFSET_INTER definition
2016-10-10 14:19:55 +02:00
vanhofen
f21851aec0 rename SHADOW_OFFSET -> OFFSET_SHADOW
Origin commit data
------------------
Commit: 5d450c60d3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- rename SHADOW_OFFSET -> OFFSET_SHADOW
2016-10-10 14:19:55 +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
897dc6ae8c colors: add COL_FRAME wrapper
Origin commit data
------------------
Commit: 75fe6e407d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- colors: add COL_FRAME wrapper
2016-10-10 14:19:54 +02:00
vanhofen
564e254b7d Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/components/cc_detailsline.cpp


Origin commit data
------------------
Commit: 16fbaaa096
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-12 (Mon, 12 Sep 2016)
2016-09-12 12:13:43 +02:00
vanhofen
6ad341fcf8 detailsline: remove unneeded position/dimension additions
Origin commit data
------------------
Commit: 974ef11d5b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-12 (Mon, 12 Sep 2016)

Origin message was:
------------------
- detailsline: remove unneeded position/dimension additions
2016-09-12 12:11:04 +02:00
vanhofen
cf2f3e11fe colors: smoother interplay; use 1px frames
Origin commit data
------------------
Commit: 5f08483671
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-22 (Mon, 22 Aug 2016)

Origin message was:
------------------
- colors: smoother interplay; use 1px frames
2016-08-22 23:30:06 +02:00
vanhofen
f607a514b1 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/themes.cpp


Origin commit data
------------------
Commit: 797dd62e5f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-17 (Wed, 17 Aug 2016)
2016-08-17 11:45:13 +02:00
Thilo Graf
a446ecdd3d CUpnpBrowserGui: enable missing shadows
Supplement for 29698685b6


Origin commit data
------------------
Commit: 6163c4f5ed
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-17 (Wed, 17 Aug 2016)
2016-08-17 10:34:36 +02:00
vanhofen
0aeff50e86 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: 29b6f4a827
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-16 (Tue, 16 Aug 2016)
2016-08-16 15:45:22 +02:00
Michael Liebmann
031b190d4c CUpnpBrowserGui: Fix segfault at neutrino start
Origin commit data
------------------
Commit: b015f65d4c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-16 (Tue, 16 Aug 2016)
2016-08-16 15:11:39 +02:00
vanhofen
f87ffd09b9 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Commit: e13549e11d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-16 (Tue, 16 Aug 2016)
2016-08-16 10:08:27 +02:00
vanhofen
29698685b6 upnpbrowser: rework elements positions; avoid using FONT_EVENTLIST
Origin commit data
------------------
Commit: c9bb55db72
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-16 (Tue, 16 Aug 2016)

Origin message was:
------------------
- upnpbrowser: rework elements positions; avoid using FONT_EVENTLIST
2016-08-16 08:37:54 +02:00
vanhofen
41a3c85a4d Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Commit: 7a28b05f26
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)
2016-08-15 19:51:29 +02:00
vanhofen
ca9a7e02ee upnpbrowser: use larger font for items; we have space, so let's use it
Origin commit data
------------------
Commit: 344101d50a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)

Origin message was:
------------------
- upnpbrowser: use larger font for items; we have space, so let's use it
2016-08-15 19:50:23 +02:00
vanhofen
9e6edc885d Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Commit: b5fd21283e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)
2016-08-15 19:35:50 +02:00
vanhofen
a5939c02ac upnpbrowser: fix calculation of upper info box height
Origin commit data
------------------
Commit: dc13d0ff28
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)

Origin message was:
------------------
- upnpbrowser: fix calculation of upper info box height
2016-08-15 19:35:02 +02:00
vanhofen
2eb15b7b6b Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Commit: c0fa9a5ca3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)
2016-08-15 00:37:16 +02:00
vanhofen
558f2265ee upnpbrowser: use COL_SHADOW_PLUS_0 instead of COL_SHADOW_PLUS_1
Origin commit data
------------------
Commit: 1209485c6b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)

Origin message was:
------------------
- upnpbrowser: use COL_SHADOW_PLUS_0 instead of COL_SHADOW_PLUS_1
2016-08-15 00:30:47 +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
67663e6b5f Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Commit: 181ffda512
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-14 (Sun, 14 Aug 2016)
2016-08-14 21:17:11 +02:00
vanhofen
3a0e930e5a upnpbrowser: reduce paintButtons calls to cc_frm_buttons default
remove obsolete setColorBody() call


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

Origin message was:
------------------
- upnpbrowser: reduce paintButtons calls to cc_frm_buttons default

remove obsolete setColorBody() call
2016-08-14 21:11:08 +02:00
gixxpunk
40036da08d Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Commit: 8167e518ae
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2016-06-26 (Sun, 26 Jun 2016)
2016-06-26 22:14:15 +02:00
Thilo Graf
c9af09e064 CUpnpBrowserGui: fix paint image while scroll, use transparent background
Origin commit data
------------------
Commit: 145209aaa1
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-03-04 (Fri, 04 Mar 2016)
2016-06-26 15:32:35 +02:00
vanhofen
1e4ad90d35 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Commit: b3ae2c924c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-06-04 (Sat, 04 Jun 2016)
2016-06-04 22:03:48 +02:00
Jacek Jendrzej
78e90171d6 avoid division by zero
Origin commit data
------------------
Commit: 75a96a2fb3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-06-04 (Sat, 04 Jun 2016)
2016-06-04 15:36:46 +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
Jacek Jendrzej
a787c2990d avoid division by zero
Origin commit data
------------------
Commit: 49c86a38b4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-21 (Thu, 21 Apr 2016)
2016-04-21 18:14:46 +02:00
Thilo Graf
d2767791a2 CUpnpBrowserGui: use static button font instead auto font size
Origin commit data
------------------
Commit: f9a40ff3d6
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-04-15 (Fri, 15 Apr 2016)
2016-04-15 08:54:35 +02:00
Thilo Graf
a4699de070 CUpnpBrowserGui: block infoclock
Infoclock was not blocked in all modes, e.g. after stopped video
infoclock was unblocked and clock was back on screen. Clock should be now
not visible while upnp browser window is openend.


Origin commit data
------------------
Commit: 2358c6333e
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-03-03 (Thu, 03 Mar 2016)
2016-03-03 09:52:22 +01:00
Thilo Graf
5eef321c19 CUpnpBrowserGui: clean up, remove unused vars
Origin commit data
------------------
Commit: 8c4bdb382a
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-03-02 (Wed, 02 Mar 2016)
2016-03-03 09:52:22 +01:00
Thilo Graf
04bc6633e8 CUpnpBrowserGui: do intit screen properties already on changed settings on runtime
Origin commit data
------------------
Commit: b297c57a31
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-02-29 (Mon, 29 Feb 2016)
2016-03-03 09:52:21 +01:00
Thilo Graf
42d0617e2b CUpnpBrowserGui: move module init into own member
Origin commit data
------------------
Commit: f55f6fcbdf
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-02-27 (Sat, 27 Feb 2016)
2016-03-03 09:52:21 +01:00