Commit Graph

168 Commits

Author SHA1 Message Date
Jacek Jendrzej
ea4ea34255 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b89baa7a2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-26 (Mon, 26 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-26 22:22:07 +02:00
vanhofen
7db503f654 timerlist: fix compiler-warning (comparison signed/unsigned int)
(cherry picked from commit 4e42382842)
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 033d6bb359
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)

Origin message was:
------------------
- timerlist: fix compiler-warning (comparison signed/unsigned int)

(cherry picked from commit 4e42382842)
Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-06-26 20:53:12 +02:00
vanhofen
64bbca26a3 timerlist: add separationline to items
(cherry picked from commit a5dd8a55fb)
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- timerlist: add separationline to items

(cherry picked from commit a5dd8a55fb)
Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-06-26 20:53:12 +02:00
Jacek Jendrzej
6e321d5966 init pre post
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4bdacf39c8
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-26 (Mon, 26 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-26 19:23:23 +02:00
Jacek Jendrzej
0d48f6627d Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2ddad19873
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-21 (Wed, 21 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-21 13:54:49 +02:00
vanhofen
0449efa2d3 cc_frm_header: remove CComponentsHeaderLocalized() subclass
use another constructor of CComponentsHeader() instead

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

Good idea, this I had already in mind too.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 980e293517
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-21 (Wed, 21 Jun 2017)

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

use another constructor of CComponentsHeader() instead

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

Good idea, this I had already in mind too.


------------------
This commit was generated by Migit
2017-06-21 10:31:22 +02:00
Thilo Graf
a3f7799ed0 CTimerList: partial revert of - timerlist: small design reworks ...
removed: * blinking clock in header (shameless stolen from TangoCash)

Not really required here and before we can enable a ticking clock here,
clock must be disabled on opened context menues, because the
timerlist context menus will be damaged. This needs a separate handling.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 06c8fd33f8
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-21 (Wed, 21 Jun 2017)



------------------
This commit was generated by Migit
2017-06-21 10:31:22 +02:00
vanhofen
d6608d21f6 timerlist: small design reworks ...
* re-align item contents
* rename some variables
* use CComponentsFooter
* blinking clock in header (shameless stolen from TangoCash)

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 915410e571
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-21 (Wed, 21 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)

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


------------------
This commit was generated by Migit
2017-06-21 10:31:22 +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
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
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
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
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
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
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
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
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
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
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
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
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
TangoCash
0ae28ef185 fix epgtitle
Origin commit data
------------------
Branch: ni/coolstream
Commit: 32c6eaf031
Author: TangoCash <eric@loxat.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:36:34 +01:00
vanhofen
64bf5d3494 timerlist: just small code cosmetics
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8ac3b64e75
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- timerlist: just small code cosmetics

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

------------------
This commit was generated by Migit
2016-11-07 10:13:04 +01:00
Thilo Graf
efee734a6c Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: aae4411d03
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-29 12:38:17 +02:00
Michael Liebmann
5b0d909a9f Use forceSaveScreen() in COsdSetup & CTimerList
Origin commit data
------------------
Branch: ni/coolstream
Commit: e5402057d3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-10-29 (Sat, 29 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-29 10:38:06 +02:00
TangoCash
0e87207cab add possibility to add Name,Url,Port, Username and Password if needed.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3776340268
Author: TangoCash <eric@loxat.de>
Date: 2016-10-28 (Fri, 28 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-28 22:20:27 +02:00
Thilo Graf
d3de92054a Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 28acb0fefa
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-27 (Thu, 27 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-27 10:13:45 +02:00
Jacek Jendrzej
f83231ec06 src/gui/timerlist.cpp update timerlist after show epgview
Origin commit data
------------------
Branch: ni/coolstream
Commit: 48c596e2ca
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-10-26 (Wed, 26 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-26 18:31:44 +02:00
Michael Liebmann
db7fc457eb CTimerList: Set httpConnectTimeout for remote timer = 3 sec
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4dceb70ce1
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-10-26 (Wed, 26 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-26 15:16:11 +02:00
Michael Liebmann
2c390c94e6 remotetimer: Don't repaint timerlist when no changes to remote ip
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4c8de6960e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-10-26 (Wed, 26 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-26 15:16:11 +02:00
Michael Liebmann
3e6623f4de CTimerList: Use enableSaveScreen() for CIPInput
Origin commit data
------------------
Branch: ni/coolstream
Commit: a132969547
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-10-26 (Wed, 26 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-26 15:16:11 +02:00
Thilo Graf
36d8d81fa6 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
------------------
Branch: ni/coolstream
Commit: dde298b1b7
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-04-04 (Mon, 04 Apr 2016)



------------------
This commit was generated by Migit
2016-10-24 10:31:24 +02:00
Stefan Seyfried
569505602b Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 037dbb0e29
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-23 (Sun, 23 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-23 16:05:40 +02:00
TangoCash
38b2bc4a9f fix overlapping remote timers
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7bd568dc9c
Author: TangoCash <eric@loxat.de>
Date: 2016-10-23 (Sun, 23 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-23 11:16:42 +02:00
TangoCash
d9af6bbfde fix empty ip
Origin commit data
------------------
Branch: ni/coolstream
Commit: d0b9b3b4a5
Author: TangoCash <eric@loxat.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-22 22:42:03 +02:00
Stefan Seyfried
7c4c0c175f timerlist: fix build with GCC 6.2
Origin commit data
------------------
Branch: ni/coolstream
Commit: f632ac5505
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-22 12:33:10 +02:00
vanhofen
1aba17ef27 timerlist: hide play button, when no remote-box is defined
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-10-21 12:11:36 +02:00
vanhofen
a41206902f timerlist: auto-calculate TimerListButtonsCount
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9a9fc2097b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)

Origin message was:
------------------
- timerlist: auto-calculate TimerListButtonsCount

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

------------------
This commit was generated by Migit
2016-10-21 10:47:38 +02:00
TangoCash
8f48e56d7a add play button in footer
Origin commit data
------------------
Branch: ni/coolstream
Commit: cc5567e0ef
Author: TangoCash <eric@loxat.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-21 10:47:38 +02:00
TangoCash
ee5d593d55 fix menue
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9b0137377a
Author: TangoCash <eric@loxat.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-21 10:47:38 +02:00