Commit Graph

127 Commits

Author SHA1 Message Date
Michael Liebmann
3e96126769 SNeutrinoSettings: convert more char[...] configuration values to std::string
Origin commit data
------------------
Commit: 004aa84e32
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-18 (Sat, 18 Jan 2014)
2014-01-19 20:57:37 +01:00
Michael Liebmann
1918153c0a Preparing the menu classes for Lua Part #2
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii


Origin commit data
------------------
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
2014-01-19 20:57:37 +01:00
Michael Liebmann
37e4b0bda8 Preparing the menu classes for Lua Part #1
- Remove CNonLocalizedMenuSeparator
- Add overloaded function CMenuSeparator for non local
 THX Martii


Origin commit data
------------------
Commit: 2c9c9debcc
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 #1

- Remove CNonLocalizedMenuSeparator
- Add overloaded function CMenuSeparator for non local
 THX Martii
2014-01-19 20:57:37 +01:00
Stefan Seyfried
ccc691278c Merge remote-tracking branch 'check/next-cc'
Lightly tested only...


Origin commit data
------------------
Commit: cdd065fc2e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-25 (Wed, 25 Dec 2013)
2013-12-25 22:51:23 +01:00
martii
ce44d1641a convert most char[...] configuration values to std::string
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: cbc9299df8
Author: martii <m4rtii@gmx.de>
Date: 2013-06-11 (Tue, 11 Jun 2013)
2013-12-25 12:08:14 +01:00
Stefan Seyfried
4c7a2f38df Merge branch 'check/next-cc'
Only compile-tested.


Origin commit data
------------------
Commit: b5e736e81b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-30 (Sat, 30 Nov 2013)
2013-11-30 20:17:31 +01:00
[CST] Focus
529f87c7d1 gui/update.cpp: fix memleak
Origin commit data
------------------
Commit: a438c0548b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-29 (Fri, 29 Nov 2013)
2013-11-29 17:27:10 +04:00
Stefan Seyfried
68e18e35d3 fix format string warnings
Origin commit data
------------------
Commit: 630c66330d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)
2013-11-13 10:38:27 +01:00
Stefan Seyfried
639a9b353d fix format string warnings
Origin commit data
------------------
Commit: c82bfbaec2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)
2013-11-10 19:48:58 +01:00
Stefan Seyfried
80b809a370 Merge branch 'check/next-cc'
Compiles on most platforms, starts. Not really tested.


Origin commit data
------------------
Commit: b93a372b54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)
2013-11-10 16:55:53 +01:00
vanhofen
788daa5ad3 locale: remove confusing string 'squashFS'
Origin commit data
------------------
Commit: c239f7af95
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-10-23 (Wed, 23 Oct 2013)

Origin message was:
------------------
- locale: remove confusing string 'squashFS'
2013-10-23 10:41:47 +02:00
Stefan Seyfried
e6cbfe61bc 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
------------------
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)
2013-10-21 22:58:55 +02:00
Michael Liebmann
cb7221a3d5 Fix compiler warnings (-Wconversion)
Origin commit data
------------------
Commit: b645b644b0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-10-08 (Tue, 08 Oct 2013)
2013-10-10 01:58:37 +02:00
Michael Liebmann
04451904b4 neutrino: Fit various functions to the changed at get_fs_usage()
Origin commit data
------------------
Commit: 4ee8fded80
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-10-08 (Tue, 08 Oct 2013)
2013-10-10 01:58:37 +02:00
Michael Liebmann
c24b0bb9ad CFlashExpert::showMTDSelector(): Fixed typo at 'disable write uboot'
Origin commit data
------------------
Commit: 00a194990e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-10-01 (Tue, 01 Oct 2013)
2013-10-01 20:42:01 +02:00
Michael Liebmann
8e76619dbf CFlashExpertSetup: Disable backup u-boot
Origin commit data
------------------
Commit: 96fd0ef59d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-29 (Sun, 29 Sep 2013)
2013-09-29 11:44:07 +02:00
Michael Liebmann
354a7b479e CFlashExpert: Exclude 'env' from write flash
Origin commit data
------------------
Commit: 4cb2465665
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-29 (Sun, 29 Sep 2013)
2013-09-29 11:42:53 +02:00
Michael Liebmann
212d44e02c CFlashExpert: Use findMTDNumberFromName() to find mtdnumber
Origin commit data
------------------
Commit: b25b1c4fb5
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-28 (Sat, 28 Sep 2013)
2013-09-28 07:29:57 +02:00
Michael Liebmann
3e016e5e81 Image backup apollo Part #6
- Menu option for including kernel/uldr/u-boot in the image backup
- Menu option for creating an image with a different erasesize
 Tank <=> Trinity


