This reverts commit 8b1b3b1418
because the display of infobar while zapping is broken with
this commit.
Origin commit data
------------------
Branch: ni/coolstream
Commit: fb892d18ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-15 (Fri, 15 Feb 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 46657a1c6b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-11 (Mon, 11 Feb 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 15d787f79b
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-10 (Sun, 10 Feb 2013)
Origin message was:
------------------
- channellist.cpp: enable to lock new_zap_mode
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: dd3bc579a0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-16 (Wed, 16 Jan 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Conflicts:
src/gui/widget/hintboxext.cpp
src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: f8f5467fdb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-30 (Sun, 30 Dec 2012)
------------------
This commit was generated by Migit
which not depend on save epg on/off
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5749f86323
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-12-19 (Wed, 19 Dec 2012)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 10e359e43b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-14 (Wed, 14 Nov 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0acc943a4f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-08 (Thu, 08 Nov 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: a47c6593dc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-08 (Thu, 08 Nov 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: dc58416597
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-02 (Fri, 02 Nov 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: d30b97afa9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-16 (Tue, 16 Oct 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: f85251128c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-15 (Mon, 15 Oct 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7b06b3fd38
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-11 (Thu, 11 Oct 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Use hardware_caps instead of cs_get_revision() and #ifdef HAVE_FOO_HW
to distinguish between different boxtypes.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 04ee2e87f3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-09-23 (Sun, 23 Sep 2012)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: a3bfab0bcd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-11 (Tue, 11 Sep 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
- english.locale sorted
- deutsch.locale sorted and translated some new entries (THX Tomworld)
- locals.h/locals_intern.h rebuild
- Corrected typo in the locale/source
Origin commit data
------------------
Branch: ni/coolstream
Commit: c542cb3360
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Origin message was:
------------------
* Menu hints: Update loclale
- english.locale sorted
- deutsch.locale sorted and translated some new entries (THX Tomworld)
- locals.h/locals_intern.h rebuild
- Corrected typo in the locale/source
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: ec1cccf571
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-08 (Sun, 08 Jul 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2be328ade2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-06-23 (Sat, 23 Jun 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b23198e56
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: cfdf7b0c69
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-05-07 (Mon, 07 May 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0319c4faad
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-05-07 (Mon, 07 May 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0a94cd0267
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-05-07 (Mon, 07 May 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
use CMenuDForwarder for created objects
Origin commit data
------------------
Branch: ni/coolstream
Commit: 464199411d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-05-05 (Sat, 05 May 2012)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: ae3bb2bddf
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-05-01 (Tue, 01 May 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3d09ab7e33
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-27 (Fri, 27 Apr 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: ff04a1d594
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-22 (Sun, 22 Apr 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 56b9b9bcc5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-03-04 (Sun, 04 Mar 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 832b2d3096
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-04-02 (Sat, 02 Apr 2011)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2bdb3539cb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-02-27 (Mon, 27 Feb 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Add small helper class to manage missing values
e.g. needed for deallocated widget objects.
This class we can also use for other things in future!
In this context I added a vector for 'selected' values needed for
deeper and deallocated submenues.
The identification of widgets working now with a new widget parameter named 'w_index'.
setSelected() and getSelected() functions are still working, but are not needed, if we use an index
-add define for default widget index
-add new header file for enums
-adapted many menu classes for this parameter
Hope it' works fine. If you find any menu without a 'memory', please add an index.
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1908 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Branch: ni/coolstream
Commit: eff98c661e
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-11-26 (Sat, 26 Nov 2011)
Origin message was:
------------------
*neutrino menu: fix 'memory ' of selected items in submenues
Add small helper class to manage missing values
e.g. needed for deallocated widget objects.
This class we can also use for other things in future!
In this context I added a vector for 'selected' values needed for
deeper and deallocated submenues.
The identification of widgets working now with a new widget parameter named 'w_index'.
setSelected() and getSelected() functions are still working, but are not needed, if we use an index
-add define for default widget index
-add new header file for enums
-adapted many menu classes for this parameter
Hope it' works fine. If you find any menu without a 'memory', please add an index.
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1908 e54a6e83-5905-42d5-8d5c-058d10e6a962
------------------
This commit was generated by Migit
- Mute-Zap Icon remove from the channel list
- Moved Mute-Zap switch in the Misc Settings menu
- Mute function restored in the channel list
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1840 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Branch: ni/coolstream
Commit: d837bbbbaf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2011-11-09 (Wed, 09 Nov 2011)
------------------
This commit was generated by Migit
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1837 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Branch: ni/coolstream
Commit: d7c0bcd68f
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-11-07 (Mon, 07 Nov 2011)
Origin message was:
------------------
*neutrino record_setup: moved zapto pre time option from misc to record-setup
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1837 e54a6e83-5905-42d5-8d5c-058d10e6a962
------------------
This commit was generated by Migit
Radiotext still not working fine and it makes no really sense to
show this option.
This fixes also a memleak in miscsettings.
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1558 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6c5742e4a9
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-07-03 (Sun, 03 Jul 2011)
Origin message was:
------------------
*neutrino radiotext: removed from misc settings
Radiotext still not working fine and it makes no really sense to
show this option.
This fixes also a memleak in miscsettings.
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1558 e54a6e83-5905-42d5-8d5c-058d10e6a962
------------------
This commit was generated by Migit
Dear pupils, this is what we learned in todays:
* crashing == bad
* not crashing == good
* deleting an object and then using it == crash
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1218 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Branch: ni/coolstream
Commit: 931c2c2661
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-02-26 (Sat, 26 Feb 2011)
------------------
This commit was generated by Migit
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1217 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Branch: ni/coolstream
Commit: 07ea7e9c63
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-02-26 (Sat, 26 Feb 2011)
------------------
This commit was generated by Migit
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1216 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Branch: ni/coolstream
Commit: eb10c59a43
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2011-02-26 (Sat, 26 Feb 2011)
Origin message was:
------------------
-fix: I'm your fan, have fun ;)
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1216 e54a6e83-5905-42d5-8d5c-058d10e6a962
------------------
This commit was generated by Migit
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1215 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e967702eb
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2011-02-26 (Sat, 26 Feb 2011)
Origin message was:
------------------
- revert to rev. 1213 since my changes didn't fix it
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1215 e54a6e83-5905-42d5-8d5c-058d10e6a962
------------------
This commit was generated by Migit
