Conflicts:
data/locale/english.locale
src/gui/channellist.cpp
src/gui/parentallock_setup.cpp
src/neutrino.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: a12f4c0274
Author: martii <m4rtii@gmx.de>
Date: 2013-06-23 (Sun, 23 Jun 2013)
------------------
This commit was generated by Migit
- Add non locale variants for CExtendedInput, CStringInput,
CStringInputSMS, CPINInput
THX Martii
Origin commit data
------------------
Branch: ni/coolstream
Commit: 31842369cc
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-18 (Sat, 18 Jan 2014)
Origin message was:
------------------
Preparing the input classes for Lua
- Add non locale variants for CExtendedInput, CStringInput,
CStringInputSMS, CPINInput
THX Martii
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 006429215b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-29 (Fri, 29 Nov 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
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
This basically inverts the "locked" attribute of bouquets.xml and
allows to selectively enable only favourites or similar.
Conflicts:
src/gui/channellist.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 27493de2ef
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-10-30 (Sun, 30 Oct 2011)
------------------
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
TODO: many other files still need corrections
Origin commit data
------------------
Branch: ni/coolstream
Commit: ddab0fd734
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-06-03 (Sun, 03 Jun 2012)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1bec7c4a7b
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: 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
this fixes also the correct pin request in settings menu for parental-setup, because personalize-PIN was requested
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2031 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Branch: ni/coolstream
Commit: b408d5487b
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-01-01 (Sun, 01 Jan 2012)
Origin message was:
------------------
*neutrino parental_setup: requesting for pincode in parental setup independently of item in settings menu
this fixes also the correct pin request in settings menu for parental-setup, because personalize-PIN was requested
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2031 e54a6e83-5905-42d5-8d5c-058d10e6a962
------------------
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
