- update-settings: formatting code using astyle; some manual code nicenings

Conflicts:
	src/gui/update_settings.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2021-12-06 05:18:19 +01:00
committed by Thilo Graf
parent 72669771a7
commit 24c9dbb73a
2 changed files with 40 additions and 40 deletions

View File

@@ -101,7 +101,8 @@ int CUpdateSettings::exec(CMenuTarget* parent, const std::string &actionKey)
if (parent)
parent->hide();
if(actionKey == "update_dir") {
if (actionKey == "update_dir")
{
const char *action_str = "update";
if (chooserDir(g_settings.update_dir, true, action_str, true))
printf("[neutrino] new %s dir %s\n", action_str, g_settings.update_dir.c_str());
@@ -109,7 +110,8 @@ int CUpdateSettings::exec(CMenuTarget* parent, const std::string &actionKey)
return res;
}
#ifndef USE_SMS_INPUT
else if(actionKey == "select_url_config_file"){
else if (actionKey == "select_url_config_file")
{
CFileBrowser fileBrowser;
CFileFilter fileFilter;
@@ -127,7 +129,7 @@ int CUpdateSettings::exec(CMenuTarget* parent, const std::string &actionKey)
return res;
}
/* init options for software update */
// init options for software update
int CUpdateSettings::initMenu()
{
COnOffNotifier *OnOffNotifier = new COnOffNotifier(0);
@@ -135,10 +137,7 @@ int CUpdateSettings::initMenu()
CMenuWidget w_upsettings(LOCALE_SERVICEMENU_UPDATE, NEUTRINO_ICON_UPDATE, width, MN_WIDGET_ID_SOFTWAREUPDATE_SETTINGS);
w_upsettings.addIntroItems(LOCALE_FLASHUPDATE_SETTINGS);
CMenuForwarder * fw_url = NULL;
if (file_exists(g_settings.softupdate_url_file.c_str()))
fw_url = new CMenuForwarder(LOCALE_FLASHUPDATE_URL_FILE, true, g_settings.softupdate_url_file, this, "select_url_config_file", CRCInput::RC_green);
CMenuForwarder *fw_url = new CMenuForwarder(LOCALE_FLASHUPDATE_URL_FILE, true, g_settings.softupdate_url_file, this, "select_url_config_file", CRCInput::RC_green);
//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);
//fw_update_dir->setHint("", LOCALE_MENU_HINT_XXX);
@@ -168,7 +167,8 @@ int CUpdateSettings::initMenu()
#if ENABLE_PKG_MANAGEMENT
CMenuOptionChooser *package_autocheck = NULL;
if (COPKGManager::hasOpkgSupport()){
if (COPKGManager::hasOpkgSupport())
{
package_autocheck = new CMenuOptionChooser(LOCALE_FLASHUPDATE_AUTOCHECK_PACKAGES, &g_settings.softupdate_autocheck_packages, AUTOUPDATE_CHECK_OPTIONS, auto_update_options_count, true, this);
package_autocheck->setHint("", LOCALE_MENU_HINT_AUTO_UPDATE_CHECK);
}