diff --git a/js/aboutApp/index.js b/js/aboutApp/index.js index f44325de..7162e240 100644 --- a/js/aboutApp/index.js +++ b/js/aboutApp/index.js @@ -6,7 +6,7 @@ const path = require('path'); const fs = require('fs'); const log = require('../log.js'); const logLevels = require('../enums/logLevels.js'); -const buildNumber = require('../../package.json').buildNumber; +const { version, clientVersion, buildNumber } = require('../../package.json'); const { initCrashReporterMain, initCrashReporterRenderer } = require('../crashReporter.js'); const i18n = require('../translation/i18n'); @@ -87,7 +87,7 @@ function openAboutWindow(windowName) { // initialize crash reporter initCrashReporterMain({ process: 'about app window' }); initCrashReporterRenderer(aboutWindow, { process: 'render | about app window' }); - aboutWindow.webContents.send('buildNumber', buildNumber || '0'); + aboutWindow.webContents.send('versionInfo', { version, clientVersion, buildNumber }); }); aboutWindow.webContents.on('crashed', function () { diff --git a/js/aboutApp/renderer.js b/js/aboutApp/renderer.js index 7effaed6..edca9141 100644 --- a/js/aboutApp/renderer.js +++ b/js/aboutApp/renderer.js @@ -17,12 +17,12 @@ function renderDom() { }); } -ipcRenderer.on('buildNumber', (event, buildNumber) => { - let versionText = document.getElementById('version'); - const version = remote.app.getVersion(); +ipcRenderer.on('versionInfo', (event, versionInfo) => { + const versionText = document.getElementById('version'); + const { version, clientVersion, buildNumber } = versionInfo; if (versionText) { - versionText.innerHTML = version ? `Version ${version} (${version}.${buildNumber})` : 'N/A'; + versionText.innerHTML = version ? `Version ${clientVersion}-${version} (${buildNumber})` : 'N/A'; } }); diff --git a/js/main.js b/js/main.js index c8b90c45..34efca59 100644 --- a/js/main.js +++ b/js/main.js @@ -9,6 +9,7 @@ const shellPath = require('shell-path'); const urlParser = require('url'); const nodePath = require('path'); const compareSemVersions = require('./utils/compareSemVersions.js'); +const { version, clientVersion, buildNumber } = require('../package.json'); // Local Dependencies const { @@ -230,6 +231,8 @@ app.on('activate', function () { // because electron leaves registry traces upon uninstallation if (isMac) { app.setAsDefaultProtocolClient('symphony'); + // Sets application version info that will be displayed in about app panel + app.setAboutPanelOptions({ applicationVersion: `${clientVersion}-${version}`, version: buildNumber }); } /** diff --git a/package.json b/package.json index cdd013ca..062aaf98 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,7 @@ "name": "Symphony", "productName": "Symphony", "version": "3.4.0", + "clientVersion": "1.53", "buildNumber": "0", "description": "Symphony desktop app (Foundation ODP)", "author": "Symphony",