Fixed #1726: Revamp menu items with correct accelerators. (#1728)

1 files changed, 101 insertions, 400 deletions

diff --git a/src/i18n/messages/src/lib/Menu.json b/src/i18n/messages/src/lib/Menu.json
index 5b185c4e7..07d1b1b80 100644
--- a/src/i18n/messages/src/lib/Menu.json
+++ b/src/i18n/messages/src/lib/Menu.json
@@ -13,8 +13,8 @@
     }
   },
   {
-    "id": "menu.edit.undo",
-    "defaultMessage": "!!!Undo",
+    "id": "menu.view",
+    "defaultMessage": "!!!View",
     "file": "src/lib/Menu.js",
     "start": {
       "line": 23,
@@ -26,106 +26,15 @@
     }
   },
   {
-    "id": "menu.edit.redo",
-    "defaultMessage": "!!!Redo",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 27,
-      "column": 8
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.cut",
-    "defaultMessage": "!!!Cut",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 31,
-      "column": 7
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.copy",
-    "defaultMessage": "!!!Copy",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 35,
-      "column": 8
-    },
-    "end": {
-      "line": 38,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.paste",
-    "defaultMessage": "!!!Paste",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 39,
-      "column": 9
-    },
-    "end": {
-      "line": 42,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.pasteAndMatchStyle",
-    "defaultMessage": "!!!Paste And Match Style",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 43,
-      "column": 22
-    },
-    "end": {
-      "line": 46,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.delete",
-    "defaultMessage": "!!!Delete",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 47,
-      "column": 10
-    },
-    "end": {
-      "line": 50,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.selectAll",
-    "defaultMessage": "!!!Select All",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 51,
-      "column": 13
-    },
-    "end": {
-      "line": 54,
-      "column": 3
-    }
-  },
-  {
     "id": "menu.edit.findInPage",
     "defaultMessage": "!!!Find in Page",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 55,
+      "line": 27,
       "column": 14
     },
     "end": {
-      "line": 58,
+      "line": 30,
       "column": 3
     }
   },
@@ -134,11 +43,11 @@
     "defaultMessage": "!!!Speech",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 59,
+      "line": 31,
       "column": 10
     },
     "end": {
-      "line": 62,
+      "line": 34,
       "column": 3
     }
   },
@@ -147,11 +56,11 @@
     "defaultMessage": "!!!Start Speaking",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 63,
+      "line": 35,
       "column": 17
     },
     "end": {
-      "line": 66,
+      "line": 38,
       "column": 3
     }
   },
@@ -160,11 +69,11 @@
     "defaultMessage": "!!!Stop Speaking",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 67,
+      "line": 39,
       "column": 16
     },
     "end": {
-      "line": 70,
+      "line": 42,
       "column": 3
     }
   },
@@ -173,11 +82,11 @@
     "defaultMessage": "!!!Start Dictation",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 71,
+      "line": 43,
       "column": 18
     },
     "end": {
-      "line": 74,
+      "line": 46,
       "column": 3
     }
   },
@@ -186,11 +95,11 @@
     "defaultMessage": "!!!Emoji & Symbols",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 75,
+      "line": 47,
       "column": 16
     },
     "end": {
-      "line": 78,
+      "line": 50,
       "column": 3
     }
   },
@@ -199,11 +108,11 @@
     "defaultMessage": "!!!Open Quick Switch",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 79,
+      "line": 51,
       "column": 19
     },
     "end": {
-      "line": 82,
+      "line": 54,
       "column": 3
     }
   },
@@ -212,11 +121,11 @@
     "defaultMessage": "!!!Back",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 83,
+      "line": 55,
       "column": 8
     },
     "end": {
-      "line": 86,
+      "line": 58,
       "column": 3
     }
   },
@@ -225,89 +134,11 @@
     "defaultMessage": "!!!Forward",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 87,
