From 3414e2daf0f1e50ff580049134c9595886709484 Mon Sep 17 00:00:00 2001 From: Miguel Teixeira Date: Thu, 22 Nov 2018 12:22:49 +0000 Subject: [PATCH 1/5] Added warning when trying to print from InfoPanel --- browser/main/Detail/SnippetNoteDetail.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js index afd81102..db862115 100644 --- a/browser/main/Detail/SnippetNoteDetail.js +++ b/browser/main/Detail/SnippetNoteDetail.js @@ -789,6 +789,7 @@ class SnippetNoteDetail extends React.Component { exportAsMd={this.showWarning} exportAsTxt={this.showWarning} type={note.type} + print={this.showWarning} /> From c33058ae2bf324fc9cd1c4ec033a4ac850a958e2 Mon Sep 17 00:00:00 2001 From: Miguel Teixeira Date: Tue, 27 Nov 2018 17:42:04 +0000 Subject: [PATCH 2/5] Added custom warning messages. --- browser/main/Detail/InfoPanel.js | 8 ++++---- browser/main/Detail/InfoPanelTrashed.js | 6 +++--- browser/main/Detail/SnippetNoteDetail.js | 12 ++++++++++-- browser/main/NoteList/index.js | 17 ++++++++++++----- lib/main-menu.js | 8 ++++---- 5 files changed, 33 insertions(+), 18 deletions(-) diff --git a/browser/main/Detail/InfoPanel.js b/browser/main/Detail/InfoPanel.js index 4ce610fa..15535186 100644 --- a/browser/main/Detail/InfoPanel.js +++ b/browser/main/Detail/InfoPanel.js @@ -70,22 +70,22 @@ class InfoPanel extends React.Component {
- - - - diff --git a/browser/main/Detail/InfoPanelTrashed.js b/browser/main/Detail/InfoPanelTrashed.js index db64a284..d4c8045d 100644 --- a/browser/main/Detail/InfoPanelTrashed.js +++ b/browser/main/Detail/InfoPanelTrashed.js @@ -31,17 +31,17 @@ const InfoPanelTrashed = ({
- - - diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js index db862115..08cd50f1 100644 --- a/browser/main/Detail/SnippetNoteDetail.js +++ b/browser/main/Detail/SnippetNoteDetail.js @@ -633,11 +633,18 @@ class SnippetNoteDetail extends React.Component { if (infoPanel.style) infoPanel.style.display = infoPanel.style.display === 'none' ? 'inline' : 'none' } - showWarning () { + showWarning (e, msg) { + const warningMessage = (msg) => ({ + 'export-txt': 'Text export is available only as a markdown note', + 'export-md': 'Markdown export is available only as a markdown note.', + 'export-html': 'HTML export is available only as a markdown note.', + 'print': 'Print is available only as a markdown note.' + })[msg] + dialog.showMessageBox(remote.getCurrentWindow(), { type: 'warning', message: i18n.__('Sorry!'), - detail: i18n.__('md/text import is available only a markdown note.'), + detail: i18n.__(warningMessage(msg)), buttons: [i18n.__('OK')] }) } @@ -788,6 +795,7 @@ class SnippetNoteDetail extends React.Component { createdAt={formatDate(note.createdAt)} exportAsMd={this.showWarning} exportAsTxt={this.showWarning} + exportAsHtml={this.showWarning} type={note.type} print={this.showWarning} /> diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js index 7bb52ccd..02bdbcd2 100644 --- a/browser/main/NoteList/index.js +++ b/browser/main/NoteList/index.js @@ -64,8 +64,8 @@ class NoteList extends React.Component { this.focusHandler = () => { this.refs.list.focus() } - this.alertIfSnippetHandler = () => { - this.alertIfSnippet() + this.alertIfSnippetHandler = (event, msg) => { + this.alertIfSnippet(msg) } this.importFromFileHandler = this.importFromFile.bind(this) this.jumpNoteByHash = this.jumpNoteByHashHandler.bind(this) @@ -494,14 +494,21 @@ class NoteList extends React.Component { }) } - alertIfSnippet () { + alertIfSnippet (msg) { + const warningMessage = (msg) => ({ + 'export-txt': 'Text export is available only as a markdown note', + 'export-md': 'Markdown export is available only as a markdown note.', + 'export-html': 'HTML export is available only as a markdown note.', + 'print': 'Print is available only as a markdown note.' + })[msg] + const targetIndex = this.getTargetIndex() if (this.notes[targetIndex].type === 'SNIPPET_NOTE') { dialog.showMessageBox(remote.getCurrentWindow(), { type: 'warning', message: i18n.__('Sorry!'), - detail: i18n.__('md/text import is available only a markdown note.'), - buttons: [i18n.__('OK'), i18n.__('Cancel')] + detail: i18n.__(warningMessage(msg)), + buttons: [i18n.__('OK')] }) } } diff --git a/lib/main-menu.js b/lib/main-menu.js index fed5eb15..2782ea8b 100644 --- a/lib/main-menu.js +++ b/lib/main-menu.js @@ -99,21 +99,21 @@ const file = { { label: 'Plain Text (.txt)', click () { - mainWindow.webContents.send('list:isMarkdownNote') + mainWindow.webContents.send('list:isMarkdownNote', 'export-txt') mainWindow.webContents.send('export:save-text') } }, { label: 'MarkDown (.md)', click () { - mainWindow.webContents.send('list:isMarkdownNote') + mainWindow.webContents.send('list:isMarkdownNote', 'export-md') mainWindow.webContents.send('export:save-md') } }, { label: 'HTML (.html)', click () { - mainWindow.webContents.send('list:isMarkdownNote') + mainWindow.webContents.send('list:isMarkdownNote', 'export-html') mainWindow.webContents.send('export:save-html') } } @@ -159,7 +159,7 @@ const file = { label: 'Print', accelerator: 'CommandOrControl+P', click () { - mainWindow.webContents.send('list:isMarkdownNote') + mainWindow.webContents.send('list:isMarkdownNote', 'print') mainWindow.webContents.send('print') } }, From ef66e71febf98dbfcf827926e99e1105f5b4a891 Mon Sep 17 00:00:00 2001 From: Miguel Teixeira Date: Tue, 27 Nov 2018 18:02:59 +0000 Subject: [PATCH 3/5] Solved some errors in identation --- browser/main/Detail/SnippetNoteDetail.js | 10 +++++----- browser/main/NoteList/index.js | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js index 08cd50f1..473ce9d0 100644 --- a/browser/main/Detail/SnippetNoteDetail.js +++ b/browser/main/Detail/SnippetNoteDetail.js @@ -635,12 +635,12 @@ class SnippetNoteDetail extends React.Component { showWarning (e, msg) { const warningMessage = (msg) => ({ - 'export-txt': 'Text export is available only as a markdown note', - 'export-md': 'Markdown export is available only as a markdown note.', - 'export-html': 'HTML export is available only as a markdown note.', - 'print': 'Print is available only as a markdown note.' + 'export-txt': 'Text export is available only as a markdown note', + 'export-md': 'Markdown export is available only as a markdown note.', + 'export-html': 'HTML export is available only as a markdown note.', + 'print': 'Print is available only as a markdown note.' })[msg] - + dialog.showMessageBox(remote.getCurrentWindow(), { type: 'warning', message: i18n.__('Sorry!'), diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js index 02bdbcd2..49d063ca 100644 --- a/browser/main/NoteList/index.js +++ b/browser/main/NoteList/index.js @@ -496,11 +496,11 @@ class NoteList extends React.Component { alertIfSnippet (msg) { const warningMessage = (msg) => ({ - 'export-txt': 'Text export is available only as a markdown note', - 'export-md': 'Markdown export is available only as a markdown note.', - 'export-html': 'HTML export is available only as a markdown note.', - 'print': 'Print is available only as a markdown note.' - })[msg] + 'export-txt': 'Text export is available only as a markdown note', + 'export-md': 'Markdown export is available only as a markdown note.', + 'export-html': 'HTML export is available only as a markdown note.', + 'print': 'Print is available only as a markdown note.' + })[msg] const targetIndex = this.getTargetIndex() if (this.notes[targetIndex].type === 'SNIPPET_NOTE') { From c245855bbf996fbd23b63d8e0ff6b10af2826da6 Mon Sep 17 00:00:00 2001 From: Miguel Teixeira Date: Tue, 27 Nov 2018 20:28:57 +0000 Subject: [PATCH 4/5] Improved messages. --- browser/main/Detail/SnippetNoteDetail.js | 10 +++++----- browser/main/NoteList/index.js | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js index 473ce9d0..47e4de98 100644 --- a/browser/main/Detail/SnippetNoteDetail.js +++ b/browser/main/Detail/SnippetNoteDetail.js @@ -635,16 +635,16 @@ class SnippetNoteDetail extends React.Component { showWarning (e, msg) { const warningMessage = (msg) => ({ - 'export-txt': 'Text export is available only as a markdown note', - 'export-md': 'Markdown export is available only as a markdown note.', - 'export-html': 'HTML export is available only as a markdown note.', - 'print': 'Print is available only as a markdown note.' + 'export-txt': 'Text export', + 'export-md': 'Markdown export', + 'export-html': 'HTML export', + 'print': 'Print' })[msg] dialog.showMessageBox(remote.getCurrentWindow(), { type: 'warning', message: i18n.__('Sorry!'), - detail: i18n.__(warningMessage(msg)), + detail: i18n.__(warningMessage(msg) + ' is available only as a markdown note.'), buttons: [i18n.__('OK')] }) } diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js index 49d063ca..51e7a41c 100644 --- a/browser/main/NoteList/index.js +++ b/browser/main/NoteList/index.js @@ -496,10 +496,10 @@ class NoteList extends React.Component { alertIfSnippet (msg) { const warningMessage = (msg) => ({ - 'export-txt': 'Text export is available only as a markdown note', - 'export-md': 'Markdown export is available only as a markdown note.', - 'export-html': 'HTML export is available only as a markdown note.', - 'print': 'Print is available only as a markdown note.' + 'export-txt': 'Text export', + 'export-md': 'Markdown export', + 'export-html': 'HTML export', + 'print': 'Print' })[msg] const targetIndex = this.getTargetIndex() @@ -507,7 +507,7 @@ class NoteList extends React.Component { dialog.showMessageBox(remote.getCurrentWindow(), { type: 'warning', message: i18n.__('Sorry!'), - detail: i18n.__(warningMessage(msg)), + detail: i18n.__(warningMessage(msg) + ' is available only as a markdown note.'), buttons: [i18n.__('OK')] }) } From a39da481e0e403b078b6ac03e462d97cbe8c2596 Mon Sep 17 00:00:00 2001 From: Miguel Teixeira Date: Wed, 28 Nov 2018 09:08:58 +0000 Subject: [PATCH 5/5] Changed message. --- browser/main/Detail/SnippetNoteDetail.js | 2 +- browser/main/NoteList/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js index 47e4de98..ddcc50bf 100644 --- a/browser/main/Detail/SnippetNoteDetail.js +++ b/browser/main/Detail/SnippetNoteDetail.js @@ -644,7 +644,7 @@ class SnippetNoteDetail extends React.Component { dialog.showMessageBox(remote.getCurrentWindow(), { type: 'warning', message: i18n.__('Sorry!'), - detail: i18n.__(warningMessage(msg) + ' is available only as a markdown note.'), + detail: i18n.__(warningMessage(msg) + ' is available only in markdown notes.'), buttons: [i18n.__('OK')] }) } diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js index 51e7a41c..3293787d 100644 --- a/browser/main/NoteList/index.js +++ b/browser/main/NoteList/index.js @@ -507,7 +507,7 @@ class NoteList extends React.Component { dialog.showMessageBox(remote.getCurrentWindow(), { type: 'warning', message: i18n.__('Sorry!'), - detail: i18n.__(warningMessage(msg) + ' is available only as a markdown note.'), + detail: i18n.__(warningMessage(msg) + ' is available only in markdown notes.'), buttons: [i18n.__('OK')] }) }