From e33b38d4db96bc5d525201eafeb39449a4a7fae8 Mon Sep 17 00:00:00 2001
From: Randy Baumgarte <randy@fbn.cx>
Date: Sun, 9 Jan 2011 20:05:11 -0500
Subject: [PATCH] Add insert/delete columns to tables.

---
 src/cx/fbn/nevernote/gui/BrowserWindow.java | 56 ++++++++++++++++++++++++++++-
 src/cx/fbn/nevernote/gui/ContentView.java   | 21 +++++++++++
 2 files changed, 76 insertions(+), 1 deletion(-)

diff --git a/src/cx/fbn/nevernote/gui/BrowserWindow.java b/src/cx/fbn/nevernote/gui/BrowserWindow.java
index 4da0b3c..e800124 100644
--- a/src/cx/fbn/nevernote/gui/BrowserWindow.java
+++ b/src/cx/fbn/nevernote/gui/BrowserWindow.java
@@ -2364,6 +2364,7 @@ public class BrowserWindow extends QWidget {
 		browser.rotateImageRight.setEnabled(false);
 		browser.insertTableAction.setEnabled(true);
 		browser.insertTableRowAction.setEnabled(false);
+		browser.insertTableColumnAction.setEnabled(false);
 		browser.deleteTableRowAction.setEnabled(false);
 		browser.insertLinkAction.setText(tr("Insert Hyperlink"));
 		insertHyperlink = true;
@@ -2431,8 +2432,34 @@ public class BrowserWindow extends QWidget {
 		browser.page().mainFrame().evaluateJavaScript(js);
 		contentChanged();
 	}
+	
+	public void insertTableColumn() {
+		String js = new String( "function insertTableColumn() {"
+				+"   var selObj = window.getSelection();"
+				+"   var selRange = selObj.getRangeAt(0);"
+				+"   var workingNode = window.getSelection().anchorNode.parentNode;"
+				+"   var current = 0;"
+				+"   while (workingNode.nodeName.toLowerCase() != 'table' && workingNode != null) {"
+				+"       if (workingNode.nodeName.toLowerCase() == 'td') {"
+				+"          var td = workingNode;"
+				+"          while (td.previousSibling != null) { " 
+				+"             current = current+1; td = td.previousSibling;"
+				+"          }"
+				+"       }"
+				+"       workingNode = workingNode.parentNode; "
+				+"   }"
+				+"   if (workingNode == null) return;"
+				+"   for (var i=0; i<workingNode.rows.length; i++) { " 
+				+"      var cell = workingNode.rows[i].insertCell(current+1); "			
+				+"      cell.innerHTML = '&nbsp'; "
+				+"   }"
+				+"} insertTableColumn();");
+			browser.page().mainFrame().evaluateJavaScript(js);
+			contentChanged();
+	}
+	
 	//****************************************************************
-	//* Insert a table row
+	//* Delete a table row
 	//****************************************************************
 	public void deleteTableRow() {
 		
@@ -2452,8 +2479,35 @@ public class BrowserWindow extends QWidget {
 		browser.page().mainFrame().evaluateJavaScript(js);
 		contentChanged();
 	}
+
+	public void deleteTableColumn() {
+		String js = new String( "function deleteTableColumn() {"
+				+"   var selObj = window.getSelection();"
+				+"   var selRange = selObj.getRangeAt(0);"
+				+"   var workingNode = window.getSelection().anchorNode.parentNode;"
+				+"   var current = 0;"
+				+"   while (workingNode.nodeName.toLowerCase() != 'table' && workingNode != null) {"
+				+"       if (workingNode.nodeName.toLowerCase() == 'td') {"
+				+"          var td = workingNode;"
+				+"          while (td.previousSibling != null) { " 
+				+"             current = current+1; td = td.previousSibling;"
+				+"          }"
+				+"       }"
+				+"       workingNode = workingNode.parentNode; "
+				+"   }"
+				+"   if (workingNode == null) return;"
+				+"   for (var i=0; i<workingNode.rows.length; i++) { " 
+				+"      workingNode.rows[i].deleteCell(current); "			
+				+"   }"
+				+"} deleteTableColumn();");
+			browser.page().mainFrame().evaluateJavaScript(js);
+			contentChanged();
+	}
+	
+	
 	public void setInsideTable() {
 		browser.insertTableRowAction.setEnabled(true);
+		browser.insertTableColumnAction.setEnabled(true);
 		browser.deleteTableRowAction.setEnabled(true);
 		browser.insertTableAction.setEnabled(false);
 		browser.encryptAction.setEnabled(false);
diff --git a/src/cx/fbn/nevernote/gui/ContentView.java b/src/cx/fbn/nevernote/gui/ContentView.java
index 81ecdfd..2dfef1f 100644
--- a/src/cx/fbn/nevernote/gui/ContentView.java
+++ b/src/cx/fbn/nevernote/gui/ContentView.java
@@ -66,8 +66,12 @@ public class ContentView extends QWebView {
 	QShortcut insertTableShortcut;
 	QAction	insertTableRowAction;
 	QShortcut insertTableRowShortcut;
+	QAction	insertTableColumnAction;
+	QShortcut insertTableColumnShortcut;
 	QAction	deleteTableRowAction;
 	QShortcut deleteTableRowShortcut;
+	QAction	deleteTableColumnAction;
+	QShortcut deleteTableColumnShortcut;
 	QAction openAction;
 	
 	QAction redBackgroundColor;
@@ -185,6 +189,14 @@ public class ContentView extends QWebView {
 		setupShortcut(insertTableRowShortcut, "Edit_Insert_Table_Row");
 		insertTableRowShortcut.activated.connect(parent, "insertTableRow()");
 		
+		insertTableColumnAction = new QAction(tr("Insert Column"), this);
+		insertTableColumnAction.triggered.connect(parent, "insertTableColumn()");
+		setupShortcut(insertTableColumnAction, "Edit_Insert_Table_Column");
+		tableMenu.addAction(insertTableColumnAction);
+		insertTableColumnShortcut = new QShortcut(this);
+		setupShortcut(insertTableColumnShortcut, "Edit_Insert_Table_Column");
+		insertTableColumnShortcut.activated.connect(parent, "insertTableColumn()");
+		
 		deleteTableRowAction = new QAction(tr("Delete Row"), this);
 		deleteTableRowAction.triggered.connect(parent, "deleteTableRow()");
 		setupShortcut(deleteTableRowAction, "Edit_Delete_Table_Row");
@@ -193,6 +205,15 @@ public class ContentView extends QWebView {
 		setupShortcut(deleteTableRowShortcut, "Edit_Delete_Table_Row");
 		deleteTableRowShortcut.activated.connect(parent, "deleteTableRow()");
 		
+		deleteTableColumnAction = new QAction(tr("Delete Column"), this);
+		deleteTableColumnAction.triggered.connect(parent, "deleteTableColumn()");
+		setupShortcut(deleteTableColumnAction, "Edit_Delete_Table_Column");
+		tableMenu.addAction(deleteTableColumnAction);
+		deleteTableColumnShortcut = new QShortcut(this);
+		setupShortcut(deleteTableColumnShortcut, "Edit_Delete_Table_Column");
+		deleteTableColumnShortcut.activated.connect(parent, "deleteTableColumn()");
+		
+		
 		insertDateTimeShortcut = new QShortcut(this);
 		insertDateTimeShortcut.activated.connect(parent, "insertDateTime()");
 		setupShortcut(insertDateTimeShortcut, "Insert_DateTime");
-- 
2.11.0