From 98ae5f728ea8e2db7b8a7717cd26e7148fd49328 Mon Sep 17 00:00:00 2001 From: Maigo Erit Date: Sun, 1 May 2016 23:41:00 +0300 Subject: [PATCH] y --- app/plugins/main-window/app/settings/settings.service.js | 5 +++-- app/plugins/tray/app/logItem/logItem.list.controller.js | 4 ++++ app/tray.js | 9 ++++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/plugins/main-window/app/settings/settings.service.js b/app/plugins/main-window/app/settings/settings.service.js index 65555bd4..56e04d2c 100755 --- a/app/plugins/main-window/app/settings/settings.service.js +++ b/app/plugins/main-window/app/settings/settings.service.js @@ -29,9 +29,10 @@ angular.module('globalServices') } return deferred.promise; }).catch(function () { - return service.create({ + service.create({ id: 'RUNNING_LOG_ITEM' - }) + }); + }); }; service.saveRunningLogItemReferemce = function (logItemId) { diff --git a/app/plugins/tray/app/logItem/logItem.list.controller.js b/app/plugins/tray/app/logItem/logItem.list.controller.js index 31f92245..7e38c716 100644 --- a/app/plugins/tray/app/logItem/logItem.list.controller.js +++ b/app/plugins/tray/app/logItem/logItem.list.controller.js @@ -1,5 +1,6 @@ 'use strict'; +var ipcRenderer = require("electron").ipcRenderer; angular.module('trayApp') .controller('LogItemListController', function (TrackItemService, $rootScope, $scope, SettingsService, $mdToast, $q) { @@ -8,6 +9,7 @@ angular.module('trayApp') ctrl.newItem = {color: '#426DFC'}; SettingsService.getRunningLogItem().then(function (item) { + console.log("Running log item.", item); ctrl.runningLogItem = item; }); @@ -36,6 +38,8 @@ angular.module('trayApp') }); }; + ipc.on('focus-tray', ctrl.list); + ctrl.startNewLogItem = function (oldItem) { console.log("startNewLogItem"); diff --git a/app/tray.js b/app/tray.js index aeb0db95..f563a620 100755 --- a/app/tray.js +++ b/app/tray.js @@ -12,13 +12,16 @@ var mb = menubar({ preloadWindow: true, width: 400, height: 500, - showDock: true + showDock: true, + 'show-dock-icon': true }); mb.on('after-create-window', function () { - //mb.window.openDevTools(); + mb.window.openDevTools(); }); -mb.on('ready', function () { +mb.on('after-show', function () { + console.log('Show tray'); + mb.window.webContents.send('focus-tray', 'ping'); }) module.exports = mb