-      "column": 11
-    },
-    "end": {
-      "line": 90,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.resetZoom",
-    "defaultMessage": "!!!Actual Size",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 91,
-      "column": 13
-    },
-    "end": {
-      "line": 94,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.zoomIn",
-    "defaultMessage": "!!!Zoom In",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 95,
-      "column": 10
-    },
-    "end": {
-      "line": 98,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.zoomOut",
-    "defaultMessage": "!!!Zoom Out",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 99,
+      "line": 59,
       "column": 11
     },
     "end": {
-      "line": 102,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.enterFullScreen",
-    "defaultMessage": "!!!Enter Full Screen",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 103,
-      "column": 19
-    },
-    "end": {
-      "line": 106,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.exitFullScreen",
-    "defaultMessage": "!!!Exit Full Screen",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 107,
-      "column": 18
-    },
-    "end": {
-      "line": 110,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.toggleFullScreen",
-    "defaultMessage": "!!!Toggle Full Screen",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 111,
-      "column": 20
-    },
-    "end": {
-      "line": 114,
+      "line": 62,
       "column": 3
     }
   },
@@ -316,11 +147,11 @@
     "defaultMessage": "!!!Toggle Dark Mode",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 115,
+      "line": 63,
       "column": 18
     },
     "end": {
-      "line": 118,
+      "line": 66,
       "column": 3
     }
   },
@@ -329,11 +160,11 @@
     "defaultMessage": "!!!Toggle Developer Tools",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 119,
+      "line": 67,
       "column": 18
     },
     "end": {
-      "line": 122,
+      "line": 70,
       "column": 3
     }
   },
@@ -342,11 +173,11 @@
     "defaultMessage": "!!!Toggle Todos Developer Tools",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 123,
+      "line": 71,
       "column": 23
     },
     "end": {
-      "line": 126,
+      "line": 74,
       "column": 3
     }
   },
@@ -355,11 +186,11 @@
     "defaultMessage": "!!!Toggle Service Developer Tools",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 127,
+      "line": 75,
       "column": 25
     },
     "end": {
-      "line": 130,
+      "line": 78,
       "column": 3
     }
   },
@@ -368,24 +199,24 @@
     "defaultMessage": "!!!Reload Service",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 131,
+      "line": 79,
       "column": 17
     },
     "end": {
-      "line": 134,
+      "line": 82,
       "column": 3
     }
   },
   {
-    "id": "menu.view.reloadFranz",
+    "id": "menu.view.reloadFerdi",
     "defaultMessage": "!!!Reload Ferdi",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 135,
+      "line": 83,
       "column": 15
     },
     "end": {
-      "line": 138,
+      "line": 86,
       "column": 3
     }
   },
@@ -394,11 +225,11 @@
     "defaultMessage": "!!!Lock Ferdi",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 139,
+      "line": 87,
       "column": 13
     },
     "end": {
-      "line": 142,
+      "line": 90,
       "column": 3
     }
   },
@@ -407,37 +238,11 @@
     "defaultMessage": "!!!Reload ToDos",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 143,
+      "line": 91,
       "column": 15
     },
     "end": {
-      "line": 146,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.window.minimize",
-    "defaultMessage": "!!!Minimize",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 147,
-      "column": 12
-    },
-    "end": {
-      "line": 150,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.window.close",
-    "defaultMessage": "!!!Close",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 151,
-      "column": 9
-    },
-    "end": {
-      "line": 154,
+      "line": 94,
       "column": 3
     }
   },
@@ -446,11 +251,11 @@
     "defaultMessage": "!!!Learn More",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 155,
+      "line": 95,
       "column": 13
     },
     "end": {
-      "line": 158,
+      "line": 98,
       "column": 3
     }
   },
@@ -459,11 +264,11 @@
     "defaultMessage": "!!!Changelog",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 159,
+      "line": 99,
       "column": 13
     },
     "end": {
-      "line": 162,
+      "line": 102,
       "column": 3
     }
   },
@@ -472,11 +277,11 @@
     "defaultMessage": "!!!Support",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 163,
+      "line": 103,
       "column": 11
     },
     "end": {
-      "line": 166,
+      "line": 106,
       "column": 3
     }
   },
@@ -485,11 +290,11 @@
     "defaultMessage": "!!!Copy Debug Information",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 167,
