Browse Source

Use path.join for icons.

pull/3202/head
TheGoddessInari 6 years ago
parent
commit
b02a61538d
No known key found for this signature in database
GPG Key ID: 1209B1B7632D69A
  1. 4
      electron/main.js
  2. 3
      electron/menu.js
  3. 2
      electron/tray.js

4
electron/main.js

@ -80,7 +80,7 @@ function createWindow () {
// Create the browser window using the state information // Create the browser window using the state information
mainWindow = new BrowserWindow({ mainWindow = new BrowserWindow({
title: 'Rambox-OS' title: 'Rambox-OS'
,icon: app.getAppPath() + '/resources/Icon.' + (process.platform === 'linux' ? 'png' : 'ico') ,icon: path.join(app.getAppPath(), '/resources/Icon.' + (process.platform === 'linux' ? 'png' : 'ico'))
,backgroundColor: '#FFF' ,backgroundColor: '#FFF'
,x: config.get('x') ,x: config.get('x')
,y: config.get('y') ,y: config.get('y')
@ -375,7 +375,7 @@ ipcMain.on('image:popup', function(event, url, partition) {
width: mainWindow.getBounds().width width: mainWindow.getBounds().width
,height: mainWindow.getBounds().height ,height: mainWindow.getBounds().height
,parent: mainWindow ,parent: mainWindow
,icon: app.getAppPath() + '/resources/Icon.' + (process.platform === 'linux' ? 'png' : 'ico') ,icon: path.join(app.getAppPath(), '/resources/Icon.' + (process.platform === 'linux' ? 'png' : 'ico'))
,backgroundColor: '#FFF' ,backgroundColor: '#FFF'
,autoHideMenuBar: true ,autoHideMenuBar: true
,skipTaskbar: true ,skipTaskbar: true

3
electron/menu.js

@ -1,6 +1,7 @@
'use strict'; 'use strict';
const os = require('os'); const os = require('os');
const {app, BrowserWindow, Menu, shell} = require('electron'); const {app, BrowserWindow, Menu, shell} = require('electron');
const path = require('path');
const appName = app.getName(); const appName = app.getName();
function sendAction(action) { function sendAction(action) {
@ -14,7 +15,7 @@ function sendAction(action) {
} }
module.exports = function(config) { module.exports = function(config) {
const locale = require(app.getAppPath()+'/resources/languages/'+config.get('locale')); const locale = require(path.join(app.getAppPath(), '/resources/languages/'+config.get('locale')));
const helpSubmenu = [ const helpSubmenu = [
{ {
label: `&Facebook`, label: `&Facebook`,

2
electron/tray.js

@ -10,7 +10,7 @@ var appIcon = null;
exports.create = function(win, config) { exports.create = function(win, config) {
if (process.platform === 'darwin' || appIcon || config.get('window_display_behavior') === 'show_taskbar' ) return; if (process.platform === 'darwin' || appIcon || config.get('window_display_behavior') === 'show_taskbar' ) return;
const locale = require(app.getAppPath()+'/resources/languages/'+config.get('locale')); const locale = require(path.join(app.getAppPath(), '/resources/languages/'+config.get('locale')));
const icon = process.platform === 'linux' || process.platform === 'darwin' ? 'IconTray.png' : 'Icon.ico'; const icon = process.platform === 'linux' || process.platform === 'darwin' ? 'IconTray.png' : 'Icon.ico';
const iconPath = path.join(app.getAppPath(), `/resources/${icon}`); const iconPath = path.join(app.getAppPath(), `/resources/${icon}`);

Loading…
Cancel
Save