Commit Graph

222 Commits

Author SHA1 Message Date
Stefan Seyfried
69132416f2 audioplayer: fix buffer overflow
Origin commit data
------------------
Branch: ni/coolstream
Commit: df74ee2d18
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-25 11:25:51 +02:00
vanhofen
daf4480f61 add and use FRAME_WIDTH defines; ...
replace other fixed frame widths with OFFSET defines


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6d58a3b1c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-20 (Wed, 20 Sep 2017)

Origin message was:
------------------
- add and use FRAME_WIDTH defines; ...

replace other fixed frame widths with OFFSET defines


------------------
This commit was generated by Migit
2017-09-20 13:46:31 +02:00
vanhofen
90a51a4564 audioplayer: update gui if streamripper has stopped or crashed
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a5843ca02
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-18 (Fri, 18 Aug 2017)

Origin message was:
------------------
- audioplayer: update gui if streamripper has stopped or crashed

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-18 13:16:40 +02:00
vanhofen
025b8adad6 audioplayer. add streamripper control to record current stream
Origin commit data
------------------
Branch: ni/coolstream
Commit: 24affa8a8b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-17 (Thu, 17 Aug 2017)

Origin message was:
------------------
- audioplayer. add streamripper control to record current stream

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-17 21:13:19 +02:00
vanhofen
bed3062e09 audioplayer: fix right offsets for item
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7cb82ccd74
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-26 (Wed, 26 Jul 2017)

Origin message was:
------------------
- audioplayer: fix right offsets for item

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-07-26 21:34:09 +02:00
vanhofen
0bec415c49 audioplayer: remove wrong transparency from cover
Origin commit data
------------------
Branch: ni/coolstream
Commit: eb2153d482
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-04 (Tue, 04 Jul 2017)

Origin message was:
------------------
- audioplayer: remove wrong transparency from cover

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-07-04 13:46:45 +02:00
vanhofen
c53b128e9d audioplayer: don't scale covers to quadrat-dimensions
Origin commit data
------------------
Branch: ni/coolstream
Commit: 99a6c9e1ee
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-03 (Mon, 03 Jul 2017)

Origin message was:
------------------
- audioplayer: don't scale covers to quadrat-dimensions

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-07-03 22:02:50 +02:00
vanhofen
88fc7e5ab1 settings.h: rename FRAME_MIN_WIDTH to FRAME_WIDTH_MIN ...
to get same name-structure as in the existing defines


Origin commit data
------------------
Branch: ni/coolstream
Commit: f77c2b897c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-28 (Wed, 28 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


------------------
This commit was generated by Migit
2017-06-28 23:08:22 +02:00
vanhofen
817425d877 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/audioplayer.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3f812037a5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)



------------------
This commit was generated by Migit
2017-06-28 22:49:34 +02:00
Thilo Graf
43d2aeee1c 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
------------------
Branch: ni/coolstream
Commit: 86742b1d72
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)



------------------
This commit was generated by Migit
2017-06-28 22:07:34 +02:00
vanhofen
ec16de6f28 audioplayer: reset idle time to avoid screensaver ...
when returning from shoutcast-filebrowser

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


Origin commit data
------------------
Branch: ni/coolstream
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 a07fbc0cd6)
Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-06-28 20:35:20 +02:00
vanhofen
9ac898c882 audioplayer: fix round borders in footer when playlist is hidden ...
and use large roundings as in the other gui-elements

cherry-picked from 102866f71d

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


Origin commit data
------------------
Branch: ni/coolstream
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 102866f71d

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


------------------
This commit was generated by Migit
2017-06-28 20:35:20 +02:00
vanhofen
fd6a3a9067 audioplayer: reset idle time to avoid screensaver ...
when returning from filebrowser

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


Origin commit data
------------------
Branch: ni/coolstream
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 e65e21a0b8)
Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-06-28 20:35:19 +02:00
vanhofen
b7f6c11c59 audioplayer: fix position of meta data in titlebox
(cherry picked from commit b49ce6f0e7)
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
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 b49ce6f0e7)
Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-06-28 20:35:19 +02:00
vanhofen
a82d0e9e58 audioplayer: fix coordinates to clear title-box
(cherry picked from commit 519de5279c)
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
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 519de5279c)
Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-06-28 20:35:18 +02:00
vanhofen
9a98c77126 audioplayer: change scanXmlData() arguments order ...
switch url <-> name to get the same order as in other used functions

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


