Skip to content

TagSpaces is an offline, open source, document manager with tagging support

fix process

sytolkf3720266d750
diff --git a/src/main/electron-tray-menu.ts b/src/main/electron-tray-menu.ts
index 398bd293f..f80f4476e 100644
--- a/src/main/electron-tray-menu.ts
+++ b/src/main/electron-tray-menu.ts
@@ -17,6 +17,7 @@
*/
import { app, Menu, nativeImage, Tray } from 'electron';
+import prcs from 'process';
let tray = null;
@@ -30,7 +31,7 @@ const icon2xWhite =
'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAYAAADFw8lbAAAACXBIWXMAAACjAAAAowHwx5rOAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAA+FJREFUWIW1mV2IVVUUx/93ZjLTCDM0sDIqKY2G7AMq+0ChlCh8GAkCwUj7xPKhD4ueBgp6KRA0iKSggsAHw/BxqCfJIEoxMjKRKCU11KwpR7vdXw9rTnPuae919pm75w+HuXPOXmv/zt5rr732vS1AU6B+SdskrcrlsC+Xo5JakrYqI6Q0NaBvSXo0t9PcoK9LejqzT0l5QTdKejmjvy61Mi2mJyS9LYvPkL6T9Feir0WSZvzvLtDrNQS0iet9oK+Bv69CTnqd+uWSPpKlo5B2SFonqVO615K0QNLtkmYm99TDSC4BRp2RHAHOr9jcAOwptRkDXkwZ0clCLgZOOZC7gQsrNrOAnyvtOuN/H5sK0GuBow7kPuDigN2TkfYd4Ps60KYxeoWkEUmXRp4flMXtqcCzhRGbImYHvI6bgM6VQc6PPD8s6T5JR0v3zit9PhCxQ9IhSW2398TpnkX3IqjqOLCoYtMPbAfeAwaA2cAvgWkHWF839SmQM4BdDuRvwM0Bu82lNjuAC4BbgP2l++eAYaDVK+h04FMH8k/gzoDdcKDtbuASbHRvBO7FRjkp4XuQA+MjEdNZYEXA7jbH5hvgMqfPO4jk5phBH/Ch02EbeMixfxb4J2J7BBgM2NyKhVFQsY42xwywBbDOsS2uIeBMxMdJ4K5S28XACafPQ6EOXnMMAF5IgCxmZRnxUToDrAKuw99AfgKuqjrfUAM5nAi5EfgEyxiDwOGIv7bzIoy/wEKgK48+wkReC2lLIuTDTMTnF8Ac4GrggOM7pGPA9YXfcjx5NeUHpNWUS7GKqKwfgGuw1PR5IuSvWKX1n28B92OpJqaPsVRVBzmbeEV1BMudM4HPaiBPYIury3+fpKckTXN22YskTXf3YdNJSWsljQWezZO0S9JKWWET02lJKyTtDe3104BtNW/5JRZrKTG61BlZbw2MAnfH/BYf+oF3amC/BS5PAJ2Dv9JjkPd4fsv/tAjv0WX9iBXOMYfrsWS+BJgH7E2AHMPWiTsAoZsb8KfoGHBTwG41E2lpFKsD5gO/O77OAg/UQcZABawB/nY6+AOrfor2D2IlWxViP3GdA1amQHqgGncS26vBpmwIy68pU1xWG9sYkiDrQIsVfLqmw7XAXODrBpCrm0CmgAorv447HXeA57HjsVdkF20fbwqZCipsz62eyat6FStEskM2ARVwJXb+now6dB/gphRUNIvFsp7rBXIyoMJicaQB5Cu9Qk4WVNjRd2cC5HAOyF5AhdUH7zqQb+aC7BVUWH3wRgByU07IHKDF9VIJcivd33xkuXJ9hy9Jz0galBXi2X9l+xc7opIKau8a2gAAAABJRU5ErkJggg==';
export default function buildTrayIconMenu(mainPageProps: any, i18n, isMacLike) {
- const cKey = isMacLike ? ' - Cmd' : ' - Ctrl';
+ const cKey = isMacLike ? ' - ⌘' : ' - Ctrl';
function openNextFile() {
mainPageProps.openNextFile();
@@ -98,15 +99,17 @@ export default function buildTrayIconMenu(mainPageProps: any, i18n, isMacLike) {
},
];
- let icon = nativeImage.createFromDataURL(icon1x);
if (!tray) {
- if (process.platform === 'darwin') {
+ let icon;
+ if (prcs.platform === 'darwin') {
icon = nativeImage.createFromDataURL(icon1xMac);
icon.addRepresentation({
scaleFactor: 2.0,
dataURL: icon2xBlack,
});
icon.setTemplateImage(true);
+ } else {
+ icon = nativeImage.createFromDataURL(icon1x);
}
tray = new Tray(icon);
}
diff --git a/src/main/main.ts b/src/main/main.ts
index 70230169b..6570dd321 100644
--- a/src/main/main.ts
+++ b/src/main/main.ts
@@ -13,6 +13,7 @@ import { app, BrowserWindow, shell, ipcMain, globalShortcut } from 'electron';
import { autoUpdater } from 'electron-updater';
import log from 'electron-log';
import pm2 from '@elife/pm2';
+import prcs from 'process';
import propertiesReader from 'properties-reader';
import { resolveHtmlPath } from './util';
import windowStateKeeper from 'electron-window-state';
@@ -308,7 +309,7 @@ function buildTrayMenu(i18n) {
quitApp: reloadApp,
},
i18n,
- process.platform === 'darwin',
+ prcs.platform === 'darwin',
);
}
@@ -541,7 +542,7 @@ app.commandLine.appendSwitch('autoplay-policy', 'no-user-gesture-required'); //
app.on('window-all-closed', () => {
// Respect the OSX convention of having the application in memory even
// after all windows have been closed
- if (process.platform !== 'darwin') {
+ if (prcs.platform !== 'darwin') {
pm2.stopAll();
globalShortcut.unregisterAll();
app.quit();
diff --git a/src/main/mainEvents.ts b/src/main/mainEvents.ts
index d3b05e3dc..9fabe0256 100644
--- a/src/main/mainEvents.ts
+++ b/src/main/mainEvents.ts
@@ -22,7 +22,7 @@ import {
} from '@tagspaces/tagspaces-common-node/io-node';
import fs from 'fs-extra';
import path from 'path';
-// import chokidar, { FSWatcher } from 'chokidar';
+import prcs from 'process';
import {
getOnProgress,
isWorkerAvailable,
@@ -56,7 +56,7 @@ export default function loadMainEvents() {
picturesFolder: app.getPath('pictures'),
videosFolder: app.getPath('videos'),
};
- if (process.platform === 'darwin') {
+ if (prcs.platform === 'darwin') {
paths.iCloudFolder =
app.getPath('home') + '/Library/Mobile Documents/com~apple~CloudDocs';
}