fontastic 0.1.7 → 0.2.0

package/app/core/menu/MenuBuilder.ts

@@ -1,53 +1,51 @@
-import { Menu, BrowserWindow } from 'electron';
-import DarwinTemplate from './templates/DarwinTemplate';
-import SystemTemplate from './templates/SystemTemplate';
-
-export default class MenuBuilder {
-  mainWindow: BrowserWindow;
-  isProduction: boolean;
-  isProductionReady = false;
-
-  constructor(mainWindow: BrowserWindow, isProduction: boolean) {
-    this.mainWindow = mainWindow;
-    this.isProduction = isProduction;
-
-    if (!this.isProduction) {
-      this.buildContextMenu();
-    }
-  }
-
-  buildContextMenu(): void {
-    this.mainWindow.webContents.on('context-menu', (_, props) => {
-      const { x, y } = props;
-      Menu.buildFromTemplate([{
-        label: 'Inspect element',
-        click: () => {
-          this.mainWindow.webContents.inspectElement(x, y);
-        },
-      }]).popup({ window: this.mainWindow });
-    });
-  }
-
-  initialize() {
-    if (!this.isProductionReady) {
-      return;
-    }
-
-    const template = process.platform === 'darwin' ? this.buildDarwinTemplate() : this.buildDefaultTemplate();
-
-    const menu = Menu.buildFromTemplate(template);
-    Menu.setApplicationMenu(menu);
-
-    return menu;
-  }
-
-  buildDarwinTemplate() {
-    const template = new DarwinTemplate(this.mainWindow, this.isProduction);
-    return template.build();
-  }
-
-  buildDefaultTemplate() {
-    const template = new SystemTemplate(this.mainWindow, this.isProduction);
-    return template.build();
-  }
-}
+import { Menu, BrowserWindow } from 'electron';
+import DarwinTemplate from './templates/DarwinTemplate';
+import SystemTemplate from './templates/SystemTemplate';
+
+export default class MenuBuilder {
+  mainWindow: BrowserWindow;
+  isProduction: boolean;
+  isProductionReady = false;
+
+  constructor(mainWindow: BrowserWindow, isProduction: boolean) {
+    this.mainWindow = mainWindow;
+    this.isProduction = isProduction;
+
+    if (!this.isProduction) {
+      this.buildContextMenu();
+    }
+  }
+
+  buildContextMenu(): void {
+    this.mainWindow.webContents.on('context-menu', (_, props) => {
+      const { x, y } = props;
+      Menu.buildFromTemplate([
+        {
+          label: 'Inspect element',
+          click: () => {
+            this.mainWindow.webContents.inspectElement(x, y);
+          },
+        },
+      ]).popup({ window: this.mainWindow });
+    });
+  }
+
+  initialize() {
+    const template = process.platform === 'darwin' ? this.buildDarwinTemplate() : this.buildDefaultTemplate();
+
+    const menu = Menu.buildFromTemplate(template);
+    Menu.setApplicationMenu(menu);
+
+    return menu;
+  }
+
+  buildDarwinTemplate() {
+    const template = new DarwinTemplate(this.mainWindow, this.isProduction);
+    return template.build();
+  }
+
+  buildDefaultTemplate() {
+    const template = new SystemTemplate(this.mainWindow, this.isProduction);
+    return template.build();
+  }
+}

package/app/core/menu/templates/DarwinTemplate.js

