mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-30 08:51:04 +02:00
update-menu: formatting code using astyle; some manual code nicenings
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
@@ -1,36 +1,35 @@
|
||||
/*
|
||||
$Id: port of software_update.cpp,v 1.8 2011/04/03 21:56:13 tuxbox-cvs Exp $
|
||||
|
||||
|
||||
Neutrino-GUI - DBoxII-Project
|
||||
|
||||
|
||||
Software update implementation - Neutrino-GUI
|
||||
|
||||
|
||||
Copyright (C) 2001 Steffen Hehn 'McClean'
|
||||
and some other guys
|
||||
Homepage: http://dbox.cyberphoria.org/
|
||||
|
||||
|
||||
Rework Copyright (C) 2011 T. Graf 'dbt'
|
||||
Homepage: http://www.dbox2-tuning.net/
|
||||
|
||||
|
||||
License: GPL
|
||||
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
|
||||
You should have received a copy of the GNU General Public
|
||||
License along with this program; if not, write to the
|
||||
Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
|
||||
Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
@@ -62,30 +61,31 @@ CSoftwareUpdate::~CSoftwareUpdate()
|
||||
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");
|
||||
int res = menu_return::RETURN_REPAINT;
|
||||
|
||||
int res = menu_return::RETURN_REPAINT;
|
||||
|
||||
if (parent)
|
||||
parent->hide();
|
||||
|
||||
|
||||
res = showSoftwareUpdate();
|
||||
return res;
|
||||
}
|
||||
|
||||
// shows the menue and options for software update
|
||||
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);
|
||||
|
||||
softUpdate.addIntroItems(LOCALE_SERVICEMENU_UPDATE);
|
||||
|
||||
unsigned int inetkey = CRCInput::RC_red;
|
||||
#if ENABLE_PKG_MANAGEMENT
|
||||
if (COPKGManager::hasOpkgSupport()) {
|
||||
//firmware update via opkg
|
||||
if (COPKGManager::hasOpkgSupport())
|
||||
{
|
||||
// firmware update via opkg
|
||||
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);
|
||||
softUpdate.addItem(mf);
|
||||
@@ -98,17 +98,17 @@ int CSoftwareUpdate::showSoftwareUpdate()
|
||||
CFlashUpdate flash;
|
||||
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->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_CHECK);
|
||||
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->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_CHECK_LOCAL);
|
||||
softUpdate.addItem(update_item);
|
||||
|
||||
//settings
|
||||
// settings
|
||||
CUpdateSettings update_settings;
|
||||
mf = new CMenuForwarder(LOCALE_FLASHUPDATE_SETTINGS, true, NULL, &update_settings, NULL, CRCInput::RC_yellow);
|
||||
mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_SETTINGS);
|
||||
@@ -117,7 +117,7 @@ int CSoftwareUpdate::showSoftwareUpdate()
|
||||
#if !HAVE_ARM_HARDWARE && !HAVE_MIPS_HARDWARE
|
||||
softUpdate.addItem(GenericMenuSeparatorLine);
|
||||
|
||||
//expert-functions
|
||||
// expert-functions
|
||||
CMenuWidget mtdexpert(LOCALE_FLASHUPDATE_EXPERTFUNCTIONS, NEUTRINO_ICON_UPDATE, width, MN_WIDGET_ID_MTDEXPERT);
|
||||
showSoftwareUpdateExpert(&mtdexpert);
|
||||
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();
|
||||
softUpdate.integratePlugins(PLUGIN_INTEGRATION_SOFTWARE_MANAGE, nextShortcut);
|
||||
|
||||
int res = softUpdate.exec (NULL, "");
|
||||
int res = softUpdate.exec(NULL, "");
|
||||
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)
|
||||
{
|
||||
CMenuForwarder * mf;
|
||||
CMenuForwarder *mf;
|
||||
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);
|
||||
w_mtd_expert->addItem(mf);
|
||||
mf = new CMenuForwarder(LOCALE_FLASHUPDATE_WRITEFLASHMTD, true, NULL, fe, "writeflashmtd", CRCInput::RC_green);
|
||||
|
||||
@@ -1,28 +1,28 @@
|
||||
/*
|
||||
$Id: port of software_update.h,v 1.6 2011/04/03 21:56:13 tuxbox-cvs Exp $
|
||||
|
||||
|
||||
Neutrino-GUI - DBoxII-Project
|
||||
|
||||
|
||||
Software update implementation - Neutrino-GUI
|
||||
|
||||
|
||||
Copyright (C) 2001 Steffen Hehn 'McClean'
|
||||
and some other guys
|
||||
Homepage: http://dbox.cyberphoria.org/
|
||||
|
||||
|
||||
Rework Copyright (C) 2011 T. Graf 'dbt'
|
||||
Homepage: http://www.dbox2-tuning.net/
|
||||
|
||||
|
||||
License: GPL
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
|
||||
You should have received a copy of the GNU General Public
|
||||
License along with this program; if not, write to the
|
||||
Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
|
||||
@@ -42,13 +42,13 @@ class CSoftwareUpdate : public CMenuTarget
|
||||
int width;
|
||||
int showSoftwareUpdate();
|
||||
void showSoftwareUpdateExpert(CMenuWidget *w_mtd_expert);
|
||||
|
||||
|
||||
CFlashExpert *fe;
|
||||
|
||||
public:
|
||||
|
||||
public:
|
||||
CSoftwareUpdate();
|
||||
~CSoftwareUpdate();
|
||||
int exec(CMenuTarget* parent, const std::string & actionKey);
|
||||
int exec(CMenuTarget *parent, const std::string &actionKey);
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user