From 53b351fc2b3aee388832c3a8ff1ff3d6c90418a0 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Wed, 30 Oct 2013 18:49:11 +0400 Subject: [PATCH] gui/update_menue.cpp: re-enable 'save current software' for easymenu mode --- src/gui/update_menue.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/gui/update_menue.cpp b/src/gui/update_menue.cpp index 886382fa6..73162ae4e 100644 --- a/src/gui/update_menue.cpp +++ b/src/gui/update_menue.cpp @@ -77,9 +77,9 @@ int CSoftwareUpdate::showSoftwareUpdate() { CMenuForwarder * mf; CMenuWidget softUpdate(LOCALE_MAINMENU_SERVICE, NEUTRINO_ICON_UPDATE, width, MN_WIDGET_ID_SOFTWAREUPDATE); - + softUpdate.addIntroItems(LOCALE_SERVICEMENU_UPDATE); - + //flashing CFlashUpdate flash; #if 0 @@ -113,14 +113,17 @@ int CSoftwareUpdate::showSoftwareUpdate() mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_EXPERT); softUpdate.addItem(mf); -#ifdef BOXMODEL_APOLLO - softUpdate.addItem(GenericMenuSeparatorLine); - - mf = new CMenuForwarder(LOCALE_FLASHUPDATE_CREATEIMAGE_MENU, true, NULL, new CFlashExpertSetup(), NULL, CRCInput::convertDigitToKey(1)); - mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_CREATEIMAGE_MENU); - softUpdate.addItem(mf); -#endif } +#ifdef BOXMODEL_APOLLO + softUpdate.addItem(GenericMenuSeparatorLine); + + if (g_settings.easymenu) + mf = new CMenuForwarder(LOCALE_FLASHUPDATE_CREATEIMAGE_MENU, true, NULL, new CFlashExpertSetup(), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW); + else + mf = new CMenuForwarder(LOCALE_FLASHUPDATE_CREATEIMAGE_MENU, true, NULL, new CFlashExpertSetup(), NULL, CRCInput::convertDigitToKey(1)); + mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_CREATEIMAGE_MENU); + softUpdate.addItem(mf); +#endif int res = softUpdate.exec (NULL, ""); return res;