Commit Graph

8286 Commits

Author SHA1 Message Date
Thilo Graf
0018c2b158 Merge branch 'master' into pu/msgbox
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3efaac5725
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-10 (Thu, 10 Nov 2016)



------------------
This commit was generated by Migit
2016-11-10 10:27:22 +01:00
Thilo Graf
c4bbe9d2c2 CMenuTarget: outsource CMenuTarget-class
It's required for some inheritations into other classes if include
of menue.h is not wanted


Origin commit data
------------------
Branch: ni/coolstream
Commit: 098905e8e1
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-10 (Thu, 10 Nov 2016)



------------------
This commit was generated by Migit
2016-11-10 09:08:47 +01:00
Thilo Graf
2d44820ae3 CTimerList: add menu context button to header
Not to see that we have a possible submenu.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9eb9158c2f
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-09 (Wed, 09 Nov 2016)



------------------
This commit was generated by Migit
2016-11-09 19:44:13 +01:00
vanhofen
7ee31ecf63 controlapi: fix compiler warning
error: declaration of 'channel_id' shadows a previous local


Origin commit data
------------------
Branch: ni/coolstream
Commit: 703caef3f6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-09 (Wed, 09 Nov 2016)

Origin message was:
------------------
- controlapi: fix compiler warning

error: declaration of 'channel_id' shadows a previous local


------------------
This commit was generated by Migit
2016-11-09 17:13:43 +01:00
vanhofen
efad07c007 controlapi: add epg_id to several outputs; add /control/getepgid
* /control/getepgid[?format=plain|json|xml]


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3150d9edac
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-09 (Wed, 09 Nov 2016)

Origin message was:
------------------
- controlapi: add epg_id to several outputs; add /control/getepgid

* /control/getepgid[?format=plain|json|xml]


------------------
This commit was generated by Migit
2016-11-09 11:55:44 +01:00
Thilo Graf
7fe97fde28 Merge branch 'master' into pu/msgbox
Conflicts:
	src/gui/timerlist.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 996beed078
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-09 (Wed, 09 Nov 2016)



------------------
This commit was generated by Migit
2016-11-09 00:30:44 +01:00
vanhofen
2149135c85 epgview: use small vertical offset around channellogo; ...
more intensive use of offset defines


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d7a924d06
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)

Origin message was:
------------------
- epgview: use small vertical offset around channellogo; ...

more intensive use of offset defines


------------------
This commit was generated by Migit
2016-11-08 22:03:44 +01:00
vanhofen
92f79c9f15 infoviewer: use small vertical offset around channellogo
Origin commit data
------------------
Branch: ni/coolstream
Commit: 21b2fbd03c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)

Origin message was:
------------------
- infoviewer: use small vertical offset around channellogo

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

------------------
This commit was generated by Migit
2016-11-08 22:02:57 +01:00
vanhofen
16d1168a28 eventlist: use small vertical offset around channellogo
Origin commit data
------------------
Branch: ni/coolstream
Commit: c9be160f20
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)

Origin message was:
------------------
- eventlist: use small vertical offset around channellogo

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

------------------
This commit was generated by Migit
2016-11-08 22:02:08 +01:00
vanhofen
5390a84504 channellist: use small vertical offset around channellogo
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8f625c3d27
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)

Origin message was:
------------------
- channellist: use small vertical offset around channellogo

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

------------------
This commit was generated by Migit
2016-11-08 22:00:51 +01:00
vanhofen
ebc3ccba12 moviebrowser: simplify channellogo scaling code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1590f4a276
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)

Origin message was:
------------------
- moviebrowser: simplify channellogo scaling code

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

------------------
This commit was generated by Migit
2016-11-08 22:00:08 +01:00
vanhofen
2a7db99c6a Merge branch 'master' into pu/moviebrowser
Origin commit data
------------------
Branch: ni/coolstream
Commit: 30333ab2e4
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-08 21:54:51 +01:00
vanhofen
14cb560f5d channellist: fix epg for webtv channels
Origin commit data
------------------
Branch: ni/coolstream
Commit: b59527e987
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)

Origin message was:
------------------
- channellist: fix epg for webtv channels

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

