Commit Graph

170 Commits

Author SHA1 Message Date
vanhofen
51a20d00c7 settings.h: rename FRAME_MIN_WIDTH to FRAME_WIDTH_MIN ...
to get same name-structure as in the existing defines

(cherry picked from commit 834e9e3843)
Signed-off-by: Thilo Graf <dbt@novatux.de>

Conflicts:
	src/system/settings.h


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

Origin message was:
------------------
- settings.h: rename FRAME_MIN_WIDTH to FRAME_WIDTH_MIN ...

to get same name-structure as in the existing defines

(cherry picked from commit 834e9e3843)
Signed-off-by: Thilo Graf <dbt@novatux.de>

Conflicts:
	src/system/settings.h
2017-06-29 17:18:06 +02:00
Thilo Graf
b955b5bc79 CAudioPlayerGui: add cc scquare objekt as title box, fix caption bg colors
Use of cc square object saves unnecessary paintBoxRel() calls.
BgColors of metatdata and time display were different to
titlebox body color, but was not to see with all themes.

btw: time box was too much on the right side. Frame of titelbox
was overpainted but was not very noticeable if frame width < 2.


Origin commit data
------------------
Commit: 86742b1d72
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)
2017-06-28 22:07:34 +02:00
vanhofen
6d71bdbcb7 audioplayer: reset idle time to avoid screensaver ...
when returning from shoutcast-filebrowser

(cherry picked from commit 3587c5e1a7)
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: b62bb3715f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)

Origin message was:
------------------
- audioplayer: reset idle time to avoid screensaver ...

when returning from shoutcast-filebrowser

(cherry picked from commit 3587c5e1a7)
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-28 20:35:20 +02:00
vanhofen
1e25393c20 audioplayer: fix round borders in footer when playlist is hidden ...
and use large roundings as in the other gui-elements

cherry-picked from 4785f5324f

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


Origin commit data
------------------
Commit: bb7b9e2207
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)

Origin message was:
------------------
- audioplayer: fix round borders in footer when playlist is hidden ...

and use large roundings as in the other gui-elements

cherry-picked from 4785f5324f

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-28 20:35:20 +02:00
vanhofen
4041279511 audioplayer: reset idle time to avoid screensaver ...
when returning from filebrowser

(cherry picked from commit e21440a6b7)
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: bab708281a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)

Origin message was:
------------------
- audioplayer: reset idle time to avoid screensaver ...

when returning from filebrowser

(cherry picked from commit e21440a6b7)
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-28 20:35:19 +02:00
vanhofen
92c28e21e8 audioplayer: fix position of meta data in titlebox
(cherry picked from commit 0ccd2a5cc7)
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: f0c70b854c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-27 (Tue, 27 Jun 2017)

Origin message was:
------------------
- audioplayer: fix position of meta data in titlebox

(cherry picked from commit 0ccd2a5cc7)
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-28 20:35:19 +02:00
vanhofen
00694dfcf8 audioplayer: fix coordinates to clear title-box
(cherry picked from commit 0fbfbc4bc3)
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 4b4cf14d6b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-27 (Tue, 27 Jun 2017)

Origin message was:
------------------
- audioplayer: fix coordinates to clear title-box

(cherry picked from commit 0fbfbc4bc3)
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-28 20:35:18 +02:00
vanhofen
6a8e1d8e55 audioplayer: change scanXmlData() arguments order ...
switch url <-> name to get the same order as in other used functions

(cherry picked from commit e93c9416be)
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: d75a3b0f58
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-27 (Tue, 27 Jun 2017)

Origin message was:
------------------
- audioplayer: change scanXmlData() arguments order ...

switch url <-> name to get the same order as in other used functions

(cherry picked from commit e93c9416be)
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-28 20:35:17 +02:00
vanhofen
0c076425eb cc_frm_header: remove CComponentsHeaderLocalized() subclass
use another constructor of CComponentsHeader() instead

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

Good idea, this I had already in mind too.


Origin commit data
------------------
Commit: 980e293517
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-21 (Wed, 21 Jun 2017)

Origin message was:
------------------
- cc_frm_header: remove CComponentsHeaderLocalized() subclass

use another constructor of CComponentsHeader() instead

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

Good idea, this I had already in mind too.
2017-06-21 10:31:22 +02:00
vanhofen
e00aebb6f4 simplify last shadow-changes ...
I didn't know about the possibility to add a shadow directly to
the scrollbar.

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


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

Origin message was:
------------------
- simplify last shadow-changes ...

I didn't know about the possibility to add a shadow directly to
the scrollbar.

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-20 09:55:37 +02:00
vanhofen
e6c030a894 audioplayer: fix coordinates in hide() function
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- audioplayer: fix coordinates in hide() function

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-20 09:55:29 +02:00
vanhofen
8afe19e759 audioplayer: add shadow to gui-elements
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

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

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-20 09:55:24 +02:00
vanhofen
6d8978b994 audioplayer: don't show not recognized bitrates
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: c1460ef905
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)

Origin message was:
------------------
- audioplayer: don't show not recognized bitrates

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-20 09:55:21 +02:00
vanhofen
a9dcef0b0a audioplayer: minor format changes in title box
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: cd6c123e56
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)

Origin message was:
------------------
- audioplayer: minor format changes in title box

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-20 09:55:18 +02:00
vanhofen
e6bcd7ab14 audioplayer: small design reworks ...
* use OFFSET defines
* use CComponentsScrollbar
* rename some variables
* many, many position calculation fixes
* re-format code

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


Origin commit data
------------------
Commit: 4c21971b4a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)

Origin message was:
------------------
- audioplayer: small design reworks ...

* use OFFSET defines
* use CComponentsScrollbar
* rename some variables
* many, many position calculation fixes
* re-format code

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-18 00:04:40 +02:00
vanhofen
b1b18819b1 audioplayer: use NEUTRINO_ICON_AUDIO in header
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 6c1d7eea59
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)

Origin message was:
------------------
- audioplayer: use NEUTRINO_ICON_AUDIO in header

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-07 14:17:11 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Jacek Jendrzej
3f53a4b636 xmlinterface use const char instand char
Origin commit data
------------------
Commit: 8227a01592
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-03-20 (Fri, 20 Mar 2015)
2015-03-20 12:05:22 +01:00
Jacek Jendrzej
b17a38a1fe audioplayer.cpp: prevent possible segfault
Origin commit data
------------------
Commit: 138e5d4763
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-03-19 (Thu, 19 Mar 2015)
2015-03-19 18:18:13 +01:00
[CST] Focus
fe69240661 gui/audioplayer.cpp: fix refresh after open picture viewer
Origin commit data
------------------
Commit: 798b6f4945
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-03-10 (Tue, 10 Mar 2015)
2015-03-10 15:32:23 +03:00
[CST] Focus
08f61f1941 gui/audioplayer.cpp: fix missing frame around infobox
Origin commit data
------------------
Commit: 4f5ac78e7f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-03-09 (Mon, 09 Mar 2015)
2015-03-09 14:58:05 +03:00
vanhofen
2dfe72b2f4 vfd/audioplayer: fix vfd progress in audioplayer
don't update full vfd every second


Origin commit data
------------------
Commit: 90f968c19d
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-01-09 (Fri, 09 Jan 2015)

Origin message was:
------------------
- vfd/audioplayer: fix vfd progress in audioplayer

 don't update full vfd every second
2015-01-09 11:18:52 +01:00