Commit Graph

9163 Commits

Author SHA1 Message Date
vanhofen
b1a12de260 cc_frm_header: try to fix clock; e.g. in timerlist
Origin commit data
------------------
Branch: ni/coolstream
Commit: c661f3f07d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-06 (Tue, 06 Dec 2016)

Origin message was:
------------------
- cc_frm_header: try to fix clock; e.g. in timerlist

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

------------------
This commit was generated by Migit
2016-12-06 20:59:35 +01:00
vanhofen
23248f595c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b2b544abf
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-06 (Tue, 06 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-06 20:44:54 +01:00
Jacek Jendrzej
d62db7dc88 src/zapit/src/femanager.cpp init sat_config_t delsys
Origin commit data
------------------
Branch: ni/coolstream
Commit: f5e00f277a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-12-06 (Tue, 06 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-06 15:49:36 +01:00
vanhofen
dc58fffbea Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/movieplayer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 461f9f046d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-06 (Tue, 06 Dec 2016)



------------------
This commit was generated by Migit
2016-12-06 13:02:25 +01:00
Thilo Graf
1d951d42c0 CMovieBrowser: remove context menu button
I forgot, it's already in footer


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5dacec7dee
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-06 (Tue, 06 Dec 2016)



------------------
This commit was generated by Migit
2016-12-06 12:17:04 +01:00
TangoCash
d9386837e3 cc_frm correct scroll direction if more than 2 pages (thx dbo)
Signed-off-by: Thilo Graf <dbt@novatux.de>

picked from:
	github.com/TangoCash/neutrino-mp-cst-next
commit:
	abce1c6be4bae17f343d3ff878670184708aa185


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0c4c90bf2e
Author: TangoCash <eric@loxat.de>
Date: 2016-12-06 (Tue, 06 Dec 2016)



------------------
This commit was generated by Migit
2016-12-06 11:34:59 +01:00
Thilo Graf
80cba66ede CMovieBrowser: add missing context buttons
No user can see anything about available submenu and help window,
because access to help via submenu is not longer possible
since 92008d0b7c


Origin commit data
------------------
Branch: ni/coolstream
Commit: bb895befef
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-06 (Tue, 06 Dec 2016)



------------------
This commit was generated by Migit
2016-12-06 11:34:59 +01:00
vanhofen
514ae3e19d eventlist: fix icon-alignment ...
some small text-alignment fixes; use OFFSET defines


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9d949c7074
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-06 (Tue, 06 Dec 2016)

Origin message was:
------------------
- eventlist: fix icon-alignment ...

some small text-alignment fixes; use OFFSET defines


------------------
This commit was generated by Migit
2016-12-06 09:54:56 +01:00
Michael Liebmann
48bfbe1779 MoviePlayer: Rework enable/disable of osd time, file time and mute icon
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2045e91c47
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-12-05 (Mon, 05 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-05 15:54:56 +01:00
Michael Liebmann
3b858ecd22 Sort locales
Origin commit data
------------------
Branch: ni/coolstream
Commit: fd21f57406
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-12-02 (Fri, 02 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-05 15:54:56 +01:00
vanhofen
34033b62a8 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a7553aad1b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-05 (Mon, 05 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-05 12:50:53 +01:00
vanhofen
1f9ff72365 locale: typo; we shouldn't open Manu XD
Origin commit data
------------------
Branch: ni/coolstream
Commit: ca53cbeb53
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-05 (Mon, 05 Dec 2016)

Origin message was:
------------------
- locale: typo; we shouldn't open Manu XD

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

------------------
This commit was generated by Migit
2016-12-05 12:46:01 +01:00
vanhofen
8e4b9462f2 locale: more movieplayer additional help text
Origin commit data
------------------
Branch: ni/coolstream
Commit: 69e34a3020
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-05 (Mon, 05 Dec 2016)

Origin message was:
------------------
- locale: more movieplayer additional help text

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

------------------
This commit was generated by Migit
2016-12-05 12:46:01 +01:00
vanhofen
8ede581ef7 helpbox: allow multi-line lines
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1b42318a2a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-05 (Mon, 05 Dec 2016)

Origin message was:
------------------
- helpbox: allow multi-line lines

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

------------------
This commit was generated by Migit
2016-12-05 12:46:01 +01:00
vanhofen
5feb35309f configure.ac: change package name/version
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1530291023
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-05 (Mon, 05 Dec 2016)

Origin message was:
------------------
- configure.ac: change package name/version

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

------------------
This commit was generated by Migit
2016-12-05 10:54:11 +01:00
Thilo Graf
2e8f4d1b61 Helpbox: add doc
Doc was missed.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 05bbf4d9b5
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-05 (Mon, 05 Dec 2016)



------------------
This commit was generated by Migit
2016-12-05 10:02:10 +01:00
vanhofen
19522ec813 bouquets.cpp: remove linebreak from auto-epg console message
Origin commit data
------------------
Branch: ni/coolstream
Commit: 588794920d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-05 (Mon, 05 Dec 2016)

Origin message was:
------------------
- bouquets.cpp: remove linebreak from auto-epg console message

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

------------------
This commit was generated by Migit
2016-12-05 08:46:52 +01:00
vanhofen
d81874eb61 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 87da827b30
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-05 (Mon, 05 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-05 00:52:33 +01:00
vanhofen
40eb7f2667 movieplayer: rework help; use rc_help to show help
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ad794e004
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-05 (Mon, 05 Dec 2016)

Origin message was:
------------------
- movieplayer: rework help; use rc_help to show help

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

------------------
This commit was generated by Migit
2016-12-05 00:50:39 +01:00
vanhofen
2526057a25 helpbox: fix height of CComponentsText element
Origin commit data
------------------
Branch: ni/coolstream
Commit: c901dff079
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-05 (Mon, 05 Dec 2016)

Origin message was:
------------------
- helpbox: fix height of CComponentsText element

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

------------------
This commit was generated by Migit
2016-12-05 00:50:39 +01:00
vanhofen
918734cf34 helpbox: fix icon alignment
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6094bd7209
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-05 (Mon, 05 Dec 2016)

Origin message was:
------------------
- helpbox: fix icon alignment

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

------------------
This commit was generated by Migit
2016-12-05 00:50:39 +01:00
vanhofen
9cd0b5d403 capmt: fix include to get g_settings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3fd39340c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-05 (Mon, 05 Dec 2016)

Origin message was:
------------------
- capmt: fix include to get g_settings

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

------------------
This commit was generated by Migit
2016-12-05 00:09:54 +01:00
vanhofen
6494a1278f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e22dcefea
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-04 22:48:16 +01:00
vanhofen
92008d0b7c moviebrowser: rework help ...
* remove from menu; this breakes menu's logic (rc_help is to switch hints)
* use rc_help to show help window
* rework content


Origin commit data
------------------
Branch: ni/coolstream
Commit: 21ed22cb6e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)

Origin message was:
------------------
- moviebrowser: rework help ...

* remove from menu; this breakes menu's logic (rc_help is to switch hints)
* use rc_help to show help window
* rework content


------------------
This commit was generated by Migit
2016-12-04 22:44:44 +01:00
vanhofen
0d80f1263b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5849e614d4
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-04 22:25:41 +01:00
vanhofen
884e1ff9be helpbox: some reworks ...
* rename line_space to line_height
* separators uses half line height
* add getLineHeight() function
* small cleanups


Origin commit data
------------------
Branch: ni/coolstream
Commit: ce82966c75
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)

Origin message was:
------------------
- helpbox: some reworks ...

* rename line_space to line_height
* separators uses half line height
* add getLineHeight() function
* small cleanups


------------------
This commit was generated by Migit
2016-12-04 22:08:44 +01:00
vanhofen
335bcb6e0d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/timerd/timermanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fac2d36cda
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)



------------------
This commit was generated by Migit
2016-12-04 21:14:27 +01:00
Jacek Jendrzej
b92d58d0ec src/timerd/timermanager.cpp sruct variable init
Origin commit data
------------------
Branch: ni/coolstream
Commit: d0008ee905
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-12-04 (Sun, 04 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-04 20:04:40 +01:00
FlatTV
7cc162c6d5 followscreenings.cpp: Fix option "always"
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c193cb9e9
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-04 12:03:03 +01:00
FlatTV
678a70ac54 capmt.cpp: Allow to disable the NI CI-Record workaround if option "usable CI channel while recording" set to "all channels"
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9880736d45
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-04 12:00:08 +01:00
FlatTV
c38364ce6f capmt.cpp: Codeing the NI CI-Record workaround closer to original
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8191d85c4c
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-04 11:53:40 +01:00
vanhofen
db94487350 helpbox: use a smoother color and a smaller height for separatorline
Origin commit data
------------------
Branch: ni/coolstream
Commit: 606cd62a43
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)

Origin message was:
------------------
- helpbox: use a smoother color and a smaller height for separatorline

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

------------------
This commit was generated by Migit
2016-12-04 00:58:51 +01:00
vanhofen
9b3eb0c567 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0267ee657f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-04 00:50:15 +01:00
vanhofen
d7d2ff51f9 helpbox: bind gradient of separatorline to user's setting
Origin commit data
------------------
Branch: ni/coolstream
Commit: 903f2ca74d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)

Origin message was:
------------------
- helpbox: bind gradient of separatorline to user's setting

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

------------------
This commit was generated by Migit
2016-12-04 00:48:32 +01:00
vanhofen
1d9d26efbe moviebrowser: fix mute-icon and "Change view" keys in helpbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a3b85dd03c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)

Origin message was:
------------------
- moviebrowser: fix mute-icon and "Change view" keys in helpbox

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

------------------
This commit was generated by Migit
2016-12-04 00:48:32 +01:00
vanhofen
510bce444c themes: make Material Gray (dark) theme a bit darker
Origin commit data
------------------
Branch: ni/coolstream
Commit: bab36f5c6b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)

