1.Refine all the goto and action opcode. When the menu link to the sub form, use the goto opcode and show the arrow. Others use the action opcode.

2.update the front page info. move down one line.



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

IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr

@@ -55,12 +55,11 @@ formset
 
     subtitle text = STRING_TOKEN(STR_NULL_STRING);
 
-    text
+    goto FORM_CON_MAIN_ID,
+         prompt = STRING_TOKEN(STR_BOOT_FROM_FILE),
          help   = STRING_TOKEN(STR_BOOT_FROM_FILE_HELP),
-         text   = STRING_TOKEN(STR_BOOT_FROM_FILE),
+         flags = INTERACTIVE,
-         text   = STRING_TOKEN(STR_NULL_STRING),
+         key = KEY_VALUE_BOOT_FROM_FILE;
-         flags  = INTERACTIVE,
-         key    = KEY_VALUE_BOOT_FROM_FILE;
 
     subtitle text = STRING_TOKEN(STR_NULL_STRING);
 
@@ -80,11 +79,12 @@ formset
 
     subtitle text = STRING_TOKEN(STR_NULL_STRING);
 
-    goto FORM_MAIN_ID,
+    text
-         prompt = STRING_TOKEN(STR_RESET),
+         help   = STRING_TOKEN(STR_RESET),
-         help = STRING_TOKEN(STR_RESET),
+         text   = STRING_TOKEN(STR_RESET),
-         flags = INTERACTIVE,
+         text   = STRING_TOKEN(STR_NULL_STRING),
-         key = FORM_RESET;
+         flags  = INTERACTIVE,
+         key    = FORM_RESET;
 
   endform;
 

IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c

@@ -883,13 +883,13 @@ CallDeviceManager (
         //
         if (!AddNetworkMenu) {
           AddNetworkMenu = TRUE;
-          HiiCreateActionOpCode (
+          HiiCreateGotoOpCode (
             StartOpCodeHandle,
-            (EFI_QUESTION_ID) QUESTION_NETWORK_DEVICE_ID,
+            DEVICE_MANAGER_FORM_ID,
             STRING_TOKEN (STR_FORM_NETWORK_DEVICE_LIST_TITLE),
             STRING_TOKEN (STR_FORM_NETWORK_DEVICE_LIST_HELP),
             EFI_IFR_FLAG_CALLBACK,
-            0
+            (EFI_QUESTION_ID) QUESTION_NETWORK_DEVICE_ID
             );
         }
       } else if (mNextShowFormId == NETWORK_DEVICE_LIST_FORM_ID) {
@@ -897,13 +897,13 @@ CallDeviceManager (
         // In network device list form, same mac address device only show one menu.
         //
         while (AddItemCount > 0) {
-            HiiCreateActionOpCode (
+            HiiCreateGotoOpCode (
               StartOpCodeHandle,
-              mMacDeviceList.NodeList[mMacDeviceList.CurListLen - AddItemCount].QuestionId,
+              NETWORK_DEVICE_LIST_FORM_ID,
               mMacDeviceList.NodeList[mMacDeviceList.CurListLen - AddItemCount].PromptId,
               STRING_TOKEN (STR_NETWORK_DEVICE_HELP),
               EFI_IFR_FLAG_CALLBACK,
-              0
+              mMacDeviceList.NodeList[mMacDeviceList.CurListLen - AddItemCount].QuestionId
               );
             AddItemCount -= 1;
           }
@@ -911,13 +911,13 @@ CallDeviceManager (
         //
         // In network device form, only the selected mac address device need to be show.
         //
-        HiiCreateActionOpCode (
+        HiiCreateGotoOpCode (
           StartOpCodeHandle,
-          (EFI_QUESTION_ID) (Index + DEVICE_KEY_OFFSET),
+          NETWORK_DEVICE_FORM_ID,
           Token,
           TokenHelp,
           EFI_IFR_FLAG_CALLBACK,
-          0
+          (EFI_QUESTION_ID) (Index + DEVICE_KEY_OFFSET)
           );
       }
     } else {
@@ -926,13 +926,13 @@ CallDeviceManager (
       // Not network device process, only need to show at device manger form.
       //
       if (mNextShowFormId == DEVICE_MANAGER_FORM_ID) {
-        HiiCreateActionOpCode (
+        HiiCreateGotoOpCode (
           StartOpCodeHandle,
-          (EFI_QUESTION_ID) (Index + DEVICE_KEY_OFFSET),
+          DEVICE_MANAGER_FORM_ID,
           Token,
           TokenHelp,
           EFI_IFR_FLAG_CALLBACK,
-          0
+          (EFI_QUESTION_ID) (Index + DEVICE_KEY_OFFSET)
           );
       }
     }
@@ -954,14 +954,14 @@ CallDeviceManager (
     // If driver health protocol is installed, create Driver Health subtitle and entry
     //
     HiiCreateSubTitleOpCode (StartOpCodeHandle, STRING_TOKEN (STR_DM_DRIVER_HEALTH_TITLE), 0, 0, 0);
-    HiiCreateActionOpCode (
+    HiiCreateGotoOpCode (
-      StartOpCodeHandle,                                // Container for dynamic created opcodes
+      StartOpCodeHandle,
-      DEVICE_MANAGER_KEY_DRIVER_HEALTH,                 // Question ID
+      DRIVER_HEALTH_FORM_ID,
       STRING_TOKEN(STR_DRIVER_HEALTH_ALL_HEALTHY),      // Prompt text
       STRING_TOKEN(STR_DRIVER_HEALTH_STATUS_HELP),      // Help text
-      EFI_IFR_FLAG_CALLBACK,                            // Question flag
+      EFI_IFR_FLAG_CALLBACK,
-      0                                                 // Action String ID
+      DEVICE_MANAGER_KEY_DRIVER_HEALTH                  // Question ID
-    );
+      );
 
     //
     // Check All Driver health status

IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr

@@ -49,27 +49,27 @@ formset
 
     banner
       title = STRING_TOKEN(STR_FRONT_PAGE_COMPUTER_MODEL),
-      line  0,
+      line  1,
       align left;
 
     banner
       title = STRING_TOKEN(STR_FRONT_PAGE_CPU_MODEL),
-      line  1,
+      line  2,
       align left;
 
     banner
       title = STRING_TOKEN(STR_FRONT_PAGE_CPU_SPEED),
-      line  1,
+      line  2,
       align right;
 
     banner
       title = STRING_TOKEN(STR_FRONT_PAGE_BIOS_VERSION),
-      line  2,
+      line  3,
       align left;
 
     banner
       title = STRING_TOKEN(STR_FRONT_PAGE_MEMORY_SIZE),
-      line  2,
+      line  3,
       align right;
 
 //    banner
@@ -102,9 +102,11 @@ formset
 //      line  3,
 //      align left;
 
-    goto FRONT_PAGE_ITEM_ONE,
+
-      prompt  = STRING_TOKEN(STR_CONTINUE_PROMPT),
+    text
       help    = STRING_TOKEN(STR_CONTINUE_HELP),
+      text    = STRING_TOKEN(STR_CONTINUE_PROMPT),
+      text    = STRING_TOKEN(STR_NULL_STRING),
       flags   = INTERACTIVE,
       key     = FRONT_PAGE_KEY_CONTINUE;