mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-09 14:48:28 +02:00
Code Issues Packages Projects Releases Wiki Activity
14,102 Commits 2 Branches 9 Tags
d9d0f8538d885efb6fd72501c479363e977ffde3
Commit Graph

270 Commits

Author SHA1 Message Date
Jacek Jendrzej
e26b8378e6 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 8b89baa7a2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-26 (Mon, 26 Jun 2017)
 2017-06-26 22:22:07 +02:00
vanhofen
842164614d timerlist: fix compiler-warning (comparison signed/unsigned int) 
(cherry picked from commit 3b84c0a7ae)
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
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 3b84c0a7ae)
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-06-26 20:53:12 +02:00
vanhofen
145b1b84fd timerlist: add separationline to items 
(cherry picked from commit 68dac768c0)
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
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 68dac768c0)
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-06-26 20:53:12 +02:00
Jacek Jendrzej
0e522bb6e6 init pre post 
Origin commit data
------------------
Commit: 4bdacf39c8
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-26 (Mon, 26 Jun 2017)
 2017-06-26 19:23:23 +02:00
vanhofen
3b84c0a7ae timerlist: fix compiler-warning (comparison signed/unsigned int) 
Origin commit data
------------------
Commit: 28b606c19f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)

Origin message was:
------------------
- timerlist: fix compiler-warning (comparison signed/unsigned int)
 2017-06-26 11:49:17 +02:00
vanhofen
68dac768c0 timerlist: add separationline to items 
Origin commit data
------------------
Commit: 2709af5f8a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-24 (Sat, 24 Jun 2017)

Origin message was:
------------------
- timerlist: add separationline to items
 2017-06-24 11:12:08 +02:00
vanhofen
663773d677 timerlist: re-add by mistake removed commit 8ef59f6 
Origin commit data
------------------
Commit: 6e7bb1c505
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-24 (Sat, 24 Jun 2017)

Origin message was:
------------------
- timerlist: re-add by mistake removed commit 8ef59f6
 2017-06-24 09:16:02 +02:00
Jacek Jendrzej
da7d2ce50f Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 2ddad19873
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-21 (Wed, 21 Jun 2017)
 2017-06-21 13:54:49 +02:00
vanhofen
bb5ecea8f0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/timerlist.cpp


Origin commit data
------------------
Commit: 94d3ba6d1e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-21 (Wed, 21 Jun 2017)
 2017-06-21 11:43:58 +02:00
vanhofen
0c076425eb 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
------------------
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.
 2017-06-21 10:31:22 +02:00
Thilo Graf
a78db68a63 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
------------------
Commit: 06c8fd33f8
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-21 (Wed, 21 Jun 2017)
 2017-06-21 10:31:22 +02:00
vanhofen
1d32d07224 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
------------------
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>
 2017-06-21 10:31:22 +02:00
vanhofen
49b94a015d timerlist: add space between channelname and "(CI)" string 
Origin commit data
------------------
Commit: ba149575e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-20 (Tue, 20 Jun 2017)

Origin message was:
------------------
- timerlist: add space between channelname and "(CI)" string
 2017-06-20 21:25:57 +02:00
vanhofen
9e625173a2 timerlist: align header's clock format to the other header-clocks 
Origin commit data
------------------
Commit: c357993cb9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-20 (Tue, 20 Jun 2017)

Origin message was:
------------------
- timerlist: align header's clock format to the other header-clocks
 2017-06-20 16:25:52 +02:00
vanhofen
ad6ede01b2 cc_frm_header: remove CComponentsHeaderLocalized() subclass 
use another constructor of CComponentsHeader() instead


Origin commit data
------------------
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
 2017-06-20 15:55:42 +02:00
vanhofen
a95ede2649 timerlist: small design reworks ... 
* re-align item contents
* rename some variables
* use CComponentsFooter
* blinking clock in header (shameless stolen from TangoCash)


Origin commit data
------------------
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)
 2017-06-20 14:16:14 +02:00
vanhofen
61d41d0862 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
------------------
Commit: e32d5a869f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-16 (Fri, 16 Jun 2017)
 2017-06-16 15:10:34 +02:00
Jacek Jendrzej
6eebe6055b Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: a70f3cb025
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-16 (Fri, 16 Jun 2017)
 2017-06-16 14:19:26 +02:00
vanhofen
26bcb96210 timerlist: use CComponentsScrollbar 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
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>
 2017-06-15 21:52:39 +02:00
vanhofen
73e943daea timerlist: use CComponentsScrollbar 
Origin commit data
------------------
Commit: bf644cdff0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- timerlist: use CComponentsScrollbar
 2017-06-15 16:30:02 +02:00
vanhofen
b4fecd0bdb Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: e78936e478
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)
 2017-05-30 01:27:37 +02:00
vanhofen
48b29784ad timerlist: don't use rc_info with remotetimers; that doesn't work 
Origin commit data
------------------
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
 2017-05-23 23:11:34 +02:00
vanhofen
4e15c2ddfe Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 665e499208
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-03 (Wed, 03 May 2017)
 2017-05-03 23:08:15 +02:00
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
gixxpunk
757ec67292 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 03891b7464
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-04-29 (Sat, 29 Apr 2017)
 2017-04-29 18:31:49 +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
vanhofen
d4196e101f Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 7bccd83b07
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-27 (Thu, 27 Apr 2017)
 2017-04-27 14:02:32 +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
ce5078e378 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: a34a8992d4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-24 (Mon, 24 Apr 2017)
 2017-04-24 12:56:51 +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
59a5f1ad6b Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 7af71a8a03
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-26 (Sun, 26 Feb 2017)
 2017-02-26 00:39:36 +01:00
vanhofen
ca5fbb4083 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 05013e825d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-26 (Sun, 26 Feb 2017)
 2017-02-26 00:38:58 +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
vanhofen
c4de218cb2 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
------------------
Commit: dd6244f33e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)
 2017-02-09 13:19:03 +01:00
vanhofen
49762424a6 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 221e4b5c04
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)
 2017-02-09 08:35:14 +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
vanhofen
f538f0d2da Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 5e69fd2b22
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-06 (Mon, 06 Feb 2017)
 2017-02-06 21:17:40 +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
vanhofen
b554e7801c Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: d39dc75c6d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)
 2016-12-29 15:15:34 +01:00
vanhofen
f62bddc57b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 116e4325c8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-22 (Thu, 22 Dec 2016)
 2016-12-22 10:34:59 +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
b05f7c1df1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 2e1aa8d0d1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-16 (Fri, 16 Dec 2016)
 2016-12-16 23:18:57 +01:00
vanhofen
a35975a3ee Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: a1ed6bb721
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-16 (Fri, 16 Dec 2016)
 2016-12-16 22:38:01 +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
vanhofen
10bf4e8837 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: fdb24232f6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)
 2016-12-12 10:29:42 +01:00
vanhofen
5a6c50e0bb Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: a141bafe7f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-08 (Thu, 08 Dec 2016)
 2016-12-08 17:57:11 +01:00