mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-16 09:53:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
10,353 Commits 2 Branches 9 Tags
c2095e1759f02bdb0a60a1263c01a4cf23eefd5c
Commit Graph

9385 Commits

Author SHA1 Message Date
vanhofen
344c495442 webtv: try to auto-add epg from existing channels (experimental) 
Origin commit data
------------------
Commit: 8d4576535f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-10 (Thu, 10 Nov 2016)

Origin message was:
------------------
- webtv: try to auto-add epg from existing channels (experimental)
 2016-11-10 15:24:38 +01:00
vanhofen
6256ce547d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 722d98b46b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-10 (Thu, 10 Nov 2016)
 2016-11-10 12:48:26 +01:00
Thilo Graf
dbf42b9d5c CTestMenu: add sample for hintbox with timeout 
Origin commit data
------------------
Commit: 43c1349ffa
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-10 (Thu, 10 Nov 2016)
 2016-11-10 11:19:09 +01:00
Thilo Graf
2f89d7ff76 CHintBox: optimize dynamic window width bahavior on different line sizes 
Width calculation is now depends on largest line of text.


Origin commit data
------------------
Commit: 0952efaba4
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-10 (Thu, 10 Nov 2016)
 2016-11-10 11:19:09 +01:00
Thilo Graf
4a2a66399d CTextBox: add static function to get largest line of passed text 
This could be useful eg. for size calculations.


Origin commit data
------------------
Commit: 91c7588aa6
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-10 (Thu, 10 Nov 2016)
 2016-11-10 11:19:09 +01:00
Thilo Graf
c337d0449e CHintBox/CMsgBox: rework text handling and dynamic size behavior 
Origin commit data
------------------
Commit: e3f51f2c91
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-03 (Thu, 03 Nov 2016)
 2016-11-10 11:18:56 +01:00
Thilo Graf
0704180bf9 CHintBox: add member to get maximal required width 
Origin commit data
------------------
Commit: 4bdd5e11a9
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-31 (Mon, 31 Oct 2016)
 2016-11-10 11:15:43 +01:00
Thilo Graf
1523582d35 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
------------------
Commit: ac8d05f5e1
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-09 (Wed, 09 Nov 2016)
 2016-11-10 11:15:43 +01:00
Thilo Graf
d34322b568 Merge branch 'master' into pu/msgbox 
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Commit: 3efaac5725
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-10 (Thu, 10 Nov 2016)
 2016-11-10 10:27:22 +01:00
Thilo Graf
99b7d20f99 CMenuTarget: outsource CMenuTarget-class 
It's required for some inheritations into other classes if include
of menue.h is not wanted


Origin commit data
------------------
Commit: 098905e8e1
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-10 (Thu, 10 Nov 2016)
 2016-11-10 09:08:47 +01:00
Thilo Graf
8241298511 CTimerList: add menu context button to header 
Not to see that we have a possible submenu.


Origin commit data
------------------
Commit: 9eb9158c2f
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-09 (Wed, 09 Nov 2016)
 2016-11-09 19:44:13 +01:00
vanhofen
39c9b659c6 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: f8deee994d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-09 (Wed, 09 Nov 2016)
 2016-11-09 17:16:25 +01:00
vanhofen
782052704c controlapi: fix compiler warning 
error: declaration of 'channel_id' shadows a previous local


Origin commit data
------------------
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
 2016-11-09 17:13:43 +01:00
vanhofen
a7a8acc8b0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: ca4bfdf36b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-09 (Wed, 09 Nov 2016)
 2016-11-09 12:35:39 +01:00
vanhofen
9bbf604d96 controlapi: add epg_id to several outputs; add /control/getepgid 
* /control/getepgid[?format=plain|json|xml]


Origin commit data
------------------
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]
 2016-11-09 11:55:44 +01:00
Thilo Graf
9e6adb848d Merge branch 'master' into pu/msgbox 
Conflicts:
	src/gui/timerlist.cpp


Origin commit data
------------------
Commit: 996beed078
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-09 (Wed, 09 Nov 2016)
 2016-11-09 00:30:44 +01:00
vanhofen
01cdb59c33 epgview: more intensive use of offset defines in imdb code 
Origin commit data
------------------
Commit: 317dd373fe
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)

Origin message was:
------------------
- epgview: more intensive use of offset defines in imdb code
 2016-11-08 22:11:57 +01:00
vanhofen
98e986dafc Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Commit: f0d9adbe46
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)
 2016-11-08 22:07:57 +01:00
vanhofen
5582d5a8d5 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 5b7c68825e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)
 2016-11-08 22:05:31 +01:00
vanhofen
761b3e7f1e epgview: use small vertical offset around channellogo; ... 
more intensive use of offset defines


Origin commit data
------------------
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
 2016-11-08 22:03:44 +01:00
vanhofen
026ca785fc infoviewer: use small vertical offset around channellogo 
Origin commit data
------------------
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
 2016-11-08 22:02:57 +01:00
vanhofen
e99fb12c00 eventlist: use small vertical offset around channellogo 
Origin commit data
------------------
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
 2016-11-08 22:02:08 +01:00
vanhofen
4ace5321ec channellist: use small vertical offset around channellogo 
Origin commit data
------------------
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
 2016-11-08 22:00:51 +01:00
