From 457b283ca5a3be5404bb71b383a57c82c3f87854 Mon Sep 17 00:00:00 2001 From: Jan Bicker Date: Wed, 24 Jul 2019 07:47:02 -0700 Subject: [PATCH] Use theia main menu factory for electron again. --- .../electron-arduino-main-menu-factory.ts | 20 ------------------- .../electron-arduino-menu-module.ts | 5 ----- 2 files changed, 25 deletions(-) delete mode 100644 arduino-ide-extension/src/electron-browser/electron-arduino-main-menu-factory.ts diff --git a/arduino-ide-extension/src/electron-browser/electron-arduino-main-menu-factory.ts b/arduino-ide-extension/src/electron-browser/electron-arduino-main-menu-factory.ts deleted file mode 100644 index 0b971357..00000000 --- a/arduino-ide-extension/src/electron-browser/electron-arduino-main-menu-factory.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { injectable } from "inversify"; -import * as electron from 'electron'; -import { ElectronMainMenuFactory } from "@theia/core/lib/electron-browser/menu/electron-main-menu-factory"; -import { - isOSX -} from '@theia/core/lib/common'; - -@injectable() -export class ElectronArduinoMainMenuFactory extends ElectronMainMenuFactory { - createMenuBar(): Electron.Menu { - const menuModel = this.menuProvider.getMenu(); - const template = this.fillMenuTemplate([], menuModel); - if (isOSX) { - template.unshift(this.createOSXMenu()); - } - const menu = electron.remote.Menu.buildFromTemplate(template); - this._menu = menu; - return menu; - } -} \ No newline at end of file diff --git a/arduino-ide-extension/src/electron-browser/electron-arduino-menu-module.ts b/arduino-ide-extension/src/electron-browser/electron-arduino-menu-module.ts index a2d28f7b..57573c4f 100644 --- a/arduino-ide-extension/src/electron-browser/electron-arduino-menu-module.ts +++ b/arduino-ide-extension/src/electron-browser/electron-arduino-menu-module.ts @@ -1,13 +1,8 @@ import { ContainerModule } from "inversify"; -import { ElectronArduinoMainMenuFactory } from "./electron-arduino-main-menu-factory"; -import { ElectronMainMenuFactory } from "@theia/core/lib/electron-browser/menu/electron-main-menu-factory"; import { ElectronMenuContribution } from "@theia/core/lib/electron-browser/menu/electron-menu-contribution" import { ElectronArduinoMenuContribution } from "./electron-arduino-menu-contribution"; export default new ContainerModule((bind, unbind, isBound, rebind) => { - bind(ElectronArduinoMainMenuFactory).toSelf().inSingletonScope(); - rebind(ElectronMainMenuFactory).to(ElectronArduinoMainMenuFactory); - bind(ElectronArduinoMenuContribution).toSelf().inSingletonScope(); rebind(ElectronMenuContribution).to(ElectronArduinoMenuContribution); }) \ No newline at end of file