Commit Graph

364 Commits

Author SHA1 Message Date
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
vanhofen
2b817520c4 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 98a6554d7b
Author: vanhofen <vanhofen@gmx.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 21:39:39 +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
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
vanhofen
773ef5c9b8 epgview: more intensive use of offset defines in imdb code
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-11-08 22:11:57 +01:00
vanhofen
05ef8b83da Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/epgview.cpp


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



------------------
This commit was generated by Migit
2016-11-08 22:07:57 +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
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
b2d2b3486e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a5632fdd76
Author: vanhofen <vanhofen@gmx.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 21:08:43 +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
Thilo Graf
36d8d81fa6 CMsgBox: rework msgbox classes with Window class implementation
Replacing messagebox, hintbox_ext and some derivated parts with
basic class hintbox and derivated class CMsgBox. This should unify
window handling and avoids maintain of multiple classes with quasi
same purpose and adds more functionality.

TODO: fix and optimize details


Origin commit data
------------------
Branch: ni/coolstream
Commit: dde298b1b7
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-04-04 (Mon, 04 Apr 2016)



------------------
This commit was generated by Migit
2016-10-24 10:31:24 +02:00
Stefan Seyfried
3f75ef5f47 Merge remote-tracking branch 'tuxbox/master'
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit
2016-10-22 11:37:40 +02:00
vanhofen
3739b4de04 Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/components/cc_detailsline.h
	src/gui/components/cc_item_infobox.h
	src/gui/infoviewer.cpp
	src/gui/upnpbrowser.cpp
	src/gui/widget/keyboard_input.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a70a3f78e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)



------------------
This commit was generated by Migit
2016-10-10 16:45:30 +02:00
vanhofen
bb756163b1 rename customcolor.h -> color_custom.h; reduce unneeded inludes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 104d21e784
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- rename customcolor.h -> color_custom.h; reduce unneeded inludes

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

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
vanhofen
7f19812d17 colors: add COL_SCROLLBAR_PASSIVE wrapper
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6629b64d6c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- colors: add COL_SCROLLBAR_PASSIVE wrapper

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

------------------
This commit was generated by Migit
2016-10-10 14:19:54 +02:00
vanhofen
e13c700904 colors: add COL_SCROLLBAR_ACTIVE wrapper
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e7d4e5fc1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- colors: add COL_SCROLLBAR_ACTIVE wrapper

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

------------------
This commit was generated by Migit
2016-10-10 14:19:54 +02:00
martii
b22de090e0 timerd/timermanager: fix EPG auto-adjustment of recordings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2cebd62aee
Author: martii <m4rtii@gmx.de>
Date: 2016-09-26 (Mon, 26 Sep 2016)


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

------------------
This commit was generated by Migit
2016-09-26 13:04:48 +02:00
martii
5967b5f2c3 timerd: adjust recording timers to epg
Origin commit data
------------------
Branch: ni/coolstream
Commit: c07b0f0b6c
Author: martii <m4rtii@gmx.de>
Date: 2016-09-26 (Mon, 26 Sep 2016)


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

------------------
This commit was generated by Migit
2016-09-26 13:04:48 +02:00
martii
cc0e1a1586 timerd/timermanager: fix EPG auto-adjustment of recordings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 659f2b372d
Author: martii <m4rtii@gmx.de>
Date: 2016-09-15 (Thu, 15 Sep 2016)


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

------------------
This commit was generated by Migit
2016-09-15 00:51:01 +02:00
martii
2b6a4a3718 [experimental] timerd: adjust recording timers to epg
Origin commit data
------------------
Branch: ni/coolstream
Commit: fe2d351750
Author: martii <m4rtii@gmx.de>
Date: 2016-09-15 (Thu, 15 Sep 2016)


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

------------------
This commit was generated by Migit
2016-09-15 00:48:06 +02:00
vanhofen
fcd0467caf movieinfo: internally rename epgEpgId -> epgId
Origin commit data
------------------
Branch: ni/coolstream
Commit: aa8a3849f4
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgEpgId -> epgId

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

