Commit Graph

246 Commits

Author SHA1 Message Date
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
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
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
Jacek Jendrzej
5ee708dd97 src/gui/timerlist.cpp fix memleak
Origin commit data
------------------
Commit: f78fc97fe3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-22 (Fri, 22 Apr 2016)
2016-04-22 15:10:39 +02:00
Jacek Jendrzej
419b55bb97 avoid null pointer use
Origin commit data
------------------
Commit: 8fb4e1b78e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-21 (Thu, 21 Apr 2016)
2016-04-21 18:14:46 +02:00
[CST] Focus
38ede6dfb0 neutrino: add webtv channel list mode
Origin commit data
------------------
Commit: 302642cee7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-23 (Wed, 23 Mar 2016)
2016-03-23 16:36:00 +03:00
Stefan Seyfried
9f399e356d timerlist: use CListHelpers
remove duplicated code and use CListHelpers::UpDownKey().
Some variable types had to be changed to avoid typecasts, as
a result (int) casts to foo.size() had to be added :-)


Origin commit data
------------------
Commit: ed7eaafbcb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-16 (Sat, 16 Jan 2016)
2016-01-18 08:10:16 +01:00
Thilo Graf
72a289a90c components: rework classes
- outsourced some classes cc_item.cpp/h, cc_draw.cpp/h
- added extra methodes for simple use of some basic components extra.cpp/h
- rework clock handling: use timer class, reworked members for
 enable/disable clock with external timer events,
 tryed to fix some display issues related with infoclock and
 time osd clock in moviebrowser, channellist, menuus
- reworked hide/kill handling, removed parameter for hide(), try to use
 cached backgrounds for other constallations, paint cache, image cache (all beta)
- reworked shadow/frame handling, add shadow modes for left/right
 arrangement, TODO: repaint for existant instances required
- reworked color gradient assignment (beta)

... Note: I had a data crash in my local git tree
and i tryed to restore my historie, but most was lost. Therefore here
the commit is large


Origin commit data
------------------
Commit: 0146511f38
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-11-18 (Wed, 18 Nov 2015)

Origin message was:
------------------
components: rework classes

- outsourced some classes cc_item.cpp/h, cc_draw.cpp/h
- added extra methodes for simple use of some basic components extra.cpp/h
- rework clock handling: use timer class, reworked members for
 enable/disable clock with external timer events,
 tryed to fix some display issues related with infoclock and
 time osd clock in moviebrowser, channellist, menuus
- reworked hide/kill handling, removed parameter for hide(), try to use
 cached backgrounds for other constallations, paint cache, image cache (all beta)
- reworked shadow/frame handling, add shadow modes for left/right
 arrangement, TODO: repaint for existant instances required
- reworked color gradient assignment (beta)

... Note: I had a data crash in my local git tree
and i tryed to restore my historie, but most was lost. Therefore here
the commit is large
2015-12-27 14:42:27 +01:00
vanhofen
35a916bcf9 timerlist: don't discard unsaved user-changes at timers silently
- some more small changes/fixes:
 * don't allow reminder-timer with standard message text ("---")
 * fix display of changed recording directory
 * use addIntroItems() function in menus
 * fix dependency of menuitems in apids-menu
 * use pulldown-mode to choose timer-type


Origin commit data
------------------
Commit: d2ee7e6f0a
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-23 (Thu, 23 Apr 2015)

Origin message was:
------------------
- timerlist: don't discard unsaved user-changes at timers silently

- some more small changes/fixes:
 * don't allow reminder-timer with standard message text ("---")
 * fix display of changed recording directory
 * use addIntroItems() function in menus
 * fix dependency of menuitems in apids-menu
 * use pulldown-mode to choose timer-type
2015-04-23 08:42:24 +02:00