Commit Graph

225 Commits

Author SHA1 Message Date
vanhofen
ce5078e378 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: a34a8992d4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-24 (Mon, 24 Apr 2017)
2017-04-24 12:56:51 +02:00
vanhofen
ce494cbd38 scrollbars: avoid usage of COL_SCROLLBAR_PASSIVE_PLUS_0 ...
... outside of CComponentsScrollBar(). Since the color-changes in
9c8c262 the non-CC scrollbars looks weird.


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

Origin message was:
------------------
- scrollbars: avoid usage of COL_SCROLLBAR_PASSIVE_PLUS_0 ...

... outside of CComponentsScrollBar(). Since the color-changes in
9c8c262 the non-CC scrollbars looks weird.
2017-04-24 12:29:52 +02:00
vanhofen
30fd965086 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: c4fa0eb30e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
2017-03-13 12:45:30 +01:00
vanhofen
9c009ade29 unify DetailsLine-names; move define to settings.h
Origin commit data
------------------
Commit: 5b0faeab8c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)

Origin message was:
------------------
- unify DetailsLine-names; move define to settings.h
2017-03-13 12:40:04 +01:00
vanhofen
eff3409675 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 33525aeafd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-25 (Sat, 25 Feb 2017)
2017-02-25 00:15:45 +01:00
vanhofen
895fe44d46 audioplayer: fix small typo
Origin commit data
------------------
Commit: eb477aee8e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-24 (Fri, 24 Feb 2017)

Origin message was:
------------------
- audioplayer: fix small typo
2017-02-24 18:26:07 +01:00
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
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
vanhofen
c61b3d77a3 audioplayer: fix topbox colors; ...
we're using header colors as in upnpbrowser too


Origin commit data
------------------
Commit: 3bccfd5835
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-31 (Mon, 31 Oct 2016)

Origin message was:
------------------
- audioplayer: fix topbox colors; ...

we're using header colors as in upnpbrowser too
2016-10-31 20:38:46 +01: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
dd4d866355 audioplayer: use getItemColors function
Origin commit data
------------------
Commit: 3a80241b0c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-19 (Wed, 19 Oct 2016)

Origin message was:
------------------
- audioplayer: use getItemColors function
2016-10-19 10:06:35 +02:00
Michael Liebmann
7221f4bd67 Fix compile error at src/gui/audioplayer.cpp
- Complement to commit 5889f01


Origin commit data
------------------
Commit: 01f3a56229
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-10-10 (Mon, 10 Oct 2016)
2016-10-10 20:53:05 +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
a5ed88a86a audioplayer: fix connectline paint
Origin commit data
------------------
Commit: 02e07e4d7e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- audioplayer: fix connectline paint
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
19f9e7bd9e audioplayer: don't darken every second entry
Origin commit data
------------------
Commit: 5c8e9f7fd3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-01 (Sat, 01 Oct 2016)

Origin message was:
------------------
- audioplayer: don't darken every second entry
2016-10-01 22:40:16 +02:00
vanhofen
e5986f007b audioplayer: smoother colors; part 2
Origin commit data
------------------
Commit: 6f156567c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-01 (Sat, 01 Oct 2016)

Origin message was:
------------------
- audioplayer: smoother colors; part 2
2016-10-01 22:24:00 +02:00
vanhofen
32bbc97496 audioplayer: smoother colors
Origin commit data
------------------
Commit: 72b595f631
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-01 (Sat, 01 Oct 2016)

Origin message was:
------------------
- audioplayer: smoother colors
2016-10-01 12:11:07 +02:00
vanhofen
b76e14080e Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/nhttpd/web/Makefile.am
	src/nhttpd/web/Y_Blocks.txt
	src/nhttpd/web/Y_Menue.yhtm
	src/nhttpd/web/Y_Settings_yWeb.yhtm


Origin commit data
------------------
Commit: 6d6873b047
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-01 (Sat, 01 Oct 2016)
2016-10-01 11:54:51 +02:00
vanhofen
30b90115a8 audioplayer: fix detailsline position
Origin commit data
------------------
Commit: c7e1a77a21
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-01 (Sat, 01 Oct 2016)

Origin message was:
------------------
- audioplayer: fix detailsline position
2016-10-01 11:06:11 +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
2be5df305e Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/moviebrowser.cpp


