From 49dad2f15debe766c6766e77d08522948cba9857 Mon Sep 17 00:00:00 2001 From: Tim Crawford Date: Tue, 4 Feb 2020 11:24:57 -0700 Subject: [PATCH] MdeModulePkg/BootMaintenanceManagerUiLib: Make it look like current BMM --- .../BootMaintenance.c | 8 ++-- .../BootMaintenanceManager.vfr | 39 ++++++++++--------- .../BootMaintenanceManagerStrings.uni | 6 +-- .../BootMaintenanceManagerUiLib/UpdatePage.c | 5 --- 4 files changed, 28 insertions(+), 30 deletions(-) diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c index 19751642a3..957baf860f 100644 --- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c +++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c @@ -1130,7 +1130,9 @@ BootMaintCallback ( // 1. Update the menus (including legacy munu) show in BootMiantenanceManager page. // 2. Re-scan the BootOption menus (including the legacy boot option). // - CustomizeMenus (); + //CustomizeMenus (); + UpdatePageId (Private, FORM_BOOT_CHG_ID); + UpdatePageBody (FORM_BOOT_CHG_ID, Private); EfiBootManagerRefreshAllBootOption (); BOpt_GetBootOptions (Private); mFirstEnterBMMForm = TRUE; @@ -1740,8 +1742,8 @@ BootMaintenanceManagerUiLibConstructor ( mBmmCallbackInfo->MenuEntry = (BM_MENU_ENTRY *)Ptr; - mBmmCallbackInfo->BmmPreviousPageId = FORM_MAIN_ID; - mBmmCallbackInfo->BmmCurrentPageId = FORM_MAIN_ID; + mBmmCallbackInfo->BmmPreviousPageId = FORM_BOOT_CHG_ID; + mBmmCallbackInfo->BmmCurrentPageId = FORM_BOOT_CHG_ID; InitAllMenu (mBmmCallbackInfo); diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.vfr b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.vfr index 69fb606324..ca655c48b4 100644 --- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.vfr +++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.vfr @@ -19,19 +19,28 @@ formset name = BmmData, guid = BOOT_MAINT_FORMSET_GUID; + form formid = FORM_BOOT_CHG_ID, + title = STRING_TOKEN(STR_FORM_BOOT_CHG_TITLE); + + // + // Add this invisible text in order to indicate enter Boot Maintenance Manager form. + // To trigger the form open action. + // + suppressif TRUE; + text + help = STRING_TOKEN(STR_NONE), + text = STRING_TOKEN(STR_NONE), + flags = INTERACTIVE, + key = KEY_VALUE_TRIGGER_FORM_OPEN_ACTION; + endif; + + label FORM_BOOT_CHG_ID; + label LABEL_END; + + endform; + form formid = FORM_MAIN_ID, title = STRING_TOKEN(STR_FORM_MAIN_TITLE); - // - // Add this invisible text in order to indicate enter Boot Maintenance Manager form. - // To trigger the form open action. - // - suppressif TRUE; - text - help = STRING_TOKEN(STR_NONE), - text = STRING_TOKEN(STR_NONE), - flags = INTERACTIVE, - key = KEY_VALUE_TRIGGER_FORM_OPEN_ACTION; - endif; label LABEL_FORM_MAIN_START; // @@ -148,14 +157,6 @@ formset label LABEL_END; endform; - form formid = FORM_BOOT_CHG_ID, - title = STRING_TOKEN(STR_FORM_BOOT_CHG_TITLE); - - label FORM_BOOT_CHG_ID; - label LABEL_END; - - endform; - form formid = FORM_DRV_ADD_ID, title = STRING_TOKEN(STR_FORM_DRV_ADD_TITLE); diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerStrings.uni b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerStrings.uni index 3d47473e6c..ee692dd96c 100644 --- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerStrings.uni +++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerStrings.uni @@ -17,11 +17,11 @@ #language fr-FR "NONE" #string STR_MISSING_STRING #language en-US "Missing String" #language fr-FR "Missing String" -#string STR_FORM_MAIN_TITLE #language en-US "Boot Maintenance Manager" +#string STR_FORM_MAIN_TITLE #language en-US "Change Boot Order" #language fr-FR "Boot Maintenance Manager" #string STR_FORM_BOOT_SETUP_TITLE #language en-US "Boot Options" #language fr-FR "Boot Options" -#string STR_BOOT_MAINT_MANAGER_HELP #language en-US "This selection will take you to the Boot Maintenance Manager" +#string STR_BOOT_MAINT_MANAGER_HELP #language en-US "Change the order of boot entries" #language fr-FR "This selection will take you to the Boot Maintenance Manager" #string STR_FORM_BOOT_SETUP_HELP #language en-US "Modify system boot options" #language fr-FR "Modify system boot options" @@ -251,7 +251,7 @@ #language fr-FR "Boot system from a file or device" #string STR_OPTIONAL_DATA #language en-US "Input Optional Data" #language fr-FR "Input Optional Data" -#string STR_CHANGE_ORDER #language en-US "Change the order" +#string STR_CHANGE_ORDER #language en-US "Change Boot Order" #language fr-FR "Change the order" #string STR_BOOT_LEGACY #language en-US "Boot Legacy System" #language fr-FR "Boot Legacy System" diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c index ca81b7f352..ba15e7c2d9 100644 --- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c +++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c @@ -1155,9 +1155,4 @@ UpdatePageId ( } else if ((NewPageId >= TERMINAL_OPTION_OFFSET) && (NewPageId < CONSOLE_OPTION_OFFSET)) { NewPageId = FORM_CON_COM_SETUP_ID; } - - if ((NewPageId > 0) && (NewPageId < MAXIMUM_FORM_ID)) { - Private->BmmPreviousPageId = Private->BmmCurrentPageId; - Private->BmmCurrentPageId = NewPageId; - } }