Commit Graph

12055 Commits

Author SHA1 Message Date
gixxpunk
677a327591 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 0e862002b6
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-06-30 (Fri, 30 Jun 2017)
2017-06-30 21:27:49 +02:00
vanhofen
3cc347df42 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: ea1a4ad6f1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-30 (Fri, 30 Jun 2017)
2017-06-30 14:41:19 +02:00
Thilo Graf
3218759464 CBouquetList: fix scrollbar shadow
Footer is painted as first item and scrollbar as last, so shadow
overpaint footer body. Either paint scrollbar as first or use
matching shadow parameter.


Origin commit data
------------------
Commit: acb5b7e292
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-29 (Thu, 29 Jun 2017)
2017-06-30 13:53:43 +02:00
Jacek Jendrzej
82099d9faa src/gui/movieplayer.cpp fix play icon after pause->seek
Origin commit data
------------------
Commit: 4318615a60
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-30 (Fri, 30 Jun 2017)
2017-06-30 13:42:09 +02:00
Jacek Jendrzej
6f65302911 src/gui/movieplayer.cpp show FileTimeOSD only if setSpeed work
Origin commit data
------------------
Commit: 1f095b96c9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-30 (Fri, 30 Jun 2017)
2017-06-30 13:40:19 +02:00
vanhofen
35e13eb34e Revert "- bouquetlist: fix footer; CComponentsFooter doesn't like 0 buttons as it seems"
This reverts commit 7442c19a59.


Origin commit data
------------------
Commit: 768bb1330b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-30 (Fri, 30 Jun 2017)
2017-06-30 10:43:06 +02:00
vanhofen
e4fdbbaa80 cc_frm_footer: avoid division by 0
Origin commit data
------------------
Commit: f7a95bd3ac
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-30 (Fri, 30 Jun 2017)

Origin message was:
------------------
- cc_frm_footer: avoid division by 0
2017-06-30 10:41:24 +02:00
vanhofen
8cbcfcabaf Merge branch 'ni/tuxbox' of bitbucket.org:neutrino-images/ni-neutrino-hd into ni/tuxbox
Origin commit data
------------------
Commit: 936a6ab3f7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-29 (Thu, 29 Jun 2017)
2017-06-29 21:37:11 +02:00
vanhofen
7442c19a59 bouquetlist: fix footer; CComponentsFooter doesn't like 0 buttons as it seems
Origin commit data
------------------
Commit: 5b3be66a93
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-29 (Thu, 29 Jun 2017)

Origin message was:
------------------
- bouquetlist: fix footer; CComponentsFooter doesn't like 0 buttons as it seems
2017-06-29 21:35:51 +02:00
gixxpunk
c2a2ab7509 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 2594a60728
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-06-29 (Thu, 29 Jun 2017)
2017-06-29 21:29:56 +02:00
Jacek Jendrzej
c44fcd296b src/gui/moviebrowser/mb.cpp fix segfault if m_movieSelectionHandler is NULL
Origin commit data
------------------
Commit: fc5ba460a5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-29 (Thu, 29 Jun 2017)
2017-06-29 19:04:10 +02:00
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
Michael Liebmann
043e374b4a Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 542626c0da
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-29 (Thu, 29 Jun 2017)
2017-06-29 15:06:39 +02:00
Michael Liebmann
3c32edae9d lib-libtuxtxt-tuxtxt.cpp avoid segfault, supplement to d6b7d95
Origin commit data
------------------
Commit: a6344b3527
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-29 (Thu, 29 Jun 2017)
2017-06-29 15:05:30 +02:00
vanhofen
834e9e3843 settings.h: rename FRAME_MIN_WIDTH to FRAME_WIDTH_MIN ...
to get same name-structure as in the existing defines


Origin commit data
------------------
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
2017-06-28 23:08:22 +02:00
vanhofen
171e52c0e6 settings.h: set FRAME_MIN_WIDTH to 1
Origin commit data
------------------
Commit: eb6863a340
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)

Origin message was:
------------------
- settings.h: set FRAME_MIN_WIDTH to 1
2017-06-28 22:50:47 +02:00
vanhofen
25e1efbc73 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
------------------
Commit: 3f812037a5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)
2017-06-28 22:49:34 +02:00
vanhofen
c1f17ef758 upnpbrowser: fix some wrong OFFSETs
Origin commit data
------------------
Commit: 788181bf27
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)

Origin message was:
------------------
- upnpbrowser: fix some wrong OFFSETs
2017-06-28 22:44:08 +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
Thilo Graf
9e012d61a8 settings.h: add define for minimal frame width
Mostly we are using a frame width of 2 lines. This should ensure
correct scaling with other screen resolution.


Origin commit data
------------------
Commit: 6aaa403197
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)
2017-06-28 21:24:09 +02:00
Thilo Graf
1203bd054a CComponentsFooter: remove FIXME tag
fixed since 428788c8a4
Obsolete wrong types caused this.


Origin commit data
------------------
Commit: 47f7426aa7
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)
2017-06-28 20:36:51 +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
c0b9460184 audiometadata: add logo to metadata
# Conflicts:
#	src/driver/audiometadata.cpp
#	src/driver/audiometadata.h

cherry-picked from da7b7b0930

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


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