Origin commit data
------------------
Commit: 3d04798d9b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)
2016-08-15 19:08:28 +02:00
vanhofen
e49ee18fb3 fonts: add and use own font for all footers
Origin commit data
------------------
Commit: 54f2ac510f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)

Origin message was:
------------------
- fonts: add and use own font for all footers
2016-08-15 19:02:42 +02:00
vanhofen
2dc8a2a968 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/gui/themes.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: fd5029560e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)
2016-08-15 00:19:32 +02:00
vanhofen
70abfb3339 colors: make footer background color configurable
TODO: footer text color and maybe footer font


Origin commit data
------------------
Commit: cc5258e6d5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)

Origin message was:
------------------
- colors: make footer background color configurable

TODO: footer text color and maybe footer font
2016-08-15 00:14: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
812d95d50c 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/gui/epgview.cpp
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: 4d898949e3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-06 (Sat, 06 Aug 2016)
2016-08-06 23:06:36 +02:00
vanhofen
2d54a78eb1 disable shoutcast, when shoutcast_dev_id is empty
Origin commit data
------------------
Commit: 1f224be672
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-06 (Sat, 06 Aug 2016)

Origin message was:
------------------
- disable shoutcast, when shoutcast_dev_id is empty
2016-08-06 22:52:37 +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
Thilo Graf
4fb0f82062 CAudioPlayerGui:try to fix infocklock view in audioplayer.
after closed screensaver, infoclock was painted. That looks not good.
This should fix this.


Origin commit data
------------------
Commit: 0f7985c95c
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-11-18 (Wed, 18 Nov 2015)
2015-12-27 14:42:29 +01:00
vanhofen
309a8b3af0 neutrino: press tv/radio key to return to plain tv/radio
Origin commit data
------------------
Commit: 736343d35b
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-14 (Mon, 14 Dec 2015)

Origin message was:
------------------
- neutrino: press tv/radio key to return to plain tv/radio
2015-12-15 08:15:17 +01:00
Jacek Jendrzej
519b645c1d audioplayer: -add flv format (THX Houdini)
Origin commit data
------------------
Commit: 29aa47aef0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-07-27 (Mon, 27 Jul 2015)
2015-07-27 12:40:41 +02:00
vanhofen
6a4659bf77 framebuffer: revival of showFrame() function to allow ...
... pictures like start.jpg, mp3.jpg etc. from /var/tuxbox/icons


Origin commit data
------------------
Commit: edc8527379
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-05 (Tue, 05 May 2015)

Origin message was:
------------------
- framebuffer: revival of showFrame() function to allow ...

... pictures like start.jpg, mp3.jpg etc. from /var/tuxbox/icons
2015-05-05 12:01:04 +02:00
Thilo Graf
61656865d0 Merge branch 'cst-next.pre' into cst-next
Origin commit data
------------------
Commit: a58f1621b4
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-04-30 (Thu, 30 Apr 2015)
2015-04-30 09:20:43 +02:00
Jacek Jendrzej
787fc5ebda add pugixml
Origin commit data
------------------
Commit: 422c91d117
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-04-27 (Mon, 27 Apr 2015)
2015-04-28 10:12:23 +02:00
Stefan Seyfried
d9354e847f global.h: Use forward-declarations to reduce number of dependencies
Origin commit data
------------------
Commit: 5ab6b53054
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-04-16 (Thu, 16 Apr 2015)
2015-04-16 13:39:35 +02:00
Thilo Graf
d4bd6d237c gui/audioplayer.cpp/h: fix some type conversions
Origin commit data
------------------
Commit: 08cb42d22f
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-01-12 (Mon, 12 Jan 2015)
2015-03-29 22:40:05 +02:00
Thilo Graf
09c9f8b9a4 CAudioPlayerGui: paint of id3 info with info box
Infobox provides already paint of text, so is not required to
call explicit fontrenderer methods.


Origin commit data
------------------
Commit: 98d18f3ff4
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-12-26 (Fri, 26 Dec 2014)
2015-03-29 22:40:01 +02:00
Thilo Graf
91018ccfe1 CAudioPlayerGui: replace showGlobalStatus() with showStatus()
Origin commit data
------------------
Commit: c2a1299438
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-11-30 (Sun, 30 Nov 2014)

Origin message was:
------------------
CAudioPlayerGui: replace showGlobalStatus() with showStatus()
2015-03-29 22:39:59 +02:00