mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 07:23:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
11,140 Commits 1 Branch 51 Tags
c90348dd1e8bda3c39414e9de06cbfc27f36409c
Commit Graph

130 Commits

Author SHA1 Message Date
Stefan Seyfried
b414474323 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
 2014-01-23 14:08:37 +01:00
svenhoefer
53f5801d6f - adapt ShowMsg handling from martii's neutrino-mp 2014-01-22 12:37:21 +01:00
svenhoefer
6995e1a765 - adapt ShowHint handling from martii's neutrino-mp 2014-01-22 12:11:52 +01:00
M. Liebmann
004aa84e32 SNeutrinoSettings: convert more char[...] configuration values to std::string 2014-01-19 20:57:37 +01:00
M. Liebmann
b41819190d 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
M. Liebmann
2c9c9debcc 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
cdd065fc2e Merge remote-tracking branch 'check/next-cc' 
Lightly tested only...
 2013-12-25 22:51:23 +01:00
martii
cbc9299df8 convert most char[...] configuration values to std::string 
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>
 2013-12-25 12:08:14 +01:00
Stefan Seyfried
b5e736e81b Merge branch 'check/next-cc' 
Only compile-tested.
 2013-11-30 20:17:31 +01:00
[CST] Focus
a438c0548b gui/update.cpp: fix memleak 2013-11-29 17:27:10 +04:00
Stefan Seyfried
630c66330d fix format string warnings 2013-11-13 10:38:27 +01:00
Stefan Seyfried
c82bfbaec2 fix format string warnings 2013-11-10 19:48:58 +01:00
Stefan Seyfried
b93a372b54 Merge branch 'check/next-cc' 
Compiles on most platforms, starts. Not really tested.
 2013-11-10 16:55:53 +01:00
svenhoefer
c239f7af95 - locale: remove confusing string 'squashFS' 2013-10-23 10:41:47 +02:00
Stefan Seyfried
d244a5991a 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
 2013-10-21 22:58:55 +02:00
Michael Liebmann
b645b644b0 Fix compiler warnings (-Wconversion) 2013-10-10 01:58:37 +02:00
Michael Liebmann
4ee8fded80 neutrino: Fit various functions to the changed at get_fs_usage() 2013-10-10 01:58:37 +02:00
Michael Liebmann
00a194990e CFlashExpert::showMTDSelector(): Fixed typo at 'disable write uboot' 2013-10-01 20:42:01 +02:00
Michael Liebmann
96fd0ef59d CFlashExpertSetup: Disable backup u-boot 2013-09-29 11:44:07 +02:00
Michael Liebmann
4cb2465665 CFlashExpert: Exclude 'env' from write flash 2013-09-29 11:42:53 +02:00
Michael Liebmann
b25b1c4fb5 CFlashExpert: Use findMTDNumberFromName() to find mtdnumber 2013-09-28 07:29:57 +02:00
Michael Liebmann
d00cb6f8ec 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
9188c78751 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
23163e7897 Image backup apollo Part #4 
- Check of available disk space before image creation
 2013-09-27 06:44:41 +02:00
Michael Liebmann
66b078cb92 src/system/mtdutils: Creation devtable moved to update.cpp 2013-09-27 06:44:41 +02:00
Michael Liebmann
acea9818b8 Image backup apollo Part #3 
- Add ".256k" string to imagename for tank boxes
 2013-09-27 06:44:39 +02:00
Michael Liebmann
d4ca6a552e Image backup apollo Part #1 
- Use src/system/mtdutils for image creation
 2013-09-27 06:44:36 +02:00
Michael Liebmann
720f52c0a0 CFlashExpert: Add return value to showMTDSelector() & showFileSelector() 2013-09-27 06:44:33 +02:00
Stefan Seyfried
58f6480a34 neutrino: fix up non-extupdate build 
this complements commit 5b72a7fe3c after recent changes
 2013-09-01 20:11:30 +02:00
Stefan Seyfried
32de6beef0 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
 2013-09-01 19:46:10 +02:00
Michael Liebmann
df2fab4ceb gui/update.cpp: disable apply settings on apollo, as non-working at the moment 2013-08-21 06:32:18 +02:00
Michael Liebmann
8eacdd6e09 Softupdate: Skip checkSize() when update_dir=/tmp on non apollo platform 
- supplement to a3762416af
 2013-08-21 06:32:10 +02:00
Michael Liebmann
9b12442b5d Softupdate: Fix filename for local update 2013-08-21 06:32:10 +02:00
Michael Liebmann
a3762416af Softupdate: Check the available disk space when reading the flash 2013-08-20 02:55:56 +02:00
Michael Liebmann
bc069b0a84 Softupdate: Use user-defined file names 
for apply settings and saving partitions from the flash.
 2013-08-20 02:55:54 +02:00
Michael Liebmann
0cc83a6a9f gui/update.cpp: disable "systemFS with settings" menu item on apollo, 
as non-working at the moment
 2013-08-17 20:56:26 +02:00
[CST] Focus
8ade9f656b gui/update.cpp: download different image for different system fs erase size 2013-08-06 15:16:54 +04:00
Stefan Seyfried
7cfe54dc2f 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
 2013-07-06 19:01:15 +02:00
[CST] Focus
d7bdd4ee6e gui/update.cpp: hide progress window, if applySettings() failed 2013-06-18 16:22:34 +04:00
Stefan Seyfried
d5d5a60261 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
 2013-06-16 21:22:14 +02:00
Michael Liebmann
c780676ce5 Software update: Copy flashimage to /tmp if it is not present in this directory 
- unmount mounted network folders before flashing
- kill timerd before flashing
 2013-06-13 01:36:03 +02:00
Michael Liebmann
c26fd64759 * 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
365661e841 * Software update: Apply the settings in the options menu switchable 2013-06-08 16:20:32 +02:00
Stefan Seyfried
8253c4d67c 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
 2013-05-10 10:06:47 +02:00
[CST] Focus
aa60c85768 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
 2013-03-07 17:10:57 +04:00
Stefan Seyfried
988a8ebec2 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>
 2013-03-05 11:58:49 +01:00
Stefan Seyfried
96650cdd45 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.
 2013-03-03 19:18:13 +01:00
Stefan Seyfried
5b72a7fe3c make the extupdate build conditional 
extupdate is not very useful for most platforms, so only
build it if --enable-extupdate is passed to configure
 2013-02-22 17:14:38 +01:00
[CST] Focus
5f105f2ee3 gui/update.cpp: use mtd0 as default on apollo, disable uboot/uldr partitions write 2013-01-29 14:24:47 +04:00
Thilo Graf
9939fc9197 extended update: move ext_update.* to update_ext.* 
Beware the canonical order of filenames.
 2013-01-14 15:31:43 +01:00