From 968cbbf45ac64d98213435ffc1ee888c10150871 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vegard=20Bj=C3=B8rsvik?= Date: Tue, 1 Aug 2017 13:41:35 +0200 Subject: [PATCH 1/2] Added right class so it get its style --- windows/main.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/main.html b/windows/main.html index e5b245f..ea57341 100644 --- a/windows/main.html +++ b/windows/main.html @@ -9,7 +9,7 @@

Upload Images

Drag and drop images here, or select them by pressing browse - +

From 93da90ced4599e8b2bddabd05bbc248b2a4b4fa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vegard=20Bj=C3=B8rsvik?= Date: Tue, 1 Aug 2017 13:53:36 +0200 Subject: [PATCH 2/2] Added auto launch as a setting --- autostart.js | 14 ++++++++++++++ index.js | 14 ++++++++++++-- package.json | 3 ++- renderer/settings.js | 12 ++++++++++++ windows/settings.html | 2 ++ yarn.lock | 22 ++++++++++++++++++++++ 6 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 autostart.js diff --git a/autostart.js b/autostart.js new file mode 100644 index 0000000..4add9f2 --- /dev/null +++ b/autostart.js @@ -0,0 +1,14 @@ +const AutoLaunch = require('auto-launch'); +const settings = require('electron-settings'); + +const hyperShotAutoLauncher = new AutoLaunch({ + name: 'hyperShot' +}); + +exports.update = () => { + if (settings.get('user.general.autoLaunch')) { + hyperShotAutoLauncher.enable(); + } else { + hyperShotAutoLauncher.disable(); + } +}; diff --git a/index.js b/index.js index ec7f7b8..fd07539 100644 --- a/index.js +++ b/index.js @@ -9,6 +9,7 @@ const isDev = require('electron-is-dev'); // New Upload object to handle upload and upload events const Upload = require('./upload'); +const autostart = require('./autostart'); const upload = new Upload(); @@ -318,16 +319,25 @@ app.on('ready', () => { folder: '' }, copyToClipboard: false, - openLink: true - } + openLink: true, + autoLaunch: true + }, + version: app.getVersion() }); if (settings.get('user') === undefined) { settings.set('user', settings.get('default')); } + if (settings.get('user.version') !== app.getVersion()) { + settings.set('user', settings.get('default')); + } + mainWindow = createMainWindow(); + // Update autostart settings + autostart.update(); + // A suitable size for the preview window let size = null; if (!shouldQuit) { diff --git a/package.json b/package.json index 877b818..0ad42a3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "hyperShot", "productName": "hyperShot", - "version": "1.0.0-beta.0", + "version": "1.0.0-beta.1", "description": "A powerfull cross-platform screenshoting tool", "license": "MIT", "repository": "https://github.com/Kuzat/hyperShot", @@ -51,6 +51,7 @@ "Linux" ], "dependencies": { + "auto-launch": "^5.0.1", "electron-debug": "1.0.X", "electron-is-dev": "^0.1.2", "electron-settings": "3.0.X", diff --git a/renderer/settings.js b/renderer/settings.js index dcf7118..4f5c7be 100644 --- a/renderer/settings.js +++ b/renderer/settings.js @@ -1,5 +1,6 @@ const remote = require('electron').remote; const settings = require('electron-settings'); +const autostart = require('../autostart'); const dialog = remote.dialog; @@ -10,6 +11,7 @@ let openLink; let uploadTypes; let fullscreenHotkey; let selectiveHotkey; +let autoLaunchSetting; function setupSettings() { // Save to folder @@ -23,6 +25,9 @@ function setupSettings() { // Open link openLink.checked = settings.get('user.general.openLink'); + // Auto-launch + autoLaunchSetting.checked = settings.get('user.general.autoLaunch'); + // Upload type uploadTypes.selectedIndex = settings.get('user.upload.type'); @@ -42,6 +47,7 @@ document.addEventListener('DOMContentLoaded', () => { uploadTypes = document.getElementsByName('upload-types')[0]; fullscreenHotkey = document.getElementsByName('fullscreen')[0]; selectiveHotkey = document.getElementsByName('selective')[0]; + autoLaunchSetting = document.getElementsByName('autoLaunch')[0]; setupSettings(); @@ -65,6 +71,12 @@ document.addEventListener('DOMContentLoaded', () => { settings.set('user.general.openLink', event.target.checked); }); + autoLaunchSetting.addEventListener('change', event => { + console.log(event.target.checked); + settings.set('user.general.autoLaunch', event.target.checked); + autostart.update(); + }); + uploadTypes.addEventListener('change', event => { console.log(event.target.selectedIndex); settings.set('user.upload.type', event.target.selectedIndex); diff --git a/windows/settings.html b/windows/settings.html index 647f081..a5743a8 100644 --- a/windows/settings.html +++ b/windows/settings.html @@ -18,6 +18,8 @@

General

Open link after successful upload

+

Auto-launch app on startup

+

Uploading

Upload type