Commit Graph

153 Commits

Author SHA1 Message Date
vanhofen
ecdeaf0566 miscsettings_menu: allow to reset movieplayer plugin
Origin commit data
------------------
Branch: ni/coolstream
Commit: a4bd8cc5a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-22 (Mon, 22 Feb 2016)

Origin message was:
------------------
- miscsettings_menu: allow to reset movieplayer plugin

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

------------------
This commit was generated by Migit
2016-02-22 21:06:46 +01:00
Stefan Seyfried
5f89c9a312 Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...


Origin commit data
------------------
Branch: ni/coolstream
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)



------------------
This commit was generated by Migit
2015-12-13 17:41:55 +01:00
[CST] Focus
17528389bf gui/osd_setup.cpp, gui/miscsettings_menu.cpp: do not delete items added to menu - menu dtor do it
Origin commit data
------------------
Branch: ni/coolstream
Commit: 60c45ec06c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-06-19 (Fri, 19 Jun 2015)


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

------------------
This commit was generated by Migit
2015-06-19 15:48:15 +03:00
vanhofen
32365276ef remove w_max()-calls to define menu-width, because ...
w-max() returns a pixel-value, but menus need a percentage-value.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9041bff59c
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-24 (Fri, 24 Apr 2015)

Origin message was:
------------------
- remove w_max()-calls to define menu-width, because ...

 w-max() returns a pixel-value, but menus need a percentage-value.


------------------
This commit was generated by Migit
2015-04-24 09:11:04 +02:00
Stefan Seyfried
c85016eb79 allow choosing bouquets to epg-scan in "favorites only" mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: dbac5741db
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-03-04 (Wed, 04 Mar 2015)


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

------------------
This commit was generated by Migit
2015-03-04 19:52:25 +01:00
Stefan Seyfried
b741f4f565 miscsettings: use correct SleepTimerWidget invocation
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2d4c6eedad
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-17 (Tue, 17 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-17 21:18:54 +01:00
Stefan Seyfried
2263c8bd2e Merge remote-tracking branch 'check/cst-next'
*needs buildfixing*

Conflicts:
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/driver/vfd.cpp
	src/gui/bedit/Makefile.am
	src/gui/components/Makefile.am
	src/gui/luainstance.cpp
	src/gui/widget/Makefile.am
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: b5a64e6887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)



------------------
This commit was generated by Migit
2015-01-26 17:26:26 +01:00
[CST] Focus
7f0ac9a93b gui/miscsettings_menu.cpp: add option to cache EPG only for favorite channels,
filter not yet reconfigured after scan or editing favorite bouquets


Origin commit data
------------------
Branch: ni/coolstream
Commit: d98d94550f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-22 (Thu, 22 Jan 2015)



------------------
This commit was generated by Migit
2015-01-22 18:58:53 +03:00
Stefan Seyfried
770e405c50 Merge remote-tracking branch 'check/cst-next'
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: d37b3c0f9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-28 (Sun, 28 Dec 2014)



------------------
This commit was generated by Migit
2014-12-28 12:32:12 +01:00
Stefan Seyfried
c8e3ec41a9 Merge remote-tracking branch 'check/cst-next'
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)



------------------
This commit was generated by Migit
2014-12-25 18:03:08 +01:00
vanhofen
2ae96ef599 add epg_save_frequently feature ...
... to provide the EPG data in frequently intervals on an external device


Origin commit data
------------------
Branch: ni/coolstream
Commit: e21a79195e
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-04 (Thu, 04 Dec 2014)

Origin message was:
------------------
- add epg_save_frequently feature ...

... to provide the EPG data in frequently intervals on an external device


------------------
This commit was generated by Migit
2014-12-05 09:08:56 +01:00
vanhofen
580de8ec3b split epg_read from epg_save ...
... to get the possibility to read EPG-data from an external device
at boot w/o saving the own data at shutdown/standby.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4c621f1dec
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-04 (Thu, 04 Dec 2014)

Origin message was:
------------------
- split epg_read from epg_save ...

... to get the possibility to read EPG-data from an external device
at boot w/o saving the own data at shutdown/standby.


------------------
This commit was generated by Migit
2014-12-05 09:08:56 +01:00
[CST] Focus
07d6899667 gui/miscsettings_menu.cpp: add option to enable/disable empty favorites in bouquet list
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8772d219f1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-27 (Mon, 27 Oct 2014)


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