------------------
This commit was generated by Migit
2016-11-08 21:48:51 +01:00
Jacek Jendrzej
1d22fadc6b src/gui/osd_setup.cpp supplement to d2ab0e9c , fix segfault if clock is NULL#
Origin commit data
------------------
Branch: ni/coolstream
Commit: ddd9bd3ca9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-07 (Mon, 07 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-07 22:54:53 +01:00
vanhofen
de05882085 moviebrowser: use small offset in header to display channellogo
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9b79662575
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- moviebrowser: use small offset in header to display channellogo

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

------------------
This commit was generated by Migit
2016-11-07 21:11:13 +01:00
vanhofen
c5a2d47f51 listbox/moviebrowser: replace internal offsets with global defines
Origin commit data
------------------
Branch: ni/coolstream
Commit: b24ec63577
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- listbox/moviebrowser: replace internal offsets with global defines

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

------------------
This commit was generated by Migit
2016-11-07 21:10:21 +01:00
vanhofen
16245bdc76 settings.h: add OFFSET_INNER_MIN define
Origin commit data
------------------
Branch: ni/coolstream
Commit: 11383271ad
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- settings.h: add OFFSET_INNER_MIN define

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

------------------
This commit was generated by Migit
2016-11-07 21:09:45 +01:00
vanhofen
f1160e84c0 cc_frm_header: use OFFSET define
Origin commit data
------------------
Branch: ni/coolstream
Commit: 15e24a3e66
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- cc_frm_header: use OFFSET define

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

------------------
This commit was generated by Migit
2016-11-07 21:08:51 +01:00
TangoCash
0ae28ef185 fix epgtitle
Origin commit data
------------------
Branch: ni/coolstream
Commit: 32c6eaf031
Author: TangoCash <eric@loxat.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-07 20:36:34 +01:00
vanhofen
4bdef16c58 moviebrowser: increase default browserFrameHeight
Origin commit data
------------------
Branch: ni/coolstream
Commit: 16dfc2d5e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- moviebrowser: increase default browserFrameHeight

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

------------------
This commit was generated by Migit
2016-11-07 14:50:50 +01:00
vanhofen
8b356f92b7 Merge branch 'master' into pu/moviebrowser
Origin commit data
------------------
Branch: ni/coolstream
Commit: c65dac6283
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-07 13:46:01 +01:00
vanhofen
b64f151731 moviebrowser: allow round borders in filter selection
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ca710ed4b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- moviebrowser: allow round borders in filter selection

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

------------------
This commit was generated by Migit
2016-11-07 13:45:55 +01:00
vanhofen
008d9e17aa listframe: allow round borders
Origin commit data
------------------
Branch: ni/coolstream
Commit: c7942adb8f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- listframe: allow round borders

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

------------------
This commit was generated by Migit
2016-11-07 13:45:55 +01:00
vanhofen
64bf5d3494 timerlist: just small code cosmetics
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8ac3b64e75
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- timerlist: just small code cosmetics

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

------------------
This commit was generated by Migit
2016-11-07 10:13:04 +01:00
Thilo Graf
fbf803565f Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3e7a1943c3
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-06 23:16:36 +01:00
vanhofen
13f171b6a5 epgview: use movie-info's channelname in movieplayer mode to get channellogo
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3b25694983
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)

Origin message was:
------------------
- epgview: use movie-info's channelname in movieplayer mode to get channellogo

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

------------------
This commit was generated by Migit
2016-11-06 20:54:26 +01:00
Jacek Jendrzej
965509456a src/gui/scan_setup.cpp use CHintBox for reloadchannels
Origin commit data
------------------
Branch: ni/coolstream
Commit: c0ce2a0d3b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-06 (Sun, 06 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-06 18:45:01 +01:00
vanhofen
ccc9e0c65d locale: update slovak; thx to Pr0metheus
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7cbe38e249
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)

Origin message was:
------------------
- locale: update slovak; thx to Pr0metheus

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

------------------
This commit was generated by Migit
2016-11-05 22:15:49 +01:00
Thilo Graf
09beeabc34 CComponentsInfoBox: ensure matching object height after assigned image
Images are not defined with constructor, so it is possible we must
consider the image height after called setPicture() methode.
This is important if an infobox sould be
added into a cc form object. This avoids overlapping of dynamic added items.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 18695fb0c9
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)



------------------
This commit was generated by Migit
2016-11-05 21:17:31 +01:00
vanhofen
cbf9a2d128 Merge branch 'master' into pu/moviebrowser
Origin commit data
------------------
Branch: ni/coolstream
Commit: 664bd8dcf9
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-05 21:09:27 +01:00
vanhofen
0e3c24452f timermanager: try to fix successive timers
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c74d0bc3b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)

Origin message was:
------------------
- timermanager: try to fix successive timers

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

