From 15c280b46a98a7c5724c11e86fcd3dff8d95ef22 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Fri, 25 Oct 2013 15:49:51 +0400 Subject: [PATCH] gui/update_menue.cpp: cut update menu for easy mode --- src/gui/update_menue.cpp | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/src/gui/update_menue.cpp b/src/gui/update_menue.cpp index 0c23ef26b..886382fa6 100644 --- a/src/gui/update_menue.cpp +++ b/src/gui/update_menue.cpp @@ -97,28 +97,30 @@ int CSoftwareUpdate::showSoftwareUpdate() update_item->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_CHECK_LOCAL); softUpdate.addItem(update_item); - //settings CUpdateSettings update_settings(update_item); - mf = new CMenuForwarder(LOCALE_FLASHUPDATE_SETTINGS, true, NULL, &update_settings, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW); - mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_SETTINGS); - softUpdate.addItem(mf); - - softUpdate.addItem(GenericMenuSeparatorLine); - - //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, NEUTRINO_ICON_BUTTON_BLUE); - mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_EXPERT); - softUpdate.addItem(mf); + //settings + if (!g_settings.easymenu) { + mf = new CMenuForwarder(LOCALE_FLASHUPDATE_SETTINGS, true, NULL, &update_settings, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW); + mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_SETTINGS); + softUpdate.addItem(mf); + + softUpdate.addItem(GenericMenuSeparatorLine); + + //expert-functions + showSoftwareUpdateExpert(&mtdexpert); + mf = new CMenuForwarder(LOCALE_FLASHUPDATE_EXPERTFUNCTIONS, true, NULL, &mtdexpert, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE); + mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_EXPERT); + softUpdate.addItem(mf); #ifdef BOXMODEL_APOLLO - softUpdate.addItem(GenericMenuSeparatorLine); + 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); + 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;