------------------
This commit was generated by Migit
2014-10-27 13:52:23 +03:00
[CST] Focus
f7c9ab84f6 gui/miscsettings_menu.cpp: fix settings sectionsd config
Origin commit data
------------------
Branch: ni/coolstream
Commit: 320c3b163c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-20 (Mon, 20 Oct 2014)


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

------------------
This commit was generated by Migit
2014-10-20 11:16:14 +04:00
martii
99f9745c97 drop explicit CMenuForwarder icon assignments
Conflicts:
	src/gui/3dsetup.cpp
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/keybind_setup.cpp
	src/gui/mediaplayer.cpp
	src/gui/mediaplayer_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/network_setup.cpp
	src/gui/nfs.cpp
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/parentallock_setup.cpp
	src/gui/personalize.cpp
	src/gui/proxyserver_setup.cpp
	src/gui/record_setup.cpp
	src/gui/scan_setup.cpp
	src/gui/screensetup.cpp
	src/gui/settings_manager.cpp
	src/gui/timerlist.cpp
	src/gui/update_menue.cpp
	src/gui/vfd_setup.cpp
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: e84782bc4c
Author: martii <m4rtii@gmx.de>
Date: 2014-02-22 (Sat, 22 Feb 2014)



------------------
This commit was generated by Migit
2014-09-15 11:44:08 +04:00
[CST] Focus
4eb5179286 neutrino: sync keybind and usermenu code with neutrino-mp, code (C) martii
Origin commit data
------------------
Branch: ni/coolstream
Commit: 420af7a4dc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)


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

------------------
This commit was generated by Migit
2014-09-05 17:49:11 +04:00
[CST] Focus
40dae113bc webtv channels integration port,
initial code (C) martii,
initial patch from jacek


Origin commit data
------------------
Branch: ni/coolstream
Commit: a473fe8194
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-08-27 (Wed, 27 Aug 2014)



------------------
This commit was generated by Migit
2014-08-27 17:32:26 +04:00
vanhofen
f958ebb26d miscsettings_menu: remove double include
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5d8814f1d4
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-08-25 (Mon, 25 Aug 2014)

Origin message was:
------------------
- miscsettings_menu: remove double include

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

------------------
This commit was generated by Migit
2014-08-26 17:33:18 +04:00
[CST] Focus
5ee14dabdd merge neutrino-mp menu/buttons/icons changes, (C) martii
Origin commit data
------------------
Branch: ni/coolstream
Commit: cf91f2eccb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-17 (Thu, 17 Jul 2014)


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

------------------
This commit was generated by Migit
2014-07-17 17:02:25 +04:00
[CST] Focus
92a6be85f7 gui/miscsettings_menu.cpp: move epg scan OFF option to epg mode,
reorder epg settings, add separators


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0c22682df3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-05-14 (Wed, 14 May 2014)



------------------
This commit was generated by Migit
2014-05-14 16:32:49 +04:00
Stefan Seyfried
8df9ff12cc Merge remote-tracking branch 'check/next-cc'
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)



------------------
This commit was generated by Migit
2014-04-27 19:14:06 +02:00
Thilo Graf
bae0f14f3f CMiscMenue: add entry for temporarily debug mode settings
Option "Level" overwrites assigned debug level output mode of Neutrino
start parameters, but only temporarily till change of options by user
or restart of Neutrino.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8a8748c5e7
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-03-08 (Sat, 08 Mar 2014)



------------------
This commit was generated by Migit
2014-04-02 08:40:21 +02:00
[CST] Focus
12b7731368 gui/miscsettings_menu.cpp: add option to scan epg in standby or live or always
Origin commit data
------------------
Branch: ni/coolstream
Commit: a6bd2589dd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-27 (Thu, 27 Mar 2014)


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

------------------
This commit was generated by Migit
2014-03-27 18:56:49 +04:00
[CST] Focus
f57e347a3f gui/miscsettings_menu.cpp: remove global rotor_swap option
Origin commit data
------------------
Branch: ni/coolstream
Commit: a3f4cbaa90
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-04 (Tue, 04 Mar 2014)


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

------------------
This commit was generated by Migit
2014-03-06 16:09:09 +04:00
vanhofen
ea1379e04a fix (and enable) one-key-plugin; fix movieplayer-plugin
Origin commit data
------------------
Branch: ni/coolstream
Commit: 580fcc97e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-03-01 (Sat, 01 Mar 2014)

Origin message was:
------------------
- fix (and enable) one-key-plugin; fix movieplayer-plugin

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

