Commit Graph

189 Commits

Author SHA1 Message Date
vanhofen
6032ad60d0 moviebrowser: reset filter at startup if filter-directory not exists ...
to avoid a wrong display in footer


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

Origin message was:
------------------
- moviebrowser: reset filter at startup if filter-directory not exists ...

to avoid a wrong display in footer


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


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

------------------
This commit was generated by Migit
2016-12-16 22:38:01 +01:00
vanhofen
37e9819938 moviebrowser: fix crash; disable non-existing movie directories
Origin commit data
------------------
Branch: ni/coolstream
Commit: 615c4f360a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-16 (Fri, 16 Dec 2016)

Origin message was:
------------------
- moviebrowser: fix crash; disable non-existing movie directories

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

------------------
This commit was generated by Migit
2016-12-16 22:23:38 +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
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
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
Stefan Seyfried
776aea7c95 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: c6d7968381
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.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 18:02:51 +01:00
vanhofen
4af96e1b6d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: d065c1f394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-21 00:14:20 +01:00
Thilo Graf
eae3d01977 CMovieBrowser: simplify and fix hintbox calls
Some hints were not closed. Explicit hide() is required.


Origin commit data
------------------
Branch: ni/coolstream
Commit: bf05d26ae3
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)



------------------
This commit was generated by Migit
2016-11-20 22:52:46 +01:00
vanhofen
a413bfb40d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/lua/lua_misc.cpp
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h


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



------------------
This commit was generated by Migit
2016-11-19 21:11:54 +01:00
Jacek Jendrzej
ffcfe9a067 src/gui/moviebrowser/mb.cpp fix clean bookmarks
Origin commit data
------------------
Branch: ni/coolstream
Commit: 534fb3d5fe
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-18 (Fri, 18 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-18 22:20:03 +01:00
Thilo Graf
b39aae929f Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 59ae2b52e9
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-17 21:53:06 +01:00
vanhofen
b0a78885b0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: addd53b04e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-17 21:33:46 +01:00
TangoCash
503c5013cc fix moviebrowser detailsline
Origin commit data
------------------
Branch: ni/coolstream
Commit: d3fe4f5e0a
Author: TangoCash <eric@loxat.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-17 21:02:28 +01:00
Jacek Jendrzej
c089c00bea src/gui/moviebrowser/mb.cpp fix bookmark Menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 531ab8f818
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-17 (Thu, 17 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-17 18:45:59 +01:00
vanhofen
b39f68a7bb Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 15f3b45175
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)



------------------
This commit was generated by Migit
2016-11-17 10:22:05 +01:00
vanhofen
b3a533e2fb moviebrowser: resort movie info update menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: de27a8a36c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)

Origin message was:
------------------
- moviebrowser: resort movie info update menu

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

------------------
This commit was generated by Migit
2016-11-17 10:19:53 +01:00
vanhofen
8c338780e8 moviebrowser: resort movie info menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: b43145af7c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)

Origin message was:
------------------
- moviebrowser: resort movie info menu

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

------------------
This commit was generated by Migit
2016-11-17 10:19:53 +01:00
vanhofen
f4c831795c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: b2b789452a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-17 01:48:51 +01:00
vanhofen
04d25db043 moviebrowser: more clarity in bookmark menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 365f36df92
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)

Origin message was:
------------------
- moviebrowser: more clarity in bookmark menu

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

------------------
This commit was generated by Migit
2016-11-17 01:48:32 +01:00
vanhofen
ac2c9e2822 moviebrowser: use red key to remove all user bookmarks
Origin commit data
------------------
Branch: ni/coolstream
Commit: d171038a6e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)

Origin message was:
------------------
- moviebrowser: use red key to remove all user bookmarks

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

------------------
This commit was generated by Migit
2016-11-17 01:48:32 +01:00
vanhofen
48ead0f169 moviebrowser: fix input for end mark and lastplay mark
Origin commit data
------------------
Branch: ni/coolstream
Commit: 86c3655e96
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)

Origin message was:
------------------
- moviebrowser: fix input for end mark and lastplay mark

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

------------------
This commit was generated by Migit
2016-11-17 01:48:32 +01:00
Thilo Graf
e0d6d5537f Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: aa40d88300
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-14 20:38:01 +01:00
vanhofen
83a0611b63 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 028049500d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-14 10:43:44 +01:00
vanhofen
a6a70301f0 moviebrowser: add PREVPLAYDATE/RECORDDATE sort buttons to footer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2f23aaedea
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)

