[CST] Focus
1bd0bd8a7b
Merge branch 'pu/cc' into next-cc
...
Conflicts:
acinclude.m4
data/locale/deutsch.locale
data/locale/english.locale
src/driver/volume.cpp
src/eitd/SIlanguage.cpp
src/gui/bedit/bouqueteditor_channels.cpp
src/gui/bedit/bouqueteditor_chanselect.cpp
src/gui/bouquetlist.cpp
src/gui/channellist.cpp
src/gui/eventlist.cpp
src/gui/osd_setup.cpp
src/gui/scan.cpp
src/gui/scan.h
src/gui/test_menu.cpp
src/gui/timeosd.cpp
src/gui/widget/progressbar.cpp
src/gui/widget/progressbar.h
src/neutrino.cpp
src/nhttpd/yconfig.h
Origin commit data
------------------
Commit: 8bb70d1ab3
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-04-17 (Wed, 17 Apr 2013)
2013-04-17 13:32:12 +04:00
Thilo Graf
0e9ff3d23c
fix license text, sorry, was a c&p error
...
Origin commit data
------------------
Commit: 0dc4686874
Author: Thilo Graf <dbt@novatux.de >
Date: 2013-03-20 (Wed, 20 Mar 2013)
2013-03-21 11:37:00 +01:00
[CST] Focus
946d0f1eaa
gui/start_wizard.cpp: copy initial settings using CONFIGDIR
...
Origin commit data
------------------
Commit: 6804d18d1c
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-01-29 (Tue, 29 Jan 2013)
2013-01-29 14:44:45 +04:00
[CST] Bas
953831c2c3
neutrino: fix file locations. use the predetermined CONFIGDIR instead of hardcoding paths.
...
Origin commit data
------------------
Commit: 8dfa226920
Author: [CST] Bas <bas@coolstreamtech.com >
Date: 2013-01-25 (Fri, 25 Jan 2013)
2013-01-25 10:33:40 +08:00
[CST] Focus
fc12b07053
gui/start_wizard.cpp: use CFEManager::haveSat in place of glocal delivery system
...
Origin commit data
------------------
Commit: 9bb283565b
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-01-16 (Wed, 16 Jan 2013)
2013-01-16 15:50:13 +04:00
[CST] Focus
52cfef2c77
gui/start_wizard.cpp: move initial settings question before calling scan setup
...
Origin commit data
------------------
Commit: 01383e083d
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2012-11-07 (Wed, 07 Nov 2012)
2012-11-07 20:50:18 +04:00
[CST] Focus
9d4a97ea84
gui/start_wizard.cpp: ask about initial settings on satellite box only
...
Origin commit data
------------------
Commit: 9d4c6165ac
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2012-10-18 (Thu, 18 Oct 2012)
2012-10-18 13:53:13 +04:00
[CST] Focus
f38e5d05a2
gui/start_wizard.cpp: copy initial zapit settings from /var/tuxbox/config/initial/ if found
...
Origin commit data
------------------
Commit: 4c41541f20
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2012-09-29 (Sat, 29 Sep 2012)
2012-09-29 14:46:43 +04:00
Thilo Graf
fb63920b0f
neutrino clean up: move "start wizard" into its own module
...
It's better, to have a single module for coming features in the wizard
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2154 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: cfa58da3c6
Author: Thilo Graf <dbt@novatux.de >
Date: 2012-03-19 (Mon, 19 Mar 2012)
Origin message was:
------------------
* neutrino clean up: move "start wizard" into its own module
It's better, to have a single module for coming features in the wizard
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2154 e54a6e83-5905-42d5-8d5c-058d10e6a962
2012-03-19 09:00:11 +00:00