From 6d22cbe6ba732a3aa7419442ae8b13adb1c2a2aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Doma=C5=84ski?= <kartofelek007@gmail.com>
Date: Fri, 6 Mar 2020 11:22:44 +0100
Subject: [PATCH] poprawki

---
 colors.json  |  2 +-
 main.js      | 10 ++++++----
 package.json | 25 ++++++++++++++-----------
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/colors.json b/colors.json
index a1495a7..b13c7e8 100644
--- a/colors.json
+++ b/colors.json
@@ -1 +1 @@
-{"colors":["#EFDC05","#f1865e","#58C9B9","#D1B6E1","#FFEEE4","#F17F42","#CE6D39","#000000","#30A9DE","#519D9E","#090707","#A593E0","#E0E3DA","#FFFFF3","#FBFFB9","#F6B352","#383A3F","#1F2124","#D7FFF1","#FDD692","#EC7357","#754F44","#F68657","#C5E99B","#8FBC94","#548687","#D499B9","#56445D","#E71D36","#2EC4B6","#EFFFE9","#011627","#DE6449","#791E94","#FFFFF2","#5CAB7D","#5A9367","#3F4B3B","#FFBC42","#D81159","#8F2D56","#218380","#E3E36A","#C16200","#881600","#49010F","#4F86C6","#6C49B8","#67D5B5","#EE7785","#C89EC4","#84B1ED","#F16B6F","#C5C6B6","#AACD6E","#3C3530","#6E7783","#D8E6E7","#9DC3C1","#AF4034","#3E4348","#C65146","#EC6A5C","#DE7E73","#CFAA9E","#D4DFE6","#8EC0E4","#CADBE9","#6AAFE6","#FADAD8","#56A902","#9B8281","#3B4E32","#F0E5DE","#ABD0CE","#7C7877","#D9D4CF","#AAABD3","#F8FAFF","#CBA6C3","#353866","#75D701","#F8F8FF","#1b995c","#007ac8","#000000","#de654a","#ffffff","#fee890"]}
\ No newline at end of file
+{"colors":["#EFDC05","#f1865e","#58C9B9","#FFEEE4","#D1B6E1","#F17F42","#CE6D39","#000000","#30A9DE","#519D9E","#090707","#A593E0","#E0E3DA","#FFFFF3","#FBFFB9","#F6B352","#383A3F","#1F2124","#D7FFF1","#FDD692","#EC7357","#754F44","#F68657","#C5E99B","#8FBC94","#548687","#D499B9","#56445D","#E71D36","#2EC4B6","#EFFFE9","#011627","#DE6449","#791E94","#FFFFF2","#5CAB7D","#5A9367","#3F4B3B","#FFBC42","#D81159","#8F2D56","#218380","#E3E36A","#C16200","#881600","#49010F","#4F86C6","#6C49B8","#67D5B5","#EE7785","#C89EC4","#84B1ED","#F16B6F","#C5C6B6","#AACD6E","#3C3530","#6E7783","#D8E6E7","#9DC3C1","#AF4034","#3E4348","#C65146","#EC6A5C","#DE7E73","#CFAA9E","#D4DFE6","#8EC0E4","#CADBE9","#6AAFE6","#FADAD8","#56A902","#9B8281","#3B4E32","#F0E5DE","#ABD0CE","#7C7877","#D9D4CF","#AAABD3","#F8FAFF","#CBA6C3","#353866","#75D701","#F8F8FF","#1b995c","#007ac8","#000000","#de654a","#ffffff","#fee890","#ded777"]}
\ No newline at end of file
diff --git a/main.js b/main.js
index 80ce581..1d7291e 100644
--- a/main.js
+++ b/main.js
@@ -5,7 +5,8 @@ const {
     Menu,
     shell,
     Tray,
-    ipcMain
+    ipcMain,
+    nativeImage
 } = require( 'electron' )
 const path = require( 'path' )
 
@@ -32,7 +33,7 @@ const myApp = {
         const { width: screenW, height: screenH } = screen.getPrimaryDisplay().workAreaSize;
 
         this.mainWindow = new BrowserWindow({
-            icon : path.join(__dirname, './images/icon.ico'),
+            icon : path.join(__dirname, '/images/icon.png'),
             width: 400,
             height: screenH,
             x: screenW - 400,
@@ -49,7 +50,8 @@ const myApp = {
             this.mainWindow.hide();
         });
 
-        const imgPath = path.join(__dirname, './images/icon.ico');
+        const imgPath = path.join(__dirname, '/images/icon.png');
+
         this.tray = new Tray(imgPath);
         this.tray.setToolTip('kolory');
         this.tray.on('click', () => {
@@ -61,7 +63,7 @@ const myApp = {
 
     createColorPickWindow() {
         this.pickedWindow = new BrowserWindow({
-            icon : path.join(__dirname, './images/icon.ico'),
+            icon : path.join(__dirname, './images/icon.png'),
             fullscreen: true,
             alwaysOnTop: true,
             transparent: true,
diff --git a/package.json b/package.json
index 9952fd1..31e6216 100644
--- a/package.json
+++ b/package.json
@@ -19,16 +19,19 @@
     "electron-builder": "^22.4.0"
   },
   "build": {
-        "appId": "PresentationDrawer",
-        "productName": "PresentationDrawer",
-        "copyright": "Marcin Domański",
-        "files": ["**/*", "images/icon.png"],
-        "win": {
-            "target": "portable",
-            "icon": "images/icon.ico"
-        },
-        "portable": {
-            "artifactName": "color_manager_portable.exe"
-        }
+    "appId": "PresentationDrawer",
+    "productName": "PresentationDrawer",
+    "copyright": "Marcin Domański",
+    "files": [
+      "**/*",
+      "images/icon.png"
+    ],
+    "win": {
+      "target": "portable",
+      "icon": "images/icon.ico"
+    },
+    "portable": {
+      "artifactName": "color_manager_portable.exe"
     }
+  }
 }