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
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
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
c43438baec
gui/update_settings.cpp: add option to enable/disable updates check on boot
2014-10-20 14:20:26 +04:00
[CST] Focus
3c5d5634a4
gui/update_settings.cpp: cleanup unused updateItem
2014-10-16 13:56:15 +04:00
martii
e84782bc4c
drop explicit CMenuForwarder icon assignments
...
Conflicts:
src/gui/3dsetup.cpp
src/gui/bouquetlist.cpp
src/gui/hdd_menu.cpp
src/gui/keybind_setup.cpp
src/gui/mediaplayer.cpp
src/gui/mediaplayer_setup.cpp
src/gui/moviebrowser.cpp
src/gui/network_setup.cpp
src/gui/nfs.cpp
src/gui/osd_setup.cpp
src/gui/osdlang_setup.cpp
src/gui/parentallock_setup.cpp
src/gui/personalize.cpp
src/gui/proxyserver_setup.cpp
src/gui/record_setup.cpp
src/gui/scan_setup.cpp
src/gui/screensetup.cpp
src/gui/settings_manager.cpp
src/gui/timerlist.cpp
src/gui/update_menue.cpp
src/gui/vfd_setup.cpp
src/gui/videosettings.cpp
src/neutrino_menue.cpp
2014-09-15 11:44:08 +04: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
M. Liebmann
004aa84e32
SNeutrinoSettings: convert more char[...] configuration values to std::string
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
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
Jacek Jendrzej
6f07cbe3dd
CUpdateSettings:: allow choose tmp(ramfs,TMPFS_MAGIC) as update dir
2013-10-08 10:10:10 +02:00
Stefan Seyfried
58f6480a34
neutrino: fix up non-extupdate build
...
this complements commit 5b72a7fe3c
2013-09-01 20:11:30 +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
[CST] Focus
73e67e8cbd
gui/update_settings.cpp: disable apply settings menu item on apollo, as non-working at the moment
2013-08-13 20:13:14 +04:00
Michael Liebmann
365661e841
* Software update: Apply the settings in the options menu switchable
2013-06-08 16:20:32 +02:00
Thilo Graf
0dc4686874
fix license text, sorry, was a c&p error
2013-03-21 11:37:00 +01:00
[CST] Focus
cce9ced9f3
gui/update_settings.cpp: always enable both url and local dir option:
...
local dir also used as target to download image from inet
2012-11-16 19:49:25 +04:00
satbaby
a3bfab0bcd
remove doubles include
2012-09-11 20:31:33 +02:00
micha-bbg
bb4682125f
* Use dynamic text for software update online/local
2012-08-11 00:40:10 +01:00
satbaby
7359504dd7
-fixes strncpy & buf size
2012-08-07 18:51:44 +02:00
Thilo Graf
9e7021025c
update_settings: set url chooser as default item
...
So we need no hotkey
2012-06-15 10:55:25 +02:00
Thilo Graf
8c5f1a1f47
update_settings: fix order of color buttons
...
Order of color buttons on remote control is red, green ... not green, red
2012-06-15 10:55:16 +02:00
thilo
be0ea475b7
update settings: don't use sms input for update.url
...
Now use file browser to select url config file, but you can
define USE_SMS_INPUT in update_settings.h to use old methode.
The SMS-Methode is not very user friendly
2012-06-08 23:16:34 +02:00
Thilo Graf
643b9f485f
update: reworked update menu
...
-moved software_update.cpp/h to update_menue.cpp/h
-add new class CUpdateSettings into files update_settings.cpp/h
-using update settings in sub menus, so we've got only hotkeys
and less menu items in update menu
-reworked some locales
2012-06-08 23:15:30 +02:00
