From 364917c910e6df6a0ddc4b33933100e8769ed6df Mon Sep 17 00:00:00 2001 From: Rokt33r Date: Thu, 3 Dec 2015 07:59:47 +0900 Subject: [PATCH] =?UTF-8?q?Finder=E3=81=AEActivity=20log=E3=82=92=E3=81=A1?= =?UTF-8?q?=E3=82=83=E3=82=93=E3=81=A8=E5=8F=96=E3=81=A3=E3=81=A6=E3=81=8F?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- browser/finder/index.js | 3 ++- browser/main/index.js | 7 +++++++ finder.js | 5 +++++ main.js | 9 ++++++--- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/browser/finder/index.js b/browser/finder/index.js index e64dec5a..c72987f2 100644 --- a/browser/finder/index.js +++ b/browser/finder/index.js @@ -11,7 +11,7 @@ import _ from 'lodash' import dataStore from 'boost/dataStore' const electron = require('electron') -const { remote, clipboard } = electron +const { remote, clipboard, ipcRenderer } = electron var hideFinder = remote.getGlobal('hideFinder') @@ -64,6 +64,7 @@ class FinderMain extends React.Component { let { activeArticle } = this.props clipboard.writeText(activeArticle.content) + ipcRenderer.send('copy-finder') notify('Saved to Clipboard!', { body: 'Paste it wherever you want!' }) diff --git a/browser/main/index.js b/browser/main/index.js index a7958fad..3224ab6d 100644 --- a/browser/main/index.js +++ b/browser/main/index.js @@ -29,6 +29,13 @@ ipc.on('notify', function (e, payload) { }) }) +ipc.on('copy-finder', function () { + activityRecord.emit('FINDER_COPY') +}) +ipc.on('open-finder', function () { + activityRecord.emit('FINDER_OPEN') +}) + let routes = ( diff --git a/finder.js b/finder.js index e0d12bf2..02da4244 100755 --- a/finder.js +++ b/finder.js @@ -3,6 +3,7 @@ const app = electron.app const Tray = electron.Tray const Menu = electron.Menu const MenuItem = electron.MenuItem +const ipcMain = electron.ipcMain process.stdin.setEncoding('utf8') @@ -63,6 +64,10 @@ app.on('ready', function () { break } }) + + ipcMain.on('copy-finder', function () { + emit('copy-finder') + }) }) global.hideFinder = function () { diff --git a/main.js b/main.js index a520380e..0dd48204 100644 --- a/main.js +++ b/main.js @@ -129,9 +129,10 @@ app.on('ready', function () { console.log('FINDER(stdout): ' + payload.data) break case 'show-main-window': - if (mainWindow != null) { - mainWindow.show() - } + mainWindow.show() + break + case 'copy-finder': + mainWindow.webContents.send('copy-finder') break case 'request-data': mainWindow.webContents.send('request-data') @@ -174,6 +175,7 @@ app.on('ready', function () { try { globalShortcut.register(toggleFinderKey, function () { emitToFinder('open-finder') + mainWindow.webContents.send('open-finder', {}) }) } catch (err) { console.log(err.name) @@ -190,6 +192,7 @@ app.on('ready', function () { try { globalShortcut.register(toggleFinderKey, function () { emitToFinder('open-finder') + mainWindow.webContents.send('open-finder', {}) }) mainWindow.webContents.send('APP_SETTING_DONE', {}) } catch (err) {