Skip to content

TagSpaces is an offline, open source, document manager with tagging support

Application should ask before close if you have an unsaved document o… (#2156)

Stanimirb37fe7fe74c9
diff --git a/src/main/main.ts b/src/main/main.ts
index f0e232b77..7b671897e 100644
--- a/src/main/main.ts
+++ b/src/main/main.ts
@@ -16,6 +16,7 @@ import {
ipcMain,
globalShortcut,
BrowserWindowConstructorOptions,
+ dialog,
} from 'electron';
// import { autoUpdater } from 'electron-updater';
import log from 'electron-log';
@@ -351,6 +352,10 @@ function createNewWindowInstance(url?) {
show: true,
center: true,
});
+ // @ts-ignore
+ mainWindow.fileChanged = false;
+ // @ts-ignore
+ mainWindow.descriptionChanged = false;
newWindowInstance.setMenuBarVisibility(false);
@@ -511,6 +516,10 @@ const createWindow = async (i18n) => {
width: mainWindowState.width,
height: mainWindowState.height,
});
+ // @ts-ignore
+ mainWindow.fileChanged = false;
+ // @ts-ignore
+ mainWindow.descriptionChanged = false;
mainWindow.setMenuBarVisibility(false);
@@ -574,6 +583,27 @@ const createWindow = async (i18n) => {
// }
});
+ mainWindow.on('close', (e) => {
+ // @ts-ignore
+ if (mainWindow.fileChanged || mainWindow.descriptionChanged) {
+ const choice = dialog.showMessageBoxSync(mainWindow, {
+ type: 'question',
+ buttons: [i18n.t('cancel'), i18n.t('closeApp')],
+ defaultId: 1,
+ cancelId: 0,
+ title: i18n.t('unsavedChanges'),
+ message: i18n.t('unsavedChangesMessage'),
+ detail: i18n.t('unsavedChangesDetails'),
+ });
+
+ if (choice === 0) {
+ // Cancel
+ e.preventDefault(); // Prevent closing
+ }
+ // No action needed for "Close Application", window will close
+ }
+ });
+
mainWindow.on('closed', () => {
mainWindow = null;
});
@@ -700,6 +730,18 @@ app
ipcMain.on('create-new-window', (e, url) => {
createNewWindowInstance(url);
});
+ ipcMain.on('file-changed', (e, isChanged) => {
+ if (mainWindow) {
+ // @ts-ignore
+ mainWindow.fileChanged = isChanged;
+ }
+ });
+ ipcMain.on('description-changed', (e, isChanged) => {
+ if (mainWindow) {
+ // @ts-ignore
+ mainWindow.descriptionChanged = isChanged;
+ }
+ });
loadMainEvents();
diff --git a/src/main/preload.ts b/src/main/preload.ts
index 97b3f4b99..b3524634f 100644
--- a/src/main/preload.ts
+++ b/src/main/preload.ts
@@ -11,6 +11,8 @@ export type Channels =
| 'global-shortcuts-enabled'
| 'show-main-window'
| 'create-new-window'
+ | 'file-changed'
+ | 'description-changed'
| 'quitApp'
| 'focus-window'
| 'getDevicePaths'
diff --git a/src/renderer/hooks/FilePropertiesContextProvider.tsx b/src/renderer/hooks/FilePropertiesContextProvider.tsx
index 06160316c..d1cd5f697 100644
--- a/src/renderer/hooks/FilePropertiesContextProvider.tsx
+++ b/src/renderer/hooks/FilePropertiesContextProvider.tsx
@@ -25,6 +25,7 @@ import React, {
useState,
} from 'react';
import { Pro } from '-/pro';
+import AppConfig from '-/AppConfig';
import { useTranslation } from 'react-i18next';
import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';
import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';
@@ -150,6 +151,12 @@ export const FilePropertiesContextProvider = ({
if (isEditDescriptionMode.current !== editMode) {
isEditDescriptionMode.current = editMode;
forceUpdate();
+ if (AppConfig.isElectron) {
+ window.electronIO.ipcRenderer.sendMessage(
+ 'description-changed',
+ editMode,
+ );
+ }
}
}
diff --git a/src/renderer/hooks/OpenedEntryContextProvider.tsx b/src/renderer/hooks/OpenedEntryContextProvider.tsx
index 454ce0ef3..6889beb88 100644
--- a/src/renderer/hooks/OpenedEntryContextProvider.tsx
+++ b/src/renderer/hooks/OpenedEntryContextProvider.tsx
@@ -642,6 +642,9 @@ export const OpenedEntryContextProvider = ({
if (fileChanged.current !== isChanged) {
fileChanged.current = isChanged;
forceUpdate();
+ if (AppConfig.isElectron) {
+ window.electronIO.ipcRenderer.sendMessage('file-changed', isChanged);
+ }
}
}
diff --git a/src/renderer/locales/en/core.json b/src/renderer/locales/en/core.json
index 64820dd9e..fd864e4c8 100644
--- a/src/renderer/locales/en/core.json
+++ b/src/renderer/locales/en/core.json
@@ -4,6 +4,10 @@
"cancel": "Cancel",
"yes": "Yes",
"no": "No",
+ "closeApp": "Close Application",
+ "unsavedChanges": "Unsaved Changes",
+ "unsavedChangesMessage": "You have unsaved changes.",
+ "unsavedChangesDetails": "By closing the application your changes will be lost.",
"titleConfirm": "Confirm",
"titleAlert": "Alert",
"aboutTitle": "About TagSpaces",