From 444a3356be5c52a959aa99bdc8216985faa2819a Mon Sep 17 00:00:00 2001 From: Randy Baumgarte Date: Wed, 18 Aug 2010 21:33:38 -0400 Subject: [PATCH 1/1] Remove shortcut code that was causing an ambiguous shortcut setting for the "Paste without format" shortcut. --- src/cx/fbn/nevernote/gui/ContentView.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cx/fbn/nevernote/gui/ContentView.java b/src/cx/fbn/nevernote/gui/ContentView.java index a3484b7..43bf4c9 100644 --- a/src/cx/fbn/nevernote/gui/ContentView.java +++ b/src/cx/fbn/nevernote/gui/ContentView.java @@ -26,9 +26,9 @@ import com.trolltech.qt.gui.QContextMenuEvent; import com.trolltech.qt.gui.QDropEvent; import com.trolltech.qt.gui.QKeyEvent; import com.trolltech.qt.gui.QKeySequence; +import com.trolltech.qt.gui.QKeySequence.StandardKey; import com.trolltech.qt.gui.QMenu; import com.trolltech.qt.gui.QShortcut; -import com.trolltech.qt.gui.QKeySequence.StandardKey; import com.trolltech.qt.network.QNetworkRequest; import com.trolltech.qt.webkit.QWebPage; import com.trolltech.qt.webkit.QWebView; @@ -117,9 +117,9 @@ public class ContentView extends QWebView { pasteWithoutFormatAction.triggered.connect(parent, "pasteWithoutFormattingClicked()"); contextMenu.addAction(pasteWithoutFormatAction); setupShortcut(pasteWithoutFormatAction, "Edit_Paste_Without_Formatting"); - pasteWithoutFormatShortcut = new QShortcut(this); - pasteWithoutFormatShortcut.activated.connect(parent, "pasteWithoutFormattingClicked()"); - setupShortcut(pasteWithoutFormatShortcut, "Edit_Paste_Without_Formatting"); +// pasteWithoutFormatShortcut = new QShortcut(this); +// pasteWithoutFormatShortcut.activated.connect(parent, "pasteWithoutFormattingClicked()"); +// setupShortcut(pasteWithoutFormatShortcut, "Edit_Paste_Without_Formatting"); contextMenu.addSeparator(); QMenu colorMenu = new QMenu(tr("Background Color")); -- 2.11.0