Skip to content

Commit

Permalink
poprawki
Browse files Browse the repository at this point in the history
  • Loading branch information
kartofelek007 committed Mar 6, 2020
1 parent ceb680b commit 6d22cbe
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 16 deletions.
2 changes: 1 addition & 1 deletion colors.json
Original file line number Diff line number Diff line change
@@ -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"]}
{"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"]}
10 changes: 6 additions & 4 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ const {
Menu,
shell,
Tray,
ipcMain
ipcMain,
nativeImage
} = require( 'electron' )
const path = require( 'path' )

Expand All @@ -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,
Expand All @@ -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', () => {
Expand All @@ -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,
Expand Down
25 changes: 14 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}

0 comments on commit 6d22cbe

Please sign in to comment.