Unread icon fix, do not create panel icon on macOS ATM.

parent f1ed198d
......@@ -43,19 +43,22 @@ function createWindow() {
mainWindow.setIcon(normalIcon);
// Tray icon.
tray = new Tray(normalIcon);
const contextMenu = Menu.buildFromTemplate([
{ label: 'Open Yandex.Mail window', type: 'normal', click: showHideMainWindow },
{ label: '-', type: 'separator' },
{ label: 'Exit Yandex.Mail wrapper', type: 'normal', click: quitWrapper }
]);
tray.setTitle('Yandex.Mail');
tray.setToolTip('Yandex.Mail');
tray.setContextMenu(contextMenu);
tray.on('click', () => {
showHideMainWindow(null, mainWindow, null);
});
// Tray icon. Do not create it on macOS.
if (app.platform != "darwin") {
tray = new Tray(normalIcon);
const contextMenu = Menu.buildFromTemplate([
{ label: 'Open Yandex.Mail window', type: 'normal', click: showHideMainWindow },
{ label: '-', type: 'separator' },
{ label: 'Exit Yandex.Mail wrapper', type: 'normal', click: quitWrapper }
]);
tray.setTitle('Yandex.Mail');
tray.setToolTip('Yandex.Mail');
tray.setContextMenu(contextMenu);
tray.on('click', () => {
showHideMainWindow(null, mainWindow, null);
});
}
mainWindow.Notification = function (title, options) {
options.icon = unreadIcon;
......@@ -82,14 +85,22 @@ app.on('activate', function () {
}
});
ipc.on("has-unread", function () {
ipc.on("has-unread", function (event, count) {
mainWindow.setIcon(unreadIcon);
tray.setImage(unreadIcon);
if (app.platform == "darwin") {
app.setBadgeCount(count);
} else {
tray.setImage(unreadIcon);
}
});
ipc.on("has-no-unread", function () {
ipc.on("has-no-unread", function (event, count) {
mainWindow.setIcon(normalIcon);
tray.setImage(normalIcon);
if (app.platform == "darwin") {
app.setBadgeCount(count);
} else {
tray.setImage(unreadIcon);
}
})
function showHideMainWindow() {
......
......@@ -28,7 +28,8 @@
"productName": "Yandex.Mail Desktop",
"copyright": "Copyright (c) 2019, Stanislav N. aka pztrn",
"mac": {
"category": "name.pztrn.yandexmail-desktop"
"category": "name.pztrn.yandexmail-desktop",
"icon": "./assets/icons/icon.png"
},
"linux": {
"category": "Internet",
......
......@@ -3,8 +3,8 @@ var ipc = require("electron").ipcRenderer;
function checkForUnreads() {
unread = parseInt(document.title.split(" ")[0]);
if (unread > 0) {
ipc.send('has-unread');
if (typeof (unread) != NaN && unread > 0) {
ipc.send('has-unread', unread);
} else {
ipc.send('has-no-unread');
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment