Commit Graph

10852 Commits

Author SHA1 Message Date
vanhofen
864bdc7867 audioplayer: fix right offsets for item
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: bfedeffb61
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-26 (Wed, 26 Jul 2017)

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

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


------------------
This commit was generated by Migit
2017-08-08 14:25:12 +02:00
Thilo Graf
4483378269 CComponentsHeader: disable permanent clock paint on interval.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8e17eadb6a
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-02 (Wed, 02 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-08 14:25:12 +02:00
Thilo Graf
af5abcccf9 CComponentsHeader: rework and simplified logo handling
This should fix some issues with possible overlapps
of logos with title. With some Conditions with text
alignment on the right side needs a fix.
There is an issue with size and position of text object, but is stll not
used at the moment. For all other conditions of logo and text alignments now
it should be not a problem (I hope) and have more code clarity.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 356719cf3a
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-02 (Wed, 02 Aug 2017)



------------------
This commit was generated by Migit
2017-08-08 14:25:12 +02:00
Thilo Graf
5e3d70752b COsdSetup: add slot to ensure clean up icon cache on changed resolution.
Some old icon data makes no sense with changed resolution.
In some cases it could happens that no icons are to see on screen
after changed resolution. This should fix this,


Origin commit data
------------------
Branch: ni/coolstream
Commit: 58d4f13bb7
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-02 (Wed, 02 Aug 2017)



------------------
This commit was generated by Migit
2017-08-08 14:25:12 +02:00
Thilo Graf
dad04f2202 CFrameBuffer: fb-generic.cpp - add methode for clean up icon cache
This could be required eg. on changed resoulutions or
changed iconsets on runtime.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4e66739ff5
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-02 (Wed, 02 Aug 2017)



------------------
This commit was generated by Migit
2017-08-08 14:25:12 +02:00
Thilo Graf
d47a04240e CBuildinfo: Don't load graphical related objects if not needed.
Objects are only required in show mode. HasData() is renamed because of for more
plausibility.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9678adc401
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-02 (Wed, 02 Aug 2017)



------------------
This commit was generated by Migit
2017-08-08 14:25:12 +02:00
Thilo Graf
7246626692 offsets: add SIDEBAR_WIDTH
required in window class


Origin commit data
------------------
Branch: ni/coolstream
Commit: c18e337d1f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-02 (Wed, 02 Aug 2017)



------------------
This commit was generated by Migit
2017-08-08 14:25:12 +02:00
Thilo Graf
7600126c2f CBuildInfo: add missing offset defines
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9c89f13cba
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-02 (Wed, 02 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-08 14:25:12 +02:00
Thilo Graf
208498a730 Colorsettings: add possibility to change shadow color
Shadow color was bound to infobar color and it's not really
understandable why, because with some colors eg. black, the shadow is
grey or with other colors it is exaggerated colored and seems to be
not realistically and looks unusual if shadow is brighter or colorful
than foreground. Some themes will thank it.

TODO: update theme files with matching values if required


Origin commit data
------------------
Branch: ni/coolstream
Commit: c600b4c416
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-02 (Wed, 02 Aug 2017)



------------------
This commit was generated by Migit
2017-08-08 14:25:12 +02:00
GetAway
aaee0baf07 neutrino: disable some menus in upnp & ts mode
to prevent inoperability of neutrino


Origin commit data
------------------
Branch: ni/coolstream
Commit: 90de51de38
Author: GetAway <get-away@t-online.de>
Date: 2017-08-06 (Sun, 06 Aug 2017)



------------------
This commit was generated by Migit
2017-08-07 07:52:41 +02:00
GetAway
c9e8652129 neutrino.cpp: repaint of background in radio mode, when close UPNP-Browser
Origin commit data
------------------
Branch: ni/coolstream
Commit: 95b535016f
Author: GetAway <get-away@t-online.de>
Date: 2017-08-06 (Sun, 06 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-07 07:52:32 +02:00
Jacek Jendrzej
80887f7906 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 72a9fa40db
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-07-05 (Wed, 05 Jul 2017)


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

------------------
This commit was generated by Migit
2017-07-05 21:43:36 +02:00
TangoCash
19059348be no shutdown if streaming (thx dbo)
prevent shutdown from timer if stb is started from deep standby > does a
timer-record > and meanwhile streaming (eg. localTV or via web-if to PC)
is active

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 57f46e1f2b
Author: TangoCash <eric@loxat.de>
Date: 2017-07-05 (Wed, 05 Jul 2017)



------------------
This commit was generated by Migit
2017-07-05 10:41:27 +02:00
vanhofen
5820d8a8a0 epgscan: allow to set rescan period to catch a bug in epgscan
Scan isn't executed while a movie is played. When movie is stopped
the scan-timer is ignored too.

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 761a2b2e73
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-04 (Tue, 04 Jul 2017)

Origin message was:
------------------
- epgscan: allow to set rescan period to catch a bug in epgscan

Scan isn't executed while a movie is played. When movie is stopped
the scan-timer is ignored too.

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


------------------
This commit was generated by Migit
2017-07-04 12:22:53 +02:00
vanhofen
3533a3bb8a moviebrowser: another fix for deletion function ...
and add some temporary console output to see what happens

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: f191f0730f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-03 (Mon, 03 Jul 2017)

Origin message was:
------------------
- moviebrowser: another fix for deletion function ...

and add some temporary console output to see what happens

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


------------------
This commit was generated by Migit
2017-07-04 12:22:53 +02:00
vanhofen
05d63ab5bc audioplayer: don't scale covers to quadrat-dimensions
Signed-off-by: Thilo Graf <dbt@novatux.de>

# Conflicts:
#	src/gui/audioplayer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: dd19314000
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-04 (Tue, 04 Jul 2017)

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

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

# Conflicts:
#	src/gui/audioplayer.cpp


------------------
This commit was generated by Migit
2017-07-04 12:22:53 +02:00
Thilo Graf
54da8c572f CLocaleManager: add casted version of getText() function
Allows easier handling with strings instead const char
for usage as string source. Separate casts are not requiered.

Overload of getText() was not possible but,
name getTextAsString() is keeping namespace of base function
getText().


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6aa66b84c1
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-07-03 (Mon, 03 Jul 2017)

Origin message was:
------------------
CLocaleManager: add casted version of getText() function

Allows easier handling with strings instead const char
for usage as string source. Separate casts are not requiered.

Overload of getText() was not possible but,
name getTextAsString() is keeping namespace of base function
getText().


------------------
This commit was generated by Migit
2017-07-04 12:22:53 +02:00
TangoCash
ff3e6fd949 fix epgplus detailsline hide bug (thx dbo)
Signed-off-by: Thilo Graf <dbt@novatux.de>

dline was not removed after called epg info.

btw. Small request:
It would be nice if a short brief justification would be included.
That would be make some things easier to track and saves unnecessary questions.
Thx!


Origin commit data
------------------
Branch: ni/coolstream
Commit: d7e196c58a
Author: TangoCash <eric@loxat.de>
Date: 2017-07-02 (Sun, 02 Jul 2017)



------------------
This commit was generated by Migit
2017-07-04 12:22:53 +02:00
Jacek Jendrzej
12870b976c Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: f791ee1455
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-07-02 (Sun, 02 Jul 2017)


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

------------------
This commit was generated by Migit
2017-07-02 17:22:23 +02:00
Thilo Graf
f0c15bdf9c CUpnpBrowserGui: try to reduce flicker effects on scroll
Some parts on screen should be painted only if changed.
This should help to reduce some flicker effects.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3213999198
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-07-01 (Sat, 01 Jul 2017)



------------------
This commit was generated by Migit
2017-07-01 22:10:26 +02:00
Thilo Graf
6c363152e3 CUpnpBrowserGui: fix dline paint during directory selection
Dline was not removed on directory selection.


Origin commit data
------------------
Branch: ni/coolstream
Commit: baf441b5d0
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-07-01 (Sat, 01 Jul 2017)



------------------
This commit was generated by Migit
2017-07-01 22:09:08 +02:00
Jacek Jendrzej
9473eabf2a src/gui/opkg_manager.cpp fix esource leak; supplement to 6e321d5966
Origin commit data
------------------
Branch: ni/coolstream
Commit: 18e1ec060f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-07-01 (Sat, 01 Jul 2017)


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

------------------
This commit was generated by Migit
2017-07-01 10:26:33 +02:00
Thilo Graf
1c9ce40eb4 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
------------------
Branch: ni/coolstream
Commit: acb5b7e292
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-29 (Thu, 29 Jun 2017)



------------------
This commit was generated by Migit
2017-06-30 13:53:43 +02:00
Jacek Jendrzej
5d38764dc8 src/gui/movieplayer.cpp fix play icon after pause->seek
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4318615a60
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-30 (Fri, 30 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-30 13:42:09 +02:00
Jacek Jendrzej
d5b0ebf8f1 src/gui/movieplayer.cpp show FileTimeOSD only if setSpeed work
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1f095b96c9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-30 (Fri, 30 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-30 13:40:19 +02:00
Jacek Jendrzej
0dda6b7979 src/gui/moviebrowser/mb.cpp fix segfault if m_movieSelectionHandler is NULL
Origin commit data
------------------
Branch: ni/coolstream
Commit: fc5ba460a5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-29 (Thu, 29 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-29 19:04:10 +02:00
vanhofen
82f30b454d settings.h: rename FRAME_MIN_WIDTH to FRAME_WIDTH_MIN ...
to get same name-structure as in the existing defines

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

Conflicts:
	src/system/settings.h


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

Conflicts:
	src/system/settings.h


------------------
This commit was generated by Migit
2017-06-29 17:18:06 +02:00
Michael Liebmann
dbb1faf69d Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 542626c0da
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-29 (Thu, 29 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-29 15:06:39 +02:00
Michael Liebmann
8d1a669301 lib-libtuxtxt-tuxtxt.cpp avoid segfault, supplement to 6771de1
Origin commit data
------------------
Branch: ni/coolstream
Commit: a6344b3527
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-29 (Thu, 29 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-29 15:05:30 +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
Thilo Graf
9b0650d695 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
------------------
Branch: ni/coolstream
Commit: 6aaa403197
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)



------------------
This commit was generated by Migit
2017-06-28 21:24:09 +02:00
Thilo Graf
6c95840345 CComponentsFooter: remove FIXME tag
fixed since 1b2eea185f
Obsolete wrong types caused this.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 47f7426aa7
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)



------------------
This commit was generated by Migit
2017-06-28 20:36:51 +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
dc545ddf1d audiometadata: add logo to metadata
# Conflicts:
#	src/driver/audiometadata.cpp
#	src/driver/audiometadata.h

cherry-picked from 9c58e2fc21

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


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

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


Origin commit data
------------------
Branch: ni/coolstream
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 c5dbede1d3)
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
Jacek Jendrzej
ea4ea34255 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b89baa7a2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-26 (Mon, 26 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-26 22:22:07 +02:00
vanhofen
5a33e3eebf bouqueteditor: use default font for CComponentsFooter
(cherry picked from commit 3beb87c12d)
Signed-off-by: Thilo Graf <dbt@novatux.de>


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


------------------
This commit was generated by Migit
2017-06-26 20:53:12 +02:00
vanhofen
86a87a7083 moviebrowser: fix deletion of non-marked movies via mute-key
(cherry picked from commit 98dcedd452)
Signed-off-by: Thilo Graf <dbt@novatux.de>


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


------------------
This commit was generated by Migit
2017-06-26 20:53:12 +02:00
vanhofen
7db503f654 timerlist: fix compiler-warning (comparison signed/unsigned int)
(cherry picked from commit 4e42382842)
Signed-off-by: Thilo Graf <dbt@novatux.de>


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


------------------
This commit was generated by Migit
2017-06-26 20:53:12 +02:00
vanhofen
64bbca26a3 timerlist: add separationline to items
(cherry picked from commit a5dd8a55fb)
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: d2415c4930
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)

Origin message was:
------------------
- timerlist: add separationline to items

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


------------------
This commit was generated by Migit
2017-06-26 20:53:12 +02:00
vanhofen
d566a902b3 CProgressWindow: use CProgressBar::PB_TIMESCALE as default
More colors makes not really sense here.

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


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



------------------
This commit was generated by Migit
2017-06-26 20:53:12 +02:00
Jacek Jendrzej
6e321d5966 init pre post
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4bdacf39c8
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-26 (Mon, 26 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-26 19:23:23 +02:00
Jacek Jendrzej
6771de1f2d lib/libtuxtxt/tuxtxt.cpp avoid segfault, FIXME
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7aec84d124
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-26 (Mon, 26 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-26 11:53:59 +02:00
Jacek Jendrzej
0d48f6627d Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2ddad19873
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-21 (Wed, 21 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-21 13:54:49 +02:00
Thilo Graf
f140be3486 EpgPlus: fix wrong shadow parameter for scrollbar
Origin commit data
------------------
Branch: ni/coolstream
Commit: 579a73f91b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-21 (Wed, 21 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-21 10:31:22 +02:00