Add some of the context menu options to the main menu bar.

[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / gui / ContentView.java

diff --git a/src/cx/fbn/nevernote/gui/ContentView.java b/src/cx/fbn/nevernote/gui/ContentView.java
index 81ecdfd..1c461e1 100644 (file)
--- a/src/cx/fbn/nevernote/gui/ContentView.java
+++ b/src/cx/fbn/nevernote/gui/ContentView.java
@@ -1,5 +1,5 @@
 /*\r
- * This file is part of NeverNote \r
+ * This file is part of NixNote \r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
@@ -62,13 +62,22 @@ public class ContentView extends QWebView {
        QShortcut rotateImageLeftShortcut;      \r
        QAction insertLinkAction;\r
        QShortcut insertLinkShortcut;\r
+       QAction insertLatexAction;\r
+       QShortcut insertLatexShortcut;\r
        QAction insertTableAction;\r
        QShortcut insertTableShortcut;\r
        QAction insertTableRowAction;\r
        QShortcut insertTableRowShortcut;\r
+       QAction insertTableColumnAction;\r
+       QShortcut insertTableColumnShortcut;\r
        QAction deleteTableRowAction;\r
        QShortcut deleteTableRowShortcut;\r
+       QAction deleteTableColumnAction;\r
+       QShortcut deleteTableColumnShortcut;\r
        QAction openAction;\r
+       QAction insertQuickLinkAction;\r
+       QShortcut insertQuickLinkShortcut;\r
+       QMenu imageMenu;\r
        \r
        QAction redBackgroundColor;\r
        \r
@@ -167,6 +176,23 @@ public class ContentView extends QWebView {
                setupShortcut(insertLinkShortcut, "Edit_Insert_Hyperlink");\r
                insertLinkShortcut.activated.connect(parent, "insertLink()");\r
                \r
+               insertQuickLinkAction = new QAction(tr("Quick Link"), this);\r
+               insertQuickLinkAction.triggered.connect(parent, "insertQuickLink()");\r
+               setupShortcut(insertQuickLinkAction, "Edit_Insert_QuickLink");\r
+               contextMenu.addAction(insertQuickLinkAction);\r
+               insertQuickLinkAction.setEnabled(false);\r
+               insertQuickLinkShortcut = new QShortcut(this);\r
+               setupShortcut(insertQuickLinkShortcut, "Edit_Insert_Quicklink");\r
+               insertQuickLinkShortcut.activated.connect(parent, "insertQuickLink()");\r
+\r
+               insertLatexAction = new QAction(tr("Insert LaTeX Formula"), this);\r
+               insertLatexAction.triggered.connect(parent, "insertLatex()");\r
+               setupShortcut(insertLatexAction, "Edit_Insert_Latex");\r
+               contextMenu.addAction(insertLatexAction);\r
+               insertLatexShortcut = new QShortcut(this);\r
+               setupShortcut(insertLatexShortcut, "Edit_Insert_Latex");\r
+               insertLatexShortcut.activated.connect(parent, "insertLatex()");\r
+               \r
                contextMenu.addMenu(tableMenu);\r
                tableMenu.setTitle("Table");\r
                insertTableAction = new QAction(tr("Insert Table"), this);\r
@@ -185,6 +211,14 @@ public class ContentView extends QWebView {
                setupShortcut(insertTableRowShortcut, "Edit_Insert_Table_Row");\r
                insertTableRowShortcut.activated.connect(parent, "insertTableRow()");\r
                \r
+               insertTableColumnAction = new QAction(tr("Insert Column"), this);\r
+               insertTableColumnAction.triggered.connect(parent, "insertTableColumn()");\r
+               setupShortcut(insertTableColumnAction, "Edit_Insert_Table_Column");\r
+               tableMenu.addAction(insertTableColumnAction);\r
+               insertTableColumnShortcut = new QShortcut(this);\r
+               setupShortcut(insertTableColumnShortcut, "Edit_Insert_Table_Column");\r
+               insertTableColumnShortcut.activated.connect(parent, "insertTableColumn()");\r
+               \r
                deleteTableRowAction = new QAction(tr("Delete Row"), this);\r
                deleteTableRowAction.triggered.connect(parent, "deleteTableRow()");\r
                setupShortcut(deleteTableRowAction, "Edit_Delete_Table_Row");\r
@@ -193,11 +227,20 @@ public class ContentView extends QWebView {
                setupShortcut(deleteTableRowShortcut, "Edit_Delete_Table_Row");\r
                deleteTableRowShortcut.activated.connect(parent, "deleteTableRow()");\r
                \r
+               deleteTableColumnAction = new QAction(tr("Delete Column"), this);\r
+               deleteTableColumnAction.triggered.connect(parent, "deleteTableColumn()");\r
+               setupShortcut(deleteTableColumnAction, "Edit_Delete_Table_Column");\r
+               tableMenu.addAction(deleteTableColumnAction);\r
+               deleteTableColumnShortcut = new QShortcut(this);\r
+               setupShortcut(deleteTableColumnShortcut, "Edit_Delete_Table_Column");\r
+               deleteTableColumnShortcut.activated.connect(parent, "deleteTableColumn()");\r
+               \r
+               \r
                insertDateTimeShortcut = new QShortcut(this);\r
                insertDateTimeShortcut.activated.connect(parent, "insertDateTime()");\r
                setupShortcut(insertDateTimeShortcut, "Insert_DateTime");\r
                        \r
-               QMenu imageMenu = new QMenu();\r
+               imageMenu = new QMenu();\r
                imageMenu.setTitle(tr("Image"));\r
                contextMenu.addMenu(imageMenu);\r
                downloadImage = pageAction(QWebPage.WebAction.DownloadImageToDisk);\r