mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity
10,013 Commits 2 Branches 9 Tags
56d77c49012ec25e865c070ec4f254a75bc07509
Commit Graph

169 Commits

Author SHA1 Message Date
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
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
vanhofen
65e0a39980 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
------------------
Commit: fce378f8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)
 2016-11-21 12:46:49 +01:00
vanhofen
cc7ad7ce1a 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
------------------
Commit: 3420991007
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)
 2016-11-19 21:11:54 +01:00
vanhofen
83e62e9d50 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	configure.ac
	lib/sectionsdclient/Makefile.am
	lib/timerdclient/Makefile.am


Origin commit data
------------------
Commit: 93fdd4aa79
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)
 2016-11-17 09:52:47 +01:00
vanhofen
8ef59f67c7 timerlist: reduce flicker-effects while timerlist construction 
Origin commit data
------------------
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
 2016-11-17 00:18:09 +01:00
vanhofen
2e8117384c Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: d4b9daf01e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)
 2016-11-11 09:16:24 +01:00
vanhofen
6256ce547d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 722d98b46b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-10 (Thu, 10 Nov 2016)
 2016-11-10 12:48: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
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
398a5d8a2b Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: bf7b22020c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)
 2016-11-07 12:57:58 +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
dbfd2214db Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Commit: 1ddcc0c7ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)
 2016-11-02 09:50:10 +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
vanhofen
ee5ff0408d Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox 
Conflicts:
	configure.ac
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/slovak.locale
	lib/libcoolstream/hardware_caps.cpp
	lib/libcoolstream/hardware_caps.h
	lib/libdvbsub/dvbsubtitle.cpp
	lib/timerdclient/timerdclient.cpp
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/framebuffer_ng.h
	src/driver/pictureviewer/Makefile.am
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgplus.cpp
	src/gui/epgview.cpp
	src/gui/plugins.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/gui/widget/listbox.cpp
	src/gui/widget/listhelpers.cpp
	src/neutrino.cpp
	src/system/helpers.cpp
	src/system/helpers.h
	src/system/settings.cpp
	src/system/settings.h
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Commit: 75cce3b113
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)
 2016-10-25 13:08:01 +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
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
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