Commit Graph

249 Commits

Author SHA1 Message Date
Michael Liebmann
8d79a9931e Complement to commit 'allow to delete all marked movies'
Origin commit data
------------------
Branch: ni/coolstream
Commit: d7c4335bff
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-09-29 (Tue, 29 Sep 2015)


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

------------------
This commit was generated by Migit
2015-09-29 08:49:14 +02:00
vanhofen
a483b5e187 moviebrowser: allow to delete all marked movies
Origin commit data
------------------
Branch: ni/coolstream
Commit: 644e3efee3
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-09-29 (Tue, 29 Sep 2015)

Origin message was:
------------------
- moviebrowser: allow to delete all marked movies

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

------------------
This commit was generated by Migit
2015-09-29 08:49:13 +02:00
Jacek Jendrzej
755209ea54 src/gui/moviebrowser.cpp fix segfault if m_movieSelectionHandler is NULL
Origin commit data
------------------
Branch: ni/coolstream
Commit: 07f25639d9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-06-28 (Sun, 28 Jun 2015)


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

------------------
This commit was generated by Migit
2015-06-28 11:33:06 +02:00
[CST] Focus
971a8269ed gui/moviebrowser.cpp: bug fix, default ytthumbnaildir is empty
Origin commit data
------------------
Branch: ni/coolstream
Commit: 94667ee39a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-06-02 (Tue, 02 Jun 2015)


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

------------------
This commit was generated by Migit
2015-06-02 12:16:14 +03:00
vanhofen
375073b01a moviebrowser: add menu to allow copy, cat or truncate movies
TODO: add good hints to explain these functions


Origin commit data
------------------
Branch: ni/coolstream
Commit: d8a4dd2c0d
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-21 (Thu, 21 May 2015)

Origin message was:
------------------
- moviebrowser: add menu to allow copy, cat or truncate movies

 TODO: add good hints to explain these functions


------------------
This commit was generated by Migit
2015-05-21 09:04:27 +02:00
Thilo Graf
946c0e8bc4 Merge branch 'cst-next.pre' into cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: a58f1621b4
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-04-30 (Thu, 30 Apr 2015)


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

------------------
This commit was generated by Migit
2015-04-30 09:20:43 +02:00
vanhofen
32365276ef remove w_max()-calls to define menu-width, because ...
w-max() returns a pixel-value, but menus need a percentage-value.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9041bff59c
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-24 (Fri, 24 Apr 2015)

Origin message was:
------------------
- remove w_max()-calls to define menu-width, because ...

 w-max() returns a pixel-value, but menus need a percentage-value.


------------------
This commit was generated by Migit
2015-04-24 09:11:04 +02:00
vanhofen
098e322feb record.h: remove include of vfd.h; use display.h instead
Origin commit data
------------------
Branch: ni/coolstream
Commit: 09adc177d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-16 (Thu, 16 Apr 2015)

Origin message was:
------------------
- record.h: remove include of vfd.h; use display.h instead

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

------------------
This commit was generated by Migit
2015-04-16 13:39:35 +02:00
vanhofen
43eec2023f moviebrowser: bind MB_MAX_DIR definition to NETWORK_NFS_NR_OF_ENTRIES ...
... to allow to add all NetFS-directories to moviebrowser


Origin commit data
------------------
Branch: ni/coolstream
Commit: f7b42af5f2
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-03-30 (Mon, 30 Mar 2015)

Origin message was:
------------------
- moviebrowser: bind MB_MAX_DIR definition to NETWORK_NFS_NR_OF_ENTRIES ...

... to allow to add all NetFS-directories to moviebrowser


------------------
This commit was generated by Migit
2015-03-30 14:54:21 +02:00
Thilo Graf
97add2603e CChannelList/CNeutrinoEventList/CMovieBrowser: fix logo scale
Downscale was broken.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1cb885dfe9
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-01-14 (Wed, 14 Jan 2015)



------------------
This commit was generated by Migit
2015-03-29 22:40:08 +02:00
Thilo Graf
9c73fdcad1 CMovieBrowser: fix unintended upscaling of channellogo
Upscale is not allowed and do down scale only if header height is too small.


Origin commit data
------------------
Branch: ni/coolstream
Commit: bee35e9042
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-11-06 (Thu, 06 Nov 2014)



