Commit Graph

256 Commits

Author SHA1 Message Date
vanhofen
4b7badf315 cc_frm_header: remove CComponentsHeaderLocalized() subclass
use another constructor of CComponentsHeader() instead


Origin commit data
------------------
Branch: ni/coolstream
Commit: 92ceac6a5d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-20 (Tue, 20 Jun 2017)

Origin message was:
------------------
- cc_frm_header: remove CComponentsHeaderLocalized() subclass

use another constructor of CComponentsHeader() instead


------------------
This commit was generated by Migit
2017-06-20 15:55:42 +02:00
vanhofen
61396582d8 timerlist: small design reworks ...
* re-align item contents
* rename some variables
* use CComponentsFooter
* blinking clock in header (shameless stolen from TangoCash)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 86067e6e44
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-20 (Tue, 20 Jun 2017)

Origin message was:
------------------
- timerlist: small design reworks ...

* re-align item contents
* rename some variables
* use CComponentsFooter
* blinking clock in header (shameless stolen from TangoCash)


------------------
This commit was generated by Migit
2017-06-20 14:16:14 +02:00
vanhofen
a567246e27 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/widget/listbox.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: e32d5a869f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-16 (Fri, 16 Jun 2017)



------------------
This commit was generated by Migit
2017-06-16 15:10:34 +02:00
Jacek Jendrzej
88de018881 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: a70f3cb025
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-16 (Fri, 16 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-16 14:19:26 +02:00
vanhofen
e077cd09e3 timerlist: use CComponentsScrollbar
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5d1a6a7f8b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- timerlist: use CComponentsScrollbar

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-06-15 21:52:39 +02:00
vanhofen
b8753315e7 timerlist: use CComponentsScrollbar
Origin commit data
------------------
Branch: ni/coolstream
Commit: bf644cdff0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- timerlist: use CComponentsScrollbar

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

------------------
This commit was generated by Migit
2017-06-15 16:30:02 +02:00
vanhofen
6755871162 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e78936e478
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)


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

------------------
This commit was generated by Migit
2017-05-30 01:27:37 +02:00
vanhofen
3063ec43d3 timerlist: don't use rc_info with remotetimers; that doesn't work
Origin commit data
------------------
Branch: ni/coolstream
Commit: a03b7bcb1e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)

Origin message was:
------------------
- timerlist: don't use rc_info with remotetimers; that doesn't work

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

------------------
This commit was generated by Migit
2017-05-23 23:11:34 +02:00
vanhofen
e1bf616576 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 665e499208
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-03 (Wed, 03 May 2017)


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

