Commit Graph

34 Commits

Author SHA1 Message Date
vanhofen
e2c1dbc75b Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 6a196e6645
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)
2016-11-02 08:49:37 +01:00
vanhofen
329b279cad moviebrowser: smaller locales for footer; clearify "filter off" mode
Origin commit data
------------------
Commit: 9d2661a1d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)

Origin message was:
------------------
- moviebrowser: smaller locales for footer; clearify "filter off" mode
2016-11-02 08:27:21 +01:00
vanhofen
bffa9ac6b0 Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 417acc9cc8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-31 (Mon, 31 Oct 2016)
2016-10-31 23:23:45 +01:00
vanhofen
ce4da19f5d moviebrowser: fix filter selection
Origin commit data
------------------
Commit: fc6e8fbbca
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-31 (Mon, 31 Oct 2016)

Origin message was:
------------------
- moviebrowser: fix filter selection
2016-10-31 23:07:27 +01:00
vanhofen
c5125da443 Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/moviebrowser/mb.cpp
	src/gui/moviebrowser/mb.h


Origin commit data
------------------
Commit: 30e1c0ef71
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)
2016-10-29 12:45:02 +02:00
vanhofen
1e5da313e7 moviebrowser: allow channellist-design in moviebrowser
Origin commit data
------------------
Commit: 142ae901b0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)

Origin message was:
------------------
- moviebrowser: allow channellist-design in moviebrowser
2016-10-29 10:02:07 +02:00
vanhofen
3d37c18a62 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/moviebrowser/mb.cpp
	src/gui/osd_setup.cpp
	src/system/settings.h


Origin commit data
------------------
Commit: 318b4926e7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)
2016-10-25 12:22:47 +02:00
vanhofen
b7f8c2c220 moviebrowser: port configuration of moviebrowser fonts from NI-Neutrino
Origin commit data
------------------
Commit: 82f7eff169
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)

Origin message was:
------------------
- moviebrowser: port configuration of moviebrowser fonts from NI-Neutrino
2016-10-25 12:19:48 +02:00
vanhofen
3984ee312a moviebrowser: add spacer row to last play/rec windows
Origin commit data
------------------
Commit: 46297266b2
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)

Origin message was:
------------------
- moviebrowser: add spacer row to last play/rec windows
2016-10-25 11:06:12 +02:00
vanhofen
6f122b3b3f moviebrowser: fix max_width in info-box
Origin commit data
------------------
Commit: 301f312673
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)

Origin message was:
------------------
- moviebrowser: fix max_width in info-box
2016-10-25 11:06:12 +02:00
vanhofen
da3d97b77e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: ec448e14fe
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-23 (Sun, 23 Oct 2016)
2016-10-23 21:57:00 +02:00
vanhofen
15ef261541 moviebrowser: show minutes in two-digits format
Origin commit data
------------------
Commit: 4d93168cf6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-23 (Sun, 23 Oct 2016)

Origin message was:
------------------
- moviebrowser: show minutes in two-digits format
2016-10-23 21:51:34 +02:00
vanhofen
2510d548e0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	lib/timerdclient/timerdtypes.h
	src/gui/channellist.cpp
	src/system/httptool.h


Origin commit data
------------------
Commit: 0bb2f888c6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)
2016-10-21 11:23:51 +02:00
vanhofen
c670b9c47f moviebrowser: add possibility to add spacers to moviebrowser
Origin commit data
------------------
Commit: 75a2665b87
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)

Origin message was:
------------------
- moviebrowser: add possibility to add spacers to moviebrowser
2016-10-21 10:47:37 +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
5889f018c0 add and use OFFSET_INTER definition
Origin commit data
------------------
Commit: 98500fdeb6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- add and use OFFSET_INTER definition
2016-10-10 14:19:55 +02:00
Thilo Graf
0fca9a3e2a Moviebrowser: outsource help class
Origin commit data
------------------
Commit: c4827704ac
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-07 (Fri, 07 Oct 2016)
2016-10-07 17:38:25 +02:00
vanhofen
9b1904e84d Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: 6c8ea9793f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-06 (Thu, 06 Oct 2016)
2016-10-06 21:18:48 +02:00
Thilo Graf
440153c2d7 Moviebrowser: complete licence texts
Origin commit data
------------------
Commit: fe8e3896a0
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-05 (Wed, 05 Oct 2016)
2016-10-05 17:48:25 +02:00
vanhofen
93a0de1cc1 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/global.h


Origin commit data
------------------
Commit: 005bd91ea9
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-01 (Sat, 01 Oct 2016)
2016-10-01 11:04:00 +02:00
vanhofen
32668ed67a moviebrowser: undock display of filling level from infobar setting
Origin commit data
------------------
Commit: cc5f776780
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-30 (Fri, 30 Sep 2016)

Origin message was:
------------------
- moviebrowser: undock display of filling level from infobar setting
2016-09-30 08:53:30 +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
138af5fcaf movieinfo: internally rename epgId -> channelId
Origin commit data
------------------
Commit: 625cbb6122
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgId -> channelId
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
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
8a52c8ab54 movieinfo: internally rename epgId -> channelId
Origin commit data
------------------
Commit: 6978b8c994
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgId -> channelId
2016-09-09 19:43:00 +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
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
3dec3ca94b Moviebrowser: functions outsourced
TODO: 	Classes and menus should follow someday.


Origin commit data
------------------
Commit: a10755dca7
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-12 (Fri, 12 Aug 2016)
2016-09-06 11:32:41 +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