From f3b0073b0c0da55b77d3a333a9cec7c601349616 Mon Sep 17 00:00:00 2001 From: Randy Baumgarte Date: Tue, 20 Mar 2012 09:55:32 -0400 Subject: [PATCH] Remove some of the popup note edit options from the main menu. For some reason they were causing issues with shortcuts. --- src/cx/fbn/nevernote/gui/MainMenuBar.java | 12 ++++++------ src/cx/fbn/nevernote/gui/ShortcutKeys.java | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/cx/fbn/nevernote/gui/MainMenuBar.java b/src/cx/fbn/nevernote/gui/MainMenuBar.java index b1e42db..1bfbe8d 100644 --- 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); fileMenu.addSeparator(); fileMenu.addAction(selectiveSyncAction); - fileMenu.addAction(parent.browserWindow.browser.downloadAttachment); + //fileMenu.addAction(parent.browserWindow.browser.downloadAttachment); fileMenu.addSeparator(); fileMenu.addAction(emptyTrashAction); fileMenu.addAction(exitAction); @@ -722,11 +722,11 @@ public class MainMenuBar extends QMenuBar { formatMenu.addAction(formatSuperscript); formatMenu.addAction(formatSubscript); formatMenu.addSeparator(); - formatMenu.addAction(parent.browserWindow.browser.todoAction); - formatMenu.addAction(parent.browserWindow.browser.encryptAction); - formatMenu.addAction(parent.browserWindow.browser.insertLinkAction); - formatMenu.addAction(parent.browserWindow.browser.insertQuickLinkAction); - formatMenu.addAction(parent.browserWindow.browser.insertLatexAction); + //formatMenu.addAction(parent.browserWindow.browser.todoAction); + //formatMenu.addAction(parent.browserWindow.browser.encryptAction); + //formatMenu.addAction(parent.browserWindow.browser.insertLinkAction); + //formatMenu.addAction(parent.browserWindow.browser.insertQuickLinkAction); + //formatMenu.addAction(parent.browserWindow.browser.insertLatexAction); formatMenu.addMenu(parent.browserWindow.browser.tableMenu); formatMenu.addMenu(parent.browserWindow.browser.imageMenu); formatMenu.addSeparator(); diff --git a/src/cx/fbn/nevernote/gui/ShortcutKeys.java b/src/cx/fbn/nevernote/gui/ShortcutKeys.java index e7d44ed..913cb57 100644 --- 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 Format_Horizontal_Line = new String(); // Href line Format_Superscript = new String("Ctrl+="); // Set superscript - Format_Subscript = new String("Ctrl++Shift+="); // Subscript + Format_Subscript = new String("Ctrl+Shift+="); // Subscript Format_Alignment_Left = new String("Ctrl+L"); // Left align text Format_Alignment_Center = new String("Ctrl+E"); // Center text Format_Alignment_Right = new String("Ctrl+R"); // Right align text @@ -233,7 +233,7 @@ public class ShortcutKeys { loadKey("Edit_Paste_Without_Formatting", Edit_Paste_Without_Formatting); loadKey("Edit_Insert_Hyperlink", Edit_Insert_Hyperlink); loadKey("Edit_Insert_Table_Row", Edit_Insert_Table_Row); - loadKey("Edit_Insert_Table_Row", Edit_Delete_Table_Row); + loadKey("Edit_Delete_Table_Row", Edit_Delete_Table_Row); loadKey("Edit_Insert_Todo", Edit_Insert_Todo); loadKey("Edit_Rotate_Image_Right", Edit_Rotate_Image_Right); loadKey("Edit_Rotate_Image_Left", Edit_Rotate_Image_Left); -- 2.11.0