+      "line": 107,
       "column": 13
     },
     "end": {
-      "line": 170,
+      "line": 110,
       "column": 3
     }
   },
@@ -498,11 +303,11 @@
     "defaultMessage": "!!!Publish Debug Information",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 171,
+      "line": 111,
       "column": 20
     },
     "end": {
-      "line": 174,
+      "line": 114,
       "column": 3
     }
   },
@@ -511,11 +316,11 @@
     "defaultMessage": "!!!Ferdi Debug Information",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 175,
+      "line": 115,
       "column": 27
     },
     "end": {
-      "line": 178,
+      "line": 118,
       "column": 3
     }
   },
@@ -524,11 +329,11 @@
     "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 179,
+      "line": 119,
       "column": 23
     },
     "end": {
-      "line": 182,
+      "line": 122,
       "column": 3
     }
   },
@@ -537,11 +342,11 @@
     "defaultMessage": "!!!Unlock with Touch ID",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 183,
+      "line": 123,
       "column": 11
     },
     "end": {
-      "line": 186,
+      "line": 126,
       "column": 3
     }
   },
@@ -550,11 +355,11 @@
     "defaultMessage": "!!!unlock via Touch ID",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 187,
+      "line": 127,
       "column": 17
     },
     "end": {
-      "line": 190,
+      "line": 130,
       "column": 3
     }
   },
@@ -563,11 +368,11 @@
     "defaultMessage": "!!!Terms of Service",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 191,
+      "line": 131,
       "column": 7
     },
     "end": {
-      "line": 194,
+      "line": 134,
       "column": 3
     }
   },
@@ -576,11 +381,11 @@
     "defaultMessage": "!!!Privacy Statement",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 195,
+      "line": 135,
       "column": 11
     },
     "end": {
-      "line": 198,
+      "line": 138,
       "column": 3
     }
   },
@@ -589,24 +394,11 @@
     "defaultMessage": "!!!File",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 199,
-      "column": 8
-    },
-    "end": {
-      "line": 202,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view",
-    "defaultMessage": "!!!View",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 203,
+      "line": 139,
       "column": 8
     },
     "end": {
-      "line": 206,
+      "line": 142,
       "column": 3
     }
   },
@@ -615,50 +407,11 @@
     "defaultMessage": "!!!Services",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 207,
+      "line": 143,
       "column": 12
     },
     "end": {
-      "line": 210,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.window",
-    "defaultMessage": "!!!Window",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 211,
-      "column": 10
-    },
-    "end": {
-      "line": 214,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help",
-    "defaultMessage": "!!!Help",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 215,
-      "column": 8
-    },
-    "end": {
-      "line": 218,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.app.about",
-    "defaultMessage": "!!!About Ferdi",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 219,
-      "column": 9
-    },
-    "end": {
-      "line": 222,
+      "line": 146,
       "column": 3
     }
   },
@@ -667,11 +420,11 @@
     "defaultMessage": "!!!What's new?",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 223,
+      "line": 147,
       "column": 16
     },
     "end": {
-      "line": 226,
+      "line": 150,
       "column": 3
     }
   },
@@ -680,11 +433,11 @@
     "defaultMessage": "!!!Settings",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 227,
+      "line": 151,
       "column": 12
     },
     "end": {
-      "line": 230,
+      "line": 154,
       "column": 3
     }
   },
@@ -693,50 +446,11 @@
     "defaultMessage": "!!!Check for updates",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 231,
+      "line": 155,
       "column": 19
     },
     "end": {
-      "line": 234,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.app.hide",
-    "defaultMessage": "!!!Hide",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 235,
-      "column": 8
-    },
-    "end": {
-      "line": 238,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.app.hideOthers",
-    "defaultMessage": "!!!Hide Others",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 239,
-      "column": 14
-    },
-    "end": {
-      "line": 242,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.app.unhide",
-    "defaultMessage": "!!!Unhide",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 243,
-      "column": 10
-    },
-    "end": {
-      "line": 246,
+      "line": 158,
       "column": 3
     }
   },
