starred/Electron.NET
1
0
Fork 0
mirror of https://github.com/ElectronNET/Electron.NET.git synced 2026-07-16 21:56:00 +00:00
Code Issues 668 Packages Projects Releases 20 Wiki Activity

Merge branch 'master' of https://github.com/ElectronNET/Electron.NET

Browse Source
This commit is contained in:
Gregor Biswanger
2020-07-06 18:19:08 +02:00
parent ed67aa8072 5e005499ef
commit 83e579d44b
6 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Changelog.md
View File

@@ -1,5 +1,7 @@
# Not released
# Released
# 9.31.1
ElectronNET.CLI:
@@ -33,8 +35,6 @@ ElectronNET.WebApp (internal use):
Thank you for donation [Phil Seeman](https://github.com/mpnow) ❤
# Released
# 8.31.2
ElectronNET.CLI:

6
ElectronNET.API/HostHook.cs
View File

@@ -72,13 +72,14 @@ namespace ElectronNET.API
{
BridgeConnector.Socket.Off(socketEventName + "Error" + guid);
Electron.Dialog.ShowErrorBox("Host Hook Exception", result.ToString());
taskCompletionSource.SetException(new Exception($"Host Hook Exception {result}"));
});
BridgeConnector.Socket.On(socketEventName + "Complete" + guid, (result) =>
{
BridgeConnector.Socket.Off(socketEventName + "Error" + guid);
BridgeConnector.Socket.Off(socketEventName + "Complete" + guid);
T data;
T data = default;
try
{
@@ -105,7 +106,8 @@ namespace ElectronNET.API
}
catch (Exception exception)
{
throw new InvalidCastException("Return value does not match with the generic type.", exception);
taskCompletionSource.SetException(exception);
//throw new InvalidCastException("Return value does not match with the generic type.", exception);
}
taskCompletionSource.SetResult(data);

9
ElectronNET.API/Tray.cs
View File

@@ -263,6 +263,15 @@ namespace ElectronNET.API
});
}
/// <summary>
/// Shows the Traybar (empty).
/// </summary>
/// <param name="image">The image.</param>
public void Show(string image)
{
BridgeConnector.Socket.Emit("create-tray", image);
}
/// <summary>
/// Destroys the tray icon immediately.
/// </summary>

2
ElectronNET.CLI/Commands/BuildCommand.cs
View File

@@ -186,7 +186,7 @@ namespace ElectronNET.CLI.Commands
ProcessHelper.CmdExecute($"node build-helper.js " + manifestFileName, tempPath);
Console.WriteLine($"Package Electron App for Platform {platformInfo.ElectronPackerPlatform}...");
ProcessHelper.CmdExecute($"npx electron-builder . --config=./bin/electron-builder.json --{platformInfo.ElectronPackerPlatform} --{electronArch} -c.electronVersion=9.0.3 {electronParams}", tempPath);
ProcessHelper.CmdExecute($"npx electron-builder --config=./bin/electron-builder.json --{platformInfo.ElectronPackerPlatform} --{electronArch} -c.electronVersion=9.0.3 {electronParams}", tempPath);
Console.WriteLine("... done");

14
ElectronNET.Host/api/tray.js
View File

@@ -47,13 +47,17 @@ module.exports = (socket) => {
}
});
socket.on('create-tray', (image, menuItems) => {
const menu = electron_1.Menu.buildFromTemplate(menuItems);
addMenuItemClickConnector(menu.items, (id) => {
electronSocket.emit('trayMenuItemClicked', id);
});
const trayIcon = electron_1.nativeImage.createFromPath(image);
tray = new electron_1.Tray(trayIcon);
tray.setContextMenu(menu);
if (menuItems) {
const menu = electron_1.Menu.buildFromTemplate(menuItems);
addMenuItemClickConnector(menu.items, (id) => {
electronSocket.emit('trayMenuItemClicked', id);
});
tray.setContextMenu(menu);
}
});
socket.on('tray-destroy', () => {
if (tray) {

16
ElectronNET.Host/api/tray.ts
View File

@@ -53,16 +53,18 @@ export = (socket: SocketIO.Socket) => {
});
socket.on('create-tray', (image, menuItems) => {
const menu = Menu.buildFromTemplate(menuItems);
addMenuItemClickConnector(menu.items, (id) => {
electronSocket.emit('trayMenuItemClicked', id);
});
const trayIcon = nativeImage.createFromPath(image);
tray = new Tray(trayIcon);
tray.setContextMenu(menu);
if (menuItems) {
const menu = Menu.buildFromTemplate(menuItems);
addMenuItemClickConnector(menu.items, (id) => {
electronSocket.emit('trayMenuItemClicked', id);
});
tray.setContextMenu(menu);
}
});
socket.on('tray-destroy', () => {