Commit Graph

158 Commits

Author SHA1 Message Date
Jacek Jendrzej
66cf4d88cd Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: d8ba9c822a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-04-29 (Sat, 29 Apr 2017)
2017-04-29 19:03:17 +02:00
Thilo Graf
35074f9564 CTimerList: adjust date offset via format
Origin commit data
------------------
Commit: b7d50b923f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-29 (Sat, 29 Apr 2017)
2017-04-29 18:00:03 +02:00
Jacek Jendrzej
a76208e0a3 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: f292ba6b69
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-04-24 (Mon, 24 Apr 2017)
2017-04-24 21:33:15 +02:00
vanhofen
ce494cbd38 scrollbars: avoid usage of COL_SCROLLBAR_PASSIVE_PLUS_0 ...
... outside of CComponentsScrollBar(). Since the color-changes in
9c8c262 the non-CC scrollbars looks weird.


Origin commit data
------------------
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
9c8c262 the non-CC scrollbars looks weird.
2017-04-24 12:29:52 +02:00
Stefan Seyfried
b93f4e419a Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Commit: abec1c311b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)
2017-03-04 19:32:30 +01:00
vanhofen
ae07afa352 timerlist: fix timer comparison in modifyTimer()
Origin commit data
------------------
Commit: cf9a1a705c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-26 (Sun, 26 Feb 2017)

Origin message was:
------------------
- timerlist: fix timer comparison in modifyTimer()
2017-02-26 00:06:32 +01:00
Stefan Seyfried
706a5ba010 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Commit: 8b47699447
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-11 (Sat, 11 Feb 2017)
2017-02-11 11:18:45 +01:00
GetAway
340dbe3324 change to CURLOPT_CONNECTTIMEOUT_MS and ...
use a connect_timeout of 300ms for remote timer


Origin commit data
------------------
Commit: c1f788ac42
Author: GetAway <get-away@t-online.de>
Date: 2017-02-07 (Tue, 07 Feb 2017)
2017-02-09 08:33:48 +01:00
TangoCash
9fc07b1cf6 fix pre and post times, set menuentry for unavailable boxes inactiv
Origin commit data
------------------
Commit: fb5ab7f9ec
Author: TangoCash <eric@loxat.de>
Date: 2017-02-06 (Mon, 06 Feb 2017)
2017-02-06 21:11:20 +01:00
TangoCash
16f587b4a7 dont ask which box, if just one is present.
Origin commit data
------------------
Commit: 22b0248d70
Author: TangoCash <eric@loxat.de>
Date: 2017-02-06 (Mon, 06 Feb 2017)
2017-02-06 21:11:06 +01:00
Stefan Seyfried
c95aca9252 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Commit: a409047714
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-22 (Sun, 22 Jan 2017)
2017-01-22 22:59:39 +01:00
Jacek Jendrzej
c969207000 src/gui/timerlist.cpp init changed
Origin commit data
------------------
Commit: c868ad5300
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-12-20 (Tue, 20 Dec 2016)
2016-12-20 22:03:43 +01:00
vanhofen
e6b0d8104d locale: right names for timerlist repeat-hints
Origin commit data
------------------
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
2016-12-16 20:32:09 +01:00
Jacek Jendrzej
8b8af1a371 src/gui/timerlist.cpp dont check empty timerlist
Origin commit data
------------------
Commit: f7cfe0256b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-12-08 (Thu, 08 Dec 2016)
2016-12-08 16:16:57 +01:00
vanhofen
38e38dba2d timerlist: remove menu button from footer; is available in header too
Origin commit data
------------------
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
2016-12-08 13:41:38 +01:00
Thilo Graf
41a47bdf37 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
------------------
Commit: f8b295b818
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-08 (Thu, 08 Dec 2016)
2016-12-08 12:54:37 +01:00
Stefan Seyfried
eab48f2ed9 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Commit: c6d7968381
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)
2016-12-04 18:02:51 +01:00
Stefan Seyfried
2e7aa7be4a Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Commit: 2c92d112d0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
2016-11-12 18:06:26 +01:00
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
Thilo Graf
8241298511 CTimerList: add menu context button to header
Not to see that we have a possible submenu.


Origin commit data
------------------
Commit: 9eb9158c2f
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-09 (Wed, 09 Nov 2016)
2016-11-09 19:44:13 +01:00
Thilo Graf
9e6adb848d Merge branch 'master' into pu/msgbox
Conflicts:
	src/gui/timerlist.cpp