------------------
This commit was generated by Migit
2014-03-01 23:33:45 +01:00
Stefan Seyfried
fe96831ba6 Merge remote-tracking branch 'check/next-cc'
Origin commit data
------------------
Branch: ni/coolstream
Commit: e9bc524562
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-27 (Mon, 27 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-27 21:00:18 +01:00
Jacek Jendrzej
109dcc3143 fix CMenuDForwarder option change
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3dc41ac047
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-27 (Mon, 27 Jan 2014)

Origin message was:
------------------
-fix CMenuDForwarder option change

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

------------------
This commit was generated by Migit
2014-01-27 17:11:27 +01:00
Stefan Seyfried
b7c804fc22 Merge remote-tracking branch 'check/next-cc'
compiles, nothing else.

Conflicts:
	configure.ac
	src/Makefile.am
	src/gui/Makefile.am
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan_setup.cpp
	src/gui/start_wizard.cpp
	src/gui/test_menu.cpp
	src/gui/user_menue.cpp
	src/gui/widget/hintboxext.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/messagebox.cpp
	src/gui/widget/stringinput.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: b414474323
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-23 (Thu, 23 Jan 2014)



------------------
This commit was generated by Migit
2014-01-23 14:08:37 +01:00
vanhofen
35830797d6 adapt ShowMsg handling from martii's neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 53f5801d6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-22 (Wed, 22 Jan 2014)

Origin message was:
------------------
- adapt ShowMsg handling from martii's neutrino-mp

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

------------------
This commit was generated by Migit
2014-01-22 12:37:21 +01:00
Michael Liebmann
7b4e3bc03b Preparing the menu classes for Lua Part #2
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii


Origin commit data
------------------
Branch: ni/coolstream
Commit: b41819190d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-16 (Thu, 16 Jan 2014)

Origin message was:
------------------
Preparing the menu classes for Lua Part #2

- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii


------------------
This commit was generated by Migit
2014-01-19 20:57:37 +01:00
Stefan Seyfried
0c4ecc191a Merge remote-tracking branch 'check/next-cc'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d379dcb30
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-29 (Sun, 29 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-29 22:12:09 +01:00
Jacek Jendrzej
53ff2f046f supplement to e558ba8025
Origin commit data
------------------
Branch: ni/coolstream
Commit: a7f68a519f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-12-27 (Fri, 27 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-27 11:39:42 +01:00
Stefan Seyfried
464d5ab9b9 Merge remote-tracking branch 'check/next-cc'
Lightly tested only...


Origin commit data
------------------
Branch: ni/coolstream
Commit: cdd065fc2e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-25 (Wed, 25 Dec 2013)



------------------
This commit was generated by Migit
2013-12-25 22:51:23 +01:00
martii
e558ba8025 system/settings: store epg times in integers
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: b45511b196
Author: martii <m4rtii@gmx.de>
Date: 2013-12-24 (Tue, 24 Dec 2013)



------------------
This commit was generated by Migit
2013-12-25 12:08:14 +01:00
martii
f870b2d240 system/settings: use integers for shutdown_count/_min
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: d125301ede
Author: martii <m4rtii@gmx.de>
Date: 2013-12-24 (Tue, 24 Dec 2013)



------------------
This commit was generated by Migit
2013-12-25 12:08:14 +01:00
Stefan Seyfried
b0077cafc5 Merge branch 'check/next-cc'
Compiles on most platforms, starts. Not really tested.


Origin commit data
------------------
Branch: ni/coolstream
Commit: b93a372b54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)



------------------
This commit was generated by Migit
2013-11-10 16:55:53 +01:00
[CST] Focus
82955c27ab gui/miscsettings_menu.cpp: add video.h header
Origin commit data
------------------
Branch: ni/coolstream
Commit: dd509ef0c2
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-25 (Fri, 25 Oct 2013)


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

------------------
This commit was generated by Migit
2013-10-25 16:41:03 +04:00
[CST] Focus
5123ca405f as requested, implement 'easy' menu mode for novice users;
default behavior should not be changed, easy mode forced by /var/etc/.easymenu file inside image;
at the moment switch between modes is done by main menu -> 'stop' button -> enter pin code,
restart needed after mode switch


Origin commit data
------------------
Branch: ni/coolstream
Commit: 606bd01878
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-25 (Fri, 25 Oct 2013)



------------------
This commit was generated by Migit
2013-10-25 13:03:26 +04:00
Stefan Seyfried
971d575b78 Merge branch 'check/next-cc'
Compiles on most platforms, starts. Not really tested.

Conflicts:
	acinclude.m4
	lib/libdvbsub/Makefile.am
	lib/libtriple/Makefile.am
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/create_rcsim_h.sh
	src/daemonc/Makefile.am
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/streaminfo2.h
	src/gui/update.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/rcsim.c
	src/system/Makefile.am
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)



------------------
This commit was generated by Migit
2013-10-21 22:58:55 +02:00
vanhofen
3eccf03688 sleeptimer: add possibilty to preset with a fixed value
Origin commit data
------------------
Branch: ni/coolstream
Commit: 25e550e9e3
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-10-16 (Wed, 16 Oct 2013)

Origin message was:
------------------
- sleeptimer: add possibilty to preset with a fixed value

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

------------------
This commit was generated by Migit
2013-10-16 10:37:23 +02:00
[CST] Focus
769fb2a6d7 src/gui/miscsettings_menu.cpp: always enable epg scan item
Origin commit data
------------------
Branch: ni/coolstream
Commit: ebaa844494
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-10 (Thu, 10 Oct 2013)


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

------------------
This commit was generated by Migit
2013-10-10 19:01:46 +04:00
[CST] Focus
65f8705975 gui/miscsettings_menu.cpp: add epg scan modes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 41f6e03e3e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-02 (Wed, 02 Oct 2013)


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

------------------
This commit was generated by Migit
2013-10-02 15:30:44 +04:00
[CST] Focus
5f4222186d gui/miscsettings_menu.cpp: add 'info' action key in epg settings to show current eit event count
Origin commit data
------------------
Branch: ni/coolstream
Commit: 550ca1dedb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-27 (Fri, 27 Sep 2013)


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

------------------
This commit was generated by Migit
2013-09-27 16:27:21 +04:00
Stefan Seyfried
4c3c21152b Merge branch 'check/next-cc'
it compiles, but is not really tested...

Conflicts:
	src/driver/netfile.cpp
	src/driver/volume.cpp
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/bouquetlist.cpp
	src/gui/eventlist.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/scan.cpp
	src/gui/test_menu.h
	src/gui/timerlist.cpp
	src/gui/update.cpp
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: d5d5a60261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)



