mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-03 10:51:05 +02:00
Code Issues Packages Projects Releases Wiki Activity
10,388 Commits 2 Branches 9 Tags
3ad81e8d394d46b3da0a6bdbd6a105dee5f3dce2
Commit Graph

202 Commits

Author SHA1 Message Date
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
vanhofen
3502ffd80d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: de468d8016
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)
 2016-11-07 20:40:57 +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
114a75f363 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 0f03766246
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)
 2016-11-07 10:14:17 +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
FlatTV
e195f3c315 timerlist: try to fix segfault in askUserOnTimerConflict() 
Origin commit data
------------------
Commit: b70160a992
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)

Origin message was:
------------------
- timerlist: try to fix segfault in askUserOnTimerConflict()
 2016-11-06 20:51:09 +01:00
vanhofen
90631ee80a timerlist: change colors for remote-timer (as requested by tewsbo) 
Origin commit data
------------------
Commit: 1e5a472748
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)

Origin message was:
------------------
- timerlist: change colors for remote-timer (as requested by tewsbo)
 2016-10-29 17:16:23 +02: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
vanhofen
6cbee866fd Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 5c9aa1562e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)
 2016-10-29 11:41:02 +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
vanhofen
e3f0aba5e6 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/system/httptool.cpp
	src/system/httptool.h


Origin commit data
------------------
Commit: d376b79ff1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-26 (Wed, 26 Oct 2016)
 2016-10-26 23:46:59 +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
vanhofen
da3d97b77e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: ec448e14fe
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-23 (Sun, 23 Oct 2016)
 2016-10-23 21:57:00 +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
vanhofen
7e853685b8 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 6994486238
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)
 2016-10-21 12:12:33 +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
2510d548e0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	lib/timerdclient/timerdtypes.h
	src/gui/channellist.cpp
	src/system/httptool.h


Origin commit data
------------------
Commit: 0bb2f888c6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)
 2016-10-21 11:23:51 +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
f374f6652f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/cst-next 
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/filebrowser.cpp
	src/gui/pictureviewer.cpp


Origin commit data
------------------
Commit: 42d1c25a8b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-19 (Wed, 19 Oct 2016)
 2016-10-19 10:22:43 +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
248b6c8684 Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/components/cc_detailsline.h
	src/gui/components/cc_item_infobox.h
	src/gui/infoviewer.cpp
	src/gui/upnpbrowser.cpp
	src/gui/widget/keyboard_input.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: 5a70a3f78e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)
 2016-10-10 16:45:30 +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
vanhofen
4b3b25ca7a colors: add COL_SCROLLBAR_ACTIVE wrapper 
Origin commit data
------------------
Commit: 7e7d4e5fc1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- colors: add COL_SCROLLBAR_ACTIVE wrapper
 2016-10-10 14:19:54 +02:00
martii
257f040315 gui/timerlist: don't auto-adjust manually-added timer to EPG (untested) 
Origin commit data
------------------
Commit: 250926daff
Author: martii <m4rtii@gmx.de>
Date: 2016-09-26 (Mon, 26 Sep 2016)
 2016-09-26 13:04:48 +02:00
martii
6836ea5d78 timerd: adjust recording timers to epg 
Origin commit data
------------------
Commit: c07b0f0b6c
Author: martii <m4rtii@gmx.de>
Date: 2016-09-26 (Mon, 26 Sep 2016)
 2016-09-26 13:04:48 +02:00
martii
238b753679 gui/timerlist: don't auto-adjust manually-added timer to EPG (untested) 
Origin commit data
------------------
Commit: ca49f488cd
Author: martii <m4rtii@gmx.de>
Date: 2016-09-15 (Thu, 15 Sep 2016)
 2016-09-15 09:09:33 +02:00
martii
1390156250 [experimental] timerd: adjust recording timers to epg 
Origin commit data
------------------
Commit: fe2d351750
Author: martii <m4rtii@gmx.de>
Date: 2016-09-15 (Thu, 15 Sep 2016)
 2016-09-15 00:48:06 +02:00
vanhofen
91fc1e2528 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Origin commit data
------------------
Commit: e419a5c3b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)
 2016-09-09 10:45:45 +02:00
vanhofen
fa2686a90e add listModeKey() function to simplify these calls 
Origin commit data
------------------
Commit: 2911e638c7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- add listModeKey() function to simplify these calls
 2016-09-09 10:42:46 +02:00
vanhofen
2561ecf644 add/use //NI tags instead of /*NI*/; just cosmetic changes 
Origin commit data
------------------
Commit: 7927af07cf
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-31 (Sun, 31 Jul 2016)

Origin message was:
------------------
- add/use //NI tags instead of /*NI*/; just cosmetic changes
 2016-07-31 21:04:37 +02:00
FlatTV
bcc4103260 Ask user for storing overlapping CI timer from epg 
Origin commit data
------------------
Commit: 7543aa602c
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-07-10 (Sun, 10 Jul 2016)
 2016-07-10 21:44:30 +02:00
martii
f1e25395ca followscreenings: port code from martiis-neutrino-mp 
Origin commit data
------------------
Commit: 61105699d4
Author: martii <m4rtii@gmx.de>
Date: 2016-07-01 (Fri, 01 Jul 2016)

Origin message was:
------------------
- followscreenings: port code from martiis-neutrino-mp
 2016-07-01 15:26:06 +02:00
Jacek Jendrzej
e607a775bf avoid division by zero 
Origin commit data
------------------
Commit: f6eb565ea3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-06-04 (Sat, 04 Jun 2016)
 2016-06-04 17:21:18 +02:00