From 4717e4fe3ffd427649df4f40d2e2b776c6ab6112 Mon Sep 17 00:00:00 2001
From: jacobherrington <jherrington.personal@gmail.com>
Date: Sun, 30 Sep 2018 20:17:10 -0500
Subject: [PATCH 1/7] Add an event for deletion hotkey

---
 browser/main/Detail/MarkdownNoteDetail.js | 5 +++++
 browser/main/lib/shortcut.js              | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js
index e4493a80..0f182636 100755
--- a/browser/main/Detail/MarkdownNoteDetail.js
+++ b/browser/main/Detail/MarkdownNoteDetail.js
@@ -61,6 +61,7 @@ class MarkdownNoteDetail extends React.Component {
       const reversedType = this.state.editorType === 'SPLIT' ? 'EDITOR_PREVIEW' : 'SPLIT'
       this.handleSwitchMode(reversedType)
     })
+    ee.on('hotkey:deletenote', this.handleDeleteNote.bind(this))
     ee.on('code:generate-toc', this.generateToc)
   }
 
@@ -293,6 +294,10 @@ class MarkdownNoteDetail extends React.Component {
     })
   }
 
+  handleDeleteNote () {
+    this.handleTrashButtonClick()
+  }
+
   renderEditor () {
     const { config, ignorePreviewPointerEvents } = this.props
     const { note } = this.state
diff --git a/browser/main/lib/shortcut.js b/browser/main/lib/shortcut.js
index a6f33196..93e33c9b 100644
--- a/browser/main/lib/shortcut.js
+++ b/browser/main/lib/shortcut.js
@@ -3,5 +3,8 @@ import ee from 'browser/main/lib/eventEmitter'
 module.exports = {
   'toggleMode': () => {
     ee.emit('topbar:togglemodebutton')
+  },
+  'deleteNote': () => {
+    ee.emit('hotkey:deletenote')
   }
 }

From 3f1fa44ee777d0d4d4fcb7f8bf248831b6e82c92 Mon Sep 17 00:00:00 2001
From: jacobherrington <jherrington.personal@gmail.com>
Date: Sun, 30 Sep 2018 20:19:22 -0500
Subject: [PATCH 2/7] Add a default hotkey for deleteNote

---
 browser/main/lib/ConfigManager.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js
index 5ffb1bc7..6e4e9ebd 100644
--- a/browser/main/lib/ConfigManager.js
+++ b/browser/main/lib/ConfigManager.js
@@ -24,7 +24,8 @@ export const DEFAULT_CONFIG = {
   amaEnabled: true,
   hotkey: {
     toggleMain: OSX ? 'Command + Alt + L' : 'Super + Alt + E',
-    toggleMode: OSX ? 'Command + Option + M' : 'Ctrl + M'
+    toggleMode: OSX ? 'Command + Option + M' : 'Ctrl + M',
+    deleteNote: OSX ? 'Command + Backspace' : 'Command + Backspace'
   },
   ui: {
     language: 'en',

From db2c6c99f79a55fb84932d038083ee622c6c3120 Mon Sep 17 00:00:00 2001
From: jacobherrington <jherrington.personal@gmail.com>
Date: Sun, 30 Sep 2018 20:44:23 -0500
Subject: [PATCH 3/7] Change default hotkeys

Setting the default hotkeys to be more consistent on OS X (using
the Alt notation as opposed to the Option notation).
---
 browser/main/lib/ConfigManager.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js
index 6e4e9ebd..42bf35c9 100644
--- a/browser/main/lib/ConfigManager.js
+++ b/browser/main/lib/ConfigManager.js
@@ -24,8 +24,8 @@ export const DEFAULT_CONFIG = {
   amaEnabled: true,
   hotkey: {
     toggleMain: OSX ? 'Command + Alt + L' : 'Super + Alt + E',
-    toggleMode: OSX ? 'Command + Option + M' : 'Ctrl + M',
-    deleteNote: OSX ? 'Command + Backspace' : 'Command + Backspace'
+    toggleMode: OSX ? 'Command + Alt + M' : 'Ctrl + M',
+    deleteNote: OSX ? 'Command + Alt + Backspace' : 'Ctrl + Alt + Backspace'
   },
   ui: {
     language: 'en',

From 80666fed1ac884bd909c016de2fab965aeeddde1 Mon Sep 17 00:00:00 2001
From: jacobherrington <jherrington.personal@gmail.com>
Date: Sun, 30 Sep 2018 20:58:56 -0500
Subject: [PATCH 4/7] Add UI to change deleteNote hotkey

---
 browser/main/modals/PreferencesModal/HotkeyTab.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/browser/main/modals/PreferencesModal/HotkeyTab.js b/browser/main/modals/PreferencesModal/HotkeyTab.js
index 1c40a13a..9f964957 100644
--- a/browser/main/modals/PreferencesModal/HotkeyTab.js
+++ b/browser/main/modals/PreferencesModal/HotkeyTab.js
@@ -68,7 +68,8 @@ class HotkeyTab extends React.Component {
     const { config } = this.state
     config.hotkey = {
       toggleMain: this.refs.toggleMain.value,
-      toggleMode: this.refs.toggleMode.value
+      toggleMode: this.refs.toggleMode.value,
+      deleteNote: this.refs.deleteNote.value
     }
     this.setState({
       config
@@ -127,6 +128,17 @@ class HotkeyTab extends React.Component {
               />
             </div>
           </div>
+          <div styleName='group-section'>
+            <div styleName='group-section-label'>{i18n.__('Delete Note')}</div>
+            <div styleName='group-section-control'>
+              <input styleName='group-section-control-input'
+                onChange={(e) => this.handleHotkeyChange(e)}
+                ref='deleteNote'
+                value={config.hotkey.deleteNote}
+                type='text'
+              />
+            </div>
+          </div>
           <div styleName='group-control'>
             <button styleName='group-control-leftButton'
               onClick={(e) => this.handleHintToggleButtonClick(e)}

From cc1cb5fbc76eb07208283bc61224c1f8a52ebcf3 Mon Sep 17 00:00:00 2001
From: jacobherrington <jherrington.personal@gmail.com>
Date: Sun, 30 Sep 2018 21:02:41 -0500
Subject: [PATCH 5/7] Add English translation for Delete Note

---
 locales/en.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/locales/en.json b/locales/en.json
index 2c07b119..2cca89a9 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -135,6 +135,7 @@
 	"Hotkeys": "Hotkeys",
 	"Show/Hide Boostnote": "Show/Hide Boostnote",
 	"Toggle Editor Mode": "Toggle Editor Mode",
+  "Delete Note": "Delete Note",
 	"Restore": "Restore",
 	"Permanent Delete": "Permanent Delete",
 	"Confirm note deletion": "Confirm note deletion",

From d83feafcb20e85c0bd82598eea974aedaf6549b1 Mon Sep 17 00:00:00 2001
From: jacobherrington <jherrington.personal@gmail.com>
Date: Sun, 30 Sep 2018 21:10:47 -0500
Subject: [PATCH 6/7] Add French translation of Delete Note

---
 locales/fr.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/locales/fr.json b/locales/fr.json
index 0523d620..fa4a526e 100644
--- a/locales/fr.json
+++ b/locales/fr.json
@@ -154,5 +154,6 @@
 	"Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.": "Convertir des flèches textuelles en jolis signes. ⚠ Cela va interferérer avec les éventuels commentaires HTML dans votre Markdown.",
 	"⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ Vous avez collé un lien qui référence une pièce-jointe qui n'a pas pu être récupéré dans le dossier de stockage de la note. Coller des liens qui font référence à des pièces-jointes ne fonctionne que si la source et la destination et la même. Veuillez plutôt utiliser du Drag & Drop ! ⚠",
 	"Enable smart table editor": "Activer l'intelligent éditeur de tableaux",
-	"Snippet Default Language": "Langage par défaut d'un snippet"
+	"Snippet Default Language": "Langage par défaut d'un snippet",
+  "Delete Note": "Supprimer la note"
 }

From ca038937e9cfab366a1af89f31b5ace8a77a6b81 Mon Sep 17 00:00:00 2001
From: jacob <jacobherringtondeveloper@gmail.com>
Date: Fri, 12 Oct 2018 22:10:35 -0500
Subject: [PATCH 7/7] Update ConfigManager.js

---
 browser/main/lib/ConfigManager.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js
index 42bf35c9..7f8ae6fb 100644
--- a/browser/main/lib/ConfigManager.js
+++ b/browser/main/lib/ConfigManager.js
@@ -25,7 +25,7 @@ export const DEFAULT_CONFIG = {
   hotkey: {
     toggleMain: OSX ? 'Command + Alt + L' : 'Super + Alt + E',
     toggleMode: OSX ? 'Command + Alt + M' : 'Ctrl + M',
-    deleteNote: OSX ? 'Command + Alt + Backspace' : 'Ctrl + Alt + Backspace'
+    deleteNote: OSX ? 'Command + Shift + Backspace' : 'Ctrl + Shift + Backspace'
   },
   ui: {
     language: 'en',