------------------
This commit was generated by Migit
2013-06-16 21:22:14 +02:00
Michael Liebmann
1a507a05c6 scan epg: fix shadow warning
- fix display menuhint


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7833cd4dc6
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-12 (Wed, 12 Jun 2013)



------------------
This commit was generated by Migit
2013-06-12 17:50:10 +02:00
[CST] Focus
f0b7161769 gui/miscsettings_menu.cpp: add option to enable/disable epg scan
Origin commit data
------------------
Branch: ni/coolstream
Commit: 680f684ce4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-12 (Wed, 12 Jun 2013)


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

------------------
This commit was generated by Migit
2013-06-12 18:46:34 +04:00
Stefan Seyfried
083bc55347 Merge remote-tracking branch 'check/next-cc'
needs some build-fixing and merge errors are likely :-(

Conflicts:
	configure.ac
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/unmaintained/dutch.locale
	lib/libdvbsub/Makefile.am
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/daemonc/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/framebuffer.h
	src/driver/pictureviewer/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/driver/volume.cpp
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/audioplayer.cpp
	src/gui/bedit/Makefile.am
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/keybind_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/test_menu.cpp
	src/gui/test_menu.h
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
	src/system/setting_helpers.cpp
	src/system/settings.h
	src/zapit/include/zapit/client/zapitclient.h
	src/zapit/include/zapit/femanager.h
	src/zapit/include/zapit/getservices.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)



------------------
This commit was generated by Migit
2013-05-10 10:06:47 +02:00
[CST] Focus
419732355d gui/miscsettings_menu.cpp: add option to adjust channel list
on numeric zap to first fav/provider/sat mode where channel exist


Origin commit data
------------------
Branch: ni/coolstream
Commit: 56eb53ec78
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-01 (Mon, 01 Apr 2013)



------------------
This commit was generated by Migit
2013-04-01 14:14:47 +04:00
Stefan Seyfried
77c08c4c15 Merge branch 'check/dvbsi++' commit c16f636011
Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/components/cc.h
	src/gui/components/components.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/neutrino.cpp
	src/zapit/src/bouquets.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0cf191822a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-21 (Thu, 21 Feb 2013)



------------------
This commit was generated by Migit
2013-02-21 17:07:18 +01:00
vanhofen
119f0c82f6 Revert "Revert '- channellist.cpp: enable to lock new_zap_mode'"
This reverts commit 72fd77bb5f.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 505c4ba80d
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-17 (Sun, 17 Feb 2013)



------------------
This commit was generated by Migit
2013-02-17 22:55:28 +01:00