------------------
This commit was generated by Migit
2016-09-10 00:32:35 +02:00
vanhofen
525688ef8a movieinfo: internally rename epgChannel -> ChannelName
Origin commit data
------------------
Branch: ni/coolstream
Commit: a85d539bd0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgChannel -> ChannelName

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

------------------
This commit was generated by Migit
2016-09-10 00:32:35 +02:00
vanhofen
9e5c1f0439 movieinfo: internally rename epgAudioPid -> AudioPid
Origin commit data
------------------
Branch: ni/coolstream
Commit: c5dcb1c4f6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgAudioPid -> AudioPid

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

------------------
This commit was generated by Migit
2016-09-10 00:32:35 +02:00
vanhofen
2e2f2ed596 movieinfo: internally rename epgEpgId -> epgId
Origin commit data
------------------
Branch: ni/coolstream
Commit: 53c6a23d07
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgEpgId -> epgId

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

------------------
This commit was generated by Migit
2016-09-09 22:01:34 +02:00
vanhofen
3c4951ef07 movieinfo: internally rename epgChannel -> ChannelName
Origin commit data
------------------
Branch: ni/coolstream
Commit: dbcbf06560
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgChannel -> ChannelName

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

------------------
This commit was generated by Migit
2016-09-09 19:33:04 +02:00
vanhofen
a2d8224109 movieinfo: internally rename epgAudioPid -> AudioPid
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6fe2d04e1e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgAudioPid -> AudioPid

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

------------------
This commit was generated by Migit
2016-09-09 18:58:11 +02:00
vanhofen
af4767a199 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: e419a5c3b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)


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

------------------
This commit was generated by Migit
2016-09-09 10:45:45 +02:00
vanhofen
58b62b0445 add listModeKey() function to simplify these calls
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2911e638c7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- add listModeKey() function to simplify these calls

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

------------------
This commit was generated by Migit
2016-09-09 10:42:46 +02:00
vanhofen
0b221325ab fix CFileHelpers.copyFile() mode again; this time for real
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6098eb8e17
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-07 (Wed, 07 Sep 2016)

Origin message was:
------------------
- fix CFileHelpers.copyFile() mode again; this time for real

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

------------------
This commit was generated by Migit
2016-09-07 17:45:49 +02:00
vanhofen
425c598991 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3a43baac7b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-06 (Tue, 06 Sep 2016)


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

------------------
This commit was generated by Migit
2016-09-06 15:41:28 +02:00
Thilo Graf
baf90c1635 Moviebrowser: start outsourcing moviebrowser code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 64053c1758
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-11 (Thu, 11 Aug 2016)


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

------------------
This commit was generated by Migit
2016-09-06 11:32:41 +02:00
vanhofen
3b1396370a temporary fix CFileHelpers.copyFile() syntax
Origin commit data
------------------
Branch: ni/coolstream
Commit: 81d9b2b027
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-05 (Mon, 05 Sep 2016)

Origin message was:
------------------
- temporary fix CFileHelpers.copyFile() syntax

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

------------------
This commit was generated by Migit
2016-09-05 13:30:56 +02:00
vanhofen
568677787e colors: smoother interplay; use 1px frames
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5f08483671
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-22 (Mon, 22 Aug 2016)

Origin message was:
------------------
- colors: smoother interplay; use 1px frames

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

------------------
This commit was generated by Migit
2016-08-22 23:30:06 +02:00
vanhofen
d229e14601 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/moviebrowser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3d04798d9b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)



------------------
This commit was generated by Migit
2016-08-15 19:08:28 +02:00
vanhofen
a8cec5244c fonts: add and use own font for all footers
Origin commit data
------------------
Branch: ni/coolstream
Commit: 54f2ac510f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)

Origin message was:
------------------
- fonts: add and use own font for all footers

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

------------------
This commit was generated by Migit
2016-08-15 19:02:42 +02:00
vanhofen
1a26af0576 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 38ca43dde0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-14 (Sun, 14 Aug 2016)



