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

5 files changed, 5 insertions, 5 deletions

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/InventoryStrings.uni b/MdeModulePkg/Universal/DriverSampleDxe/InventoryStrings.uni
index 7b13d3a6b5..24e48f8868 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/InventoryStrings.uni
+++ b/MdeModulePkg/Universal/DriverSampleDxe/InventoryStrings.uni
diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxeStrings.uni b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxeStrings.uni
index 808f431617..c3886dffac 100644
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxeStrings.uni
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxeStrings.uni
diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
index e161b51ec5..1e8c64d8c7 100644
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
@@ -856,12 +856,12 @@ Ip4ConfigDeviceInit (
   //

   Status = NetLibGetMacString (Instance->Controller, Instance->Image, &MacString);

   if (!EFI_ERROR (Status)) {

-    OldMenuString = HiiGetString (Instance->RegisteredHandle, STRING_TOKEN (STR_IP4_CONFIG_FORM_TITLE), NULL);

+    OldMenuString = HiiGetString (Instance->RegisteredHandle, STRING_TOKEN (STR_IP4_CONFIG_FORM_HELP), NULL);

     UnicodeSPrint (MenuString, 128, L"%s (MAC:%s)", OldMenuString, MacString);

-    HiiSetString (Instance->RegisteredHandle, STRING_TOKEN (STR_IP4_CONFIG_FORM_TITLE), MenuString, NULL);

+    HiiSetString (Instance->RegisteredHandle, STRING_TOKEN (STR_IP4_CONFIG_FORM_HELP), MenuString, NULL);

 

     UnicodeSPrint (PortString, 128, L"MAC:%s", MacString);

-    HiiSetString (Instance->RegisteredHandle, STRING_TOKEN (STR_IP4_DEVICE_FORM_TITLE), PortString, NULL);

+    HiiSetString (Instance->RegisteredHandle, STRING_TOKEN (STR_IP4_DEVICE_FORM_HELP), PortString, NULL);

     FreePool (MacString);

   }

 

diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
index 57fe339129..e9e98fa225 100644
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
+++ b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
@@ -541,7 +541,7 @@ InstallVlanConfigForm (
   StrCat (Str, L")");

   HiiSetString (

     HiiHandle,

-    STRING_TOKEN (STR_VLAN_FORM_SET_TITLE),

+    STRING_TOKEN (STR_VLAN_FORM_SET_TITLE_HELP),

     Str,

     NULL

     );

@@ -551,7 +551,7 @@ InstallVlanConfigForm (
   //

   HiiSetString (

     HiiHandle,

-    STRING_TOKEN (STR_VLAN_FORM_TITLE),

+    STRING_TOKEN (STR_VLAN_FORM_HELP),

     Str,

     NULL

     );

diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigStrings.uni b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigStrings.uni
index edb6071281..e5a6d16204 100644
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigStrings.uni
+++ b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigStrings.uni