mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Softupdate: Use user-defined file names

Browse Source 
for apply settings and saving partitions from the flash.
This commit is contained in:
Michael Liebmann
2013-08-08 14:02:27 +02:00
parent 0cc83a6a9f
commit bc069b0a84
10 changed files with 100 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/gui/update_settings.cpp
View File

@@ -37,8 +37,9 @@
#include <neutrino.h>
#include <mymenu.h>
#include <neutrino_menue.h>
#include "update_settings.h"
#include "filebrowser.h"
#include <gui/filebrowser.h>
#include <gui/update_ext.h>
#include <gui/update_settings.h>
#include <gui/widget/icons.h>
#include <driver/screen_max.h>
#include <system/debug.h>
@@ -67,6 +68,21 @@ const CMenuOptionChooser::keyval FLASHUPDATE_UPDATEMODE_OPTIONS[FLASHUPDATE_UPDA
{ 1, LOCALE_FLASHUPDATE_UPDATEMODE_INTERNET }
};
#define SOFTUPDATE_NAME_MODE1_OPTION_COUNT 3
const CMenuOptionChooser::keyval SOFTUPDATE_NAME_MODE1_OPTIONS[SOFTUPDATE_NAME_MODE1_OPTION_COUNT] =
{
{ CExtUpdate::SOFTUPDATE_NAME_DEFAULT, LOCALE_FLASHUPDATE_NAMEMODE1_DEFAULT },
{ CExtUpdate::SOFTUPDATE_NAME_HOSTNAME_TIME, LOCALE_FLASHUPDATE_NAMEMODE1_HOSTNAME_TIME },
{ CExtUpdate::SOFTUPDATE_NAME_ORGNAME_TIME, LOCALE_FLASHUPDATE_NAMEMODE1_ORGNAME_TIME }
};
#define SOFTUPDATE_NAME_MODE2_OPTION_COUNT 2
const CMenuOptionChooser::keyval SOFTUPDATE_NAME_MODE2_OPTIONS[SOFTUPDATE_NAME_MODE2_OPTION_COUNT] =
{
{ CExtUpdate::SOFTUPDATE_NAME_DEFAULT, LOCALE_FLASHUPDATE_NAMEMODE2_DEFAULT },
{ CExtUpdate::SOFTUPDATE_NAME_HOSTNAME_TIME, LOCALE_FLASHUPDATE_NAMEMODE2_HOSTNAME_TIME }
};
int CUpdateSettings::exec(CMenuTarget* parent, const std::string &actionKey)
{
dprintf(DEBUG_DEBUG, "init software-update settings\n");
@@ -113,11 +129,18 @@ int CUpdateSettings::initMenu()
// fw_url->setHint("", LOCALE_MENU_HINT_XXX);
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);
// fw_update_dir->setHint("", LOCALE_MENU_HINT_XXX);
CMenuOptionChooser *name_backup = new CMenuOptionChooser(LOCALE_FLASHUPDATE_NAMEMODE2, &g_settings.softupdate_name_mode_backup, SOFTUPDATE_NAME_MODE2_OPTIONS, SOFTUPDATE_NAME_MODE2_OPTION_COUNT, true);
// name_backup->setHint("", LOCALE_MENU_HINT_XXX);
#ifndef BOXMODEL_APOLLO
CMenuOptionChooser *apply_settings = new CMenuOptionChooser(LOCALE_FLASHUPDATE_MENU_APPLY_SETTINGS, &g_settings.apply_settings, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, OnOffNotifier);
#endif
// apply_settings->setHint("", LOCALE_MENU_HINT_XXX);
CMenuOptionChooser *name_apply = new CMenuOptionChooser(LOCALE_FLASHUPDATE_NAMEMODE1, &g_settings.softupdate_name_mode_apply, SOFTUPDATE_NAME_MODE1_OPTIONS, SOFTUPDATE_NAME_MODE1_OPTION_COUNT, g_settings.apply_settings);
// name_apply->setHint("", LOCALE_MENU_HINT_XXX);
OnOffNotifier->addItem(name_apply);
#endif
#if 0
CMenuOptionChooser *apply_kernel = new CMenuOptionChooser(LOCALE_FLASHUPDATE_MENU_APPLY_KERNEL, &g_settings.apply_kernel, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, g_settings.apply_settings);
// apply_kernel->setHint("", LOCALE_MENU_HINT_XXX);
@@ -126,10 +149,13 @@ int CUpdateSettings::initMenu()
w_upsettings.addItem(fw_update_dir);
w_upsettings.addItem(fw_url);
w_upsettings.addItem(GenericMenuSeparatorLine);
w_upsettings.addItem(name_backup);
#ifndef BOXMODEL_APOLLO
w_upsettings.addItem(GenericMenuSeparatorLine);
w_upsettings.addItem(apply_settings);
w_upsettings.addItem(name_apply);
#endif
#if 0
w_upsettings.addItem(apply_kernel);
#endif