Origin message was:
------------------
- audiometadata: add logo to metadata

# Conflicts:
#	src/driver/audiometadata.cpp
#	src/driver/audiometadata.h

cherry-picked from da7b7b0930

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
2b74966d80 audiodec: unify cover handling
(cherry picked from commit a33f81ba2e)
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- audiodec: unify cover handling

(cherry picked from commit a33f81ba2e)
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
a762acd9cc audioplayer: allow to load radio-favorites.xml via menu
Origin commit data
------------------
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
2017-06-28 16:26:36 +02:00
vanhofen
3587c5e1a7 audioplayer: reset idle time to avoid screensaver ...
when returning from shoutcast-filebrowser


Origin commit data
------------------
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
2017-06-28 15:58:40 +02:00
vanhofen
f87ca6e44c audioplayer: fix loading of radio-favorites.xml
Origin commit data
------------------
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
2017-06-28 15:12:00 +02:00
vanhofen
4785f5324f audioplayer: fix round borders in footer when playlist is hidden ...
and use large roundings as in the other gui-elements


Origin commit data
------------------
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
2017-06-28 11:29:03 +02:00
vanhofen
e21440a6b7 audioplayer: reset idle time to avoid screensaver ...
when returning from filebrowser


Origin commit data
------------------
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
2017-06-28 11:29:03 +02:00
vanhofen
898a85ddd7 audiometadata: fix compile with -Werror; "will be initialized after ..."
Origin commit data
------------------
Commit: 97837d1513
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)

Origin message was:
------------------
- audiometadata: fix compile with -Werror; "will be initialized after ..."
2017-06-28 08:25:40 +02:00
vanhofen
e4b0a3e5b6 radio-favorites.xml: add new sample entry
Origin commit data
------------------
Commit: 113e0e4f34
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-27 (Tue, 27 Jun 2017)

Origin message was:
------------------
- radio-favorites.xml: add new sample entry
2017-06-27 23:45:57 +02:00
vanhofen
0ccd2a5cc7 audioplayer: fix position of meta data in titlebox
Origin commit data
------------------
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
2017-06-27 23:45:57 +02:00
vanhofen
da7b7b0930 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
------------------
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"
/>
2017-06-27 23:45:57 +02:00
vanhofen
b999431eec audiometadata: add logo to metadata
Origin commit data
------------------
Commit: 473dc945c5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-27 (Tue, 27 Jun 2017)

Origin message was:
------------------
- audiometadata: add logo to metadata
2017-06-27 23:45:57 +02:00
vanhofen
0fbfbc4bc3 audioplayer: fix coordinates to clear title-box
Origin commit data
------------------
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
2017-06-27 23:45:57 +02:00
vanhofen
a33f81ba2e audiodec: unify cover handling
Origin commit data
------------------
Commit: ae0f735d99
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-27 (Tue, 27 Jun 2017)

Origin message was:
------------------
- audiodec: unify cover handling
2017-06-27 23:45:57 +02:00
vanhofen
e93c9416be audioplayer: change scanXmlData() arguments order ...
switch url <-> name to get the same order as in other used functions


Origin commit data
------------------
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
2017-06-27 23:45:57 +02:00
vanhofen
d4545b0abd Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: a1baacc7d4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)
2017-06-26 22:51:16 +02:00
vanhofen
37d602cfde cc_frm_button.cpp: fix comparsion to detect dyn-font usage
Origin commit data
------------------
Commit: 942d8594f5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)

Origin message was:
------------------
- cc_frm_button.cpp: fix comparsion to detect dyn-font usage
2017-06-26 22:43:36 +02:00
vanhofen
1f8d52be0d cc_frm_footer: re-add auto-calc label_width by default
Origin commit data
------------------
Commit: bd5602c050
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)

Origin message was:
------------------
- cc_frm_footer: re-add auto-calc label_width by default
2017-06-26 22:43:36 +02:00
vanhofen
b3f508bb90 fontrenderer: align FTC_Manager_New()-call to tuxbox-neutrino
Origin commit data
------------------
Commit: bae61aa343
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)

Origin message was:
------------------
- fontrenderer: align FTC_Manager_New()-call to tuxbox-neutrino
2017-06-26 22:43:36 +02:00
Jacek Jendrzej
e26b8378e6 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 8b89baa7a2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-26 (Mon, 26 Jun 2017)
2017-06-26 22:22:07 +02:00
vanhofen
b8fab4c0fb bouqueteditor: use default font for CComponentsFooter
(cherry picked from commit 17aa5edad9)
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- bouqueteditor: use default font for CComponentsFooter

(cherry picked from commit 17aa5edad9)
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-26 20:53:12 +02:00
vanhofen
30f56a7edc moviebrowser: fix deletion of non-marked movies via mute-key
(cherry picked from commit 15e33337a6)
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- moviebrowser: fix deletion of non-marked movies via mute-key

(cherry picked from commit 15e33337a6)
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-26 20:53:12 +02:00
vanhofen
842164614d timerlist: fix compiler-warning (comparison signed/unsigned int)
(cherry picked from commit 3b84c0a7ae)
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- timerlist: fix compiler-warning (comparison signed/unsigned int)

(cherry picked from commit 3b84c0a7ae)
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-26 20:53:12 +02:00