Mainly change the context of pop up message in FormDisplayStr.uni file In V2, the pop up message is "Press 'Y' to confirm, 'N'/'ESC' to ignore." In v1, it is "Press 'Y' to confirm, 'N/ESC' to ignore." That's the difference.
Thanks, Dandan -----Original Message----- From: Justen, Jordan L Sent: Monday, July 27, 2015 2:31 PM To: Bi, Dandan; Dong, Eric; Gao, Liming; [email protected] Subject: Re: [edk2] [PATCH v2] MdeModulePkg:Add ESC key support in setup browser pop-up message box On 2015-07-26 22:19:04, Dandan Bi wrote: > When load default value or save changes will pop up message box to let > user confirm,Y means confirm and N means ignore,now add Esc key with > the same function of N key.And change the context of pop up message in > .uni file, now will display "Press 'Y' to confirm, 'N'/'ESC' to ignore." What changed from v1? I find it is good to add a list of changes to the commit message here, just before the signatures. For example: v2: * Add your text here telling what changed in v2 > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Dandan Bi <[email protected]> > --- > .../Universal/DisplayEngineDxe/FormDisplay.c | 3 ++- > .../Universal/DisplayEngineDxe/FormDisplayStr.uni | Bin 17032 -> 17056 > bytes What about making 2 patches? The first patch can convert FormDisplayStr.uni to UTF-8 without changing the text, and then this patch can be the second patch. Then we will be able to see the diff in the FormDisplayStr.uni file. -Jordan > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c > b/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c > index ae3038b..aba149f 100644 > --- a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c > +++ b/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c > @@ -2257,11 +2257,12 @@ FxConfirmPopup ( > StrCatS (CfmStr, MaxLen, gConfirmMsgEnd); > > do { > CreateDialog (&Key, gEmptyString, CfmStr, gConfirmOpt, gEmptyString, > NULL); > } while (((Key.UnicodeChar | UPPER_LOWER_CASE_OFFSET) != > (gConfirmOptYes[0] | UPPER_LOWER_CASE_OFFSET)) && > - ((Key.UnicodeChar | UPPER_LOWER_CASE_OFFSET) != (gConfirmOptNo[0] > | UPPER_LOWER_CASE_OFFSET))); > + ((Key.UnicodeChar | UPPER_LOWER_CASE_OFFSET) != (gConfirmOptNo[0] > | UPPER_LOWER_CASE_OFFSET)) && > + (Key.ScanCode != SCAN_ESC)); > > if ((Key.UnicodeChar | UPPER_LOWER_CASE_OFFSET) == (gConfirmOptYes[0] | > UPPER_LOWER_CASE_OFFSET)) { > RetVal = TRUE; > } else { > RetVal = FALSE; > diff --git > a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplayStr.uni > b/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplayStr.uni > index > 5c6ad48433b2c6f50016dc27a5801da90930e76f..ff94518b06d3294c3f581d9d18a1 > 9c28d8399730 100644 GIT binary patch delta 38 > lcmeBZWn9q8xZ#2+r#^!^gDXQYgY)FGriT%{&An#7xdGnb3o-xz > > delta 26 > hcmZ3`%GlA$xZ#57<U6JZfLLbo33I*8pUl>A0|2L}3}OHP > > -- > 1.9.5.msysgit.1 > > _______________________________________________ > edk2-devel mailing list > [email protected] > https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
