From e8793479cffd6f209818993aad5a235f63e1410d Mon Sep 17 00:00:00 2001 From: Ev Date: Tue, 24 Jan 2017 20:32:59 -0200 Subject: [PATCH] Adding a develop menu option to open Remix IDE (#1608) * Adding browser solidity menu item * Adding i18n keys for Remix menu item * Moving Remix menu option UP * Opening Remix on a separated popup * Changing display name * minor refactor * reverting travis change --- interface/i18n/mist.de.i18n.json | 1 + interface/i18n/mist.en.i18n.json | 1 + modules/menuItems.js | 37 ++++++++++++++++++++++++++------ modules/preloader/mistUI.js | 1 - 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/interface/i18n/mist.de.i18n.json b/interface/i18n/mist.de.i18n.json index fa21cdcc1..96bf5816c 100644 --- a/interface/i18n/mist.de.i18n.json +++ b/interface/i18n/mist.de.i18n.json @@ -42,6 +42,7 @@ "devToolsWebview": "__webview__", "runTests": "Tests durchführen", "logFiles": "Logdatei anzeigen", + "openRemix": "Remix IDE öffnen", "ethereumNode": "Ethereum Node", "network": "Netzwerk", "mainNetwork": "Hauptnetzwerk", diff --git a/interface/i18n/mist.en.i18n.json b/interface/i18n/mist.en.i18n.json index 39df06f00..03e806e63 100644 --- a/interface/i18n/mist.en.i18n.json +++ b/interface/i18n/mist.en.i18n.json @@ -60,6 +60,7 @@ "devToolsWebview": "__webview__", "runTests": "Run tests", "logFiles": "Show log file", + "openRemix": "Open Remix IDE", "externalNode": "using external node", "ethereumNode": "Ethereum Node", "network": "Network", diff --git a/modules/menuItems.js b/modules/menuItems.js index 812ebf349..7545068dd 100644 --- a/modules/menuItems.js +++ b/modules/menuItems.js @@ -16,6 +16,7 @@ const switchForSystem = function (options) { } else if ('default' in options) { return options.default; } + return null; }; @@ -297,7 +298,7 @@ let menuTempl = function (webviews) { // DEVELOP - let devToolsMenu = []; + const devToolsMenu = []; // change for wallet if (Settings.uiMode === 'mist') { @@ -337,16 +338,40 @@ let menuTempl = function (webviews) { } const externalNodeMsg = (ethereumNode.isOwnNode) ? '' : ` (${i18n.t('mist.applicationMenu.develop.externalNode')})`; - devToolsMenu = [{ + devToolsMenu.push({ label: i18n.t('mist.applicationMenu.develop.devTools'), submenu: devtToolsSubMenu, - }, { + }); + + if (Settings.uiMode === 'mist') { + devToolsMenu.push({ + label: i18n.t('mist.applicationMenu.develop.openRemix'), + enabled: true, + click() { + Windows.createPopup('remix', { + url: 'https://remix.ethereum.org', + electronOptions: { + width: 1024, + height: 720, + center: true, + frame: true, + resizable: true, + titleBarStyle: 'default', + } + }); + }, + }); + } + + devToolsMenu.push({ label: i18n.t('mist.applicationMenu.develop.runTests'), enabled: (Settings.uiMode === 'mist'), click() { Windows.getByType('main').send('uiAction_runTests', 'webview'); }, - }, { + }); + + devToolsMenu.push({ label: i18n.t('mist.applicationMenu.develop.logFiles') + externalNodeMsg, enabled: ethereumNode.isOwnNode, click() { @@ -357,9 +382,7 @@ let menuTempl = function (webviews) { log = 'Couldn\'t load log file.'; } }, - }, - ]; - + }); // add node switching menu devToolsMenu.push({ diff --git a/modules/preloader/mistUI.js b/modules/preloader/mistUI.js index 6f401ab6f..a42f50508 100644 --- a/modules/preloader/mistUI.js +++ b/modules/preloader/mistUI.js @@ -131,7 +131,6 @@ ipcRenderer.on('uiAction_runTests', (e, type) => { } }); - // CONTEXT MENU const currentMousePosition = { x: 0, y: 0 };