------------------
This commit was generated by Migit
2017-05-03 23:08:15 +02:00
Jacek Jendrzej
88d1e42c45 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: d8ba9c822a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-04-29 (Sat, 29 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-29 19:03:17 +02:00
gixxpunk
55b23c6e0a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 03891b7464
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-04-29 (Sat, 29 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-29 18:31:49 +02:00
Thilo Graf
2b47df912d CTimerList: adjust date offset via format
Origin commit data
------------------
Branch: ni/coolstream
Commit: b7d50b923f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-29 (Sat, 29 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-29 18:00:03 +02:00
vanhofen
8af0c9668b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7bccd83b07
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-27 (Thu, 27 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-27 14:02:32 +02:00
Jacek Jendrzej
229b0d7580 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: f292ba6b69
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-04-24 (Mon, 24 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-24 21:33:15 +02:00
vanhofen
3c5a9a5d88 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a34a8992d4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-24 (Mon, 24 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-24 12:56:51 +02:00
vanhofen
a2cab1dffa scrollbars: avoid usage of COL_SCROLLBAR_PASSIVE_PLUS_0 ...
... outside of CComponentsScrollBar(). Since the color-changes in
cd80e26 the non-CC scrollbars looks weird.


Origin commit data
------------------
Branch: ni/coolstream
Commit: fe5f84c1d0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-24 (Mon, 24 Apr 2017)

Origin message was:
------------------
- scrollbars: avoid usage of COL_SCROLLBAR_PASSIVE_PLUS_0 ...

... outside of CComponentsScrollBar(). Since the color-changes in
cd80e26 the non-CC scrollbars looks weird.


------------------
This commit was generated by Migit
2017-04-24 12:29:52 +02:00
Stefan Seyfried
a5cbcf84af Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: abec1c311b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-04 19:32:30 +01:00
vanhofen
dce47308fe Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7af71a8a03
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-26 (Sun, 26 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-26 00:39:36 +01:00
vanhofen
6e51a8e1ce Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 05013e825d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-26 (Sun, 26 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-26 00:38:58 +01:00
vanhofen
94a2706033 timerlist: fix timer comparison in modifyTimer()
Origin commit data
------------------
Branch: ni/coolstream
Commit: cf9a1a705c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-26 (Sun, 26 Feb 2017)

Origin message was:
------------------
- timerlist: fix timer comparison in modifyTimer()

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

------------------
This commit was generated by Migit
2017-02-26 00:06:32 +01:00
Stefan Seyfried
94d677b18c Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b47699447
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-11 (Sat, 11 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-11 11:18:45 +01:00
vanhofen
c80102a917 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac
	src/driver/Makefile.am
	src/driver/framebuffer.h
	src/gui/bookmarkmanager.cpp
	src/gui/filebrowser.cpp
	src/gui/widget/buttons.cpp
	src/system/httptool.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: dd6244f33e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)



------------------
This commit was generated by Migit
2017-02-09 13:19:03 +01:00
vanhofen
b67368c624 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 221e4b5c04
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-09 08:35:14 +01:00
GetAway
cc37e37e40 change to CURLOPT_CONNECTTIMEOUT_MS and ...
use a connect_timeout of 300ms for remote timer


Origin commit data
------------------
Branch: ni/coolstream
Commit: c1f788ac42
Author: GetAway <get-away@t-online.de>
Date: 2017-02-07 (Tue, 07 Feb 2017)



------------------
This commit was generated by Migit
2017-02-09 08:33:48 +01:00
vanhofen
9aaeb66d92 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5e69fd2b22
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-06 (Mon, 06 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-06 21:17:40 +01:00
TangoCash
1f0a8b1061 fix pre and post times, set menuentry for unavailable boxes inactiv
Origin commit data
------------------
Branch: ni/coolstream
Commit: fb5ab7f9ec
Author: TangoCash <eric@loxat.de>
Date: 2017-02-06 (Mon, 06 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-06 21:11:20 +01:00
TangoCash
082f209da8 dont ask which box, if just one is present.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 22b0248d70
Author: TangoCash <eric@loxat.de>
Date: 2017-02-06 (Mon, 06 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-06 21:11:06 +01:00
Stefan Seyfried
d6861c1054 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: a409047714
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-22 (Sun, 22 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-22 22:59:39 +01:00
vanhofen
45d33bdf00 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: d39dc75c6d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-29 15:15:34 +01:00
vanhofen
77faf88b66 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 116e4325c8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-22 (Thu, 22 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-22 10:34:59 +01:00
Jacek Jendrzej
34ce71fb57 src/gui/timerlist.cpp init changed
Origin commit data
------------------
Branch: ni/coolstream
Commit: c868ad5300
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-12-20 (Tue, 20 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-20 22:03:43 +01:00
vanhofen
133edf4688 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e1aa8d0d1
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 23:18:57 +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
1474434304 locale: right names for timerlist repeat-hints
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4fc60600f7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-16 (Fri, 16 Dec 2016)

Origin message was:
------------------
- locale: right names for timerlist repeat-hints

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

------------------
This commit was generated by Migit
2016-12-16 20:32:09 +01:00
vanhofen
2dae9f273a Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: fdb24232f6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-12 10:29:42 +01:00
vanhofen
dbb517a861 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a141bafe7f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-08 (Thu, 08 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-08 17:57:11 +01:00
Jacek Jendrzej
092024e4fe src/gui/timerlist.cpp dont check empty timerlist
Origin commit data
------------------
Branch: ni/coolstream
Commit: f7cfe0256b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-12-08 (Thu, 08 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-08 16:16:57 +01:00
vanhofen
585d9942ec timerlist: remove menu button from footer; is available in header too
Origin commit data
------------------
Branch: ni/coolstream
Commit: 74c54d885a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-08 (Thu, 08 Dec 2016)

Origin message was:
------------------
- timerlist: remove menu button from footer; is available in header too

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

------------------
This commit was generated by Migit
2016-12-08 13:41:38 +01:00
Thilo Graf
5af065acab CTimerList: remove timeout for delete warning
Timeout for deletions are not a really good idea. This should be
controlled by user and it should be durable visualized what
he just is doing.


Origin commit data
------------------
Branch: ni/coolstream
Commit: f8b295b818
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-08 (Thu, 08 Dec 2016)



------------------
This commit was generated by Migit
2016-12-08 12:54:37 +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
6b0e887585 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	data/locale/slovak.locale
	data/locale/unmaintained/czech.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/start_wizard.cpp
	src/gui/widget/msgbox.cpp


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



------------------
This commit was generated by Migit
2016-11-21 12:46:49 +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
vanhofen
b0f13d51ce Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac
	lib/sectionsdclient/Makefile.am
	lib/timerdclient/Makefile.am


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



------------------
This commit was generated by Migit
2016-11-17 09:52:47 +01:00
vanhofen
08cf7677c4 timerlist: reduce flicker-effects while timerlist construction
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0ce3513d78
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)

Origin message was:
------------------
- timerlist: reduce flicker-effects while timerlist construction

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

------------------
This commit was generated by Migit
2016-11-17 00:18:09 +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
vanhofen
390f589ac1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: d4b9daf01e
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 09:16:24 +01:00
vanhofen
3a6109ce9e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 722d98b46b
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 12:48:26 +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
Thilo Graf
2d44820ae3 CTimerList: add menu context button to header
Not to see that we have a possible submenu.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9eb9158c2f
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-09 (Wed, 09 Nov 2016)



------------------
This commit was generated by Migit
2016-11-09 19:44:13 +01:00
Thilo Graf
7fe97fde28 Merge branch 'master' into pu/msgbox
Conflicts:
	src/gui/timerlist.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 996beed078
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-09 (Wed, 09 Nov 2016)



------------------
This commit was generated by Migit
2016-11-09 00:30:44 +01:00