1 Commits

Author SHA1 Message Date
aa3a3ea265 testing tray 2021-05-29 15:28:06 +02:00
8 changed files with 1666 additions and 779 deletions

View File

@@ -5,12 +5,6 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [1.1.2] - 2021-05-31
### Fixed
- Bug with update window when banner is currently open
## [1.1.1] - 2021-05-28
### Added

BIN
assets/trayTemplate.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
assets/trayTemplate@2x.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
design/tray.afdesign LFS Normal file

Binary file not shown.

View File

@@ -11,7 +11,7 @@
"repository": {
"url": "https://github.com/cupcakearmy/unpixel"
},
"version": "1.1.2",
"version": "1.1.1",
"main": "./dist/back/index.js",
"scripts": {
"start": "electron .",
@@ -62,7 +62,7 @@
"electron": "^12.0.0",
"electron-builder": "^22.10.5",
"npm-run-all": "^4.1.5",
"parcel": "^2.0.0-beta.3.1",
"parcel": "next",
"postcss": "^8.2.10",
"typescript": "^4.2.3"
}

View File

@@ -60,11 +60,11 @@ export default class TrayUtility {
static init() {
if (!this.tray) {
const file = path.join(__dirname, '../../assets/tray.png')
const resized = nativeImage.createFromPath(file).resize({ width: 24, height: 24 })
resized.setTemplateImage(true)
resized.isMacTemplateImage = true
this.tray = new Tray(resized)
const file = path.join(__dirname, '../../assets/trayTemplate.png')
// const resized = nativeImage.createFromPath(file).resize({ width: 24, height: 24 })
// resized.setTemplateImage(true)
// resized.isMacTemplateImage = true
this.tray = new Tray(file)
this.build()
}
}

View File

@@ -4,7 +4,6 @@ import logger from 'electron-log'
import { dialog, shell } from 'electron'
import pkg from '../../package.json'
import Banner from './banner'
const current = semver.coerce(pkg.version)
const url = 'https://api.github.com/repos/cupcakearmy/unpixel/tags'
@@ -26,9 +25,7 @@ export default class Updater {
if (!current) throw new Error('Could not determine current version')
if (semver.lt(current, latest)) {
logger.info('New version available')
Banner.close()
dialog
// @ts-ignore
.showMessageBox(null, {
title: 'Update available',
message: 'A newer version is available, please download.',

2419
yarn.lock

File diff suppressed because it is too large Load Diff