Commit Graph

10062 Commits

Author SHA1 Message Date
vanhofen
569ce7dbbc moviebrowser: fix MB_INFO_SPACER's empty content
Origin commit data
------------------
Branch: ni/coolstream
Commit: da604fb9a5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)

Origin message was:
------------------
- moviebrowser: fix MB_INFO_SPACER's empty content

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

------------------
This commit was generated by Migit
2016-11-12 20:40:28 +01:00
Stefan Seyfried
ce4c21fab3 timermanager: fix -Waddress warning with newer gcc
The address of Events (wich is checked against NULL) can never be NULL,
because Events is passed by reference.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4bd8696a84
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)



------------------
This commit was generated by Migit
2016-11-12 18:25:06 +01:00
Stefan Seyfried
512e039fb6 neutrinoyparser: fix string literal warning with newer gcc
Origin commit data
------------------
Branch: ni/coolstream
Commit: bc06052985
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-12 18:24:14 +01:00
Stefan Seyfried
d8d4d753a5 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c92d112d0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-12 18:06:26 +01:00
Thilo Graf
9300387451 CFileBrowser: use mbrYes as default selection
TODO: 	Re-evaluate the logic of current used messages with risky actions
	and adjust the buttons accordingly.
Reason: <yes> is now as default assigned to green button (traffic light principle), and we use stricktly
	the order of colors from remote control (r,g,g,b), but in some cases
	it is useful to assign the <Yes> button to red for risky actions.


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



------------------
This commit was generated by Migit
2016-11-12 15:05:05 +01:00
Thilo Graf
42c7190679 CHintBox: update ascII scheme
Origin commit data
------------------
Branch: ni/coolstream
Commit: 27905b9acf
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-12 14:51:18 +01:00
Thilo Graf
74ebb1bb34 CHintBox: remove center text mode on used picon
Origin commit data
------------------
Branch: ni/coolstream
Commit: 075917e32d
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-11 23:10:39 +01:00
Thilo Graf
f026899dca CHintbox: enlarge possible max height
Better use of available screen size for many lines


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3193fef4c6
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)



------------------
This commit was generated by Migit
2016-11-11 21:42:07 +01:00
Thilo Graf
a061341fd4 CHintBox: try to fix truncated chars
Last chars were truncated. Indent and titel text were not considered.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7f5a576795
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)



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


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

------------------
This commit was generated by Migit
2016-11-11 21:33:12 +01:00
vanhofen
790508f5e0 moviebrowser: reset m_pcInfo1 box to default height, ...
when turning m_settings.browserAdditional off


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

Origin message was:
------------------
- moviebrowser: reset m_pcInfo1 box to default height, ...

when turning m_settings.browserAdditional off


------------------
This commit was generated by Migit
2016-11-11 16:35:50 +01:00
vanhofen
8c75cc78d2 locale: small changes in moviebrowser locales
Origin commit data
------------------
Branch: ni/coolstream
Commit: af9672edb8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- locale: small changes in moviebrowser locales

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

------------------
This commit was generated by Migit
2016-11-11 13:46:55 +01:00
vanhofen
7b8ed1d11f moviebrowser: show sorting menu; displays only available options
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2cd4a9e410
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- moviebrowser: show sorting menu; displays only available options

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

------------------
This commit was generated by Migit
2016-11-11 13:46:55 +01:00
vanhofen
3223119408 moviebrowser: remove obsolete strReplace() function
Origin commit data
------------------
Branch: ni/coolstream
Commit: a57ef57714
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- moviebrowser: remove obsolete strReplace() function

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

------------------
This commit was generated by Migit
2016-11-11 08:51:35 +01:00
vanhofen
cd019ed4c1 eventlist: allow windows size changes w/o neutrino restart
Origin commit data
------------------
Branch: ni/coolstream
Commit: e3306076de
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- eventlist: allow windows size changes w/o neutrino restart

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

------------------
This commit was generated by Migit
2016-11-11 00:51:32 +01:00
Thilo Graf
fd32ad9b83 Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 96ffa4778a
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-11 00:51:20 +01:00
Thilo Graf
b13d1966d2 CMenuWidget: move signal before render methodes
At start of methode, unusual behavior could occur.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 30f231c801
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)



------------------
This commit was generated by Migit
2016-11-11 00:48:37 +01:00
vanhofen
f2eb47b9fc eventlist: allow gradient/radius changes w/o neutrino restart
Origin commit data
------------------
Branch: ni/coolstream
Commit: c056b56d12
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- eventlist: allow gradient/radius changes w/o neutrino restart

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

------------------
This commit was generated by Migit
2016-11-11 00:25:25 +01:00
vanhofen
b1d2a19a42 eventlist: fix right textbox in header; last char was not displayed
Origin commit data
------------------
Branch: ni/coolstream
Commit: 00ad1ecd1c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- eventlist: fix right textbox in header; last char was not displayed

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

------------------
This commit was generated by Migit
2016-11-11 00:18:43 +01:00
Jacek Jendrzej
64a4f33629 src/gui/epgview.cpp reset header height to single size
Origin commit data
------------------
Branch: ni/coolstream
Commit: e3136b888c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-10 (Thu, 10 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-10 20:52:58 +01:00
Thilo Graf
67e279d287 CTestMenu: add sample for hintbox with timeout
Origin commit data
------------------
Branch: ni/coolstream
Commit: 43c1349ffa
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-10 (Thu, 10 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-10 11:19:09 +01:00
Thilo Graf
70e32a78c4 CHintBox: optimize dynamic window width bahavior on different line sizes
Width calculation is now depends on largest line of text.


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



------------------
This commit was generated by Migit
2016-11-10 11:19:09 +01:00
Thilo Graf
0556b53285 CTextBox: add static function to get largest line of passed text
This could be useful eg. for size calculations.


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



------------------
This commit was generated by Migit
2016-11-10 11:19:09 +01:00
Thilo Graf
75a5b63a4c CHintBox/CMsgBox: rework text handling and dynamic size behavior
Origin commit data
------------------
Branch: ni/coolstream
Commit: e3f51f2c91
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-10 11:18:56 +01:00
Thilo Graf
2bf18c6de4 CHintBox: add member to get maximal required width
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4bdd5e11a9
Author: Thilo Graf <dbt@novatux.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-11-10 11:15:43 +01:00
Thilo Graf
7990881fe3 CTextBox: add static function to get count of lines from passed text
I'm missing a function that returns current line count outside
of a CTextBox object. This could be useful eg. for size calculations
before object init etc


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



------------------
This commit was generated by Migit
2016-11-10 11:15:43 +01:00
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