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
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
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
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
Thilo Graf
11b3307251
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
------------------
Commit: dde298b1b7
Author: Thilo Graf <dbt@novatux.de >
Date: 2016-04-04 (Mon, 04 Apr 2016)
2016-10-24 10:31:24 +02:00
vanhofen
248b6c8684
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
------------------
Commit: 5a70a3f78e
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-10-10 (Mon, 10 Oct 2016)
2016-10-10 16:45:30 +02:00
vanhofen
892603fe68
rename customcolor.h -> color_custom.h; reduce unneeded inludes
...
Origin commit data
------------------
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
2016-10-10 14:19:55 +02:00
vanhofen
af3e39a47d
colors: add COL_SCROLLBAR_PASSIVE wrapper
...
Origin commit data
------------------
Commit: 6629b64d6c
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-10-10 (Mon, 10 Oct 2016)
Origin message was:
------------------
- colors: add COL_SCROLLBAR_PASSIVE wrapper
2016-10-10 14:19:54 +02:00
vanhofen
4b3b25ca7a
colors: add COL_SCROLLBAR_ACTIVE wrapper
...
Origin commit data
------------------
Commit: 7e7d4e5fc1
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-10-10 (Mon, 10 Oct 2016)
Origin message was:
------------------
- colors: add COL_SCROLLBAR_ACTIVE wrapper
2016-10-10 14:19:54 +02:00
martii
9aae39eab8
timerd/timermanager: fix EPG auto-adjustment of recordings
...
Origin commit data
------------------
Commit: 2cebd62aee
Author: martii <m4rtii@gmx.de >
Date: 2016-09-26 (Mon, 26 Sep 2016)
2016-09-26 13:04:48 +02:00
martii
6836ea5d78
timerd: adjust recording timers to epg
...
Origin commit data
------------------
Commit: c07b0f0b6c
Author: martii <m4rtii@gmx.de >
Date: 2016-09-26 (Mon, 26 Sep 2016)
2016-09-26 13:04:48 +02:00
martii
7d4fb5b880
timerd/timermanager: fix EPG auto-adjustment of recordings
...
Origin commit data
------------------
Commit: 659f2b372d
Author: martii <m4rtii@gmx.de >
Date: 2016-09-15 (Thu, 15 Sep 2016)
2016-09-15 00:51:01 +02:00
martii
1390156250
[experimental] timerd: adjust recording timers to epg
...
Origin commit data
------------------
Commit: fe2d351750
Author: martii <m4rtii@gmx.de >
Date: 2016-09-15 (Thu, 15 Sep 2016)
2016-09-15 00:48:06 +02:00
vanhofen
49386530ec
movieinfo: internally rename epgEpgId -> epgId
...
Origin commit data
------------------
Commit: aa8a3849f4
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-09-09 (Fri, 09 Sep 2016)
Origin message was:
------------------
- movieinfo: internally rename epgEpgId -> epgId
2016-09-10 00:32:35 +02:00
vanhofen
08e1339fcf
movieinfo: internally rename epgChannel -> ChannelName
...
Origin commit data
------------------
Commit: a85d539bd0
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-09-09 (Fri, 09 Sep 2016)
Origin message was:
------------------
- movieinfo: internally rename epgChannel -> ChannelName
2016-09-10 00:32:35 +02:00
vanhofen
bde496cad2
movieinfo: internally rename epgAudioPid -> AudioPid
...
Origin commit data
------------------
Commit: c5dcb1c4f6
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-09-09 (Fri, 09 Sep 2016)
Origin message was:
------------------
- movieinfo: internally rename epgAudioPid -> AudioPid
2016-09-10 00:32:35 +02:00
vanhofen
c7b679a928
movieinfo: internally rename epgEpgId -> epgId
...
Origin commit data
------------------
Commit: 53c6a23d07
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-09-09 (Fri, 09 Sep 2016)
Origin message was:
------------------
- movieinfo: internally rename epgEpgId -> epgId
2016-09-09 22:01:34 +02:00
vanhofen
599c6608fa
movieinfo: internally rename epgChannel -> ChannelName
...
Origin commit data
------------------
Commit: dbcbf06560
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-09-09 (Fri, 09 Sep 2016)
Origin message was:
------------------
- movieinfo: internally rename epgChannel -> ChannelName
2016-09-09 19:33:04 +02:00
vanhofen
d0882070ed
movieinfo: internally rename epgAudioPid -> AudioPid
...
Origin commit data
------------------
Commit: 6fe2d04e1e
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-09-09 (Fri, 09 Sep 2016)
Origin message was:
------------------
- movieinfo: internally rename epgAudioPid -> AudioPid
2016-09-09 18:58:11 +02:00
vanhofen
91fc1e2528
Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
...
Origin commit data
------------------
Commit: e419a5c3b6
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-09-09 (Fri, 09 Sep 2016)
2016-09-09 10:45:45 +02:00
vanhofen
fa2686a90e
add listModeKey() function to simplify these calls
...
Origin commit data
------------------
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
2016-09-09 10:42:46 +02:00
vanhofen
843d10dee7
fix CFileHelpers.copyFile() mode again; this time for real
...
Origin commit data
------------------
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
2016-09-07 17:45:49 +02:00
vanhofen
57dd1c7712
Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
...
Origin commit data
------------------
Commit: 3a43baac7b
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-09-06 (Tue, 06 Sep 2016)
2016-09-06 15:41:28 +02:00
Thilo Graf
b0c0c3bd05
Moviebrowser: start outsourcing moviebrowser code
...
Origin commit data
------------------
Commit: 64053c1758
Author: Thilo Graf <dbt@novatux.de >
Date: 2016-08-11 (Thu, 11 Aug 2016)
2016-09-06 11:32:41 +02:00
vanhofen
05c8ddd772
temporary fix CFileHelpers.copyFile() syntax
...
Origin commit data
------------------
Commit: 81d9b2b027
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-09-05 (Mon, 05 Sep 2016)
Origin message was:
------------------
- temporary fix CFileHelpers.copyFile() syntax
2016-09-05 13:30:56 +02:00
vanhofen
cf2f3e11fe
colors: smoother interplay; use 1px frames
...
Origin commit data
------------------
Commit: 5f08483671
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-08-22 (Mon, 22 Aug 2016)
Origin message was:
------------------
- colors: smoother interplay; use 1px frames
2016-08-22 23:30:06 +02:00
vanhofen
2be5df305e
Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
...
Conflicts:
src/gui/moviebrowser.cpp
Origin commit data
------------------
Commit: 3d04798d9b
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-08-15 (Mon, 15 Aug 2016)
2016-08-15 19:08:28 +02:00
vanhofen
e49ee18fb3
fonts: add and use own font for all footers
...
Origin commit data
------------------
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
2016-08-15 19:02:42 +02:00
vanhofen
ed1a6bc916
Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
...
Conflicts:
src/gui/epgview.cpp
Origin commit data
------------------
Commit: 38ca43dde0
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-08-14 (Sun, 14 Aug 2016)
2016-08-14 22:05:07 +02:00
vanhofen
78230ead13
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
------------------
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
2016-08-14 21:55:18 +02:00
vanhofen
31a80d2f93
use CFileHelpers::copyFile instead of own function; cleanup helpers
...
Origin commit data
------------------
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
2016-08-11 13:52:49 +02:00
vanhofen
2c4355417f
Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
...
Origin commit data
------------------
Commit: f5ced1263e
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-08-11 (Thu, 11 Aug 2016)
2016-08-11 00:58:36 +02:00
vanhofen
b175c9e6db
epgview: fix display of mp_movie_info->productionDate
...
Origin commit data
------------------
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
2016-08-11 00:58:10 +02:00
vanhofen
9f4b18b863
epgview: try to fix wrong buttonbar in imdb view
...
Origin commit data
------------------
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
2016-08-11 00:10:21 +02:00
vanhofen
e8e319215b
Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
...
Origin commit data
------------------
Commit: 1ef027bdca
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-08-10 (Wed, 10 Aug 2016)
2016-08-10 16:01:20 +02:00
vanhofen
964ad94a87
epgview: show progressbar in movieplayer mode
...
Origin commit data
------------------
Commit: de74242310
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-08-10 (Wed, 10 Aug 2016)
Origin message was:
------------------
- epgview: show progressbar in movieplayer mode
2016-08-10 15:53:11 +02:00
vanhofen
3e37b42a8f
Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
...
Origin commit data
------------------
Commit: 758c4b8b14
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-08-10 (Wed, 10 Aug 2016)
2016-08-10 14:07:48 +02:00
Michael Liebmann
e335b76b4a
epgview: Fix save movie info
...
Signed-off-by: svenhoefer <svenhoefer@svenhoefer.com >
Origin commit data
------------------
Commit: 5ad25b387e
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2016-08-10 (Wed, 10 Aug 2016)
2016-08-10 13:55:33 +02:00
vanhofen
f0ddecb625
Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
...
Origin commit data
------------------
Commit: 7dbda6c25e
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-08-10 (Wed, 10 Aug 2016)
2016-08-10 13:02:18 +02:00
vanhofen
7a90c723d8
epgview: fix bigfonts switch in movieplayer mode
...
Origin commit data
------------------
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
2016-08-10 12:58:43 +02:00
vanhofen
6faa23a177
Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
...
Conflicts:
src/gui/epgview.cpp
Origin commit data
------------------
Commit: 9613ee37d1
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-08-10 (Wed, 10 Aug 2016)
2016-08-10 12:19:02 +02:00
vanhofen
3202d27319
epgview: fix content of small bottom box in movieplayer mode
...
Origin commit data
------------------
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
2016-08-10 12:17:16 +02:00
vanhofen
57777bc44b
Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
...
Origin commit data
------------------
Commit: ee8c5161e7
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-08-09 (Tue, 09 Aug 2016)
2016-08-09 19:03:13 +02:00
TangoCash
30621ed39f
fix epgview channelogo (from moviebrowser)
...
Origin commit data
------------------
Commit: 0040a21293
Author: TangoCash <eric@loxat.de >
Date: 2016-08-09 (Tue, 09 Aug 2016)
2016-08-09 19:00:22 +02:00
vanhofen
3f85932d33
Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
...
Origin commit data
------------------
Commit: a62689a553
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-08-09 (Tue, 09 Aug 2016)
2016-08-09 18:01:04 +02:00
TangoCash
d18df6d118
fix fading from moviebrowser
...
Origin commit data
------------------
Commit: c0f3e908ff
Author: TangoCash <eric@loxat.de >
Date: 2016-08-09 (Tue, 09 Aug 2016)
2016-08-09 17:56:00 +02:00
vanhofen
cb9bdf1577
Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
...
Conflicts:
src/gui/moviebrowser.cpp
Origin commit data
------------------
Commit: 9f8499d661
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-08-09 (Tue, 09 Aug 2016)
2016-08-09 15:37:20 +02:00