Merge pull request #90 from nexB/85-add-keyboard-shortcuts-for-different-views

Add keyboard shortcuts for different views #85

Author: jdaguil

assets/js/renderer.js

@@ -338,35 +338,53 @@ $(document).ready(function () {
         placeholder: "select me"
     });
 
-    // Show clue DataTable. Hide node view and component summary table
-    showClueButton.click(function() {
+    // Show Table View (aka "clue DataTable").  Hide node view and component summary table.
+    function showTableView() {
         cluesContainer.show();
         nodeContainer.hide();
         componentContainer.hide();
         leftCol.addClass('col-md-2').show();
         tabBar.removeClass('col-md-11').addClass('col-md-9');
         cluesTable.draw();
-    });
+    }
+
+    // Show clue DataTable. Hide node view and component summary table
+    showClueButton.click(showTableView);
+
+    // Show clue DataTable. Hide node view and component summary table -- custom menu
+    ipcRenderer.on('table-view', showTableView);
 
     // Show node view. Hide clue and component table
-    showNodeViewButton.click(function() {
+    function showNodeView() {
         nodeContainer.show();
         cluesContainer.hide();
         componentContainer.hide();
         leftCol.addClass('col-md-2').show();
         tabBar.removeClass('col-md-11').addClass('col-md-9');
         nodeView.redraw();
-    });
+    }
+
+    // Show node view. Hide clue and component table
+    showNodeViewButton.click(showNodeView);
+
+    // Show node view. Hide clue and component table -- custom menu
+    ipcRenderer.on('node-view', showNodeView);
 
     // Show component summary table. Hide DataTable and node view
-    showComponentButton.click(function() {
+    function showComponentSummaryView() {
         componentContainer.show();
         nodeContainer.hide();
         cluesContainer.hide();
         leftCol.removeClass('col-md-2').hide();
         tabBar.removeClass('col-md-9').addClass('col-md-11');
         componentsTable.reload();
-    });
+    }
+
+    // Show component summary table. Hide DataTable and node view
+    showComponentButton.click(showComponentSummaryView);
+
+    // Show component summary table. Hide DataTable and node view -- custom menu
+    ipcRenderer.on('component-summary-view', showComponentSummaryView);
 
     // Creates the database and all View objects from a SQLite file
     function loadDatabaseFromFile(fileName) {

index.html

@@ -66,13 +66,13 @@
                     <button class="btn btn-sidebar" id="save-file" data-toggle="tooltip" title="Save SQLite File"><i class="fa fa-floppy-o" aria-hidden="true"></i></button>
                 </li>
                 <li>
-                    <button class="btn btn-sidebar" id="show-clue-table" data-toggle="tooltip" title="Table view"><i class="fa fa-table" aria-hidden="true"></i></button>
+                    <button class="btn btn-sidebar" id="show-clue-table" data-toggle="tooltip" title="Table View"><i class="fa fa-table" aria-hidden="true"></i></button>
                 </li>
                 <li>
-                    <button class="btn btn-sidebar" id="show-tree" data-toggle="tooltip" title="Conclusions view"><i class="fa fa-code-fork" aria-hidden="true"></i></button>
+                    <button class="btn btn-sidebar" id="show-tree" data-toggle="tooltip" title="Node View"><i class="fa fa-code-fork" aria-hidden="true"></i></button>
                 </li>
                 <li>
-                    <button class="btn btn-sidebar" id="show-component-table" data-toggle="modal" data-placement="right" title="Import Components to DejaCode"><i class="fa fa-list-ol" aria-hidden="true"></i></button>
+                    <button class="btn btn-sidebar" id="show-component-table" data-toggle="modal" data-placement="right" title="Component Summary View"><i class="fa fa-list-ol" aria-hidden="true"></i></button>
                 </li>
                 <li>
                     <button class="btn btn-sidebar" id="show-help" data-toggle="modal" data-placement="right" title="Help with Application" data-target="#helpModal"><i class="fa fa-question" aria-hidden="true"></i></button>

main.js

@@ -113,6 +113,30 @@ function getTemplate() {
     {
       label: '&View',
       submenu: [
+        {
+          label: "Table View",
+          accelerator: 'CmdOrCtrl+T',
+          click: function (menuItem, currentWindow) {
+            currentWindow.webContents.send('table-view')
+          }
+        },
+        {
+          label: "Node View",
+          accelerator: 'CmdOrCtrl+N',
+          click: function (menuItem, currentWindow) {
+            currentWindow.webContents.send('node-view')
+          }
+        },
+        {
+          label: "Component Summary View",
+          accelerator: 'Shift+CmdOrCtrl+C',
+          click: function (menuItem, currentWindow) {
+            currentWindow.webContents.send('component-summary-view')
+          }
+        },
+        {
+          type: 'separator'
+        },
         {
           label: 'Reload',
           accelerator: 'CmdOrCtrl+R',