Commit Graph

158 Commits

Author SHA1 Message Date
Stefan Seyfried
13ab1ebc8a Merge remote-tracking branch 'tuxbox/master'
* needs compile fixes
* needs additional tests, of course :-)
2016-10-22 11:37:40 +02:00
M. Liebmann
312a80bee9 Set correct path for /.version if TARGET_PREFIX is in use. 2016-10-01 11:47:59 +02:00
Jacek Jendrzej
0d9fbd5378 some never read compil warning fixes 2016-04-24 17:18:37 +02:00
Stefan Seyfried
b53fbaf327 Merge remote-tracking branch 'cst-next' 2016-01-08 19:52:41 +01:00
Thilo Graf
ab29b2fa43 CFlashUpdate: remove superfluous paint of progress
This should fix remains on screen of progressbars after
flashing or local updates.
2016-01-03 16:49:11 +01:00
Stefan Seyfried
b837d8697b Merge remote-tracking branch 'uncool/cst-next' 2015-12-28 16:15:14 +01:00
Thilo Graf
362018ed76 CFlashUpdate: use locales for install and error messages 2015-12-28 12:13:44 +01:00
Thilo Graf
58fa104967 CFlashUpdate: add localized messages for installation from default update feature 2015-12-28 12:13:43 +01:00
Thilo Graf
9ff0512496 CFlashUpdate: change lines for better statement readability 2015-12-28 12:13:43 +01:00
Thilo Graf
b987c9595a CFlashUpdate: add log output for not found package file 2015-12-28 12:13:43 +01:00
Thilo Graf
68585f1a0d CFlashUpdate: add filters for packages 2015-12-28 12:13:43 +01:00
Stefan Seyfried
880115fa98 Merge remote-tracking branch 'uncool/cst-next' 2015-12-25 16:28:39 +01:00
svenhoefer
ceb3344a70 - update: localize question of flashing image 2015-12-23 10:16:26 +01:00
Stefan Seyfried
eeee5bacab Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...
2015-12-13 17:41:55 +01:00
M. Liebmann
dd1e02b6e4 src/gui/update.cpp: Go back to the expert menu after backup 2015-09-22 13:41:14 +02:00
M. Liebmann
885f13f6b0 Apollo/Kronos: Display backup options for 'var' and 'root1'...
...only if are mounted.

- Using /proc/mounts to find correct mountpoint for backup
2015-09-22 13:41:14 +02:00
M. Liebmann
cb4c7431c7 Apollo/Kronos: Use backup with readmtdJFFS2() also for root1 partition 2015-09-22 13:41:14 +02:00
M. Liebmann
6121e57fbc Apollo/Kronos: Use backup with readmtdJFFS2() also for var partition 2015-09-22 13:41:13 +02:00
Thilo Graf
a58f1621b4 Merge branch 'cst-next.pre' into cst-next 2015-04-30 09:20:43 +02:00
svenhoefer
9041bff59c - remove w_max()-calls to define menu-width, because ...
w-max() returns a pixel-value, but menus need a percentage-value.
2015-04-24 09:11:04 +02:00
Thilo Graf
e58b86f38f CFlashUpdate: change name for CFile object for better differ 2015-03-29 22:40:03 +02:00
Stefan Seyfried
b5a64e6887 Merge remote-tracking branch 'check/cst-next'
*needs buildfixing*

Conflicts:
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/driver/vfd.cpp
	src/gui/bedit/Makefile.am
	src/gui/components/Makefile.am
	src/gui/luainstance.cpp
	src/gui/widget/Makefile.am
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
2015-01-26 17:26:26 +01:00
[CST] Focus
f04e22befe gui/update.cpp: fix image update check,
enable save u-boot menu switch
2015-01-09 12:42:01 +03:00
Stefan Seyfried
69c4dbbdba Merge remote-tracking branch 'check/cst-next'
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp
2014-12-25 18:03:08 +01:00
[CST] Focus
a755074c0e gui/update.cpp: add function to check first url for image update;
check update version and timestamp to notify user about updates
2014-10-20 14:19:37 +04:00
M. Liebmann
2e6ad3caa1 SoftUpdate: Hide "Create image for Tank/Trinity STB" at the Kronos platform 2014-09-01 21:14:09 +02:00
Stefan Seyfried
ecd62d81d1 Merge remote-tracking branch 'check/next-cc'
...only build-tested, needs fixes
2014-02-15 20:22:07 +01:00
M. Liebmann
583931e446 CFlashExpert::checkSize: Fix display backupMaxSize & backupRequiredSize 2014-01-29 21:20:43 +01:00
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