vanhofen
efcc10c271 moviebrowser: simplify channellogo scaling code 
Origin commit data
------------------
Commit: 1590f4a276
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)

Origin message was:
------------------
- moviebrowser: simplify channellogo scaling code
 2016-11-08 22:00:08 +01:00
vanhofen
7fe4180b1b Merge branch 'master' into pu/moviebrowser 
Origin commit data
------------------
Commit: 30333ab2e4
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)
 2016-11-08 21:54:51 +01:00
vanhofen
9a9ffd754b channellist: fix epg for webtv channels 
Origin commit data
------------------
Commit: b59527e987
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)

Origin message was:
------------------
- channellist: fix epg for webtv channels
 2016-11-08 21:48:51 +01:00
Jacek Jendrzej
bf0624760c src/gui/osd_setup.cpp supplement to 7bafa13c , fix segfault if clock is NULL# 
Origin commit data
------------------
Commit: ddd9bd3ca9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-07 (Mon, 07 Nov 2016)
 2016-11-07 22:54:53 +01:00
vanhofen
2a769e02ce Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 8d598b3d28
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)
 2016-11-07 22:21:35 +01:00
vanhofen
130ba10bd4 moviebrowser: use small offset in header to display channellogo 
Origin commit data
------------------
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
 2016-11-07 21:11:13 +01:00
vanhofen
5f1e7af7a9 listbox/moviebrowser: replace internal offsets with global defines 
Origin commit data
------------------
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
 2016-11-07 21:10:21 +01:00
vanhofen
b7a21ec8ae settings.h: add OFFSET_INNER_MIN define 
Origin commit data
------------------
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
 2016-11-07 21:09:45 +01:00
vanhofen
3449a434d4 cc_frm_header: use OFFSET define 
Origin commit data
------------------
Commit: 15e24a3e66
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- cc_frm_header: use OFFSET define
 2016-11-07 21:08:51 +01:00
vanhofen
87d5f81006 Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 0159ed78a0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)
 2016-11-07 20:42:11 +01:00
vanhofen
3502ffd80d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: de468d8016
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)
 2016-11-07 20:40:57 +01:00
TangoCash
d1e313b4f3 fix epgtitle 
Origin commit data
------------------
Commit: 32c6eaf031
Author: TangoCash <eric@loxat.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)
 2016-11-07 20:36:34 +01:00
FlatTV
3a31450471 Merge branch 'ni/tuxbox' of bitbucket.org:neutrino-images/ni-neutrino-hd into ni/tuxbox 
Origin commit data
------------------
Commit: 1915f59d91
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)
 2016-11-07 17:35:54 +01:00
vanhofen
4de89cd1f6 moviebrowser: increase default browserFrameHeight 
Origin commit data
------------------
Commit: 16dfc2d5e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- moviebrowser: increase default browserFrameHeight
 2016-11-07 14:50:50 +01:00
vanhofen
7c249335f1 Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/widget/listframe.cpp


Origin commit data
------------------
Commit: aa2517293f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)
 2016-11-07 13:48:21 +01:00
vanhofen
9e86fba5d9 Merge branch 'master' into pu/moviebrowser 
Origin commit data
------------------
Commit: c65dac6283
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)
 2016-11-07 13:46:01 +01:00
vanhofen
eedddf19ce moviebrowser: allow round borders in filter selection 
Origin commit data
------------------
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
 2016-11-07 13:45:55 +01:00
vanhofen
738182d80f listframe: allow round borders 
Origin commit data
------------------
Commit: c7942adb8f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- listframe: allow round borders
 2016-11-07 13:45:55 +01:00
vanhofen
114a75f363 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 0f03766246
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)
 2016-11-07 10:14:17 +01:00
vanhofen
7886ea960e timerlist: just small code cosmetics 
Origin commit data
------------------
Commit: 8ac3b64e75
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- timerlist: just small code cosmetics
 2016-11-07 10:13:04 +01:00
Thilo Graf
e4bc926b72 Merge branch 'master' into pu/msgbox 
Origin commit data
------------------
Commit: 3e7a1943c3
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)
 2016-11-06 23:16:36 +01:00
vanhofen
704b2845ce Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: a5632fdd76
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)
 2016-11-06 21:08:43 +01:00
vanhofen
d9c9f402e9 epgview: use movie-info's channelname in movieplayer mode to get channellogo 
Origin commit data
------------------
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
 2016-11-06 20:54:26 +01:00
FlatTV
e195f3c315 timerlist: try to fix segfault in askUserOnTimerConflict() 
Origin commit data
------------------
Commit: b70160a992
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)

Origin message was:
------------------
- timerlist: try to fix segfault in askUserOnTimerConflict()
 2016-11-06 20:51:09 +01:00
Jacek Jendrzej
699d6a311b src/gui/scan_setup.cpp use CHintBox for reloadchannels 
Origin commit data
------------------
Commit: c0ce2a0d3b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-06 (Sun, 06 Nov 2016)
 2016-11-06 18:45:01 +01:00
FlatTV
2172180021 capmt: set rmode only if recording channel use CI 
Origin commit data
------------------
Commit: 07c090b9cc
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)
 2016-11-06 10:46:50 +01:00
FlatTV
72d1110d5e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 53016b4818
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)
 2016-11-06 08:15:03 +01:00