From 11bd1248177d61643dff5255fccf31e85408d888 Mon Sep 17 00:00:00 2001
From: Randy Baumgarte <randy@fbn.cx>
Date: Sun, 22 Aug 2010 14:24:52 -0400
Subject: [PATCH 1/1] Correct problem where images may not be pasted properly
 due to ' character messing up the insert html command.

---
 src/cx/fbn/nevernote/NeverNote.java          | 54 ++++++++++++----------------
 src/cx/fbn/nevernote/gui/BrowserWindow.java  |  4 ++-
 src/cx/fbn/nevernote/gui/NoteTableModel.java | 32 +++++++++++++++++
 3 files changed, 58 insertions(+), 32 deletions(-)

diff --git a/src/cx/fbn/nevernote/NeverNote.java b/src/cx/fbn/nevernote/NeverNote.java
index 279e92b..e0a846b 100644
--- a/src/cx/fbn/nevernote/NeverNote.java
+++ b/src/cx/fbn/nevernote/NeverNote.java
@@ -1520,25 +1520,31 @@ public class NeverNote extends QMainWindow{
 		if (tagName == null)
 			return;
 		
-		for (int i=0; i<listManager.getNoteTableModel().rowCount(); i++) {
-			QModelIndex modelIndex =  listManager.getNoteTableModel().index(i, Global.noteTableGuidPosition);
-			if (modelIndex != null) {
-				SortedMap<Integer, Object> ix = listManager.getNoteTableModel().itemData(modelIndex);
-				String titleGuid = (String)ix.values().toArray()[0];
-				if (titleGuid.equals(noteGuid)) {
-					String text = (String)listManager.getNoteTableModel().data(i, Global.noteTableTagPosition);
-					if (!text.trim().equals(""))
-						text = text + Global.tagDelimeter + " " +tagName;
-					else
-						text = tagName;
-					listManager.getNoteTableModel().setData(i, Global.noteTableTagPosition, text);
-					listManager.getNoteTableModel().setData(i, Global.noteTableSynchronizedPosition, "false");
-					if (noteGuid.equals(currentNoteGuid))
-						browserWindow.setTag(text);
-					i=listManager.getNoteTableModel().rowCount();
+		for (int i=0; i<listManager.getMasterNoteIndex().size(); i++) {
+			if (listManager.getMasterNoteIndex().get(i).getGuid().equals(noteGuid)) {
+				List<String> tagNames = new ArrayList<String>();
+				tagNames.add(new String(tagName));
+				Note n = listManager.getMasterNoteIndex().get(i);
+				for (int j=0; j<n.getTagNames().size(); j++) {
+					tagNames.add(new String(n.getTagNames().get(j)));
+				}
+				listManager.getNoteTableModel().updateNoteTags(noteGuid, n.getTagGuids(), tagNames);
+				if (n.getGuid().equals(currentNoteGuid)) {
+					Collections.sort(tagNames);
+					String display = "";
+					for (int j=0; j<tagNames.size(); j++) {
+						display = display+tagNames.get(j);
+						if (j+2<tagNames.size()) 
+							display = display+Global.tagDelimeter+" ";
+					}
+					browserWindow.setTag(display);
 				}
+				i=listManager.getMasterNoteIndex().size();
 			}
 		}
+		
+		
+		listManager.getNoteTableModel().updateNoteSyncStatus(noteGuid, false);
 	}
 	private void clearTagFilter() {
 		tagTree.blockSignals(true);
@@ -2597,21 +2603,7 @@ public class NeverNote extends QMainWindow{
     }
 	private void updateListNoteNotebook(String guid, String notebook) {
     	logger.log(logger.HIGH, "Entering NeverNote.updateListNoteNotebook");
-
-    	for (int i=0; i<listManager.getNoteTableModel().rowCount(); i++) {
-    		//QModelIndex modelIndex =  noteTableView.proxyModel.index(i, Global.noteTableGuidPosition);
-    		QModelIndex modelIndex =  listManager.getNoteTableModel().index(i, Global.noteTableGuidPosition);
-    		if (modelIndex != null) {
-//    			SortedMap<Integer, Object> ix = noteTableView.proxyModel.itemData(modelIndex);
-    			SortedMap<Integer, Object> ix = listManager.getNoteTableModel().itemData(modelIndex);
-    			String tableGuid =  (String)ix.values().toArray()[0];
-    			if (tableGuid.equals(guid)) {
-    				listManager.getNoteTableModel().setData(i, Global.noteTableNotebookPosition,notebook);
-    				listManager.getNoteTableModel().setData(i, Global.noteTableSynchronizedPosition, "false");
-    				return;
-    			}	
-    		}
-    	}
+    	listManager.getNoteTableModel().updateNoteSyncStatus(guid, false);
     	logger.log(logger.HIGH, "Leaving NeverNote.updateListNoteNotebook");
     }
     // Update a title for a specific note in the list
diff --git a/src/cx/fbn/nevernote/gui/BrowserWindow.java b/src/cx/fbn/nevernote/gui/BrowserWindow.java
index 37e143a..488cf7c 100644
--- a/src/cx/fbn/nevernote/gui/BrowserWindow.java
+++ b/src/cx/fbn/nevernote/gui/BrowserWindow.java
@@ -1567,8 +1567,10 @@ public class BrowserWindow extends QWidget {
 		buffer.append("\" en-tag=en-media type=\"image/jpeg\""
 				+" hash=\""+Global.byteArrayToHexString(newRes.getData().getBodyHash()) +"\""
 				+" guid=\"" +newRes.getGuid() +"\""
-				+" onContextMenu=\"window.jambi.imageContextMenu('" +tfile.fileName() +"');\""
+//				+" onContextMenu=\"window.jambi.imageContextMenu('" +tfile.fileName() +"');\""
+				+" onContextMenu=\"window.jambi.imageContextMenu(&amp." +tfile.fileName() +"&amp.);\""
 				+ " />");
+		
 		browser.page().mainFrame().evaluateJavaScript(
 				script_start + buffer + script_end);
 
diff --git a/src/cx/fbn/nevernote/gui/NoteTableModel.java b/src/cx/fbn/nevernote/gui/NoteTableModel.java
index 195d019..f901470 100644
--- a/src/cx/fbn/nevernote/gui/NoteTableModel.java
+++ b/src/cx/fbn/nevernote/gui/NoteTableModel.java
@@ -2,6 +2,7 @@ package cx.fbn.nevernote.gui;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 
@@ -236,6 +237,28 @@ public class NoteTableModel extends QAbstractTableModel {
 		}
 	}
 	
+	// Update a note title
+	public void updateNoteTags(String guid, List<String> tags, List<String> names) {
+		for (int i=0; i<getMasterNoteIndex().size(); i++) {
+			if (getMasterNoteIndex().get(i).getGuid().equals(guid)) {
+				getMasterNoteIndex().get(i).setTagGuids(tags);
+				getMasterNoteIndex().get(i).setTagNames(names);
+				String display = new String("");
+				Collections.sort(names);
+				for (int j=0; j<names.size(); j++) {
+					display = display+names.get(j);
+					if (j+2<names.size()) {
+						display = display+Global.tagDelimeter+" ";
+					}
+				}
+				QModelIndex idx = createIndex(i, Global.noteTableTagPosition, nativePointer());
+				setData(idx, display, Qt.ItemDataRole.EditRole); 
+				i = getMasterNoteIndex().size();
+			}	
+		}
+	}
+
+	
 	public void updateNoteCreatedDate(String guid, QDateTime date) {
 		
 		for (int i=0; i<getMasterNoteIndex().size(); i++) {
@@ -436,5 +459,14 @@ public class NoteTableModel extends QAbstractTableModel {
 		getTitleColors().put(guid, color);
 		layoutChanged.emit();
 	}
+
+	@Override
+	public Qt.ItemFlags flags(QModelIndex index) {
+		Qt.ItemFlag flags[] = { Qt.ItemFlag.ItemIsEnabled, 
+								Qt.ItemFlag.ItemIsDragEnabled,
+								Qt.ItemFlag.ItemIsSelectable };
+		
+		return new Qt.ItemFlags(flags);
+	}
 	
 }
-- 
2.11.0