@@ -745,24 +459,11 @@
     "defaultMessage": "!!!Auto-hide menu bar",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 247,
+      "line": 159,
       "column": 19
     },
     "end": {
-      "line": 250,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.app.quit",
-    "defaultMessage": "!!!Quit",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 251,
-      "column": 8
-    },
-    "end": {
-      "line": 254,
+      "line": 162,
       "column": 3
     }
   },
@@ -771,11 +472,11 @@
     "defaultMessage": "!!!Add New Service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 255,
+      "line": 163,
       "column": 17
     },
     "end": {
-      "line": 258,
+      "line": 166,
       "column": 3
     }
   },
@@ -784,11 +485,11 @@
     "defaultMessage": "!!!Add New Workspace...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 259,
+      "line": 167,
       "column": 19
     },
     "end": {
-      "line": 262,
+      "line": 170,
       "column": 3
     }
   },
@@ -797,11 +498,11 @@
     "defaultMessage": "!!!Open workspace drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 263,
+      "line": 171,
       "column": 23
     },
     "end": {
-      "line": 266,
+      "line": 174,
       "column": 3
     }
   },
@@ -810,11 +511,11 @@
     "defaultMessage": "!!!Close workspace drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 267,
+      "line": 175,
       "column": 24
     },
     "end": {
-      "line": 270,
+      "line": 178,
       "column": 3
     }
   },
@@ -823,11 +524,11 @@
     "defaultMessage": "!!!Activate next service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 271,
+      "line": 179,
       "column": 23
     },
     "end": {
-      "line": 274,
+      "line": 182,
       "column": 3
     }
   },
@@ -836,11 +537,11 @@
     "defaultMessage": "!!!Activate previous service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 275,
+      "line": 183,
       "column": 27
     },
     "end": {
-      "line": 278,
+      "line": 186,
       "column": 3
     }
   },
@@ -849,11 +550,11 @@
     "defaultMessage": "!!!Disable notifications & audio",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 279,
+      "line": 187,
       "column": 11
     },
     "end": {
-      "line": 282,
+      "line": 190,
       "column": 3
     }
   },
@@ -862,11 +563,11 @@
     "defaultMessage": "!!!Enable notifications & audio",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 283,
+      "line": 191,
       "column": 13
     },
     "end": {
-      "line": 286,
+      "line": 194,
       "column": 3
     }
   },
@@ -875,11 +576,11 @@
     "defaultMessage": "!!!Workspaces",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 287,
+      "line": 195,
       "column": 14
     },
     "end": {
-      "line": 290,
+      "line": 198,
       "column": 3
     }
   },
@@ -888,11 +589,11 @@
     "defaultMessage": "!!!Default",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 291,
+      "line": 199,
       "column": 20
     },
     "end": {
-      "line": 294,
+      "line": 202,
       "column": 3
     }
   },
@@ -901,11 +602,11 @@
     "defaultMessage": "!!!Todos",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 295,
+      "line": 203,
       "column": 9
     },
     "end": {
-      "line": 298,
+      "line": 206,
       "column": 3
     }
   },
@@ -914,11 +615,11 @@
     "defaultMessage": "!!!Open Todos drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 299,
+      "line": 207,
       "column": 19
     },
     "end": {
-      "line": 302,
+      "line": 210,
       "column": 3
     }
   },
@@ -927,11 +628,11 @@
     "defaultMessage": "!!!Close Todos drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 303,
+      "line": 211,
       "column": 20
     },
     "end": {
-      "line": 306,
+      "line": 214,
       "column": 3
     }
   },
@@ -940,11 +641,11 @@
     "defaultMessage": "!!!Enable Todos",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 307,
+      "line": 215,
       "column": 15
     },
     "end": {
-      "line": 310,
+      "line": 218,
       "column": 3
     }
   },
@@ -953,11 +654,11 @@
     "defaultMessage": "!!!Home",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 311,
+      "line": 219,
       "column": 17
     },
     "end": {
-      "line": 314,
+      "line": 222,
       "column": 3
     }
   }