Origin message was:
------------------
- moviebrowser: add PREVPLAYDATE/RECORDDATE sort buttons to footer

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

------------------
This commit was generated by Migit
2016-11-14 10:09:34 +01:00
vanhofen
69e17e4b10 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 73d3abcdef
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-13 20:25:22 +01:00
Thilo Graf
fd5bab0236 CMovieBrowser: unfify and reduce flicker effects of connect line
Connectline object can handle hide behavior itself.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5dc6255b43
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)



------------------
This commit was generated by Migit
2016-11-13 16:44:08 +01:00
Thilo Graf
1d7fa5c914 Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5394f4b2e1
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-12 22:31:11 +01:00
vanhofen
6281d1f066 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e40d4c44b5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-12 22:05:01 +01:00
vanhofen
9bd690019e moviebrowser: limit cover to one third of m_cBoxFrameInfo1 width
Origin commit data
------------------
Branch: ni/coolstream
Commit: a47a5cd422
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)

Origin message was:
------------------
- moviebrowser: limit cover to one third of m_cBoxFrameInfo1 width

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

------------------
This commit was generated by Migit
2016-11-12 22:03:05 +01:00
vanhofen
569ce7dbbc moviebrowser: fix MB_INFO_SPACER's empty content
Origin commit data
------------------
Branch: ni/coolstream
Commit: da604fb9a5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)

Origin message was:
------------------
- moviebrowser: fix MB_INFO_SPACER's empty content

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

------------------
This commit was generated by Migit
2016-11-12 20:40:28 +01:00
Stefan Seyfried
d8d4d753a5 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c92d112d0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-12 18:06:26 +01:00
Thilo Graf
e85436e185 Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 97006c6615
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 21:33:12 +01:00
vanhofen
caff50b53e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 184e6325c8
Author: vanhofen <vanhofen@gmx.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 16:39:18 +01:00
vanhofen
ebec9b29c6 moviebrowser: use own defaults for moviebrowser's view
Origin commit data
------------------
Branch: ni/coolstream
Commit: 98ba673e19
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- moviebrowser: use own defaults for moviebrowser's view

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

------------------
This commit was generated by Migit
2016-11-11 16:38:24 +01:00
vanhofen
790508f5e0 moviebrowser: reset m_pcInfo1 box to default height, ...
when turning m_settings.browserAdditional off


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

Origin message was:
------------------
- moviebrowser: reset m_pcInfo1 box to default height, ...

when turning m_settings.browserAdditional off


------------------
This commit was generated by Migit
2016-11-11 16:35:50 +01:00
vanhofen
cae6749ba3 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: abb8e5f02a
Author: vanhofen <vanhofen@gmx.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 13:59:11 +01:00
vanhofen
7b8ed1d11f moviebrowser: show sorting menu; displays only available options
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2cd4a9e410
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- moviebrowser: show sorting menu; displays only available options

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

------------------
This commit was generated by Migit
2016-11-11 13:46:55 +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
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
ebc3ccba12 moviebrowser: simplify channellogo scaling code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1590f4a276
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)

Origin message was:
------------------
- moviebrowser: simplify channellogo scaling code

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

------------------
This commit was generated by Migit
2016-11-08 22:00:08 +01:00
vanhofen
ea9e977f03 Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8d598b3d28
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-07 22:21:35 +01:00
vanhofen
de05882085 moviebrowser: use small offset in header to display channellogo
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-11-07 21:11:13 +01:00
vanhofen
c5a2d47f51 listbox/moviebrowser: replace internal offsets with global defines
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-11-07 21:10:21 +01:00
vanhofen
4fb7d29886 Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0159ed78a0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-07 20:42:11 +01:00
vanhofen
4bdef16c58 moviebrowser: increase default browserFrameHeight
Origin commit data
------------------
Branch: ni/coolstream
Commit: 16dfc2d5e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- moviebrowser: increase default browserFrameHeight

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

------------------
This commit was generated by Migit
2016-11-07 14:50:50 +01:00
vanhofen
5184ca6657 Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/widget/listframe.cpp


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



------------------
This commit was generated by Migit
2016-11-07 13:48:21 +01:00
vanhofen
b64f151731 moviebrowser: allow round borders in filter selection
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-11-07 13:45:55 +01:00