diff --git a/main.js b/main.js index f61100f23087835ae072dbc76989bc40408a0b9d..64abb0de5981fd7e31bd12212d7e0ad9198e15c2 100644 --- a/main.js +++ b/main.js @@ -1,4 +1,4 @@ -const { app, shell, net, BrowserWindow, Notification } = require('electron'); +const { app, dialog, shell, net, BrowserWindow, Notification } = require('electron'); let win; @@ -31,21 +31,25 @@ function createWindow () { event.newGuest = win2; }); */ - // Close the app. - win.on('close', () => { - // @TODO does not render properly on Linux - /* const choice = dialog.showMessageBox(this, + // Ask confirmation before closing the app. + win.on('close', (e) => { + e.preventDefault(); + // @WARNING renders ugly on Linux + const choice = dialog.showMessageBoxSync( { - type: 'question', - buttons: ['Certes', 'Fuque'], - title: 'Confirme-z-y voir', - message: "T'es-tu sûr de vouloir quitter, là ?" + type: "question", + buttons: [ "Ok", "Cancel"] , // "OK" and "Cancel" are automatically translated + defaultId: 1, + cancelId: 1, + title: "Exit Cassiopée", + message: "Are you sure you want to exit Cassiopée ?" } ); if(choice == 1){ e.preventDefault(); - } */ - win.destroy(); + } else { + win.destroy(); + } }); // Emitted when the window is closed. diff --git a/package-lock.json b/package-lock.json index 11ea8836ef80c7d858fd1be4f93fc5cfefac1da5..25302d1cd1632dddab29c3d657bc41008acfcd2f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7063,9 +7063,9 @@ "dev": true }, "electron": { - "version": "5.0.10", - "resolved": "https://registry.npmjs.org/electron/-/electron-5.0.10.tgz", - "integrity": "sha512-OSyxTlJ+7Yf0B+6pTdHdxY9RvI4U+mVKAbn+CkAOWxlCPMg3K+jt5UHKSPRRLnXQhQ0Tulg4vupbC0k27aukVw==", + "version": "6.0.10", + "resolved": "https://registry.npmjs.org/electron/-/electron-6.0.10.tgz", + "integrity": "sha512-eTFm6uTn7NKZE1OtSZSOxNuOrCXXeUR0U3vdF3R00byB7mrNe5AOaXEDDMwtzRGGY1jMuUX9Z7RvgXaCXRYSmw==", "dev": true, "requires": { "@types/node": "^10.12.18", @@ -7074,9 +7074,9 @@ }, "dependencies": { "@types/node": { - "version": "10.14.17", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.17.tgz", - "integrity": "sha512-p/sGgiPaathCfOtqu2fx5Mu1bcjuP8ALFg4xpGgNkcin7LwRyzUKniEHBKdcE1RPsenq5JVPIpMTJSygLboygQ==", + "version": "10.14.18", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.18.tgz", + "integrity": "sha512-ryO3Q3++yZC/+b8j8BdKd/dn9JlzlHBPdm80656xwYUdmPkpTGTjkAdt6BByiNupGPE8w0FhBgvYy/fX9hRNGQ==", "dev": true } } diff --git a/package.json b/package.json index 4c42e08a3b83649c8c1c4e24d8e88bb0773a7168..d24daa76da3bcba729600fd51813b6458b9c409f 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "@types/node": "^12.7.4", "codelyzer": "^5.0.1", "cordova": "^9.0.0", - "electron": "^5.0.10", + "electron": "^6.0.10", "electron-builder": "^21.2.0", "fs-extra": "^8.1.0", "jasmine-core": "^3.4.0",