Merge branch 'master' into spellchecker

lib/main-app.js

@@ -78,9 +78,11 @@ app.on('ready', function () {
 
   var template = require('./main-menu')
   var menu = Menu.buildFromTemplate(template)
+  var touchBarMenu = require('./touchbar-menu')
   switch (process.platform) {
     case 'darwin':
       Menu.setApplicationMenu(menu)
+      mainWindow.setTouchBar(touchBarMenu)
       break
     case 'win32':
       mainWindow.setMenu(menu)

lib/main-menu.js

@@ -145,6 +145,16 @@ const file = {
     {
       type: 'separator'
     },
+    {
+      label: 'Generate/Update Markdown TOC',
+      accelerator: 'Shift+Ctrl+T',
+      click () {
+        mainWindow.webContents.send('code:generate-toc')
+      }
+    },
+    {
+      type: 'separator'
+    },
     {
       label: 'Print',
       accelerator: 'CommandOrControl+P',

lib/main.html

@@ -10,6 +10,8 @@
   <link rel="stylesheet" href="../node_modules/codemirror/lib/codemirror.css">
   <link rel="stylesheet" href="../node_modules/katex/dist/katex.min.css">
   <link rel="stylesheet" href="../node_modules/codemirror/addon/dialog/dialog.css">
+  <link rel="stylesheet" href="../extra_scripts/codemirror/mode/bfm/bfm.css">
+
   <title>Boostnote</title>
 
   <style>
@@ -94,8 +96,13 @@
   <script src="../node_modules/codemirror/keymap/emacs.js"></script>
   <script src="../node_modules/codemirror/addon/runmode/runmode.js"></script>
   <script src="../node_modules/codemirror/addon/display/panel.js"></script>
+  <script src="../node_modules/codemirror/mode/xml/xml.js"></script>
+  <script src="../node_modules/codemirror/mode/markdown/markdown.js"></script>
+  <script src="../node_modules/codemirror/mode/gfm/gfm.js"></script>
 
   <script src="../extra_scripts/boost/boostNewLineIndentContinueMarkdownList.js"></script>
+  <script src="../extra_scripts/codemirror/addon/hyperlink/hyperlink.js"></script>
+  <script src="../extra_scripts/codemirror/mode/bfm/bfm.js"></script>
 
   <script src="../node_modules/codemirror/addon/edit/closebrackets.js"></script>
   <script src="../node_modules/codemirror/addon/edit/matchbrackets.js"></script>

lib/touchbar-menu.js

@@ -0,0 +1,41 @@
+const {TouchBar} = require('electron')
+const {TouchBarButton, TouchBarSpacer} = TouchBar
+const mainWindow = require('./main-window')
+
+const allNotes = new TouchBarButton({
+  label: '📒',
+  click: () => {
+    mainWindow.webContents.send('list:navigate', '/home')
+  }
+})
+
+const starredNotes = new TouchBarButton({
+  label: '⭐️',
+  click: () => {
+    mainWindow.webContents.send('list:navigate', '/starred')
+  }
+})
+
+const trash = new TouchBarButton({
+  label: '🗑',
+  click: () => {
+    mainWindow.webContents.send('list:navigate', '/trashed')
+  }
+})
+
+const newNote = new TouchBarButton({
+  label: '✎',
+  click: () => {
+    mainWindow.webContents.send('list:navigate', '/home')
+    mainWindow.webContents.send('top:new-note')
+  }
+})
+
+module.exports = new TouchBar([
+  allNotes,
+  starredNotes,
+  trash,
+  new TouchBarSpacer({size: 'small'}),
+  newNote
+])
+