WinIMerge.rc: move menu items

diff --git a/src/WinIMerge.rc b/src/WinIMerge.rc
index 9631a6e..1d3d788 100644 (file)
--- a/src/WinIMerge.rc
+++ b/src/WinIMerge.rc
@@ -15,11 +15,11 @@
 #undef APSTUDIO_READONLY_SYMBOLS\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
-// \93ú\96{\8cê (\93ú\96{) resources\r
+// \89p\8cê (\95Ä\8d\91) resources\r
 \r
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN)\r
-LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT\r
-#pragma code_page(932)\r
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US\r
+#pragma code_page(1252)\r
 \r
 #ifdef APSTUDIO_INVOKED\r
 /////////////////////////////////////////////////////////////////////////////\r
@@ -48,16 +48,6 @@ END
 \r
 #endif    // APSTUDIO_INVOKED\r
 \r
-#endif    // \93ú\96{\8cê (\93ú\96{) resources\r
-/////////////////////////////////////////////////////////////////////////////\r
-\r
-\r
-/////////////////////////////////////////////////////////////////////////////\r
-// \89p\8cê (\95Ä\8d\91) resources\r
-\r
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US\r
-#pragma code_page(1252)\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r
@@ -79,42 +69,22 @@ BEGIN
     BEGIN\r
         MENUITEM "&Open Images\tCtrl+O",        ID_FILE_OPEN\r
         MENUITEM "Open &3 Images\tCtrl+3",      ID_FILE_OPEN3\r
+        MENUITEM SEPARATOR\r
         MENUITEM "&Save\tCtrl+S",               ID_FILE_SAVE\r
         MENUITEM "&Generate Report",            ID_FILE_GENERATE_REPORT\r
+        MENUITEM SEPARATOR\r
         MENUITEM "Re&load\tCtrl+F5",            ID_FILE_RELOAD\r
-        MENUITEM "E&xit",                       ID_FILE_EXIT\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "E&xit\tAlt+F4",               ID_FILE_EXIT\r
     END\r
     POPUP "&Edit"\r
     BEGIN\r
         MENUITEM "&Undo\tCtrl+Z",               ID_EDIT_UNDO\r
         MENUITEM "&Redo\tCtrl+Y",               ID_EDIT_REDO\r
-        MENUITEM SEPARATOR\r
-        MENUITEM "Cu&t\tCtrl+X",                ID_EDIT_CUT\r
-        MENUITEM "&Copy\tCtrl+C",               ID_EDIT_COPY\r
-        MENUITEM "&Paste\tCtrl+V",              ID_EDIT_PASTE\r
-        MENUITEM "Select &All",                 ID_EDIT_SELECTALL\r
     END\r
     POPUP "&View"\r
     BEGIN\r
         MENUITEM "View &Differences",           ID_VIEW_VIEWDIFFERENCES\r
-        MENUITEM SEPARATOR\r
-        MENUITEM "&Prev Page",                  ID_VIEW_PAGE_PREVPAGE\r
-        MENUITEM "&Next Page",                  ID_VIEW_PAGE_NEXTPAGE\r
-        MENUITEM SEPARATOR\r
-        POPUP "&Zoom"\r
-        BEGIN\r
-            MENUITEM "&400%",                       ID_VIEW_ZOOM_400\r
-            MENUITEM "&200%",                       ID_VIEW_ZOOM_200\r
-            MENUITEM "&100%",                       ID_VIEW_ZOOM_100\r
-            MENUITEM "&50%",                        ID_VIEW_ZOOM_50\r
-            MENUITEM "&25%",                        ID_VIEW_ZOOM_25\r
-        END\r
-        POPUP "&Overlay Mode"\r
-        BEGIN\r
-            MENUITEM "&None",                       ID_VIEW_OVERLAY_NONE\r
-            MENUITEM "&XOR",                        ID_VIEW_OVERLAY_XOR\r
-            MENUITEM "&Alpha Blend",                ID_VIEW_OVERLAY_ALPHABLEND\r
-        END\r
         POPUP "Diff &Block Size"\r
         BEGIN\r
             MENUITEM "&1",                          ID_VIEW_DIFFBLOCKSIZE_1\r
@@ -134,16 +104,40 @@ BEGIN
             MENUITEM "&32",                         ID_VIEW_THRESHOLD_32\r
             MENUITEM "64",                          ID_VIEW_THRESHOLD_64\r
         END\r
-        MENUITEM "Split &Horizontally",         ID_VIEW_SPLITHORIZONTALLY\r
         MENUITEM SEPARATOR\r
