Commit Graph

38 Commits

Author SHA1 Message Date
Stefan Seyfried
776aea7c95 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: c6d7968381
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-04 18:02:51 +01:00
Thilo Graf
36d8d81fa6 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
------------------
Branch: ni/coolstream
Commit: dde298b1b7
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-04-04 (Mon, 04 Apr 2016)



------------------
This commit was generated by Migit
2016-10-24 10:31:24 +02: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
vanhofen
f26b53d4ad start_wizard: use a global enum; switch detection from bool to int
Origin commit data
------------------
Branch: ni/coolstream
Commit: af90286a30
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-15 (Fri, 15 May 2015)

Origin message was:
------------------
- start_wizard: use a global enum; switch detection from bool to int

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

------------------
This commit was generated by Migit
2015-05-15 03:46:50 +02:00
vanhofen
af4fcb301d start_wizard: add settingsmanager menu ...
... to allow restoring of backups


Origin commit data
------------------
Branch: ni/coolstream
Commit: f3044134b1
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-15 (Fri, 15 May 2015)

Origin message was:
------------------
- start_wizard: add settingsmanager menu ...

 ... to allow restoring of backups


------------------
This commit was generated by Migit
2015-05-15 03:46:49 +02:00
vanhofen
91b9e9b609 framebuffer: revival of showFrame() function to allow ...
... pictures like start.jpg, mp3.jpg etc. from /var/tuxbox/icons


Origin commit data
------------------
Branch: ni/coolstream
Commit: edc8527379
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-05 (Tue, 05 May 2015)

Origin message was:
------------------
- framebuffer: revival of showFrame() function to allow ...

... pictures like start.jpg, mp3.jpg etc. from /var/tuxbox/icons


------------------
This commit was generated by Migit
2015-05-05 12:01:04 +02:00
Stefan Seyfried
189e55ec30 global.h: Use forward-declarations to reduce number of dependencies
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ab6b53054
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-04-16 (Thu, 16 Apr 2015)


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

------------------
This commit was generated by Migit
2015-04-16 13:39:35 +02:00
Stefan Seyfried
7da9a646ed start_wizard: ensure sytem timezone settings are sane
Origin commit data
------------------
Branch: ni/coolstream
Commit: e0f8cddeed
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-06 (Fri, 06 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-06 19:59:43 +01:00
Stefan Seyfried
697a076599 start_wizard: remove duplicate #ifdef
Origin commit data
------------------
Branch: ni/coolstream
Commit: 57ce8bee0a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-06 (Fri, 06 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-06 19:57:53 +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
vanhofen
65cbab0307 Revert "global.h: Use forward-declarations to reduce number of dependencies"
This reverts commit c266f96560.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c8d47fa49
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)



------------------
This commit was generated by Migit
2013-11-13 23:40:16 +01:00
Stefan Seyfried
c266f96560 global.h: Use forward-declarations to reduce number of dependencies
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4bc6e43ad4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)


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

------------------
This commit was generated by Migit
2013-11-13 10:40:03 +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
martii
f43b9f7e12 global.h: Use forward-declarations to reduce number of dependencies
[seife: amended to fix build]

Signed-off-by: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4eb66ba4b2
Author: martii <m4rtii@gmx.de>
Date: 2013-11-09 (Sat, 09 Nov 2013)



------------------
This commit was generated by Migit
2013-11-09 17:03:03 +01:00
[CST] Focus
f464a20851 gui/start_wizard.cpp: fix missing frontend setup
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0c724b457a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-05 (Tue, 05 Nov 2013)


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

------------------
This commit was generated by Migit
2013-11-05 11:44:44 +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
2dcc32acd2 Merge remote-tracking branch 'check/next-cc'
needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)



------------------
This commit was generated by Migit
2013-09-01 19:46:10 +02:00
[CST] Focus
d3597cf9b3 gui/start_wizard.cpp: disable astra initial settings in case of fast-scan setup
Origin commit data
------------------
Branch: ni/coolstream
Commit: d54a49b243
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-08-06 (Tue, 06 Aug 2013)


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

------------------
This commit was generated by Migit
2013-08-06 15:17:03 +04:00
[CST] Focus
1fba1d3eb8 gui/start_wizard.cpp: hack to enable easy setup aka fast scan setup, if locale is nederlands only
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3e207638ef
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-08-05 (Mon, 05 Aug 2013)


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

------------------
This commit was generated by Migit
2013-08-06 15:16:59 +04:00
Jacek Jendrzej
37e9e487b1 fix compil without ENABLE_FASTSCAN
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6948ab4258
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-07-15 (Mon, 15 Jul 2013)


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