Origin commit data
------------------
Branch: ni/coolstream
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 f97a29a785)
Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-06-28 20:35:17 +02:00
vanhofen
0c585b0d70 audioplayer: allow to load radio-favorites.xml via menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6a3fa8c4e7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)

Origin message was:
------------------
- audioplayer: allow to load radio-favorites.xml via menu

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-06-28 16:26:36 +02:00
vanhofen
a07fbc0cd6 audioplayer: reset idle time to avoid screensaver ...
when returning from shoutcast-filebrowser


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0a8024cdef
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


------------------
This commit was generated by Migit
2017-06-28 15:58:40 +02:00
vanhofen
e8594b03e2 audioplayer: fix loading of radio-favorites.xml
Origin commit data
------------------
Branch: ni/coolstream
Commit: f49a8fe9b9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)

Origin message was:
------------------
- audioplayer: fix loading of radio-favorites.xml

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-06-28 15:12:00 +02:00
vanhofen
102866f71d audioplayer: fix round borders in footer when playlist is hidden ...
and use large roundings as in the other gui-elements


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8a3d8f8b51
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


------------------
This commit was generated by Migit
2017-06-28 11:29:03 +02:00
vanhofen
e65e21a0b8 audioplayer: reset idle time to avoid screensaver ...
when returning from filebrowser


Origin commit data
------------------
Branch: ni/coolstream
Commit: d4f366c0dd
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


------------------
This commit was generated by Migit
2017-06-28 11:29:03 +02:00
vanhofen
b49ce6f0e7 audioplayer: fix position of meta data in titlebox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 37c61fa12f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-27 (Tue, 27 Jun 2017)

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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-06-27 23:45:57 +02:00
vanhofen
9c58e2fc21 audioplayer: allow logos for internet radio stations ...
Syntax in radio-stations.xml or radio-favorites.xml:

<station
 url="http://url/to/the/station"
 name="Name of the station"
 logo="http://url/to/the/logo"
/>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9c115bec03
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-27 (Tue, 27 Jun 2017)

Origin message was:
------------------
- audioplayer: allow logos for internet radio stations ...

Syntax in radio-stations.xml or radio-favorites.xml:

<station
    url="http://url/to/the/station"
    name="Name of the station"
    logo="http://url/to/the/logo"
/>


------------------
This commit was generated by Migit
2017-06-27 23:45:57 +02:00
vanhofen
519de5279c audioplayer: fix coordinates to clear title-box
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0dfe5becbb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-27 (Tue, 27 Jun 2017)

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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-06-27 23:45:57 +02:00
vanhofen
f97a29a785 audioplayer: change scanXmlData() arguments order ...
switch url <-> name to get the same order as in other used functions


Origin commit data
------------------
Branch: ni/coolstream
Commit: f31f8c5bc8
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


------------------
This commit was generated by Migit
2017-06-27 23:45:57 +02:00
vanhofen
0449efa2d3 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
------------------
Branch: ni/coolstream
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.


------------------
This commit was generated by Migit
2017-06-21 10:31:22 +02:00
vanhofen
4b7badf315 cc_frm_header: remove CComponentsHeaderLocalized() subclass
use another constructor of CComponentsHeader() instead


Origin commit data
------------------
Branch: ni/coolstream
Commit: 92ceac6a5d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-20 (Tue, 20 Jun 2017)

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

use another constructor of CComponentsHeader() instead


------------------
This commit was generated by Migit
2017-06-20 15:55:42 +02:00
vanhofen
5c243cf9ff 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
------------------
Branch: ni/coolstream
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>


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


Origin commit data
------------------
Branch: ni/coolstream
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>


------------------
This commit was generated by Migit
2017-06-20 09:55:29 +02:00
vanhofen
3d99119ebe audioplayer: add shadow to gui-elements
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
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>


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


Origin commit data
------------------
Branch: ni/coolstream
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>


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


Origin commit data
------------------
Branch: ni/coolstream
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>


------------------
This commit was generated by Migit
2017-06-20 09:55:18 +02:00
vanhofen
970c5c123f simplify last shadow-changes ...
I didn't know about the possibility to add a shadow directly to
the scrollbar.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 738ffc1d24
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.


