Remove some of the popup note edit options from the main menu. For some reason they...

diff --git a/src/cx/fbn/nevernote/gui/MainMenuBar.java b/src/cx/fbn/nevernote/gui/MainMenuBar.java
index b1e42db..1bfbe8d 100644 (file)
--- a/src/cx/fbn/nevernote/gui/MainMenuBar.java
+++ b/src/cx/fbn/nevernote/gui/MainMenuBar.java
@@ -673,7 +673,7 @@ public class MainMenuBar extends QMenuBar {
                fileMenu.addAction(restoreAction);\r
                fileMenu.addSeparator();\r
                fileMenu.addAction(selectiveSyncAction);\r
-               fileMenu.addAction(parent.browserWindow.browser.downloadAttachment);\r
+               //fileMenu.addAction(parent.browserWindow.browser.downloadAttachment);\r
                fileMenu.addSeparator();\r
                fileMenu.addAction(emptyTrashAction);\r
                fileMenu.addAction(exitAction);\r
@@ -722,11 +722,11 @@ public class MainMenuBar extends QMenuBar {
                formatMenu.addAction(formatSuperscript);\r
                formatMenu.addAction(formatSubscript);\r
                formatMenu.addSeparator();\r
-               formatMenu.addAction(parent.browserWindow.browser.todoAction);\r
-               formatMenu.addAction(parent.browserWindow.browser.encryptAction);\r
-               formatMenu.addAction(parent.browserWindow.browser.insertLinkAction);\r
-               formatMenu.addAction(parent.browserWindow.browser.insertQuickLinkAction);\r
-               formatMenu.addAction(parent.browserWindow.browser.insertLatexAction);\r
+               //formatMenu.addAction(parent.browserWindow.browser.todoAction);\r
+               //formatMenu.addAction(parent.browserWindow.browser.encryptAction);\r
+               //formatMenu.addAction(parent.browserWindow.browser.insertLinkAction);\r
+               //formatMenu.addAction(parent.browserWindow.browser.insertQuickLinkAction);\r
+               //formatMenu.addAction(parent.browserWindow.browser.insertLatexAction);\r
                formatMenu.addMenu(parent.browserWindow.browser.tableMenu);\r
                formatMenu.addMenu(parent.browserWindow.browser.imageMenu);\r
                formatMenu.addSeparator();\r

diff --git a/src/cx/fbn/nevernote/gui/ShortcutKeys.java b/src/cx/fbn/nevernote/gui/ShortcutKeys.java
index e7d44ed..913cb57 100644 (file)
--- a/src/cx/fbn/nevernote/gui/ShortcutKeys.java
+++ b/src/cx/fbn/nevernote/gui/ShortcutKeys.java
@@ -180,7 +180,7 @@ public class ShortcutKeys {
                Format_Strikethrough = new String("Ctrl+-");    // Strikethrough\r
                Format_Horizontal_Line = new String();          // Href line\r
                Format_Superscript = new String("Ctrl+=");      // Set superscript\r
-               Format_Subscript = new String("Ctrl++Shift+="); // Subscript\r
+               Format_Subscript = new String("Ctrl+Shift+=");  // Subscript\r
                Format_Alignment_Left = new String("Ctrl+L");   // Left align text\r
                Format_Alignment_Center = new String("Ctrl+E"); // Center text\r
                Format_Alignment_Right = new String("Ctrl+R");  // Right align text\r
@@ -233,7 +233,7 @@ public class ShortcutKeys {
                loadKey("Edit_Paste_Without_Formatting", Edit_Paste_Without_Formatting);\r
                loadKey("Edit_Insert_Hyperlink", Edit_Insert_Hyperlink);\r
                loadKey("Edit_Insert_Table_Row", Edit_Insert_Table_Row);\r
-               loadKey("Edit_Insert_Table_Row", Edit_Delete_Table_Row);\r
+               loadKey("Edit_Delete_Table_Row", Edit_Delete_Table_Row);\r
                loadKey("Edit_Insert_Todo", Edit_Insert_Todo);\r
                loadKey("Edit_Rotate_Image_Right", Edit_Rotate_Image_Right);\r
                loadKey("Edit_Rotate_Image_Left", Edit_Rotate_Image_Left);\r