Move some menu items to the settings

Author: jtpio

packages/application-extension/schema/pages.json

@@ -0,0 +1,24 @@
+{
+  "title": "Jupyter Notebook Pages",
+  "description": "Jupyter Notebook Pages",
+  "jupyter.lab.menus": {
+    "main": [
+      {
+        "id": "jp-mainmenu-view",
+        "items": [
+          {
+            "command": "application:open-lab",
+            "rank": 2
+          },
+          {
+            "command": "application:open-tree",
+            "rank": 2
+          }
+        ]
+      }
+    ]
+  },
+  "properties": {},
+  "additionalProperties": false,
+  "type": "object"
+}

packages/application-extension/schema/top.json

@@ -3,6 +3,19 @@
   "jupyter.lab.setting-icon-label": "Jupyter Notebook Top Area",
   "title": "Jupyter Notebook Top Area",
   "description": "Jupyter Notebook Top Area settings",
+  "jupyter.lab.menus": {
+    "main": [
+      {
+        "id": "jp-mainmenu-view",
+        "items": [
+          {
+            "command": "application:toggle-top",
+            "rank": 2
+          }
+        ]
+      }
+    ]
+  },
   "properties": {
     "visible": {
       "type": "boolean",

packages/application-extension/schema/zen.json

@@ -0,0 +1,20 @@
+{
+  "title": "Jupyter Notebook Zen Mode",
+  "description": "Jupyter Notebook Zen Mode",
+  "jupyter.lab.menus": {
+    "main": [
+      {
+        "id": "jp-mainmenu-view",
+        "items": [
+          {
+            "command": "application:toggle-zen",
+            "rank": 3
+          }
+        ]
+      }
+    ]
+  },
+  "properties": {},
+  "additionalProperties": false,
+  "type": "object"
+}

packages/application-extension/src/index.ts

@@ -236,12 +236,11 @@ const pages: JupyterFrontEndPlugin<void> = {
   id: '@jupyter-notebook/application-extension:pages',
   autoStart: true,
   requires: [ITranslator],
-  optional: [ICommandPalette, IMainMenu],
+  optional: [ICommandPalette],
   activate: (
     app: JupyterFrontEnd,
     translator: ITranslator,
-    palette: ICommandPalette | null,
-    menu: IMainMenu | null
+    palette: ICommandPalette | null
   ): void => {
     const trans = translator.load('notebook');
     const baseUrl = PageConfig.getBaseUrl();
@@ -265,13 +264,6 @@ const pages: JupyterFrontEndPlugin<void> = {
         palette.addItem({ command, category: 'View' });
       });
     }
-
-    if (menu) {
-      menu.viewMenu.addGroup(
-        [{ command: CommandIDs.openLab }, { command: CommandIDs.openTree }],
-        0
-      );
-    }
   }
 };
 
@@ -489,12 +481,11 @@ const title: JupyterFrontEndPlugin<void> = {
 const topVisibility: JupyterFrontEndPlugin<void> = {
   id: '@jupyter-notebook/application-extension:top',
   requires: [INotebookShell, ITranslator],
-  optional: [IMainMenu, ISettingRegistry],
+  optional: [ISettingRegistry],
   activate: (
     app: JupyterFrontEnd<JupyterFrontEnd.IShell>,
     notebookShell: INotebookShell,
     translator: ITranslator,
-    menu: IMainMenu | null,
     settingRegistry: ISettingRegistry | null
   ) => {
     const trans = translator.load('notebook');
@@ -512,10 +503,6 @@ const topVisibility: JupyterFrontEndPlugin<void> = {
       isToggled: () => top.isVisible
     });
 
-    if (menu) {
-      menu.viewMenu.addGroup([{ command: CommandIDs.toggleTop }], 2);
-    }
-
     let settingsOverride = false;
 
     if (settingRegistry) {
@@ -648,13 +635,12 @@ const zen: JupyterFrontEndPlugin<void> = {
   id: '@jupyter-notebook/application-extension:zen',
   autoStart: true,
   requires: [ITranslator],
-  optional: [ICommandPalette, INotebookShell, IMainMenu],
+  optional: [ICommandPalette, INotebookShell],
   activate: (
     app: JupyterFrontEnd,
     translator: ITranslator,
     palette: ICommandPalette | null,
-    notebookShell: INotebookShell | null,
-    menu: IMainMenu | null
+    notebookShell: INotebookShell | null
   ): void => {
     const { commands } = app;
     const elem = document.documentElement;
@@ -695,10 +681,6 @@ const zen: JupyterFrontEndPlugin<void> = {
     if (palette) {
       palette.addItem({ command: CommandIDs.toggleZen, category: 'Mode' });
     }
-
-    if (menu) {
-      menu.viewMenu.addGroup([{ command: CommandIDs.toggleZen }], 3);
-    }
   }
 };