------------------
This commit was generated by Migit
2017-06-19 16:20:49 +02:00
vanhofen
e9e0e3b497 audioplayer: fix coordinates in hide() function
Origin commit data
------------------
Branch: ni/coolstream
Commit: 825b658197
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-19 (Mon, 19 Jun 2017)

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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-06-19 13:00:05 +02:00
vanhofen
1038b22e2d audioplayer: add shadow to gui-elements
Origin commit data
------------------
Branch: ni/coolstream
Commit: 679fd0207c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-19 (Mon, 19 Jun 2017)

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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-06-19 09:33:11 +02:00
vanhofen
393ded6d49 audioplayer: don't show not recognized bitrates
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9fefb133d9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)

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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-06-18 23:54:43 +02:00
vanhofen
a70843710e audioplayer: minor format changes in title box
Origin commit data
------------------
Branch: ni/coolstream
Commit: 31df95ef58
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)

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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-06-18 23:27:45 +02:00
vanhofen
ef6a3304c6 audioplayer: add url to infobox; minor changes in display format
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7fbbafd613
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)

Origin message was:
------------------
- audioplayer: add url to infobox; minor changes in display format

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-06-18 23:00:12 +02:00
vanhofen
a37ea12a57 audioplayer: add url to metadata
Origin commit data
------------------
Branch: ni/coolstream
Commit: eaabd0ca48
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)

Origin message was:
------------------
- audioplayer: add url to metadata

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-06-18 23:00:12 +02:00
vanhofen
7e214a917c audioplayer: fix total time position
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5d394b70d9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)

Origin message was:
------------------
- audioplayer: fix total time position

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-06-18 23:00:11 +02:00
vanhofen
e0886a019c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/audioplayer.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5433054b38
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)



------------------
This commit was generated by Migit
2017-06-18 00:52:04 +02:00
vanhofen
a3d5baa1e6 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
------------------
Branch: ni/coolstream
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>


------------------
This commit was generated by Migit
2017-06-18 00:04:40 +02:00
vanhofen
2f46bc7116 audioplayer: add missing OFFSET define
Origin commit data
------------------
Branch: ni/coolstream
Commit: c6ca98fd8e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-17 (Sat, 17 Jun 2017)

Origin message was:
------------------
- audioplayer: add missing OFFSET define

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-06-17 16:34:47 +02:00
vanhofen
aa1470d37e audioplayer: small design reworks ...
* use OFFSET defines
* use CComponentsScrollbar
* rename some variables
* many, many position calculation fixes
* re-format code


Origin commit data
------------------
Branch: ni/coolstream
Commit: 96cd0f09a1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-17 (Sat, 17 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


------------------
This commit was generated by Migit
2017-06-17 15:00:54 +02:00
vanhofen
48db0bd94c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac
	data/icons/filetypes/mp3.png
	data/icons/filetypes/picture.png
	src/gui/audioplayer.cpp
	src/gui/bouquetlist.cpp
	src/gui/filebrowser.cpp
	src/gui/followscreenings.cpp
	src/gui/followscreenings.h
	src/gui/osd_setup.cpp
	src/gui/record_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 75db11c2e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)



------------------
This commit was generated by Migit
2017-06-07 15:14:51 +02:00
vanhofen
67f8ed5225 audioplayer: use NEUTRINO_ICON_AUDIO in header
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
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>


------------------
This commit was generated by Migit
2017-06-07 14:17:11 +02:00
vanhofen
6fc9503975 audioplayer: use NEUTRINO_ICON_AUDIO in header
Origin commit data
------------------
Branch: ni/coolstream
Commit: 563a4f5088
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)

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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-05-30 01:24:21 +02:00
vanhofen
3c5a9a5d88 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a34a8992d4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-24 (Mon, 24 Apr 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-04-24 12:56:51 +02:00
vanhofen
a2cab1dffa scrollbars: avoid usage of COL_SCROLLBAR_PASSIVE_PLUS_0 ...
... outside of CComponentsScrollBar(). Since the color-changes in
cd80e26 the non-CC scrollbars looks weird.


Origin commit data
------------------
Branch: ni/coolstream
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
cd80e26 the non-CC scrollbars looks weird.


------------------
This commit was generated by Migit
2017-04-24 12:29:52 +02:00
vanhofen
7dcc90f09f 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
------------------
Branch: ni/coolstream
Commit: c4fa0eb30e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)



------------------
This commit was generated by Migit
2017-03-13 12:45:30 +01:00