added copy/paste menu for MacOS
This commit is contained in:
parent
f654ebd4c8
commit
c3dabb7352
128
main-electron.js
128
main-electron.js
|
@ -1,81 +1,111 @@
|
||||||
const { app, Menu, server, BrowserWindow, shell } = require('electron');
|
const { app, Menu, server, BrowserWindow, shell } = require("electron");
|
||||||
const path = require('path');
|
const path = require("path");
|
||||||
const url = require('url');
|
const url = require("url");
|
||||||
const http = require('http');
|
const http = require("http");
|
||||||
const fs = require('fs');
|
const fs = require("fs");
|
||||||
|
|
||||||
// Keep a global reference of the window object, if you don't, the window will
|
// Keep a global reference of the window object, if you don't, the window will
|
||||||
// be closed automatically when the JavaScript object is garbage collected.
|
// be closed automatically when the JavaScript object is garbage collected.
|
||||||
let win
|
let win;
|
||||||
|
|
||||||
function createWindow() {
|
function createWindow() {
|
||||||
// Create the browser window.
|
// Create the browser window.
|
||||||
win = new BrowserWindow({ width: 377, height: 800, title: "Sengi", backgroundColor: '#FFF', 'useContentSize': true });
|
win = new BrowserWindow({
|
||||||
|
width: 377,
|
||||||
|
height: 800,
|
||||||
|
title: "Sengi",
|
||||||
|
backgroundColor: "#FFF",
|
||||||
|
useContentSize: true
|
||||||
|
});
|
||||||
|
|
||||||
var server = http.createServer(requestHandler).listen(9527);
|
var server = http.createServer(requestHandler).listen(9527);
|
||||||
win.loadURL('http://localhost:9527');
|
win.loadURL("http://localhost:9527");
|
||||||
|
|
||||||
|
|
||||||
const template = [
|
const template = [
|
||||||
{
|
{
|
||||||
label: 'View',
|
label: "View",
|
||||||
submenu: [
|
submenu: [
|
||||||
{ role: 'reload' },
|
{ role: "reload" },
|
||||||
{ role: 'forcereload' },
|
{ role: "forcereload" },
|
||||||
{ type: 'separator' },
|
{ type: "separator" },
|
||||||
{ role: 'close' }
|
{ role: "close" }
|
||||||
|
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
role: 'help',
|
role: "help",
|
||||||
submenu: [
|
submenu: [
|
||||||
{ role: 'toggledevtools' },
|
{ role: "toggledevtools" },
|
||||||
{
|
{
|
||||||
label: 'Open GitHub project',
|
label: "Open GitHub project",
|
||||||
click() { require('electron').shell.openExternal('https://github.com/NicolasConstant/sengi') }
|
click() {
|
||||||
|
require("electron").shell.openExternal(
|
||||||
|
"https://github.com/NicolasConstant/sengi"
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
];
|
||||||
|
|
||||||
const menu = Menu.buildFromTemplate(template);
|
const menu = Menu.buildFromTemplate(template);
|
||||||
win.setMenu(menu);
|
win.setMenu(menu);
|
||||||
|
|
||||||
|
// Check if we are on a MAC
|
||||||
|
if (process.platform === "darwin") {
|
||||||
|
// Create our menu entries so that we can use MAC shortcuts
|
||||||
|
Menu.setApplicationMenu(
|
||||||
|
Menu.buildFromTemplate([
|
||||||
|
{
|
||||||
|
label: "Edit",
|
||||||
|
submenu: [
|
||||||
|
{ role: "undo" },
|
||||||
|
{ role: "redo" },
|
||||||
|
{ type: "separator" },
|
||||||
|
{ role: "cut" },
|
||||||
|
{ role: "copy" },
|
||||||
|
{ role: "paste" },
|
||||||
|
{ role: "pasteandmatchstyle" },
|
||||||
|
{ role: "delete" },
|
||||||
|
{ role: "selectall" }
|
||||||
|
]
|
||||||
|
}
|
||||||
|
])
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
// Open the DevTools.
|
// Open the DevTools.
|
||||||
// win.webContents.openDevTools()
|
// win.webContents.openDevTools()
|
||||||
|
|
||||||
//open external links to browser
|
//open external links to browser
|
||||||
win.webContents.on('new-window', function (event, url) {
|
win.webContents.on("new-window", function(event, url) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
shell.openExternal(url);
|
shell.openExternal(url);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Emitted when the window is closed.
|
// Emitted when the window is closed.
|
||||||
win.on('closed', () => {
|
win.on("closed", () => {
|
||||||
// Dereference the window object, usually you would store windows
|
// Dereference the window object, usually you would store windows
|
||||||
// in an array if your app supports multi windows, this is the time
|
// in an array if your app supports multi windows, this is the time
|
||||||
// when you should delete the corresponding element.
|
// when you should delete the corresponding element.
|
||||||
win = null
|
win = null;
|
||||||
})
|
});
|
||||||
};
|
}
|
||||||
|
|
||||||
|
|
||||||
function requestHandler(req, res) {
|
function requestHandler(req, res) {
|
||||||
var file = req.url == '/' ? '/index.html' : req.url,
|
var file = req.url == "/" ? "/index.html" : req.url,
|
||||||
root = __dirname + '/dist',
|
root = __dirname + "/dist",
|
||||||
page404 = root + '/404.html';
|
page404 = root + "/404.html";
|
||||||
|
|
||||||
if (file.includes('register') || file.includes('home')) file = '/index.html';
|
if (file.includes("register") || file.includes("home")) file = "/index.html";
|
||||||
|
|
||||||
getFile((root + file), res, page404);
|
getFile(root + file, res, page404);
|
||||||
};
|
}
|
||||||
|
|
||||||
function getFile(filePath, res, page404) {
|
function getFile(filePath, res, page404) {
|
||||||
console.warn(`filePath: ${filePath}`)
|
console.warn(`filePath: ${filePath}`);
|
||||||
fs.exists(filePath, function (exists) {
|
fs.exists(filePath, function(exists) {
|
||||||
if (exists) {
|
if (exists) {
|
||||||
fs.readFile(filePath, function (err, contents) {
|
fs.readFile(filePath, function(err, contents) {
|
||||||
if (!err) {
|
if (!err) {
|
||||||
res.end(contents);
|
res.end(contents);
|
||||||
} else {
|
} else {
|
||||||
|
@ -83,9 +113,9 @@ function getFile(filePath, res, page404) {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
fs.readFile(page404, function (err, contents) {
|
fs.readFile(page404, function(err, contents) {
|
||||||
if (!err) {
|
if (!err) {
|
||||||
res.writeHead(404, { 'Content-Type': 'text/html' });
|
res.writeHead(404, { "Content-Type": "text/html" });
|
||||||
res.end(contents);
|
res.end(contents);
|
||||||
} else {
|
} else {
|
||||||
console.dir(err);
|
console.dir(err);
|
||||||
|
@ -93,31 +123,31 @@ function getFile(filePath, res, page404) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
}
|
||||||
|
|
||||||
app.commandLine.appendSwitch('force-color-profile', 'srgb');
|
app.commandLine.appendSwitch("force-color-profile", "srgb");
|
||||||
|
|
||||||
// This method will be called when Electron has finished
|
// This method will be called when Electron has finished
|
||||||
// initialization and is ready to create browser windows.
|
// initialization and is ready to create browser windows.
|
||||||
// Some APIs can only be used after this event occurs.
|
// Some APIs can only be used after this event occurs.
|
||||||
app.on('ready', createWindow)
|
app.on("ready", createWindow);
|
||||||
|
|
||||||
// Quit when all windows are closed.
|
// Quit when all windows are closed.
|
||||||
app.on('window-all-closed', () => {
|
app.on("window-all-closed", () => {
|
||||||
// On macOS it is common for applications and their menu bar
|
// On macOS it is common for applications and their menu bar
|
||||||
// to stay active until the user quits explicitly with Cmd + Q
|
// to stay active until the user quits explicitly with Cmd + Q
|
||||||
if (process.platform !== 'darwin') {
|
if (process.platform !== "darwin") {
|
||||||
app.quit()
|
app.quit();
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
|
|
||||||
app.on('activate', () => {
|
app.on("activate", () => {
|
||||||
// On macOS it's common to re-create a window in the app when the
|
// On macOS it's common to re-create a window in the app when the
|
||||||
// dock icon is clicked and there are no other windows open.
|
// dock icon is clicked and there are no other windows open.
|
||||||
if (win === null) {
|
if (win === null) {
|
||||||
createWindow()
|
createWindow();
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
|
|
||||||
// In this file you can include the rest of your app's specific main process
|
// In this file you can include the rest of your app's specific main process
|
||||||
// code. You can also put them in separate files and require them here.
|
// code. You can also put them in separate files and require them here.
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "sengi",
|
"name": "sengi",
|
||||||
"version": "0.6.0",
|
"version": "0.7.0",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "sengi",
|
"name": "sengi",
|
||||||
"version": "0.7.0",
|
"version": "0.7.1",
|
||||||
"license": "AGPL-3.0-or-later",
|
"license": "AGPL-3.0-or-later",
|
||||||
"main": "main-electron.js",
|
"main": "main-electron.js",
|
||||||
"description": "A multi-account desktop client for Mastodon and Pleroma",
|
"description": "A multi-account desktop client for Mastodon and Pleroma",
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
<div class="panel">
|
<div class="panel">
|
||||||
<h3 class="panel__title">settings</h3>
|
<h3 class="panel__title">settings</h3>
|
||||||
|
|
||||||
<p class="version">Sengi version: 0.7.0</p>
|
<p class="version">Sengi version: 0.7.1</p>
|
||||||
|
|
||||||
</div>
|
</div>
|
Loading…
Reference in New Issue