Origin commit data
------------------
Commit: 996beed078
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-09 (Wed, 09 Nov 2016)
2016-11-09 00:30:44 +01:00
TangoCash
d1e313b4f3 fix epgtitle
Origin commit data
------------------
Commit: 32c6eaf031
Author: TangoCash <eric@loxat.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)
2016-11-07 20:36:34 +01:00
vanhofen
7886ea960e timerlist: just small code cosmetics
Origin commit data
------------------
Commit: 8ac3b64e75
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- timerlist: just small code cosmetics
2016-11-07 10:13:04 +01:00
Thilo Graf
eae883a161 Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Commit: aae4411d03
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)
2016-10-29 12:38:17 +02:00
Michael Liebmann
ca4121947f Use forceSaveScreen() in COsdSetup & CTimerList
Origin commit data
------------------
Commit: e5402057d3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-10-29 (Sat, 29 Oct 2016)
2016-10-29 10:38:06 +02:00
TangoCash
985775b93c add possibility to add Name,Url,Port, Username and Password if needed.
Origin commit data
------------------
Commit: 3776340268
Author: TangoCash <eric@loxat.de>
Date: 2016-10-28 (Fri, 28 Oct 2016)
2016-10-28 22:20:27 +02:00
Thilo Graf
ffad03c63d Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Commit: 28acb0fefa
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-27 (Thu, 27 Oct 2016)
2016-10-27 10:13:45 +02:00
Jacek Jendrzej
2d6f298423 src/gui/timerlist.cpp update timerlist after show epgview
Origin commit data
------------------
Commit: 48c596e2ca
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-10-26 (Wed, 26 Oct 2016)
2016-10-26 18:31:44 +02:00
Michael Liebmann
388f6402a0 CTimerList: Set httpConnectTimeout for remote timer = 3 sec
Origin commit data
------------------
Commit: 4dceb70ce1
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-10-26 (Wed, 26 Oct 2016)
2016-10-26 15:16:11 +02:00
Michael Liebmann
3d79a4fe9c remotetimer: Don't repaint timerlist when no changes to remote ip
Origin commit data
------------------
Commit: 4c8de6960e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-10-26 (Wed, 26 Oct 2016)
2016-10-26 15:16:11 +02:00
Michael Liebmann
38046c788e CTimerList: Use enableSaveScreen() for CIPInput
Origin commit data
------------------
Commit: a132969547
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-10-26 (Wed, 26 Oct 2016)
2016-10-26 15:16:11 +02: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
Stefan Seyfried
5fcbcc1c8a Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Commit: 037dbb0e29
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-23 (Sun, 23 Oct 2016)
2016-10-23 16:05:40 +02:00
TangoCash
fa76d8511d fix overlapping remote timers
Origin commit data
------------------
Commit: 7bd568dc9c
Author: TangoCash <eric@loxat.de>
Date: 2016-10-23 (Sun, 23 Oct 2016)
2016-10-23 11:16:42 +02:00
TangoCash
b707176221 fix empty ip
Origin commit data
------------------
Commit: d0b9b3b4a5
Author: TangoCash <eric@loxat.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
2016-10-22 22:42:03 +02:00
Stefan Seyfried
e1a1c76827 timerlist: fix build with GCC 6.2
Origin commit data
------------------
Commit: f632ac5505
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
2016-10-22 12:33:10 +02:00
vanhofen
3b220b4b11 timerlist: hide play button, when no remote-box is defined
Origin commit data
------------------
Commit: 418bf4b341
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)

Origin message was:
------------------
- timerlist: hide play button, when no remote-box is defined
2016-10-21 12:11:36 +02:00
vanhofen
1c976d8579 timerlist: auto-calculate TimerListButtonsCount
Origin commit data
------------------
Commit: 9a9fc2097b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)

Origin message was:
------------------
- timerlist: auto-calculate TimerListButtonsCount
2016-10-21 10:47:38 +02:00
TangoCash
b86cba0bc9 add play button in footer
Origin commit data
------------------
Commit: cc5567e0ef
Author: TangoCash <eric@loxat.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)
2016-10-21 10:47:38 +02:00
TangoCash
2d529439a4 fix menue
Origin commit data
------------------
Commit: 9b0137377a
Author: TangoCash <eric@loxat.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)
2016-10-21 10:47:38 +02:00
TangoCash
796c0781db add locals, add menu to manage box ip's
Origin commit data
------------------
Commit: 083c547e27
Author: TangoCash <eric@loxat.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)
2016-10-21 10:47:37 +02:00
TangoCash
0801b9f3bc varius fixes
Origin commit data
------------------
Commit: fb26f93d98
Author: TangoCash <eric@loxat.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)
2016-10-21 10:47:37 +02:00
TangoCash
5aaea95ee1 add multiple remote boxes
Origin commit data
------------------
Commit: f354089763
Author: TangoCash <eric@loxat.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)
2016-10-21 10:47:37 +02:00
TangoCash
aaf9725d8d check if channel is present (send + fetch)
Origin commit data
------------------
Commit: 7f91b853f7
Author: TangoCash <eric@loxat.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)
2016-10-21 10:47:37 +02:00
TangoCash
f3658891ea suppleental to last commit: fix time corrections for remote timers
Origin commit data
------------------
Commit: 9d19834340
Author: TangoCash <eric@loxat.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)
2016-10-21 10:47:37 +02:00
TangoCash
6b76a665f1 adding remote timer (experimental)
switch record timers to remote box or back with "play"-key


Origin commit data
------------------
Commit: 716e9f4d9b
Author: TangoCash <eric@loxat.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)
2016-10-21 10:47:37 +02:00
vanhofen
a4e5ce1c6b timerlist: use getItemColors function
Origin commit data
------------------
Commit: a38158919d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-19 (Wed, 19 Oct 2016)

Origin message was:
------------------
- timerlist: use getItemColors function
2016-10-19 10:06:36 +02:00
vanhofen
f21851aec0 rename SHADOW_OFFSET -> OFFSET_SHADOW
Origin commit data
------------------
Commit: 5d450c60d3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- rename SHADOW_OFFSET -> OFFSET_SHADOW
2016-10-10 14:19:55 +02:00
vanhofen
594362934d timerlist: fix shadow color
Origin commit data
------------------
Commit: 74040e7ef5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- timerlist: fix shadow color
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