OSDN Git Service

Remove shortcut code that was causing an ambiguous shortcut setting for the "Paste...
[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / gui / ContentView.java
index 2bba156..43bf4c9 100644 (file)
@@ -26,9 +26,9 @@ import com.trolltech.qt.gui.QContextMenuEvent;
 import com.trolltech.qt.gui.QDropEvent;\r
 import com.trolltech.qt.gui.QKeyEvent;\r
 import com.trolltech.qt.gui.QKeySequence;\r
 import com.trolltech.qt.gui.QDropEvent;\r
 import com.trolltech.qt.gui.QKeyEvent;\r
 import com.trolltech.qt.gui.QKeySequence;\r
+import com.trolltech.qt.gui.QKeySequence.StandardKey;\r
 import com.trolltech.qt.gui.QMenu;\r
 import com.trolltech.qt.gui.QShortcut;\r
 import com.trolltech.qt.gui.QMenu;\r
 import com.trolltech.qt.gui.QShortcut;\r
-import com.trolltech.qt.gui.QKeySequence.StandardKey;\r
 import com.trolltech.qt.network.QNetworkRequest;\r
 import com.trolltech.qt.webkit.QWebPage;\r
 import com.trolltech.qt.webkit.QWebView;\r
 import com.trolltech.qt.network.QNetworkRequest;\r
 import com.trolltech.qt.webkit.QWebPage;\r
 import com.trolltech.qt.webkit.QWebView;\r
@@ -117,9 +117,9 @@ public class ContentView extends QWebView {
                pasteWithoutFormatAction.triggered.connect(parent, "pasteWithoutFormattingClicked()");\r
                contextMenu.addAction(pasteWithoutFormatAction); \r
                setupShortcut(pasteWithoutFormatAction, "Edit_Paste_Without_Formatting");\r
                pasteWithoutFormatAction.triggered.connect(parent, "pasteWithoutFormattingClicked()");\r
                contextMenu.addAction(pasteWithoutFormatAction); \r
                setupShortcut(pasteWithoutFormatAction, "Edit_Paste_Without_Formatting");\r
-               pasteWithoutFormatShortcut = new QShortcut(this);\r
-               pasteWithoutFormatShortcut.activated.connect(parent, "pasteWithoutFormattingClicked()");\r
-               setupShortcut(pasteWithoutFormatShortcut, "Edit_Paste_Without_Formatting");\r
+//             pasteWithoutFormatShortcut = new QShortcut(this);\r
+//             pasteWithoutFormatShortcut.activated.connect(parent, "pasteWithoutFormattingClicked()");\r
+//             setupShortcut(pasteWithoutFormatShortcut, "Edit_Paste_Without_Formatting");\r
                \r
                contextMenu.addSeparator();\r
                QMenu colorMenu = new QMenu(tr("Background Color"));\r
                \r
                contextMenu.addSeparator();\r
                QMenu colorMenu = new QMenu(tr("Background Color"));\r
@@ -198,7 +198,7 @@ public class ContentView extends QWebView {
                setupShortcut(insertDateTimeShortcut, "Insert_DateTime");\r
                        \r
                QMenu imageMenu = new QMenu();\r
                setupShortcut(insertDateTimeShortcut, "Insert_DateTime");\r
                        \r
                QMenu imageMenu = new QMenu();\r
-               imageMenu.setTitle("Image");\r
+               imageMenu.setTitle(tr("Image"));\r
                contextMenu.addMenu(imageMenu);\r
                downloadImage = pageAction(QWebPage.WebAction.DownloadImageToDisk);\r
                downloadImage.setText(tr("Save Image"));\r
                contextMenu.addMenu(imageMenu);\r
                downloadImage = pageAction(QWebPage.WebAction.DownloadImageToDisk);\r
                downloadImage.setText(tr("Save Image"));\r