+        MENUITEM "&Prev Page",                  ID_VIEW_PAGE_PREVPAGE\r
+        MENUITEM "&Next Page",                  ID_VIEW_PAGE_NEXTPAGE\r
+        POPUP "&Active Pane"\r
+        BEGIN\r
+            MENUITEM "&Previous Page",              ID_POPUP_CURPANE_PREVIOUSPAGE\r
+            MENUITEM "&Next Page",                  ID_POPUP_CURPANE_NEXTPAGE\r
+        END\r
+        MENUITEM SEPARATOR\r
+        POPUP "&Zoom"\r
+        BEGIN\r
+            MENUITEM "&400%",                       ID_VIEW_ZOOM_400\r
+            MENUITEM "&200%",                       ID_VIEW_ZOOM_200\r
+            MENUITEM "&100%",                       ID_VIEW_ZOOM_100\r
+            MENUITEM "&50%",                        ID_VIEW_ZOOM_50\r
+            MENUITEM "&25%",                        ID_VIEW_ZOOM_25\r
+        END\r
+        POPUP "&Overlay Mode"\r
+        BEGIN\r
+            MENUITEM "&None",                       ID_VIEW_OVERLAY_NONE\r
+            MENUITEM "&XOR",                        ID_VIEW_OVERLAY_XOR\r
+            MENUITEM "&Alpha Blend",                ID_VIEW_OVERLAY_ALPHABLEND\r
+        END\r
+        MENUITEM "Split &Horizontally",         ID_VIEW_SPLITHORIZONTALLY\r
         MENUITEM "&Set Background Color",       ID_VIEW_USEBACKCOLOR\r
     END\r
     POPUP "&Merge"\r
     BEGIN\r
         MENUITEM "&Next Difference\tAlt+Down",  ID_MERGE_NEXTDIFFERENCE\r
         MENUITEM "&Previous Difference\tAlt+Up", ID_MERGE_PREVIOUSDIFFERENCE\r
+        MENUITEM SEPARATOR\r
         MENUITEM "&First Difference\tAlt+Home", ID_MERGE_FIRSTDIFFERENCE\r
         MENUITEM "&Last Difference\tAlt+End",   ID_MERGE_LASTDIFFERENCE\r
+        MENUITEM SEPARATOR\r
         MENUITEM "Next Conflict\tAlt+Shift+Down", ID_MERGE_NEXTCONFLICT\r
         MENUITEM "Previous Conflict\tAlt+Shift+Up", ID_MERGE_PREVIOUSCONFLICT\r
         MENUITEM SEPARATOR\r
@@ -184,9 +178,11 @@ BEGIN
     "Y",            ID_EDIT_REDO,           VIRTKEY, CONTROL, NOINVERT\r
     "Z",            ID_EDIT_UNDO,           VIRTKEY, CONTROL, NOINVERT\r
     "O",            ID_FILE_OPEN,           VIRTKEY, CONTROL, NOINVERT\r
-    "S",            ID_FILE_SAVE,           VIRTKEY, CONTROL, NOINVERT\r
     VK_F5,          ID_FILE_RELOAD,         VIRTKEY, CONTROL, NOINVERT\r
-    "M",            ID_MERGE_AUTOMERGE, VIRTKEY, CONTROL, ALT, NOINVERT\r
+    "S",            ID_FILE_SAVE,           VIRTKEY, CONTROL, NOINVERT\r
+    "M",            ID_MERGE_AUTOMERGE,     VIRTKEY, CONTROL, ALT, NOINVERT\r
+    VK_RIGHT,       ID_MERGE_COPYFROMLEFT,  VIRTKEY, SHIFT, ALT, NOINVERT\r
+    VK_LEFT,        ID_MERGE_COPYFROMRIGHT, VIRTKEY, SHIFT, ALT, NOINVERT\r
     VK_LEFT,        ID_MERGE_COPYTOLEFT,    VIRTKEY, ALT, NOINVERT\r
     VK_RIGHT,       ID_MERGE_COPYTORIGHT,   VIRTKEY, ALT, NOINVERT\r
     VK_HOME,        ID_MERGE_FIRSTDIFFERENCE, VIRTKEY, ALT, NOINVERT\r
@@ -195,8 +191,6 @@ BEGIN
     VK_DOWN,        ID_MERGE_NEXTDIFFERENCE, VIRTKEY, ALT, NOINVERT\r
     VK_UP,          ID_MERGE_PREVIOUSCONFLICT, VIRTKEY, SHIFT, ALT, NOINVERT\r
     VK_UP,          ID_MERGE_PREVIOUSDIFFERENCE, VIRTKEY, ALT, NOINVERT\r
-    VK_RIGHT,       ID_MERGE_COPYFROMLEFT,  VIRTKEY, SHIFT, ALT, NOINVERT\r
-    VK_LEFT,        ID_MERGE_COPYFROMRIGHT, VIRTKEY, SHIFT, ALT, NOINVERT\r
 END\r
 \r
 \r