@@ -1,127 +1,125 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const electron_1 = require("electron");
-class DarwinTemplate {
-    constructor(mainWindow, isProduction) {
-        this.mainWindow = mainWindow;
-        this.isProduction = isProduction;
-    }
-    build() {
-        const subMenuAbout = this.addSubMenuAbout();
-        const subMenuEdit = this.addSubMenuEdit();
-        const subMenuView = this.addSubMenuView();
-        const subMenuWindow = this.addSubMenuWindow();
-        const subMenuHelp = this.addSubMenuHelp();
-        return [subMenuAbout, subMenuEdit, subMenuView, subMenuWindow, subMenuHelp];
-    }
-    addSubMenuAbout() {
-        return {
-            label: 'Electron',
-            submenu: [
-                {
-                    label: 'About ElectronReact',
-                    selector: 'orderFrontStandardAboutPanel:',
-                },
-                { type: 'separator' },
-                { label: 'Services', submenu: [] },
-                { type: 'separator' },
-                {
-                    label: 'Hide ElectronReact',
-                    accelerator: 'Command+H',
-                    selector: 'hide:',
-                },
-                {
-                    label: 'Hide Others',
-                    accelerator: 'Command+Shift+H',
-                    selector: 'hideOtherApplications:',
-                },
-                { label: 'Show All', selector: 'unhideAllApplications:' },
-                { type: 'separator' },
-                {
-                    label: 'Quit',
-                    accelerator: 'Command+Q',
-                    click: () => {
-                        electron_1.app.quit();
-                    },
-                },
-            ],
-        };
-    }
-    addSubMenuEdit() {
-        return {
-            label: 'Edit',
-            submenu: [
-                { label: 'Undo', accelerator: 'Command+Z', selector: 'undo:' },
-                { label: 'Redo', accelerator: 'Shift+Command+Z', selector: 'redo:' },
-                { type: 'separator' },
-                { label: 'Cut', accelerator: 'Command+X', selector: 'cut:' },
-                { label: 'Copy', accelerator: 'Command+C', selector: 'copy:' },
-                { label: 'Paste', accelerator: 'Command+V', selector: 'paste:' },
-                { label: 'Select All', accelerator: 'Command+A', selector: 'selectAll:' }
-            ],
-        };
-    }
-    addSubMenuView() {
-        return {
-            label: 'View',
-            submenu: [{
-                    label: 'Reload',
-                    accelerator: 'Command+R',
-                    click: () => {
-                        this.mainWindow.webContents.reload();
-                    },
-                }, {
-                    label: 'Toggle Full Screen',
-                    accelerator: 'Ctrl+Command+F',
-                    click: () => {
-                        this.mainWindow.setFullScreen(!this.mainWindow.isFullScreen());
-                    },
-                }, {
-                    label: 'Toggle Developer Tools',
-                    accelerator: 'Alt+Command+I',
-                    click: () => {
-                        this.mainWindow.webContents.toggleDevTools();
-                    },
-                }]
-        };
-    }
-    addSubMenuWindow() {
-        return {
-            label: 'Window',
-            submenu: [
-                { label: 'Minimize', accelerator: 'Command+M', selector: 'performMiniaturize:' },
-                { label: 'Close', accelerator: 'Command+W', selector: 'performClose:' },
-                { type: 'separator' },
-                { label: 'Bring All to Front', selector: 'arrangeInFront:' },
-            ]
-        };
-    }
-    addSubMenuHelp() {
-        return {
-            label: 'Help',
-            submenu: [{
-                    label: 'Learn More',
-                    click() {
-                        electron_1.shell.openExternal('https://electronjs.org');
-                    },
-                }, {
-                    label: 'Documentation',
-                    click() {
-                        electron_1.shell.openExternal('https://github.com/electron/electron/tree/main/docs#readme');
-                    },
-                }, {
-                    label: 'Community Discussions',
-                    click() {
-                        electron_1.shell.openExternal('https://www.electronjs.org/community');
-                    },
-                }, {
-                    label: 'Search Issues',
-                    click() {
-                        electron_1.shell.openExternal('https://github.com/electron/electron/issues');
-                    },
-                }]
-        };
-    }
-}
-exports.default = DarwinTemplate;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const electron_1 = require("electron");
+const enums_1 = require("../../../enums");
+class DarwinTemplate {
+    constructor(mainWindow, isProduction) {
+        this.mainWindow = mainWindow;
+        this.isProduction = isProduction;
+    }
+    build() {
+        const subMenuAbout = this.addSubMenuAbout();
+        const subMenuEdit = this.addSubMenuEdit();
+        const subMenuView = this.addSubMenuView();
+        const subMenuWindow = this.addSubMenuWindow();
+        return [subMenuAbout, subMenuEdit, subMenuView, subMenuWindow];
+    }
+    addSubMenuAbout() {
+        return {
+            label: 'Fontastic',
+            submenu: [
+                {
+                    label: 'About Fontastic',
+                    selector: 'orderFrontStandardAboutPanel:',
+                },
+                { type: 'separator' },
+                {
+                    label: 'Hide Fontastic',
+                    accelerator: 'Command+H',
+                    selector: 'hide:',
+                },
+                {
+                    label: 'Hide Others',
+                    accelerator: 'Command+Shift+H',
+                    selector: 'hideOtherApplications:',
+                },
+                { label: 'Show All', selector: 'unhideAllApplications:' },
+                { type: 'separator' },
+                {
+                    label: 'Quit',
+                    accelerator: 'Command+Q',
+                    click: () => {
+                        electron_1.app.quit();
+                    },
+                },
+            ],
+        };
+    }
+    addSubMenuEdit() {
+        return {
+            label: 'Edit',
+            submenu: [
+                { label: 'Undo', accelerator: 'Command+Z', selector: 'undo:' },
+                { label: 'Redo', accelerator: 'Shift+Command+Z', selector: 'redo:' },
+                { type: 'separator' },
+                { label: 'Cut', accelerator: 'Command+X', selector: 'cut:' },
+                { label: 'Copy', accelerator: 'Command+C', selector: 'copy:' },
+                { label: 'Paste', accelerator: 'Command+V', selector: 'paste:' },
+                { label: 'Select All', accelerator: 'Command+A', selector: 'selectAll:' },
+            ],
+        };
+    }
+    addSubMenuView() {
+        const items = [
+            {
+                label: 'Toggle Full Screen',
+                accelerator: 'Ctrl+Command+F',
+                click: () => {
+                    this.mainWindow.setFullScreen(!this.mainWindow.isFullScreen());
+                },
+            },
+        ];
+        if (!this.isProduction) {
+            items.push({ type: 'separator' }, {
+                label: 'Reload',
+                accelerator: 'Command+R',
+                click: () => {
+                    this.mainWindow.webContents.reload();
+                },
+            }, {
+                label: 'Toggle Developer Tools',
+                accelerator: 'Alt+Command+I',
+                click: () => {
+                    this.mainWindow.webContents.toggleDevTools();
+                },
+            });
+        }
+        return {
+            label: 'View',
+            submenu: items,
+        };
+    }
+    addSubMenuWindow() {
+        return {
+            label: 'Window',
+            submenu: [
+                { label: 'Minimize', accelerator: 'Command+M', selector: 'performMiniaturize:' },
+                { label: 'Close', accelerator: 'Command+W', selector: 'performClose:' },
+                { type: 'separator' },
+                { label: 'Bring All to Front', selector: 'arrangeInFront:' },
+                { type: 'separator' },
+                ...this.addTogglePanelItems(),
+            ],
+        };
+    }
+    addTogglePanelItems() {
+        const panels = [
+            { label: 'Toggle Navigation', panel: 'navigation', accelerator: 'Alt+Command+1' },
+            { label: 'Toggle Aside', panel: 'aside', accelerator: 'Alt+Command+2' },
+            { label: 'Toggle Preview', panel: 'preview', accelerator: 'Alt+Command+3' },
+            { label: 'Toggle Inspect', panel: 'inspect', accelerator: 'Alt+Command+4' },
+            { label: 'Toggle Toolbar', panel: 'toolbar', accelerator: 'Alt+Command+5' },
+            { label: 'Toggle Grid', panel: 'grid', accelerator: 'Alt+Command+6' },
+            { label: 'Toggle Waterfall', panel: 'waterfall', accelerator: 'Alt+Command+7' },
+        ];
+        return panels.map(({ label, panel, accelerator }) => ({
+            label,
+            accelerator,
+            click: () => {
+                this.mainWindow.webContents.send(enums_1.ChannelType.IPC_TOGGLE_PANEL, panel);
+            },
+        }));
+    }
+}
+exports.default = DarwinTemplate;
 //# sourceMappingURL=DarwinTemplate.js.map

