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

update_menu: put opkg update in front

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 20bf0b00d8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-04 (Mon, 04 Jan 2016)
This commit is contained in:
Stefan Seyfried
2016-01-04 21:05:29 +01:00
committed by vanhofen
parent cb35c2ec4c
commit 18ecc961ff
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gui/update_menue.cpp
View File

@@ -46,6 +46,7 @@
#include <driver/screen_max.h> #include <driver/screen_max.h>
#include <system/debug.h> #include <system/debug.h>
#include <system/flashtool.h> #include <system/flashtool.h>
#include <system/helpers.h>
CSoftwareUpdate::CSoftwareUpdate() CSoftwareUpdate::CSoftwareUpdate()
{ {
@@ -73,17 +74,27 @@ int CSoftwareUpdate::exec(CMenuTarget* parent, const std::string &/*actionKey*/)
int CSoftwareUpdate::showSoftwareUpdate() int CSoftwareUpdate::showSoftwareUpdate()
/* shows the menue and options for software update */ /* shows the menue and options for software update */
{ {
CMenuForwarder * mf; 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);
//flashing //flashing
CFlashUpdate flash; CFlashUpdate flash;
unsigned int inetkey = CRCInput::RC_red;
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);
inetkey = CRCInput::convertDigitToKey(1);
}
CMenuForwarder *update_item = new CMenuForwarder(LOCALE_FLASHUPDATE_CHECKUPDATE_INTERNET, true, NULL, &flash, "inet", CRCInput::RC_red); if (file_exists(g_settings.softupdate_url_file.c_str())) {
update_item = new CMenuForwarder(LOCALE_FLASHUPDATE_CHECKUPDATE_INTERNET, true, 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);
}
update_item = new CMenuForwarder(LOCALE_FLASHUPDATE_CHECKUPDATE_LOCAL, true, NULL, &flash, "local", CRCInput::RC_green); update_item = new CMenuForwarder(LOCALE_FLASHUPDATE_CHECKUPDATE_LOCAL, true, NULL, &flash, "local", CRCInput::RC_green);
update_item->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_CHECK_LOCAL); update_item->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_CHECK_LOCAL);
@@ -105,10 +116,12 @@ int CSoftwareUpdate::showSoftwareUpdate()
mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_EXPERT); mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_EXPERT);
softUpdate.addItem(mf); softUpdate.addItem(mf);
#if 0
//firmware update via opkg //firmware update via opkg
mf = new CMenuDForwarder(LOCALE_OPKG_TITLE, COPKGManager::hasOpkgSupport(), NULL, new COPKGManager()); mf = new CMenuDForwarder(LOCALE_OPKG_TITLE, COPKGManager::hasOpkgSupport(), NULL, new COPKGManager());
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);
#endif
} }
#ifdef BOXMODEL_APOLLO #ifdef BOXMODEL_APOLLO