------------------
This commit was generated by Migit
2013-07-15 23:16:07 +02:00
Stefan Seyfried
7e692549d3 Merge branch 'check/next-cc'
again: it compiles, but is not really tested...

Conflicts:
	acinclude.m4
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/osd_setup.cpp
	src/gui/start_wizard.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-07-06 (Sat, 06 Jul 2013)



------------------
This commit was generated by Migit
2013-07-06 19:01:15 +02:00
[CST] Focus
dcea029cd0 start wizard: add easy mode as requested by customers,
which only ask for gui language and show fast scan (sat) and/or simple cable scan menu


Origin commit data
------------------
Branch: ni/coolstream
Commit: d5e57f8877
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-28 (Fri, 28 Jun 2013)



------------------
This commit was generated by Migit
2013-06-28 15:55:19 +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
0c3a4fa858 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
------------------
Branch: ni/coolstream
Commit: 8bb70d1ab3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-17 (Wed, 17 Apr 2013)



------------------
This commit was generated by Migit
2013-04-17 13:32:12 +04:00
Stefan Seyfried
7254e280e3 Merge branch 'check/pu-cc' into master
needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/framebuffer.h
	src/driver/volume.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/filebrowser.cpp
	src/gui/imageinfo.cpp
	src/gui/infoviewer.cpp
	src/gui/streaminfo2.cpp
	src/gui/widget/textbox.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ad0b6b6dc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)



------------------
This commit was generated by Migit
2013-04-06 11:21:55 +02:00
Thilo Graf
6d6cf7e177 fix license text, sorry, was a c&p error
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0dc4686874
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-03-20 (Wed, 20 Mar 2013)


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

------------------
This commit was generated by Migit
2013-03-21 11:37:00 +01:00
[CST] Focus
010749fda3 gui/start_wizard.cpp: copy initial settings using CONFIGDIR
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6804d18d1c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-29 14:44:45 +04:00
[CST] Bas
1e3dcd7e9a neutrino: fix file locations. use the predetermined CONFIGDIR instead of hardcoding paths.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8dfa226920
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2013-01-25 (Fri, 25 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-25 10:33:40 +08:00
[CST] Focus
110380d545 gui/start_wizard.cpp: use CFEManager::haveSat in place of glocal delivery system
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9bb283565b
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
2013-01-16 15:50:13 +04:00
Stefan Seyfried
fbee2df820 Merge branch 'uncool/dvbsi++'
Conflicts:
	src/driver/Makefile.am
	src/driver/streamts.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/widget/textbox.h


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



------------------
This commit was generated by Migit
2012-11-11 01:45:22 +01:00
[CST] Focus
ed0aba54c9 gui/start_wizard.cpp: move initial settings question before calling scan setup
Origin commit data
------------------
Branch: ni/coolstream
Commit: 01383e083d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-07 (Wed, 07 Nov 2012)


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

------------------
This commit was generated by Migit
2012-11-07 20:50:18 +04:00
Stefan Seyfried
58ca3266e7 Merge branch 'uncool/dvbsi++' commit '9d1444a8df5'
...needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e23ac7223
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)



------------------
This commit was generated by Migit
2012-11-03 10:45:33 +01:00
[CST] Focus
21e6592357 gui/start_wizard.cpp: ask about initial settings on satellite box only
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9d4c6165ac
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-10-18 (Thu, 18 Oct 2012)


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

------------------
This commit was generated by Migit
2012-10-18 13:53:13 +04:00
Stefan Seyfried
a603ec74af Merge branch 'uncool/dvbsi++' commit 'd493b1155c4'
...needs buildfixing...

Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	lib/libtuxtxt/tuxtxt.h
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/record.cpp
	src/driver/volume.cpp
	src/gui/audio_setup.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/system/Makefile.am
	src/system/configure_network.cpp
	src/system/httptool.cpp
	src/system/setting_helpers.cpp
	src/timerd/timermanager.cpp
	src/zapit/include/zapit/frontend_c.h
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: adb23b23ee
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-14 (Sun, 14 Oct 2012)



------------------
This commit was generated by Migit
2012-10-14 12:51:07 +02:00
[CST] Focus
ff37c461d9 gui/start_wizard.cpp: copy initial zapit settings from /var/tuxbox/config/initial/ if found
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4c41541f20
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-09-29 (Sat, 29 Sep 2012)


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

------------------
This commit was generated by Migit
2012-09-29 14:46:43 +04:00
Stefan Seyfried
38649ee07c remove branding
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1a61b68644
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-02-19 (Sun, 19 Feb 2012)


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

------------------
This commit was generated by Migit
2012-04-17 19:33:53 +02:00
Thilo Graf
67a348e3e3 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
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2012-03-19 09:00:11 +00:00