package/app/core/menu/templates/DarwinTemplate.ts

@@ -1,142 +1,144 @@
-import { app, Menu, shell, BrowserWindow, MenuItemConstructorOptions } from 'electron';
-
-interface DarwinMenuItemConstructorOptions extends MenuItemConstructorOptions {
-  selector?: string;
-  submenu?: DarwinMenuItemConstructorOptions[] | Menu;
-}
-
-export default class DarwinTemplate {
-  mainWindow: BrowserWindow;
-  isProduction: boolean;
-
-  constructor(mainWindow: BrowserWindow, isProduction: boolean) {
-    this.mainWindow = mainWindow;
-    this.isProduction = isProduction;
-  }
-
-  build(): MenuItemConstructorOptions[] {
-    const subMenuAbout = this.addSubMenuAbout();
-    const subMenuEdit = this.addSubMenuEdit();
-    const subMenuView = this.addSubMenuView();
-    const subMenuWindow = this.addSubMenuWindow();
-    const subMenuHelp = this.addSubMenuHelp();
-
-    return [subMenuAbout, subMenuEdit, subMenuView, subMenuWindow, subMenuHelp];
-  }
-
-  addSubMenuAbout(): MenuItemConstructorOptions | DarwinMenuItemConstructorOptions {
-    return {
-      label: 'Electron',
-      submenu: [
-        {
-          label: 'About ElectronReact',
-          selector: 'orderFrontStandardAboutPanel:',
-        },
-        { type: 'separator' },
-        { label: 'Services', submenu: [] },
-        { type: 'separator' },
-        {
-          label: 'Hide ElectronReact',
-          accelerator: 'Command+H',
-          selector: 'hide:',
-        },
-        {
-          label: 'Hide Others',
-          accelerator: 'Command+Shift+H',
-          selector: 'hideOtherApplications:',
-        },
-        { label: 'Show All', selector: 'unhideAllApplications:' },
-        { type: 'separator' },
-        {
-          label: 'Quit',
-          accelerator: 'Command+Q',
-          click: () => {
-            app.quit();
-          },
-        },
-      ],
-    };
-  }
-
-  addSubMenuEdit(): DarwinMenuItemConstructorOptions {
-    return {
-      label: 'Edit',
-      submenu: [
-        { label: 'Undo', accelerator: 'Command+Z', selector: 'undo:' },
-        { label: 'Redo', accelerator: 'Shift+Command+Z', selector: 'redo:' },
-        { type: 'separator' },
-        { label: 'Cut', accelerator: 'Command+X', selector: 'cut:' },
-        { label: 'Copy', accelerator: 'Command+C', selector: 'copy:' },
-        { label: 'Paste', accelerator: 'Command+V', selector: 'paste:' },
-        { label: 'Select All', accelerator: 'Command+A', selector: 'selectAll:' }
-      ],
-    };
-  }
-
-  addSubMenuView(): MenuItemConstructorOptions {
-    return {
-      label: 'View',
-      submenu: [{
-        label: 'Reload',
-        accelerator: 'Command+R',
-        click: () => {
-          this.mainWindow.webContents.reload();
-        },
-      }, {
-        label: 'Toggle Full Screen',
-        accelerator: 'Ctrl+Command+F',
-        click: () => {
-          this.mainWindow.setFullScreen(!this.mainWindow.isFullScreen());
-        },
-      }, {
-        label: 'Toggle Developer Tools',
-        accelerator: 'Alt+Command+I',
-        click: () => {
-          this.mainWindow.webContents.toggleDevTools();
-        },
-      }]
-    };
-  }
-
-  addSubMenuWindow(): DarwinMenuItemConstructorOptions {
-    return {
-      label: 'Window',
-      submenu: [
-        { label: 'Minimize', accelerator: 'Command+M', selector: 'performMiniaturize:' },
-        { label: 'Close', accelerator: 'Command+W', selector: 'performClose:' },
-        { type: 'separator' },
-        { label: 'Bring All to Front', selector: 'arrangeInFront:' },
-      ]
-    };
-  }
-
-  addSubMenuHelp(): MenuItemConstructorOptions {
-    return {
-      label: 'Help',
-      submenu: [{
-        label: 'Learn More',
-        click() {
-          shell.openExternal('https://electronjs.org');
-        },
-      }, {
-        label: 'Documentation',
-        click() {
-          shell.openExternal(
-            'https://github.com/electron/electron/tree/main/docs#readme'
-          );
-        },
-      }, {
-        label: 'Community Discussions',
-        click() {
-          shell.openExternal('https://www.electronjs.org/community');
-        },
-      }, {
-        label: 'Search Issues',
-        click() {
-          shell.openExternal('https://github.com/electron/electron/issues');
-        },
-      }]
-    };
-  }
-
-}
+import { app, Menu, BrowserWindow, MenuItemConstructorOptions } from 'electron';
+import { ChannelType } from '../../../enums';
+
+interface DarwinMenuItemConstructorOptions extends MenuItemConstructorOptions {
+  selector?: string;
+  submenu?: DarwinMenuItemConstructorOptions[] | Menu;
+}
+
+export default class DarwinTemplate {
+  mainWindow: BrowserWindow;
+  isProduction: boolean;
+
+  constructor(mainWindow: BrowserWindow, isProduction: boolean) {
+    this.mainWindow = mainWindow;
+    this.isProduction = isProduction;
+  }
+
+  build(): MenuItemConstructorOptions[] {
+    const subMenuAbout = this.addSubMenuAbout();
+    const subMenuEdit = this.addSubMenuEdit();
+    const subMenuView = this.addSubMenuView();
+    const subMenuWindow = this.addSubMenuWindow();
+
+    return [subMenuAbout, subMenuEdit, subMenuView, subMenuWindow];
+  }
+
+  addSubMenuAbout(): MenuItemConstructorOptions | DarwinMenuItemConstructorOptions {
+    return {
+      label: 'Fontastic',
+      submenu: [
+        {
+          label: 'About Fontastic',
+          selector: 'orderFrontStandardAboutPanel:',
+        },
+        { type: 'separator' },
+        {
+          label: 'Hide Fontastic',
+          accelerator: 'Command+H',
+          selector: 'hide:',
+        },
+        {
+          label: 'Hide Others',
+          accelerator: 'Command+Shift+H',
+          selector: 'hideOtherApplications:',
+        },
+        { label: 'Show All', selector: 'unhideAllApplications:' },
+        { type: 'separator' },
+        {
+          label: 'Quit',
+          accelerator: 'Command+Q',
+          click: () => {
+            app.quit();
+          },
+        },
+      ],
+    };
+  }
+
+  addSubMenuEdit(): DarwinMenuItemConstructorOptions {
+    return {
+      label: 'Edit',
+      submenu: [
+        { label: 'Undo', accelerator: 'Command+Z', selector: 'undo:' },
+        { label: 'Redo', accelerator: 'Shift+Command+Z', selector: 'redo:' },
+        { type: 'separator' },
+        { label: 'Cut', accelerator: 'Command+X', selector: 'cut:' },
+        { label: 'Copy', accelerator: 'Command+C', selector: 'copy:' },
+        { label: 'Paste', accelerator: 'Command+V', selector: 'paste:' },
+        { label: 'Select All', accelerator: 'Command+A', selector: 'selectAll:' },
+      ],
+    };
+  }
+
+  addSubMenuView(): MenuItemConstructorOptions {
+    const items: MenuItemConstructorOptions[] = [
+      {
+        label: 'Toggle Full Screen',
+        accelerator: 'Ctrl+Command+F',
+        click: () => {
+          this.mainWindow.setFullScreen(!this.mainWindow.isFullScreen());
+        },
+      },
+    ];
+
+    if (!this.isProduction) {
+      items.push(
+        { type: 'separator' },
+        {
+          label: 'Reload',
+          accelerator: 'Command+R',
+          click: () => {
+            this.mainWindow.webContents.reload();
+          },
+        },
+        {
+          label: 'Toggle Developer Tools',
+          accelerator: 'Alt+Command+I',
+          click: () => {
+            this.mainWindow.webContents.toggleDevTools();
+          },
+        },
+      );
+    }
+
+    return {
+      label: 'View',
+      submenu: items,
+    };
+  }
+
+  addSubMenuWindow(): DarwinMenuItemConstructorOptions {
+    return {
+      label: 'Window',
+      submenu: [
+        { label: 'Minimize', accelerator: 'Command+M', selector: 'performMiniaturize:' },
+        { label: 'Close', accelerator: 'Command+W', selector: 'performClose:' },
+        { type: 'separator' },
+        { label: 'Bring All to Front', selector: 'arrangeInFront:' },
+        { type: 'separator' },
+        ...this.addTogglePanelItems(),
+      ],
+    };
+  }
+
+  addTogglePanelItems(): MenuItemConstructorOptions[] {
+    const panels: { label: string; panel: string; accelerator: string }[] = [
+      { label: 'Toggle Navigation', panel: 'navigation', accelerator: 'Alt+Command+1' },
+      { label: 'Toggle Aside', panel: 'aside', accelerator: 'Alt+Command+2' },
+      { label: 'Toggle Preview', panel: 'preview', accelerator: 'Alt+Command+3' },
+      { label: 'Toggle Inspect', panel: 'inspect', accelerator: 'Alt+Command+4' },
+      { label: 'Toggle Toolbar', panel: 'toolbar', accelerator: 'Alt+Command+5' },
+      { label: 'Toggle Grid', panel: 'grid', accelerator: 'Alt+Command+6' },
+      { label: 'Toggle Waterfall', panel: 'waterfall', accelerator: 'Alt+Command+7' },
+    ];
+
+    return panels.map(({ label, panel, accelerator }) => ({
+      label,
+      accelerator,
+      click: () => {
+        this.mainWindow.webContents.send(ChannelType.IPC_TOGGLE_PANEL, panel);
+      },
+    }));
+  }
+}