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

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

Browse Source 
Origin commit data
------------------
Commit: 79eb6d0e34
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-12-04 (Sat, 04 Dec 2021)

Origin message was:
------------------
- update-menu: formatting code using astyle; some manual code nicenings
This commit is contained in:
vanhofen
2021-12-04 23:22:35 +01:00
parent 69e34bab75
commit 36cf1f8432
2 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/gui/update_menue.cpp
View File

@@ -30,7 +30,6 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
@@ -62,7 +61,7 @@ CSoftwareUpdate::~CSoftwareUpdate()
delete fe; delete fe;
} }
int CSoftwareUpdate::exec(CMenuTarget* parent, const std::string &/*actionKey*/) int CSoftwareUpdate::exec(CMenuTarget *parent, const std::string &/*actionKey*/)
{ {
dprintf(DEBUG_DEBUG, "init software-update\n"); dprintf(DEBUG_DEBUG, "init software-update\n");
int res = menu_return::RETURN_REPAINT; int res = menu_return::RETURN_REPAINT;
@@ -74,18 +73,19 @@ int CSoftwareUpdate::exec(CMenuTarget* parent, const std::string &/*actionKey*/)
return res; return res;
} }
// shows the menue and options for software update
int CSoftwareUpdate::showSoftwareUpdate() int CSoftwareUpdate::showSoftwareUpdate()
/* shows the menue and options for software update */
{ {
CMenuForwarder * mf, *update_item; CMenuForwarder *mf, *update_item;
CMenuWidget softUpdate(LOCALE_MAINMENU_SERVICE, NEUTRINO_ICON_UPDATE, width, MN_WIDGET_ID_SOFTWAREUPDATE); CMenuWidget softUpdate(LOCALE_MAINMENU_SERVICE, NEUTRINO_ICON_UPDATE, width, MN_WIDGET_ID_SOFTWAREUPDATE);
softUpdate.addIntroItems(LOCALE_SERVICEMENU_UPDATE); softUpdate.addIntroItems(LOCALE_SERVICEMENU_UPDATE);
unsigned int inetkey = CRCInput::RC_red; unsigned int inetkey = CRCInput::RC_red;
#if ENABLE_PKG_MANAGEMENT #if ENABLE_PKG_MANAGEMENT
if (COPKGManager::hasOpkgSupport()) { if (COPKGManager::hasOpkgSupport())
//firmware update via opkg {
// firmware update via opkg
mf = new CMenuDForwarder(LOCALE_OPKG_TITLE, true, NULL, new COPKGManager(), NULL, CRCInput::RC_red); mf = new CMenuDForwarder(LOCALE_OPKG_TITLE, true, NULL, new COPKGManager(), NULL, CRCInput::RC_red);
mf->setHint(NEUTRINO_ICON_HINT_SW_UPDATE, LOCALE_MENU_HINT_OPKG); mf->setHint(NEUTRINO_ICON_HINT_SW_UPDATE, LOCALE_MENU_HINT_OPKG);
softUpdate.addItem(mf); softUpdate.addItem(mf);
@@ -98,17 +98,17 @@ int CSoftwareUpdate::showSoftwareUpdate()
CFlashUpdate flash; CFlashUpdate flash;
flash.enableNotify(false); flash.enableNotify(false);
//online update // online update
update_item = new CMenuForwarder(LOCALE_FLASHUPDATE_CHECKUPDATE_INTERNET, allow_update && file_exists(g_settings.softupdate_url_file.c_str()), NULL, &flash, "inet", inetkey); update_item = new CMenuForwarder(LOCALE_FLASHUPDATE_CHECKUPDATE_INTERNET, allow_update && file_exists(g_settings.softupdate_url_file.c_str()), NULL, &flash, "inet", inetkey);
update_item->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_CHECK); update_item->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_CHECK);
softUpdate.addItem(update_item); softUpdate.addItem(update_item);
//local update // local update
update_item = new CMenuForwarder(LOCALE_FLASHUPDATE_CHECKUPDATE_LOCAL, allow_update, NULL, &flash, "local", CRCInput::RC_green); update_item = new CMenuForwarder(LOCALE_FLASHUPDATE_CHECKUPDATE_LOCAL, allow_update, NULL, &flash, "local", CRCInput::RC_green);
update_item->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_CHECK_LOCAL); update_item->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_CHECK_LOCAL);
softUpdate.addItem(update_item); softUpdate.addItem(update_item);
//settings // settings
CUpdateSettings update_settings; CUpdateSettings update_settings;
mf = new CMenuForwarder(LOCALE_FLASHUPDATE_SETTINGS, true, NULL, &update_settings, NULL, CRCInput::RC_yellow); mf = new CMenuForwarder(LOCALE_FLASHUPDATE_SETTINGS, true, NULL, &update_settings, NULL, CRCInput::RC_yellow);
mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_SETTINGS); mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_SETTINGS);
@@ -117,7 +117,7 @@ int CSoftwareUpdate::showSoftwareUpdate()
#if !HAVE_ARM_HARDWARE && !HAVE_MIPS_HARDWARE #if !HAVE_ARM_HARDWARE && !HAVE_MIPS_HARDWARE
softUpdate.addItem(GenericMenuSeparatorLine); softUpdate.addItem(GenericMenuSeparatorLine);
//expert-functions // expert-functions
CMenuWidget mtdexpert(LOCALE_FLASHUPDATE_EXPERTFUNCTIONS, NEUTRINO_ICON_UPDATE, width, MN_WIDGET_ID_MTDEXPERT); CMenuWidget mtdexpert(LOCALE_FLASHUPDATE_EXPERTFUNCTIONS, NEUTRINO_ICON_UPDATE, width, MN_WIDGET_ID_MTDEXPERT);
showSoftwareUpdateExpert(&mtdexpert); showSoftwareUpdateExpert(&mtdexpert);
mf = new CMenuForwarder(LOCALE_FLASHUPDATE_EXPERTFUNCTIONS, true, NULL, &mtdexpert, NULL, CRCInput::RC_blue); mf = new CMenuForwarder(LOCALE_FLASHUPDATE_EXPERTFUNCTIONS, true, NULL, &mtdexpert, NULL, CRCInput::RC_blue);
@@ -139,17 +139,17 @@ int CSoftwareUpdate::showSoftwareUpdate()
nextShortcut = (unsigned int)softUpdate.getNextShortcut(); nextShortcut = (unsigned int)softUpdate.getNextShortcut();
softUpdate.integratePlugins(PLUGIN_INTEGRATION_SOFTWARE_MANAGE, nextShortcut); softUpdate.integratePlugins(PLUGIN_INTEGRATION_SOFTWARE_MANAGE, nextShortcut);
int res = softUpdate.exec (NULL, ""); int res = softUpdate.exec(NULL, "");
return res; return res;
} }
/* shows experts-functions to read/write to the mtd */ // shows experts-functions to read/write to the mtd
void CSoftwareUpdate::showSoftwareUpdateExpert(CMenuWidget *w_mtd_expert) void CSoftwareUpdate::showSoftwareUpdateExpert(CMenuWidget *w_mtd_expert)
{ {
CMenuForwarder * mf; CMenuForwarder *mf;
w_mtd_expert->addIntroItems(); w_mtd_expert->addIntroItems();
mf = new CMenuForwarder(LOCALE_FLASHUPDATE_READFLASHMTD , true, NULL, fe, "readflashmtd" , CRCInput::RC_red); mf = new CMenuForwarder(LOCALE_FLASHUPDATE_READFLASHMTD, true, NULL, fe, "readflashmtd", CRCInput::RC_red);
mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_EXPERT_READ); mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_EXPERT_READ);
w_mtd_expert->addItem(mf); w_mtd_expert->addItem(mf);
mf = new CMenuForwarder(LOCALE_FLASHUPDATE_WRITEFLASHMTD, true, NULL, fe, "writeflashmtd", CRCInput::RC_green); mf = new CMenuForwarder(LOCALE_FLASHUPDATE_WRITEFLASHMTD, true, NULL, fe, "writeflashmtd", CRCInput::RC_green);

2
src/gui/update_menue.h
View File

@@ -48,7 +48,7 @@ class CSoftwareUpdate : public CMenuTarget
public: public:
CSoftwareUpdate(); CSoftwareUpdate();
~CSoftwareUpdate(); ~CSoftwareUpdate();
int exec(CMenuTarget* parent, const std::string & actionKey); int exec(CMenuTarget *parent, const std::string &actionKey);
}; };
#endif #endif