Co-work with patch V11137 to refine the Hii menu.

1. Move the Mac address string from the form title to form title help for the driver Ipv4 and VLAN.
2. Change the menu show in the device manager from "Network Controller Information" to "ABC Information Sample".

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11138 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/InventoryStrings.uni b/MdeModulePkg/Universal/DriverSampleDxe/InventoryStrings.uni
index 7b13d3a6b5843fa5b91826662333d26698f3b576..24e48f8868dc6fe257a9333fbfb806c72bed2d66 100644 (file)
Binary files a/MdeModulePkg/Universal/DriverSampleDxe/InventoryStrings.uni and b/MdeModulePkg/Universal/DriverSampleDxe/InventoryStrings.uni differ

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxeStrings.uni b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxeStrings.uni
index 808f431617cb6b3bf5f49df4c4626d0c4ce40772..c3886dffaca5343c346548e79bfabe50153e3b18 100644 (file)
Binary files a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxeStrings.uni and b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxeStrings.uni differ

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
index e161b51ec57d7029f425aca2c6efea098b179bde..1e8c64d8c7a6a8071e27a012b5ae4151896b4c8f 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
@@ -856,12 +856,12 @@ Ip4ConfigDeviceInit (
   //\r
   Status = NetLibGetMacString (Instance->Controller, Instance->Image, &MacString);\r
   if (!EFI_ERROR (Status)) {\r
-    OldMenuString = HiiGetString (Instance->RegisteredHandle, STRING_TOKEN (STR_IP4_CONFIG_FORM_TITLE), NULL);\r
+    OldMenuString = HiiGetString (Instance->RegisteredHandle, STRING_TOKEN (STR_IP4_CONFIG_FORM_HELP), NULL);\r
     UnicodeSPrint (MenuString, 128, L"%s (MAC:%s)", OldMenuString, MacString);\r
-    HiiSetString (Instance->RegisteredHandle, STRING_TOKEN (STR_IP4_CONFIG_FORM_TITLE), MenuString, NULL);\r
+    HiiSetString (Instance->RegisteredHandle, STRING_TOKEN (STR_IP4_CONFIG_FORM_HELP), MenuString, NULL);\r
 \r
     UnicodeSPrint (PortString, 128, L"MAC:%s", MacString);\r
-    HiiSetString (Instance->RegisteredHandle, STRING_TOKEN (STR_IP4_DEVICE_FORM_TITLE), PortString, NULL);\r
+    HiiSetString (Instance->RegisteredHandle, STRING_TOKEN (STR_IP4_DEVICE_FORM_HELP), PortString, NULL);\r
     FreePool (MacString);\r
   }\r
 \r

diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
index 57fe339129a274ea88dc880b72edec34f5c5265d..e9e98fa225a8372e9407c4a660ddb5f7930b6619 100644 (file)
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
+++ b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
@@ -541,7 +541,7 @@ InstallVlanConfigForm (
   StrCat (Str, L")");\r
   HiiSetString (\r
     HiiHandle,\r
-    STRING_TOKEN (STR_VLAN_FORM_SET_TITLE),\r
+    STRING_TOKEN (STR_VLAN_FORM_SET_TITLE_HELP),\r
     Str,\r
     NULL\r
     );\r
@@ -551,7 +551,7 @@ InstallVlanConfigForm (
   //\r
   HiiSetString (\r
     HiiHandle,\r
-    STRING_TOKEN (STR_VLAN_FORM_TITLE),\r
+    STRING_TOKEN (STR_VLAN_FORM_HELP),\r
     Str,\r
     NULL\r
     );\r

diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigStrings.uni b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigStrings.uni
index edb6071281a5c6e940a282963d7102921ad7b037..e5a6d1620416214eea4ad7c71427187e672bfce0 100644 (file)
Binary files a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigStrings.uni and b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigStrings.uni differ