Merge pull request #34 from kicken/v10.1.0

Release v10.1.5

Author: kicken

CHANGES.md

@@ -1,3 +1,11 @@
+## 10.1.5 (unreleased)
+
+ - Update to Electron 22.3.15
+ - Update to Converse.js 10.1.5
+ - Build universal binary for macOS
+ - Remember window size and position
+ - Update icon images
+
 ## 10.0.0 (2022-11-01)
 
 - Update to Electron 21

README.md

@@ -18,7 +18,6 @@ A basic integration of [Converse.js](https://conversejs.org/) and Electron. With
 [![One-to-one chat](https://user-images.githubusercontent.com/6234547/161444320-62179698-d4cb-4522-8ee4-5fd727bbff0d.jpg)](https://user-images.githubusercontent.com/6234547/161444152-8a44b284-48a6-4c8e-a16e-95399b4def16.jpg)
 [![Multi-user chat](https://user-images.githubusercontent.com/6234547/161444323-5fe7e478-1923-47c3-9e99-84020fb44009.jpg)](https://user-images.githubusercontent.com/6234547/161444156-eb2224a7-6082-4fe7-aa55-44eec093e04d.jpg)
 
-
 - Permanent account storage
 - Tray icon
 - Tray notifications
@@ -29,19 +28,17 @@ A basic integration of [Converse.js](https://conversejs.org/) and Electron. With
 
 See [CHANGES.md](https://github.com/conversejs/converse-desktop/blob/master/CHANGES.md)
 
-
 #### Latest release installers
 
-| Operation System | Download link                                                                                                                                            |
-|------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------|
-| macOS            | [Converse_Desktop-9.1.0_x64.dmg](https://github.com/conversejs/converse-desktop/releases/download/v9.1.0/Converse.Desktop-9.1.0.dmg)                     |
-| Windows          | [Converse_Desktop_Setup-9.1.0_x64.exe](https://github.com/conversejs/converse-desktop/releases/download/v9.1.0/Converse.Desktop.Setup.9.1.0.exe)         |
-| Linux DEB        | [converse_desktop-9.1.0_amd64.deb](https://github.com/conversejs/converse-desktop/releases/download/v9.1.0/converse_desktop-9.1.0_amd64.deb)             |
-| Linux AppImage   | [converse_desktop-9.1.0_x86_64.AppImage](https://github.com/conversejs/converse-desktop/releases/download/v9.1.0/converse_desktop-9.1.0_x86_64.AppImage) |
-| Linux other      | [converse_desktop-9.1.0_x64.tar.gz](https://github.com/conversejs/converse-desktop/releases/download/v9.1.0/converse_desktop-9.1.0_x64.tar.gz)           |
-
-   - [All releases](https://github.com/conversejs/converse-desktop/releases)
+| Operation System | Download link                                                                                                                                               |
+|------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| macOS            | [Converse Desktop-10.1.5-universal.dmg](https://github.com/conversejs/converse-desktop/releases/download/v10.1.5/Converse.Desktop-10.1.5-universal.dmg)     |
+| Windows          | [Converse Desktop Setup 10.1.5.exe](https://github.com/conversejs/converse-desktop/releases/download/v10.1.5/Converse.Desktop.Setup.10.1.5.exe)             |
+| Linux DEB        | [converse_desktop-10.1.5_amd64.deb](https://github.com/conversejs/converse-desktop/releases/download/v10.1.5/converse_desktop-10.1.5_amd64.deb)             |
+| Linux AppImage   | [converse_desktop-10.1.5_x86_64.AppImage](https://github.com/conversejs/converse-desktop/releases/download/v10.1.5/converse_desktop-10.1.5_x86_64.AppImage) |
+| Linux other      | [converse_desktop-10.1.5_x64.tar.gz](https://github.com/conversejs/converse-desktop/releases/download/v10.1.5/converse_desktop-10.1.5_x64.tar.gz)           |
 
+- [All releases](https://github.com/conversejs/converse-desktop/releases)
 
 ## Build from source
 
@@ -75,9 +72,7 @@ Like Converse.js, Converse Desktop's files are released under the Mozilla Public
 
 However, libsignal library, which is required for OMEMO support is released under the GPLv3. The MPLv2 license is compatible with GPLv3 and when GPLv3 code is included, the entire project effectively is licensed under the GPLv3.
 
-Any custom build of Converse Desktop without libsignal included will again be licensed
-under the MPLv2.
-
+Any custom build of Converse Desktop without libsignal included will again be licensed under the MPLv2.
 
 ## Acknowledgements
 

app/converse-plugins/desktop-settings.js

@@ -4,7 +4,7 @@ converse.plugins.add('converse-desktop-settings', {
     initialize () {
         const { _converse } = this;
         api.settings.changed(function (key, newValue) {
-            if (['omemo_default'].indexOf(key) !== -1){
+            if (['omemo_default'].indexOf(key) !== -1) {
                 _converse.api.settings.set(key, newValue);
             }
         });

main.js

@@ -16,18 +16,25 @@ const isMac = process.platform === 'darwin'
 const isWin = process.platform === 'win32'
 
 function initApp () {
-    if (!app.requestSingleInstanceLock()){
+    if (!app.requestSingleInstanceLock()) {
         app.quit();
     }
 
     createWindow()
     // Set Windows platform notifications
-    if (isWin){
+    if (isWin) {
         app.setAppUserModelId("com.denry.converseDesktop")
     }
 }
 
 function createWindow () {
+    function getSavedWindowBounds () {
+        const winBounds = settingsService.get('winBounds');
+        winBounds.width = Math.max(winBounds.width, 200);
+        winBounds.height = Math.max(winBounds.height, 200);
+        return winBounds;
+    }
+
     // Main window options
     const mainWindowOptions = {
         zoomToPageWidth: true,
@@ -36,8 +43,8 @@ function createWindow () {
         webPreferences: {
             preload: path.join(__dirname, 'preload.js')
         },
-        icon: './resources/images/logo.png',
-        ...settingsService.get('winBounds'),
+        icon: path.join(__dirname, 'resources', 'images', 'logo-48x48.png'),
+        ...getSavedWindowBounds(),
     }
 
     // Create the browser window.
@@ -54,21 +61,28 @@ function createWindow () {
 
     // Before close
     mainWindow.on('close', (e) => {
-        settingsService.set('winBounds', mainWindow.getBounds());
         settingsService.set('isMaximized', mainWindow.isMaximized());
         if (mainWindow.isFullScreen()) {
             mainWindow.setFullScreen(false);
         }
-        if (!app.isQuitting && settingsService.get('minimizeOnClose')){
+        if (!app.isQuitting && settingsService.get('minimizeOnClose')) {
             e.preventDefault()
             mainWindow.hide()
         }
         return false;
     })
 
+    mainWindow.on('resized', () => {
+        settingsService.set('winBounds', mainWindow.getBounds());
+    })
+    mainWindow.on('moved', () => {
+        settingsService.set('winBounds', mainWindow.getBounds());
+    })
+
+
     // Handle shutdown event on Mac with minimizeOnClose
     // to prevent shutdown interrupt
-    if (isMac){
+    if (isMac) {
         const { powerMonitor } = require('electron')
         powerMonitor.on('shutdown', () => {
             app.isQuitting = true
@@ -143,7 +157,7 @@ app.on('window-all-closed', function () {
 })
 
 app.on('activate', function () {
-    if (mainWindow === null){
+    if (mainWindow === null) {
         createWindow()
     } else {
         mainWindow.show();

modules/settings-service.js

@@ -8,15 +8,15 @@ let settingsService = {}
 
 settingsService.get = (itemKey) => {
     const settingValue = electronSettings.getSync(itemKey)
-    if (typeof settingValue === 'undefined' || settingValue === null){
+    if (typeof settingValue === 'undefined' || settingValue === null) {
         return false
     }
     return settingValue
 }
 
 settingsService.set = (itemKey, settingValue) => {
     electronSettings.setSync(itemKey, settingValue);
-    if (settingsService.webContents){
+    if (settingsService.webContents) {
         settingsService.webContents.send('settings', 'changed', itemKey, settingValue);
     }
 }

modules/tray-service.js

@@ -2,22 +2,27 @@
  * Module for Tray functions.
  */
 
-const { Tray } = require('electron')
+const {Tray} = require('electron')
 
 const path = require('path')
 
 let tray = null
 
 const trayService = {}
 
-const getTrayServiceIcon = (iconName = 'icon') => {
-    let iconImage;
+const getTrayServiceIcon = (withEnvelope = false) => {
+    let size;
     if (process.platform === 'darwin' || process.platform === 'win32') {
-        iconImage = iconName + '-16x16'
+        size = '16x16';
     } else {
-        iconImage = iconName + '-48x48'
+        size = '48x48';
+    }
+
+    if (withEnvelope) {
+        return path.join(__dirname, '..', 'resources', 'images', 'tray', 'envelope-' + size + '.png');
+    } else {
+        return path.join(__dirname, '..', 'resources', 'images', 'logo-' + size + '.png');
     }
-    return path.join(__dirname, '..', 'resources', 'images', iconImage + '.png')
 }
 
 trayService.initTray = (window) => {
@@ -32,7 +37,7 @@ trayService.initTray = (window) => {
 }
 
 trayService.showEnvelope = () => {
-    const iconPath = getTrayServiceIcon('envelope')
+    const iconPath = getTrayServiceIcon(true)
     tray.setImage(iconPath)
 }