From 91a510a174e161766a668b2f7b6795bbbcee002b Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Tue, 12 Feb 2019 14:17:56 +0100 Subject: Bump version to 5.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 17e1c2bc9..8ece958ee 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "franz", "productName": "Franz", "appId": "com.meetfranz.franz", - "version": "5.0.0-beta.24", + "version": "5.0.0", "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", "copyright": "adlk x franz - Stefan Malzner", "main": "index.js", -- cgit v1.2.3-70-g09d2 From 88086011a634acbfd5179fcfb855de0bfd31930c Mon Sep 17 00:00:00 2001 From: Stefan Date: Tue, 12 Feb 2019 15:40:50 +0100 Subject: feat(Windows): Add option to quit Franz from Taskbar icon --- electron-builder.yml | 4 +++- src/config.js | 3 ++- src/helpers/asar-helpers.js | 3 +++ src/index.js | 14 +++++++++++++- 4 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 src/helpers/asar-helpers.js diff --git a/electron-builder.yml b/electron-builder.yml index 1d62669bf..97aafa207 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -43,4 +43,6 @@ protocols: name: Franz schemes: [franz] -asarUnpack: "./dictionaries" +asarUnpack: + - ./dictionaries + - ./assets/images/taskbar diff --git a/src/config.js b/src/config.js index 789ddd1a0..101a4379a 100644 --- a/src/config.js +++ b/src/config.js @@ -1,5 +1,6 @@ import electron from 'electron'; import path from 'path'; +import { asarPath } from './helpers/asar-helpers'; const app = process.type === 'renderer' ? electron.remote.app : electron.app; const systemPreferences = process.type === 'renderer' ? electron.remote.systemPreferences : electron.systemPreferences; @@ -57,4 +58,4 @@ export const FILE_SYSTEM_SETTINGS_TYPES = [ export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config'); // Replacing app.asar is not beautiful but unforunately necessary -export const DICTIONARY_PATH = path.join(__dirname, 'dictionaries').replace('app.asar', 'app.asar.unpacked'); +export const DICTIONARY_PATH = asarPath(path.join(__dirname, 'dictionaries').replace('app.asar', 'app.asar.unpacked')); diff --git a/src/helpers/asar-helpers.js b/src/helpers/asar-helpers.js new file mode 100644 index 000000000..9e4380c06 --- /dev/null +++ b/src/helpers/asar-helpers.js @@ -0,0 +1,3 @@ +export function asarPath(dir = '') { + return dir.replace('app.asar', 'app.asar.unpacked'); +} diff --git a/src/index.js b/src/index.js index a2b4acb00..6a0ee600f 100644 --- a/src/index.js +++ b/src/index.js @@ -33,6 +33,7 @@ import { DEFAULT_APP_SETTINGS, DEFAULT_WINDOW_OPTIONS, } from './config'; +import { asarPath } from './helpers/asar-helpers'; /* eslint-enable import/first */ const debug = require('debug')('Franz:App'); @@ -88,6 +89,12 @@ if (!gotTheLock) { window.setPosition(DEFAULT_WINDOW_OPTIONS.x + 100, DEFAULT_WINDOW_OPTIONS.y + 100); window.setSize(DEFAULT_WINDOW_OPTIONS.width, DEFAULT_WINDOW_OPTIONS.height); }, 1); + } else if (argv.includes('--quit')) { + // Needs to be delayed to not interfere with mainWindow.restore(); + setTimeout(() => { + debug('Quitting Franz via Task'); + app.quit(); + }, 1); } }); } @@ -265,10 +272,15 @@ app.on('ready', () => { app.setUserTasks([{ program: process.execPath, arguments: `${isDevMode ? `${__dirname} ` : ''}--reset-window`, - iconPath: path.join(`${__dirname}`, '../src/assets/images/taskbar/win32/display.ico'), + iconPath: asarPath(path.join(isDevMode ? `${__dirname}../src/` : __dirname, 'assets/images/taskbar/win32/display.ico')), iconIndex: 0, title: 'Move Franz to Current Display', description: 'Restore the position and size of Franz', + }, { + program: process.execPath, + arguments: `${isDevMode ? `${__dirname} ` : ''}--quit`, + iconIndex: 0, + title: 'Quit Franz', }]); } -- cgit v1.2.3-70-g09d2 From 69e49f37e7d1069c133162c521f892d8eb6599d0 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Wed, 13 Feb 2019 17:05:10 +0100 Subject: fix dictionary path --- src/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config.js b/src/config.js index 101a4379a..aecba45be 100644 --- a/src/config.js +++ b/src/config.js @@ -58,4 +58,4 @@ export const FILE_SYSTEM_SETTINGS_TYPES = [ export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config'); // Replacing app.asar is not beautiful but unforunately necessary -export const DICTIONARY_PATH = asarPath(path.join(__dirname, 'dictionaries').replace('app.asar', 'app.asar.unpacked')); +export const DICTIONARY_PATH = asarPath(path.join(__dirname, 'dictionaries')); -- cgit v1.2.3-70-g09d2 From 363ed77f02c5060b1322f012a9d039ae757cfa3b Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Thu, 14 Feb 2019 14:09:40 +0100 Subject: Update CHANGELOG.md [ci skip] --- CHANGELOG.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 08fd79aaa..641cd2b6b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,20 @@ +# [5.0.0](https://github.com/meetfranz/franz/compare/5.0.0-beta.24...5.0.0) (2019-02-15) + +### General + +* **App:** Updated electron to 4.0.4 + +### Features + +* **Spellchecker:** Add automatic spellcheck language detection ([a5e7171](https://github.com/meetfranz/franz/commit/a5e7171)) +* **Windows:** Add option to quit Franz from Taskbar ([8808601](https://github.com/meetfranz/franz/commit/8808601)) + +### Bug Fixes + +* **App:** Various bugfixes and improvements + + + # [5.0.0-beta.24](https://github.com/meetfranz/franz/compare/v5.0.0-beta.23...v5.0.0-beta.24) (2019-02-03) -- cgit v1.2.3-70-g09d2 -- cgit v1.2.3-70-g09d2