Origin commit data
------------------
Commit: d00cb6f8ec
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-24 (Tue, 24 Sep 2013)

Origin message was:
------------------
Image backup apollo Part #6

- Menu option for including kernel/uldr/u-boot in the image backup
- Menu option for creating an image with a different erasesize
 Tank <=> Trinity
2013-09-27 06:44:43 +02:00
Michael Liebmann
4bffdaa95b Image backup apollo Part #5
- Rework handling devtable
- Use file for devtable '/var/tuxbox/config/devtable.txt'
- If file is empty or does not exist, will default entries
 '/dev/console' and '/dev/null' creates


Origin commit data
------------------
Commit: 9188c78751
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-24 (Tue, 24 Sep 2013)

Origin message was:
------------------
Image backup apollo Part #5

- Rework handling devtable
- Use file for devtable '/var/tuxbox/config/devtable.txt'
- If file is empty or does not exist, will default entries
 '/dev/console' and '/dev/null' creates
2013-09-27 06:44:43 +02:00
Michael Liebmann
5fb5b497ae Image backup apollo Part #4
- Check of available disk space before image creation


Origin commit data
------------------
Commit: 23163e7897
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-22 (Sun, 22 Sep 2013)
2013-09-27 06:44:41 +02:00
Michael Liebmann
1b32725b15 src/system/mtdutils: Creation devtable moved to update.cpp
Origin commit data
------------------
Commit: 66b078cb92
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-22 (Sun, 22 Sep 2013)
2013-09-27 06:44:41 +02:00
Michael Liebmann
03371d7c80 Image backup apollo Part #3
- Add ".256k" string to imagename for tank boxes


Origin commit data
------------------
Commit: acea9818b8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-21 (Sat, 21 Sep 2013)
2013-09-27 06:44:39 +02:00
Michael Liebmann
786fd14316 Image backup apollo Part #1
- Use src/system/mtdutils for image creation


Origin commit data
------------------
Commit: d4ca6a552e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-21 (Sat, 21 Sep 2013)
2013-09-27 06:44:36 +02:00
Michael Liebmann
1a4b568ceb CFlashExpert: Add return value to showMTDSelector() & showFileSelector()
Origin commit data
------------------
Commit: 720f52c0a0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-26 (Thu, 26 Sep 2013)
2013-09-27 06:44:33 +02:00
Stefan Seyfried
a07ee2b304 neutrino: fix up non-extupdate build
this complements commit 1684f2481d after recent changes


Origin commit data
------------------
Commit: 58f6480a34
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)
2013-09-01 20:11:30 +02:00
Stefan Seyfried
2c76238007 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
------------------
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)
2013-09-01 19:46:10 +02:00
Michael Liebmann
72207b6d56 gui/update.cpp: disable apply settings on apollo, as non-working at the moment
Origin commit data
------------------
Commit: df2fab4ceb
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-08-21 (Wed, 21 Aug 2013)
2013-08-21 06:32:18 +02:00
Michael Liebmann
26ecade694 Softupdate: Skip checkSize() when update_dir=/tmp on non apollo platform
- supplement to 87fef9c895


Origin commit data
------------------
Commit: 8eacdd6e09
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-08-20 (Tue, 20 Aug 2013)
2013-08-21 06:32:10 +02:00
Michael Liebmann
b77b1a38bd Softupdate: Fix filename for local update
Origin commit data
------------------
Commit: 9b12442b5d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-08-20 (Tue, 20 Aug 2013)
2013-08-21 06:32:10 +02:00
Michael Liebmann
87fef9c895 Softupdate: Check the available disk space when reading the flash
Origin commit data
------------------
Commit: a3762416af
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-08-20 (Tue, 20 Aug 2013)
2013-08-20 02:55:56 +02:00
Michael Liebmann
36b3fd0a99 Softupdate: Use user-defined file names
for apply settings and saving partitions from the flash.


Origin commit data
------------------
Commit: bc069b0a84
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-08-08 (Thu, 08 Aug 2013)
2013-08-20 02:55:54 +02:00
Michael Liebmann
3b56d80cce gui/update.cpp: disable "systemFS with settings" menu item on apollo,
as non-working at the moment


Origin commit data
------------------
Commit: 0cc83a6a9f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-08-17 (Sat, 17 Aug 2013)
2013-08-17 20:56:26 +02:00
[CST] Focus
aa3fa4f480 gui/update.cpp: download different image for different system fs erase size
Origin commit data
------------------
Commit: 8ade9f656b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-08-05 (Mon, 05 Aug 2013)
2013-08-06 15:16:54 +04:00
Stefan Seyfried
6830b68cac 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
------------------
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-07-06 (Sat, 06 Jul 2013)
2013-07-06 19:01:15 +02:00
[CST] Focus
1f79fbdde3 gui/update.cpp: hide progress window, if applySettings() failed
Origin commit data
------------------
Commit: d7bdd4ee6e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-18 (Tue, 18 Jun 2013)
2013-06-18 16:22:34 +04:00
Stefan Seyfried
fce4dbbe72 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
------------------
Commit: d5d5a60261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)
2013-06-16 21:22:14 +02:00
Michael Liebmann
67903dfd93 Software update: Copy flashimage to /tmp if it is not present in this directory
- unmount mounted network folders before flashing
- kill timerd before flashing


