mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 01:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/update_settings.cpp: always enable both url and local dir option:

Browse Source 
local dir also used as target to download image from inet


Origin commit data
------------------
Branch: ni/coolstream
Commit: cce9ced9f3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-16 (Fri, 16 Nov 2012)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2012-11-16 19:49:25 +04:00
parent 9968abbbf2
commit 56c937e64e
1 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/update_settings.cpp
View File

@@ -107,6 +107,7 @@ int CUpdateSettings::initMenu()
w_upsettings.addIntroItems(LOCALE_FLASHUPDATE_SETTINGS); w_upsettings.addIntroItems(LOCALE_FLASHUPDATE_SETTINGS);
#if 0
#ifdef USE_SMS_INPUT #ifdef USE_SMS_INPUT
CMenuForwarder * fw_url = new CMenuForwarder(LOCALE_FLASHUPDATE_URL_FILE, g_settings.softupdate_mode, g_settings.softupdate_url_file, input_url_file, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN); CMenuForwarder * fw_url = new CMenuForwarder(LOCALE_FLASHUPDATE_URL_FILE, g_settings.softupdate_mode, g_settings.softupdate_url_file, input_url_file, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
#else #else
@@ -117,9 +118,14 @@ int CUpdateSettings::initMenu()
CUrlConfigSetupNotifier url_setup_notifier(fw_url, fw_update_dir, updateItem); CUrlConfigSetupNotifier url_setup_notifier(fw_url, fw_update_dir, updateItem);
CMenuOptionChooser *oj_mode = new CMenuOptionChooser(LOCALE_FLASHUPDATE_UPDATEMODE, &g_settings.softupdate_mode, FLASHUPDATE_UPDATEMODE_OPTIONS, FLASHUPDATE_UPDATEMODE_OPTION_COUNT, true, &url_setup_notifier); CMenuOptionChooser *oj_mode = new CMenuOptionChooser(LOCALE_FLASHUPDATE_UPDATEMODE, &g_settings.softupdate_mode, FLASHUPDATE_UPDATEMODE_OPTIONS, FLASHUPDATE_UPDATEMODE_OPTION_COUNT, true, &url_setup_notifier);
#endif
CMenuForwarder * fw_url = new CMenuForwarder(LOCALE_FLASHUPDATE_URL_FILE, true, g_settings.softupdate_url_file, this, "select_url_config_file", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
CMenuForwarder * fw_update_dir = new CMenuForwarder(LOCALE_EXTRA_UPDATE_DIR, true, g_settings.update_dir , this, "update_dir", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
#if 0
w_upsettings.addItem(oj_mode, true); w_upsettings.addItem(oj_mode, true);
w_upsettings.addItem(GenericMenuSeparatorLine); w_upsettings.addItem(GenericMenuSeparatorLine);
#endif
w_upsettings.addItem(fw_update_dir); w_upsettings.addItem(fw_update_dir);
w_upsettings.addItem(fw_url); w_upsettings.addItem(fw_url);
@@ -128,7 +134,7 @@ int CUpdateSettings::initMenu()
return res; return res;
} }
#if 0
CUrlConfigSetupNotifier::CUrlConfigSetupNotifier( CMenuItem* i1, CMenuItem* i2, CMenuForwarder * f1) CUrlConfigSetupNotifier::CUrlConfigSetupNotifier( CMenuItem* i1, CMenuItem* i2, CMenuForwarder * f1)
{ {
toDisable[0] = i1; toDisable[0] = i1;
@@ -149,3 +155,4 @@ bool CUrlConfigSetupNotifier::changeNotify(const neutrino_locale_t, void *)
} }
return false; return false;
} }
#endif