Origin message was:
------------------
- themes: make Material Gray (dark) theme a bit darker

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

------------------
This commit was generated by Migit
2016-12-04 00:41:17 +01:00
vanhofen
3db60ff17f themes: add Material Gray (Medium) theme
Origin commit data
------------------
Branch: ni/coolstream
Commit: 236e6541f2
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)

Origin message was:
------------------
- themes: add Material Gray (Medium) theme

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

------------------
This commit was generated by Migit
2016-12-04 00:40:15 +01:00
vanhofen
243909caf8 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: ad1e3beb3d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-02 (Fri, 02 Dec 2016)



------------------
This commit was generated by Migit
2016-12-02 22:00:25 +01:00
Thilo Graf
4f2116df43 Messages: add localized osd timeout option for interactive/static messages
TODO: add locales for hints


Origin commit data
------------------
Branch: ni/coolstream
Commit: d6ecaf855b
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-02 (Fri, 02 Dec 2016)



------------------
This commit was generated by Migit
2016-12-02 21:32:15 +01:00
vanhofen
48cc63df9e Message Timeouts: add possibilty to change timeout for static messages
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9607957e07
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-01 (Thu, 01 Dec 2016)



------------------
This commit was generated by Migit
2016-12-02 21:32:15 +01:00
Michael Liebmann
4590bd4644 MoviePlayer: Disable NI InfoIcons when view movieinfo
Origin commit data
------------------
Branch: ni/coolstream
Commit: c05351c8d8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-12-02 (Fri, 02 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-02 00:40:01 +01:00
vanhofen
5ed9fc4b80 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: bd9aa1b199
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-02 (Fri, 02 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-02 00:39:36 +01:00
Michael Liebmann
8dbecf4980 MoviePlayer: Disable InfoClock and FileTime when view movieinfo
Origin commit data
------------------
Branch: ni/coolstream
Commit: 47ffc7586a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-12-02 (Fri, 02 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-02 00:21:59 +01:00
Michael Liebmann
57de23f12a CLuaInstVideo::PlayFile: Infoviewer was not displayed when InfoFunc was set
- Fix commit b74fcf6676
 - Set Lua api version to 1.68


Origin commit data
------------------
Branch: ni/coolstream
Commit: e92df63a4a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-12-02 (Fri, 02 Dec 2016)



------------------
This commit was generated by Migit
2016-12-02 00:21:58 +01:00
Thilo Graf
7ed170cf11 CComponentsWindow: fix window body color
Color parameter was not passed to body. Parameters in constructor and
setters had no effect.


Origin commit data
------------------
Branch: ni/coolstream
Commit: c1ec746321
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-01 (Thu, 01 Dec 2016)



------------------
This commit was generated by Migit
2016-12-01 22:42:21 +01:00
vanhofen
90dc3d43a9 infoviewer: move ICON_CA to the left
Origin commit data
------------------
Branch: ni/coolstream
Commit: 716e64b10c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-01 (Thu, 01 Dec 2016)

Origin message was:
------------------
- infoviewer: move ICON_CA to the left

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

------------------
This commit was generated by Migit
2016-12-01 21:59:36 +01:00
Michael Liebmann
376eabfd9e CLuaInstCCText: Add various script functions
getLines()
 getLines(test)
 setDimensionsAll(x, y, w, h)

 - Set Lua api version to 1.67


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1576681543
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-12-01 (Thu, 01 Dec 2016)



------------------
This commit was generated by Migit
2016-12-01 18:27:37 +01:00
Michael Liebmann
b74fcf6676 lua: Fix InfoFunc for displaying information in the movieplayer
- Fix for commit 7c29c4029e
 - Set Lua api version to 1.66


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1aee964c14
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-12-01 (Thu, 01 Dec 2016)



------------------
This commit was generated by Migit
2016-12-01 14:28:21 +01:00
vanhofen
1a9ef010ab Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1e48d0c60b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-30 (Wed, 30 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-30 09:17:51 +01:00
vanhofen
b60a4f9ab7 bouqueteditor: fix icon alignment
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8c2301472b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-30 (Wed, 30 Nov 2016)

Origin message was:
------------------
- bouqueteditor: fix icon alignment

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

------------------
This commit was generated by Migit
2016-11-30 09:17:04 +01:00