Origin commit data
------------------
Commit: c780676ce5
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-12 (Wed, 12 Jun 2013)
2013-06-13 01:36:03 +02:00
Michael Liebmann
4987f7ef5b Software update: Rework preparing the flash process
- Finish all unnecessary threads and processes before the flash process
- Use flash.start to stop other (user-defined) processes


Origin commit data
------------------
Commit: c26fd64759
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-08 (Sat, 08 Jun 2013)

Origin message was:
------------------
* Software update: Rework preparing the flash process

- Finish all unnecessary threads and processes before the flash process
- Use flash.start to stop other (user-defined) processes
2013-06-08 16:20:32 +02:00
Michael Liebmann
5dba8edf5e Software update: Apply the settings in the options menu switchable
Origin commit data
------------------
Commit: 365661e841
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-08 (Sat, 08 Jun 2013)

Origin message was:
------------------
* Software update: Apply the settings in the options menu switchable
2013-06-08 16:20:32 +02:00
Stefan Seyfried
f6c0718366 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
------------------
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)
2013-05-10 10:06:47 +02:00
[CST] Focus
a3aba8fba3 Merge branch 'next' of coolstreamtech.de:cst-public-gui-neutrino into next
Conflicts:
	lib/libconfigfile/configfile.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Commit: aa60c85768
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-07 (Thu, 07 Mar 2013)
2013-03-07 17:10:57 +04:00
Stefan Seyfried
9c0fbe8943 helpers: improve my_system function
Instead of hardcoding the maximum number of arguments to the
my_system helper, pass a variable argument list.
The function is deliberately source-incompatible with the old
implementation (as opposed to a variant with a sentinel NULL
argument, which would be compatible) to find all users and to
make sure that new future users of this function are not
overlooked during merges with other branches.

Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: 988a8ebec2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-03 (Sun, 03 Mar 2013)
2013-03-05 11:58:49 +01:00
Stefan Seyfried
811e75380e helpers: improve my_system function
Instead of hardcoding the maximum number of arguments to the
my_system helper, pass a variable argument list.
The function is deliberately source-incompatible with the old
implementation (as opposed to a variant with a sentinel NULL
argument, which would be compatible) to find all users and to
make sure that new future users of this function are not
overlooked during merges with other branches.


Origin commit data
------------------
Commit: 96650cdd45
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-03 (Sun, 03 Mar 2013)
2013-03-03 19:18:13 +01:00
Stefan Seyfried
1684f2481d make the extupdate build conditional
extupdate is not very useful for most platforms, so only
build it if --enable-extupdate is passed to configure


Origin commit data
------------------
Commit: 5b72a7fe3c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-22 (Fri, 22 Feb 2013)
2013-02-22 17:14:38 +01:00
[CST] Focus
c29d2fa06c gui/update.cpp: use mtd0 as default on apollo, disable uboot/uldr partitions write
Origin commit data
------------------
Commit: 5f105f2ee3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)
2013-01-29 14:24:47 +04:00
Thilo Graf
daf4a68e5e extended update: move ext_update.* to update_ext.*
Beware the canonical order of filenames.


Origin commit data
------------------
Commit: 9939fc9197
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-01-13 (Sun, 13 Jan 2013)
2013-01-14 15:31:43 +01:00
[CST] Focus
067dd5bc98 gui/update.cpp: add local variable for update mode
Origin commit data
------------------
Commit: 2ac735d0ec
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-16 (Fri, 16 Nov 2012)
2012-11-16 19:47:25 +04:00
[CST] Focus
e6be82615a gui/update.cpp: return result from file browser or image select menu
Origin commit data
------------------
Commit: 76947173c0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-16 (Fri, 16 Nov 2012)
2012-11-16 16:49:58 +04:00
Michael Liebmann
e61906948d Software Update with apply the settings (Part9)
- Functions now available for internet & local update.
- Rename writemtdExt() to applySettings()


Origin commit data
------------------
Commit: 0c84840e10
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-11-05 (Mon, 05 Nov 2012)

Origin message was:
------------------
* Software Update with apply the settings (Part9)

- Functions now available for internet & local update.
- Rename writemtdExt() to applySettings()
2012-11-07 04:06:48 +01:00