------------------
This commit was generated by Migit
2015-03-29 22:39:54 +02:00
Jacek Jendrzej
ea6ba212f1 moviebrowser.cpp: silence comparing floating point warning
Origin commit data
------------------
Branch: ni/coolstream
Commit: 632ecc3b1e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-03-19 (Thu, 19 Mar 2015)


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

------------------
This commit was generated by Migit
2015-03-19 18:29:37 +01:00
[CST] Focus
71ebf30e32 gui/moviebrowser.cpp: do not paint logo if not present
Origin commit data
------------------
Branch: ni/coolstream
Commit: caef89d587
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-03-07 (Sat, 07 Mar 2015)


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

------------------
This commit was generated by Migit
2015-03-07 13:56:45 +03:00
vanhofen
52b574d3f6 moviebrowser: auto-choose movie-start in startup menu, when ...
... start-bookmark is set


Origin commit data
------------------
Branch: ni/coolstream
Commit: f737192ef4
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-02-21 (Sat, 21 Feb 2015)

Origin message was:
------------------
- moviebrowser: auto-choose movie-start in startup menu, when ...

 ... start-bookmark is set


------------------
This commit was generated by Migit
2015-02-21 17:21:07 +01:00
[CST] Focus
457e836436 gui/moviebrowser.cpp: remove old TS cut code
Origin commit data
------------------
Branch: ni/coolstream
Commit: cc4f10297d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-02-20 (Fri, 20 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-20 18:37:56 +03:00
Jacek Jendrzej
8668aa9ab4 src/gui/moviebrowser.cpp set deleted CChannelLogo pointers to NULL
Origin commit data
------------------
Branch: ni/coolstream
Commit: cbf4c9bae8
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-02-15 (Sun, 15 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-15 18:49:30 +01:00
Stefan Seyfried
4e54d5c781 moviebrowser/player: remove unneeded (char *) casts
Origin commit data
------------------
Branch: ni/coolstream
Commit: b90991da77
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-14 14:31:11 +01:00
Stefan Seyfried
896aad4e0a filebrowser, moviebrowser, pictureviewer: clarify error message
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4e1678c2a3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-06 (Fri, 06 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-09 13:47:32 +01:00
Jacek Jendrzej
5afc24dc67 use empty to check string
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2b5e7b5ba3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-01-09 (Fri, 09 Jan 2015)


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

------------------
This commit was generated by Migit
2015-01-09 17:15:11 +01:00
[CST] Focus
85fc0dd24c gui/mediaplayer_setup.cpp: integrate MB / YT settings, (c) martii
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9b78e49d0e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-12-26 (Fri, 26 Dec 2014)


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

------------------
This commit was generated by Migit
2014-12-26 19:00:32 +03:00
vanhofen
f80f7d6822 moviebrowser: localize dialogs around TS-editing
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3e24de2d67
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-22 (Mon, 22 Dec 2014)

Origin message was:
------------------
- moviebrowser: localize dialogs around TS-editing

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

------------------
This commit was generated by Migit
2014-12-22 09:16:20 +01:00
Christian Schuett
c8f1735a63 moviebrowser: sort column item option choosers alphabetically
also add missing entry 'info2' to this option choosers and remove
 duplicate entry 'filename' from them

- english.locale: fix typo


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4975b33dfd
Author: Christian Schuett <Gaucho316@hotmail.com>
Date: 2014-12-15 (Mon, 15 Dec 2014)

Origin message was:
------------------
- moviebrowser: sort column item option choosers alphabetically

 also add missing entry 'info2' to this option choosers and remove
 duplicate entry 'filename' from them

- english.locale: fix typo


------------------
This commit was generated by Migit
2014-12-15 08:50:22 +01:00
vanhofen
7c148eed7d moviebrowser: add hotkeys to options to setup
Origin commit data
------------------
Branch: ni/coolstream
Commit: 598c79bd83
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-12 (Fri, 12 Dec 2014)

Origin message was:
------------------
- moviebrowser: add hotkeys to options to setup

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

------------------
This commit was generated by Migit
2014-12-12 18:11:05 +01:00
vanhofen
1aa823eda8 moviebrowser: use pulldown-menu to show options to setup
Origin commit data
------------------
Branch: ni/coolstream
Commit: c993ef9e28
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-12 (Fri, 12 Dec 2014)

Origin message was:
------------------
- moviebrowser: use pulldown-menu to show options to setup

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

------------------
This commit was generated by Migit
2014-12-12 18:11:05 +01:00
vanhofen
6a896e91d1 moviebrowser: allow 9 instead of 6 rows
* remove fake-entrys for lastPlayRow and lastRecordRow


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

Origin message was:
------------------
- moviebrowser: allow 9 instead of 6 rows

* remove fake-entrys for lastPlayRow and lastRecordRow


------------------
This commit was generated by Migit
2014-12-12 18:11:05 +01:00
vanhofen
4dffc7a8d5 align most CKeyboardInput calls to the changes in 88c6640
Origin commit data
------------------
Branch: ni/coolstream
Commit: ee91014c48
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-22 (Sat, 22 Nov 2014)

Origin message was:
------------------
- align most CKeyboardInput calls to the changes in 88c6640

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

------------------
This commit was generated by Migit
2014-11-22 15:58:02 +01:00
[CST] Focus
703a04f386 change most code to use CKeyboardInput in place of CStringInputSMS
Origin commit data
------------------
Branch: ni/coolstream
Commit: 549e110e14
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-11-19 (Wed, 19 Nov 2014)


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

------------------
This commit was generated by Migit
2014-11-19 18:21:38 +03:00
[CST] Focus
fc4b8cc81c gui/moviebrowser.cpp: allow to delete any file + xml
Origin commit data
------------------
Branch: ni/coolstream
Commit: 50a90906a0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-11-05 (Wed, 05 Nov 2014)


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

------------------
This commit was generated by Migit
2014-11-05 16:35:41 +03:00
[CST] Focus
99fab30fe3 gui/moviebrowser.cpp: apply rows / browser height changes after quit menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: b33247f346
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-29 (Mon, 29 Sep 2014)


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

------------------
This commit was generated by Migit
2014-09-29 14:39:23 +04:00
[CST] Focus
d18fc34b0d gui/moviebrowser.cpp: try to fix footer position
Origin commit data
------------------
Branch: ni/coolstream
Commit: fb5dddc3f5
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-29 (Mon, 29 Sep 2014)


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

------------------
This commit was generated by Migit
2014-09-29 12:26:36 +04:00
[CST] Focus
116e13c038 gui/moviebrowser.cpp: case-insensitive extension compare
Origin commit data
------------------
Branch: ni/coolstream
Commit: 879652a300
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-28 (Sun, 28 Sep 2014)


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

------------------
This commit was generated by Migit
2014-09-28 12:26:39 +04:00
[CST] Focus
30d8d5c101 gui/moviebrowser.cpp: add support for non-TS/xml files, idea (c) martii
Origin commit data
------------------
Branch: ni/coolstream
Commit: b8d398a69a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-27 (Sat, 27 Sep 2014)


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

------------------
This commit was generated by Migit
2014-09-27 16:21:43 +04:00
[CST] Focus
d10cd4bb75 gui/moviebrowser.cpp: cleanup, indent code; bug fixes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 819b5f5dae
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)


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

------------------
This commit was generated by Migit
2014-09-26 14:22:58 +04:00
martii
2d97d6807d guimoviebrowser: start bookmark: query actual item position instead of using fixed value
Origin commit data
------------------
Branch: ni/coolstream
Commit: 126a2ffde2
Author: martii <m4rtii@gmx.de>
Date: 2013-12-28 (Sat, 28 Dec 2013)


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

------------------
This commit was generated by Migit
2014-09-26 14:22:57 +04:00
martii
8fdaf712e4 gui/moviebrowser: unbreak footer
Conflicts:
	src/gui/moviebrowser.cpp
	src/gui/widget/buttons.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: bc6b7ebf1d
Author: martii <m4rtii@gmx.de>
Date: 2013-12-13 (Fri, 13 Dec 2013)



------------------
This commit was generated by Migit
2014-09-26 14:22:57 +04:00
martii
1c18b7666a moviebrowser/yt history: use a less collision-prone action key for clearing the history
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1cabec4ace
Author: martii <m4rtii@gmx.de>
Date: 2013-08-16 (Fri, 16 Aug 2013)


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

------------------
This commit was generated by Migit
2014-09-26 14:22:57 +04:00
martii
c073d0695d gui/moviebrowser/yt menue: change color key assignment
Conflicts:
	src/gui/moviebrowser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8c89445e7b
Author: martii <m4rtii@gmx.de>
Date: 2013-08-22 (Thu, 22 Aug 2013)



------------------
This commit was generated by Migit
2014-09-26 14:22:57 +04:00
martii
024b712721 gui/moviebrowser: Never call a local variable 'errno'.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 279fc10327
Author: martii <m4rtii@gmx.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)


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

------------------
This commit was generated by Migit
2014-09-26 14:22:57 +04:00
martii
982860b30e gui/moviebrowser: let page up/down handle search prev/next
Conflicts:
	src/gui/moviebrowser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: ba4b33ea67
Author: martii <m4rtii@gmx.de>
Date: 2013-08-22 (Thu, 22 Aug 2013)



------------------
This commit was generated by Migit
2014-09-25 16:35:05 +04:00
martii
8cba86dc0c gui/channellist, gui/moviebrowser: use g_settings.key_record instead of CRCInput::RC_record
Conflicts:
	src/gui/channellist.cpp
	src/gui/moviebrowser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6f6068f4cd
Author: martii <m4rtii@gmx.de>
Date: 2014-02-23 (Sun, 23 Feb 2014)



------------------
This commit was generated by Migit
2014-09-25 16:02:06 +04:00
martii
e4d5855ec0 gui/movieinfo: minor simplifications
Conflicts:
	src/gui/movieinfo.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7cd3a92e10
Author: martii <m4rtii@gmx.de>
Date: 2014-04-21 (Mon, 21 Apr 2014)



------------------
This commit was generated by Migit
2014-09-25 15:54:41 +04:00
martii
c3a494579d movieplayer: use #defines from record.h for timeshift
Conflicts:
	src/gui/movieplayer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 540a060ba9
Author: martii <m4rtii@gmx.de>
Date: 2014-04-17 (Thu, 17 Apr 2014)



------------------
This commit was generated by Migit
2014-09-25 15:29:56 +04:00
martii
5f118b65da MI_MOVIE_INFO: add constructor
Conflicts:
	src/driver/record.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieinfo.cpp
	src/gui/movieplayer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: e611ed381d
Author: martii <m4rtii@gmx.de>
Date: 2014-01-23 (Thu, 23 Jan 2014)



------------------
This commit was generated by Migit
2014-09-25 14:44:53 +04:00
[CST] Focus
d6478dff3c gui/moviebrowser.cpp: try to fix header, similar to:
30fc50ca71


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1f8bb7dfae
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-25 (Thu, 25 Sep 2014)



------------------
This commit was generated by Migit
2014-09-25 13:28:42 +04:00
martii
792cc4bbe3 system/ytcache: add progress data
Conflicts:
	src/gui/moviebrowser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 050138c107
Author: martii <m4rtii@gmx.de>
Date: 2013-11-16 (Sat, 16 Nov 2013)



------------------
This commit was generated by Migit
2014-09-24 19:50:35 +04:00
martii
6ad4e8615f gui/moviebrowser: add gui options for yt/nk cache directories
Conflicts:
	src/gui/moviebrowser.cpp
	src/system/nkparser.cpp
	src/system/nkparser.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: fd1ba8df97
Author: martii <m4rtii@gmx.de>
Date: 2013-11-17 (Sun, 17 Nov 2013)



------------------
This commit was generated by Migit
2014-09-24 19:50:35 +04:00
martii
b94bd9697b gui/moviebrowser: caching fixes
Conflicts:
	src/gui/moviebrowser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 891170490e
Author: martii <m4rtii@gmx.de>
Date: 2013-11-16 (Sat, 16 Nov 2013)



------------------
This commit was generated by Migit
2014-09-24 19:50:35 +04:00
martii
070b342de4 overload access(2)
Conflicts:
	src/driver/pictureviewer/pictureviewer.cpp
	src/gui/components/cc_item_picture.cpp
	src/gui/movieplayer.cpp
	src/gui/osdlang_setup.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.h
	src/system/setting_helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 81ca577fb8
Author: martii <m4rtii@gmx.de>
Date: 2013-06-30 (Sun, 30 Jun 2013)



------------------
This commit was generated by Migit
2014-09-24 19:50:35 +04:00
martii
3aca178cb0 yt download fixes
Conflicts:
	src/gui/moviebrowser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: f6ae1796f2
Author: martii <m4rtii@gmx.de>
Date: 2013-06-13 (Thu, 13 Jun 2013)



------------------
This commit was generated by Migit
2014-09-24 19:50:35 +04:00
martii
9c87251620 add gui support for experimental yt caching code
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/moviebrowser.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7fac02ba45
Author: martii <m4rtii@gmx.de>
Date: 2013-06-13 (Thu, 13 Jun 2013)



------------------
This commit was generated by Migit
2014-09-24 19:50:35 +04:00