------------------
This commit was generated by Migit
2016-11-05 21:07:12 +01:00
Thilo Graf
d0f320bef1 Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 28a146e0ba
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-05 00:08:05 +01:00
Thilo Graf
c782bff2b4 CComponentsInfoBox: fix missing calculation of image position with parent
Origin commit data
------------------
Branch: ni/coolstream
Commit: 90a693a1ec
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-04 (Fri, 04 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-04 23:56:29 +01:00
vanhofen
15a345b484 cablex.xml: update Unitymedia; thx to klauser
Origin commit data
------------------
Branch: ni/coolstream
Commit: bf987b7478
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-04 (Fri, 04 Nov 2016)

Origin message was:
------------------
- cablex.xml: update Unitymedia; thx to klauser

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

------------------
This commit was generated by Migit
2016-11-04 16:49:01 +01:00
vanhofen
ea127a5d37 cablex.xml: update Unitymedia; thx to klauser
Origin commit data
------------------
Branch: ni/coolstream
Commit: b94f35421a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-04 (Fri, 04 Nov 2016)

Origin message was:
------------------
- cablex.xml: update Unitymedia; thx to klauser

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

------------------
This commit was generated by Migit
2016-11-04 16:46:47 +01:00
Thilo Graf
02ac7b42f5 Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: b6a06af7ca
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-03 (Thu, 03 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-03 19:13:34 +01:00
Jacek Jendrzej
d806d6ae7d Revert "src/gui/widget/textbox.cpp try to fix text lines per page"
This reverts commit 3a2876ce22.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2907aa5a37
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-03 (Thu, 03 Nov 2016)



------------------
This commit was generated by Migit
2016-11-03 18:38:41 +01:00
Jacek Jendrzej
3e32c17062 Revert "src/gui/widget/textbox.cpp supplement to try to fix text lines per page"
This reverts commit be4173bff6.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3815694e39
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-03 (Thu, 03 Nov 2016)



------------------
This commit was generated by Migit
2016-11-03 18:38:14 +01:00
Jacek Jendrzej
be4173bff6 src/gui/widget/textbox.cpp supplement to try to fix text lines per page
Origin commit data
------------------
Branch: ni/coolstream
Commit: e26ad6e9f1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-03 (Thu, 03 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-03 12:51:31 +01:00
Jacek Jendrzej
3a2876ce22 src/gui/widget/textbox.cpp try to fix text lines per page
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6c4324f6c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-03 (Thu, 03 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-03 12:17:11 +01:00
Thilo Graf
8b6a60f100 Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ab9bf2ffa6
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-02 21:05:36 +01:00
vanhofen
20f02fb954 textbox: fix compilation for generic hardware
error: declaration of ‘clear’ shadows a member of 'this'


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0f5aa73033
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)

Origin message was:
------------------
- textbox: fix compilation for generic hardware

error: declaration of ‘clear’ shadows a member of 'this'


------------------
This commit was generated by Migit
2016-11-02 09:55:45 +01:00
vanhofen
fde04323f8 moviebrowser: smaller locales for footer; clearify "filter off" mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9d2661a1d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)

Origin message was:
------------------
- moviebrowser: smaller locales for footer; clearify "filter off" mode

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

------------------
This commit was generated by Migit
2016-11-02 08:27:21 +01:00
vanhofen
4dbb29ed12 miscsettings_menu: fix youtube api key length
Origin commit data
------------------
Branch: ni/coolstream
Commit: da14d72dcb
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-01 (Tue, 01 Nov 2016)

Origin message was:
------------------
- miscsettings_menu: fix youtube api key length

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

------------------
This commit was generated by Migit
2016-11-01 22:20:26 +01:00
Jacek Jendrzej
cc3f3cf43c pictureviewer: fix possible segfault if width or height < 1,fix possible memleak
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ea4cbf145
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-01 (Tue, 01 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-01 14:50:08 +01:00
vanhofen
3811c8e64e Merge branch 'master' into pu/moviebrowser
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8dfdcee894
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-31 (Mon, 31 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-31 23:19:47 +01:00
vanhofen
6c4a1dee23 moviebrowser: fix filter selection
Origin commit data
------------------
Branch: ni/coolstream
Commit: fc6e8fbbca
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-31 (Mon, 31 Oct 2016)

Origin message was:
------------------
- moviebrowser: fix filter selection

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

------------------
This commit was generated by Migit
2016-10-31 23:07:27 +01:00
vanhofen
def8aa2a82 textbox: add clear() function
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b504f8c60
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-31 (Mon, 31 Oct 2016)

Origin message was:
------------------
- textbox: add clear() function

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

------------------
This commit was generated by Migit
2016-10-31 23:06:47 +01:00
Jacek Jendrzej
36927c1614 src/gui/scan_setup.cpp fix preselected transponder item
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6b640cfa7b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-10-31 (Mon, 31 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-31 18:23:17 +01:00
Jacek Jendrzej
8412a9b608 fix possible segfault and negative height
Origin commit data
------------------
Branch: ni/coolstream
Commit: b8849d53b5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-10-31 (Mon, 31 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-31 15:53:29 +01:00