------------------
This commit was generated by Migit
2016-08-14 22:05:07 +02:00
vanhofen
1c1c5a05f3 colors: some internal renamings
* INFOBAR_SHADOW to SHADOW because it's not only used in infoviewer
* INFOBAR_SHADOW_TEXT to MENUFOOT_TEXT because it's the proper name

This is in preparation to make footer colors configurable


Origin commit data
------------------
Branch: ni/coolstream
Commit: bc39d1e14e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-14 (Sun, 14 Aug 2016)

Origin message was:
------------------
- colors: some internal renamings

* INFOBAR_SHADOW to SHADOW because it's not only used in infoviewer
* INFOBAR_SHADOW_TEXT to MENUFOOT_TEXT because it's the proper name

This is in preparation to make footer colors configurable


------------------
This commit was generated by Migit
2016-08-14 21:55:18 +02:00
vanhofen
ec73df296a use CFileHelpers::copyFile instead of own function; cleanup helpers
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6d01d59b53
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-11 (Thu, 11 Aug 2016)

Origin message was:
------------------
- use CFileHelpers::copyFile instead of own function; cleanup helpers

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

------------------
This commit was generated by Migit
2016-08-11 13:52:49 +02:00
vanhofen
e4f297dd48 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: f5ced1263e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-11 (Thu, 11 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-11 00:58:36 +02:00
vanhofen
32c5fc68e3 epgview: fix display of mp_movie_info->productionDate
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5885500e5f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-11 (Thu, 11 Aug 2016)

Origin message was:
------------------
- epgview: fix display of mp_movie_info->productionDate

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

------------------
This commit was generated by Migit
2016-08-11 00:58:10 +02:00
vanhofen
d29f46a44a epgview: try to fix wrong buttonbar in imdb view
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6390b616be
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-11 (Thu, 11 Aug 2016)

Origin message was:
------------------
- epgview: try to fix wrong buttonbar in imdb view

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

------------------
This commit was generated by Migit
2016-08-11 00:10:21 +02:00
vanhofen
e0ac38cbcc Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1ef027bdca
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-10 (Wed, 10 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-10 16:01:20 +02:00
vanhofen
a8721ee89c epgview: show progressbar in movieplayer mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: de74242310
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-10 (Wed, 10 Aug 2016)

Origin message was:
------------------
- epgview: show progressbar in movieplayer mode

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

------------------
This commit was generated by Migit
2016-08-10 15:53:11 +02:00
vanhofen
cbba450c5f Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 758c4b8b14
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-10 (Wed, 10 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-10 14:07:48 +02:00
Michael Liebmann
f4dacaab4a epgview: Fix save movie info
Signed-off-by: svenhoefer <svenhoefer@svenhoefer.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ad25b387e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-10 (Wed, 10 Aug 2016)



------------------
This commit was generated by Migit
2016-08-10 13:55:33 +02:00
vanhofen
60b9430ebc Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7dbda6c25e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-10 (Wed, 10 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-10 13:02:18 +02:00
vanhofen
199be90d4d epgview: fix bigfonts switch in movieplayer mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: a6875eb3f3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-10 (Wed, 10 Aug 2016)

Origin message was:
------------------
- epgview: fix bigfonts switch in movieplayer mode

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

------------------
This commit was generated by Migit
2016-08-10 12:58:43 +02:00
vanhofen
e00130c05b Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9613ee37d1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-10 (Wed, 10 Aug 2016)



------------------
This commit was generated by Migit
2016-08-10 12:19:02 +02:00
vanhofen
5a06e8e04d epgview: fix content of small bottom box in movieplayer mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 99de005c68
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-10 (Wed, 10 Aug 2016)

Origin message was:
------------------
- epgview: fix content of small bottom box in movieplayer mode

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

------------------
This commit was generated by Migit
2016-08-10 12:17:16 +02:00
vanhofen
3e1d26d39c Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: ee8c5161e7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-09 (Tue, 09 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-09 19:03:13 +02:00