Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add discard warning setting #1153

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions main/common/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ interface Settings {
[key in keyof typeof shortcuts]: string
};
version: string;
showDiscardWarning: boolean;
}

export const settings = new Store<Settings>({
Expand Down Expand Up @@ -123,6 +124,10 @@ export const settings = new Store<Settings>({
version: {
type: 'string',
default: ''
},
showDiscardWarning: {
type: 'boolean',
default: true
}
}
});
Expand Down
33 changes: 19 additions & 14 deletions main/windows/editor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {is} from 'electron-util';
import fs from 'fs';
import {saveSnapshot} from '../utils/image-preview';
import {windowManager} from './manager';
import {settings} from '../common/settings';

const pify = require('pify');

Expand Down Expand Up @@ -86,20 +87,24 @@ const open = async (video: Video) => {
editorWindow.setDocumentEdited(true);
editorWindow.on('close', (event: any) => {
editorsWithNotSavedDialogs.set(video.filePath, true);
const buttonIndex = dialog.showMessageBoxSync(editorWindow, {
type: 'question',
buttons: [
'Discard',
'Cancel'
],
defaultId: 0,
cancelId: 1,
message: 'Are you sure that you want to discard this recording?',
detail: 'You will no longer be able to edit and export the original recording.'
});

if (buttonIndex === 1) {
event.preventDefault();

const showDiscardWarning = settings.get('showDiscardWarning');
if (showDiscardWarning) {
const buttonIndex = dialog.showMessageBoxSync(editorWindow, {
type: 'question',
buttons: [
'Discard',
'Cancel'
],
defaultId: 0,
cancelId: 1,
message: 'Are you sure that you want to discard this recording?',
detail: 'You will no longer be able to edit and export the original recording. You can set Kap to not show this warning in the preferences.'
});

if (buttonIndex === 1) {
event.preventDefault();
}
}

editorsWithNotSavedDialogs.delete(video.filePath);
Expand Down
18 changes: 17 additions & 1 deletion renderer/components/preferences/categories/general.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class General extends React.Component {
toggleShortcuts,
category,
lossyCompression,
showDiscardWarning,
shortcuts,
shortcutMap
} = this.props;
Expand Down Expand Up @@ -200,6 +201,18 @@ class General extends React.Component {
onClick={() => toggleSetting('lossyCompression')}
/>
</Item>
<Item
key="showDiscardWarning"
parentItem
title="Show discard warning"
subtitle="Show a warning when discarding a recording."
>
<Switch
tabIndex={tabIndex}
checked={showDiscardWarning}
onClick={() => toggleSetting('showDiscardWarning')}
/>
</Item>
</Category>
);
}
Expand Down Expand Up @@ -227,7 +240,8 @@ General.propTypes = {
category: PropTypes.string,
shortcutMap: PropTypes.object,
shortcuts: PropTypes.object,
lossyCompression: PropTypes.bool
lossyCompression: PropTypes.bool,
showDiscardWarning: PropTypes.bool
};

export default connect(
Expand All @@ -246,6 +260,7 @@ export default connect(
loopExports,
category,
lossyCompression,
showDiscardWarning,
shortcuts,
shortcutMap
}) => ({
Expand All @@ -262,6 +277,7 @@ export default connect(
loopExports,
category,
lossyCompression,
showDiscardWarning,
shortcuts,
shortcutMap
}),
Expand Down