OSDN Git Service

Change hex 0A in string compare to \n to avoid compile issues.
[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / gui / BrowserWindow.java
index db005a9..8f0eef7 100644 (file)
@@ -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
@@ -36,8 +36,10 @@ import java.util.GregorianCalendar;
 import java.util.HashMap;\r
 import java.util.List;\r
 import java.util.Locale;\r
+import java.util.StringTokenizer;\r
 \r
-import org.apache.commons.lang.StringUtils;\r
+import org.apache.commons.lang3.StringEscapeUtils;\r
+import org.apache.commons.lang3.StringUtils;\r
 \r
 import com.evernote.edam.limits.Constants;\r
 import com.evernote.edam.type.Data;\r
@@ -46,6 +48,8 @@ import com.evernote.edam.type.Notebook;
 import com.evernote.edam.type.Resource;\r
 import com.evernote.edam.type.ResourceAttributes;\r
 import com.evernote.edam.type.Tag;\r
+import com.evernote.edam.type.User;\r
+import com.swabunga.spell.engine.Configuration;\r
 import com.swabunga.spell.engine.SpellDictionary;\r
 import com.swabunga.spell.engine.SpellDictionaryHashMap;\r
 import com.swabunga.spell.engine.Word;\r
@@ -54,6 +58,7 @@ import com.swabunga.spell.event.SpellCheckListener;
 import com.swabunga.spell.event.SpellChecker;\r
 import com.swabunga.spell.event.StringWordTokenizer;\r
 import com.trolltech.qt.core.QByteArray;\r
+import com.trolltech.qt.core.QCoreApplication;\r
 import com.trolltech.qt.core.QDataStream;\r
 import com.trolltech.qt.core.QDateTime;\r
 import com.trolltech.qt.core.QEvent;\r
@@ -62,7 +67,10 @@ import com.trolltech.qt.core.QFile;
 import com.trolltech.qt.core.QFileSystemWatcher;\r
 import com.trolltech.qt.core.QIODevice;\r
 import com.trolltech.qt.core.QMimeData;\r
+import com.trolltech.qt.core.QTextCodec;\r
+import com.trolltech.qt.core.QTimer;\r
 import com.trolltech.qt.core.QUrl;\r
+import com.trolltech.qt.core.Qt;\r
 import com.trolltech.qt.core.Qt.Key;\r
 import com.trolltech.qt.core.Qt.KeyboardModifier;\r
 import com.trolltech.qt.core.Qt.KeyboardModifiers;\r
@@ -70,6 +78,7 @@ import com.trolltech.qt.gui.QAction;
 import com.trolltech.qt.gui.QApplication;\r
 import com.trolltech.qt.gui.QCalendarWidget;\r
 import com.trolltech.qt.gui.QClipboard;\r
+import com.trolltech.qt.gui.QClipboard.Mode;\r
 import com.trolltech.qt.gui.QColor;\r
 import com.trolltech.qt.gui.QComboBox;\r
 import com.trolltech.qt.gui.QDateEdit;\r
@@ -77,6 +86,7 @@ import com.trolltech.qt.gui.QDesktopServices;
 import com.trolltech.qt.gui.QFileDialog;\r
 import com.trolltech.qt.gui.QFileDialog.AcceptMode;\r
 import com.trolltech.qt.gui.QFileDialog.FileMode;\r
+import com.trolltech.qt.gui.QFont;\r
 import com.trolltech.qt.gui.QFontDatabase;\r
 import com.trolltech.qt.gui.QFormLayout;\r
 import com.trolltech.qt.gui.QGridLayout;\r
@@ -90,13 +100,21 @@ import com.trolltech.qt.gui.QLineEdit;
 import com.trolltech.qt.gui.QListWidgetItem;\r
 import com.trolltech.qt.gui.QMatrix;\r
 import com.trolltech.qt.gui.QMessageBox;\r
+import com.trolltech.qt.gui.QPalette;\r
+import com.trolltech.qt.gui.QPalette.ColorRole;\r
 import com.trolltech.qt.gui.QPushButton;\r
 import com.trolltech.qt.gui.QShortcut;\r
+import com.trolltech.qt.gui.QSplitter;\r
+import com.trolltech.qt.gui.QTextEdit;\r
+import com.trolltech.qt.gui.QTextEdit.LineWrapMode;\r
 import com.trolltech.qt.gui.QTimeEdit;\r
 import com.trolltech.qt.gui.QToolButton;\r
 import com.trolltech.qt.gui.QToolButton.ToolButtonPopupMode;\r
 import com.trolltech.qt.gui.QVBoxLayout;\r
 import com.trolltech.qt.gui.QWidget;\r
+import com.trolltech.qt.network.QNetworkAccessManager;\r
+import com.trolltech.qt.network.QNetworkReply;\r
+import com.trolltech.qt.network.QNetworkReply.NetworkError;\r
 import com.trolltech.qt.network.QNetworkRequest;\r
 import com.trolltech.qt.webkit.QWebPage;\r
 import com.trolltech.qt.webkit.QWebPage.WebAction;\r
@@ -107,16 +125,21 @@ import cx.fbn.nevernote.Global;
 import cx.fbn.nevernote.dialog.EnCryptDialog;\r
 import cx.fbn.nevernote.dialog.EnDecryptDialog;\r
 import cx.fbn.nevernote.dialog.GeoDialog;\r
+import cx.fbn.nevernote.dialog.InsertLatexImage;\r
 import cx.fbn.nevernote.dialog.InsertLinkDialog;\r
+import cx.fbn.nevernote.dialog.NoteQuickLinkDialog;\r
 import cx.fbn.nevernote.dialog.SpellCheck;\r
 import cx.fbn.nevernote.dialog.TableDialog;\r
 import cx.fbn.nevernote.dialog.TagAssign;\r
 import cx.fbn.nevernote.evernote.EnCrypt;\r
+import cx.fbn.nevernote.filters.FilterEditorTags;\r
 import cx.fbn.nevernote.signals.NoteResourceSignal;\r
 import cx.fbn.nevernote.signals.NoteSignal;\r
 import cx.fbn.nevernote.sql.DatabaseConnection;\r
 import cx.fbn.nevernote.utilities.ApplicationLogger;\r
 import cx.fbn.nevernote.utilities.FileUtils;\r
+import cx.fbn.nevernote.utilities.Pair;\r
+import cx.fbn.nevernote.xml.HtmlTagModifier;\r
 \r
 public class BrowserWindow extends QWidget {\r
 \r
@@ -143,17 +166,20 @@ public class BrowserWindow extends QWidget {
        public final QAction    fontSizeAction;\r
        private boolean extendedOn;\r
        public boolean buttonsVisible;\r
-       private final String iconPath = new String("classpath:cx/fbn/nevernote/icons/");\r
+       private final String iconPath;\r
        private final ContentView browser;\r
+       private final QTextEdit sourceEdit;\r
+       private String sourceEditHeader;\r
+       Highlighter syntaxHighlighter;\r
        private List<Tag> allTags;\r
        private List<String> currentTags;\r
        public NoteSignal noteSignal;\r
+       public Signal2<String,String> evernoteLinkClicked;\r
        private List<Notebook> notebookList;\r
        private Note currentNote;\r
        private String saveNoteTitle;\r
        private String saveTagList;\r
        private boolean insideList;\r
-//     private String selectedText;\r
        private final DatabaseConnection conn;\r
        private final QCalendarWidget createdCalendarWidget;\r
        private final QCalendarWidget alteredCalendarWidget;\r
@@ -219,7 +245,7 @@ public class BrowserWindow extends QWidget {
        private final ColorMenu fontHilightColorMenu;\r
        public final QFileSystemWatcher fileWatcher;\r
        public int cursorPosition;\r
-       private boolean forceTextPaste = false;\r
+       private boolean forceTextPaste;\r
        private String selectedFile;\r
        private String currentHyperlink;\r
        public boolean keepPDFNavigationHidden;\r
@@ -228,31 +254,38 @@ public class BrowserWindow extends QWidget {
     SpellDictionary userDictionary;\r
     SpellChecker spellChecker;\r
     SuggestionListener spellListener;\r
-       private final HashMap<String,Integer> previewPageList; \r
-       \r
+       private final HashMap<String,Integer> previewPageList;  \r
+       boolean insertHyperlink;\r
+       boolean insideTable;\r
+       boolean insideEncryption;\r
+       public Signal1<BrowserWindow> blockApplication;\r
+       public Signal0 unblockApplication;\r
+       public boolean awaitingHttpResponse;\r
+       public long     unblockTime;\r
+       private final QTimer setSourceTimer;\r
+       String latexGuid;  // This is set if we are editing an existing LaTeX formula.  Useful to track guid.\r
+\r
        \r
        public static class SuggestionListener implements SpellCheckListener {\r
                public boolean abortSpellCheck = false;\r
                public boolean errorsFound = false;\r
                private final SpellCheck                spellCheckDialog;\r
-               private final SpellChecker checker;\r
                \r
                \r
                private final BrowserWindow parent;\r
                public SuggestionListener(BrowserWindow parent, SpellChecker checker) {\r
                        this.parent = parent;\r
                        spellCheckDialog = new SpellCheck(checker);\r
-                       this.checker = checker;\r
                }\r
                public void spellingError(SpellCheckEvent event) {\r
                        errorsFound = true;\r
                        spellCheckDialog.setWord(event.getInvalidWord());\r
 \r
-                   List<Word> suggestions = event.getSuggestions();\r
-                   if (suggestions.isEmpty()) {\r
-                      spellCheckDialog.setNoSuggestions(true);\r
-                   } else {\r
-                      spellCheckDialog.setCurrentSuggestion(suggestions.get(0).getWord());\r
+                   @SuppressWarnings("unchecked")\r
+                       List<Word> suggestions = event.getSuggestions();\r
+                   spellCheckDialog.clearSuggestions();\r
+                   if (!suggestions.isEmpty()) {\r
+//                    spellCheckDialog.setCurrentSuggestion(suggestions.get(0).getWord());\r
                       for (int i=0; i<suggestions.size(); i++) {\r
                          spellCheckDialog.addSuggestion(suggestions.get(i).getWord());\r
                       }\r
@@ -261,6 +294,7 @@ public class BrowserWindow extends QWidget {
                    spellCheckDialog.exec();\r
                    if (spellCheckDialog.cancelPressed()) {\r
                        abortSpellCheck = true;\r
+                       event.cancel();\r
                        return;\r
                    }\r
                    if (spellCheckDialog.replacePressed()) {\r
@@ -268,6 +302,7 @@ public class BrowserWindow extends QWidget {
                        clipboard.setText(spellCheckDialog.getReplacementWord()); \r
                        parent.pasteClicked();\r
                    }\r
+                   event.cancel();\r
                 }\r
        }\r
 \r
@@ -276,11 +311,17 @@ public class BrowserWindow extends QWidget {
        public BrowserWindow(DatabaseConnection c) {\r
                logger = new ApplicationLogger("browser.log");\r
                logger.log(logger.HIGH, "Setting up browser");\r
+               iconPath = new String("classpath:cx/fbn/nevernote/icons/");\r
+               forceTextPaste = false;\r
+               insertHyperlink = true;\r
+               insideTable = false;\r
+               insideEncryption = false;\r
                \r
                fileWatcher = new QFileSystemWatcher();\r
 //             fileWatcher.fileChanged.connect(this, "fileChanged(String)");\r
                noteSignal = new NoteSignal();\r
                titleLabel = new QLineEdit();\r
+               evernoteLinkClicked = new Signal2<String,String>();\r
                titleLabel.setMaxLength(Constants.EDAM_NOTE_TITLE_LEN_MAX);\r
                urlText = new QLineEdit();\r
                authorText = new QLineEdit();\r
@@ -293,7 +334,7 @@ public class BrowserWindow extends QWidget {
                focusLost = new Signal0();\r
 \r
                tagEdit = new TagLineEdit(allTags);\r
-               tagLabel = new QLabel("Tags:");\r
+               tagLabel = new QLabel(tr("Tags:"));\r
                tagEdit.focusLost.connect(this, "modifyTagsTyping()");\r
 \r
                createdCalendarWidget = new QCalendarWidget();\r
@@ -311,7 +352,7 @@ public class BrowserWindow extends QWidget {
                alteredDate.setCalendarPopup(true);\r
                alteredDate.setCalendarWidget(alteredCalendarWidget);\r
                alteredTime = new QTimeEdit();\r
-               alteredLabel = new QLabel("Altered:");\r
+               alteredLabel = new QLabel(tr("Altered:"));\r
                alteredDate.dateChanged.connect(this, "alteredChanged()");\r
                alteredTime.timeChanged.connect(this, "alteredChanged()");\r
 \r
@@ -360,11 +401,25 @@ public class BrowserWindow extends QWidget {
                setAcceptDrops(true);\r
 \r
                browser = new ContentView(this);\r
+                               \r
                browser.page().setLinkDelegationPolicy(\r
                                QWebPage.LinkDelegationPolicy.DelegateAllLinks);\r
                browser.linkClicked.connect(this, "linkClicked(QUrl)");\r
                currentHyperlink = "";\r
                \r
+               //Setup the source editor\r
+               sourceEdit = new QTextEdit(this);\r
+               sourceEdit.setVisible(false);\r
+               sourceEdit.setTabChangesFocus(true);\r
+               sourceEdit.setLineWrapMode(LineWrapMode.NoWrap);\r
+               QFont font = new QFont();\r
+               font.setFamily("Courier");\r
+               font.setFixedPitch(true);\r
+               font.setPointSize(10);\r
+               sourceEdit.setFont(font);\r
+               syntaxHighlighter = new Highlighter(sourceEdit.document());\r
+               sourceEdit.textChanged.connect(this, "sourceEdited()");\r
+\r
                QVBoxLayout v = new QVBoxLayout();\r
                QFormLayout notebookLayout = new QFormLayout();\r
                QGridLayout dateLayout = new QGridLayout();\r
@@ -530,9 +585,19 @@ public class BrowserWindow extends QWidget {
                buttonLayout.toggleNumberListVisible.triggered.connect(this, "todoClicked()");\r
                buttonLayout.toggleTodo.triggered.connect(this, "toggleTodoVisible(Boolean)");\r
 \r
+               // Setup the source browser);\r
 \r
 //             buttonLayout.addWidget(new QLabel(), 1);\r
-               v.addWidget(browser, 1);\r
+               QSplitter editSplitter = new QSplitter(this);\r
+               editSplitter.addWidget(browser);\r
+               editSplitter.setOrientation(Qt.Orientation.Vertical);\r
+               editSplitter.addWidget(sourceEdit);\r
+\r
+               \r
+\r
+//             v.addWidget(browser, 1);\r
+//             v.addWidget(sourceEdit);\r
+               v.addWidget(editSplitter);\r
                setLayout(v);\r
 \r
                browser.downloadAttachmentRequested.connect(this,\r
@@ -565,6 +630,30 @@ public class BrowserWindow extends QWidget {
                \r
                browser.page().microFocusChanged.connect(this, "microFocusChanged()");\r
                \r
+               //Setup colors\r
+               \r
+               QPalette pal = new QPalette();\r
+               pal.setColor(ColorRole.Text, QColor.black);\r
+               titleLabel.setPalette(pal);\r
+               authorText.setPalette(pal);\r
+               authorLabel.setPalette(pal);\r
+               urlLabel.setPalette(pal);\r
+               urlText.setPalette(pal);\r
+               createdDate.setPalette(pal);\r
+               createdTime.setPalette(pal);\r
+               alteredDate.setPalette(pal);\r
+               alteredTime.setPalette(pal);\r
+               subjectDate.setPalette(pal);\r
+               subjectTime.setPalette(pal);\r
+               tagEdit.setPalette(pal);\r
+               notebookBox.setPalette(pal);\r
+               \r
+               blockApplication = new Signal1<BrowserWindow>();\r
+               unblockApplication = new Signal0();\r
+               \r
+               setSourceTimer = new QTimer();\r
+               setSourceTimer.timeout.connect(this, "setSource()");\r
+               \r
                logger.log(logger.HIGH, "Browser setup complete");\r
        }\r
 \r
@@ -617,7 +706,12 @@ public class BrowserWindow extends QWidget {
                createdDate.setEnabled(!v);\r
                subjectDate.setEnabled(!v);\r
                alteredDate.setEnabled(!v);\r
+               authorText.setEnabled(!v);\r
+               createdTime.setEnabled(!v);\r
+               alteredTime.setEnabled(!v);\r
+               subjectTime.setEnabled(!v);\r
                getBrowser().setEnabled(true);\r
+//             getBrowser().setEnabled(!v);\r
        }\r
        \r
        // expose this class to Javascript on the web page\r
@@ -639,7 +733,7 @@ public class BrowserWindow extends QWidget {
        public void clear() {\r
                logger.log(logger.EXTREME, "Entering BrowserWindow.clear()");\r
                setNote(null);\r
-               browser.setContent(new QByteArray());\r
+               setContent(new QByteArray());\r
                tagEdit.setText("");\r
                tagEdit.tagCompleter.reset();\r
                urlLabel.setText(tr("Source URL:"));\r
@@ -647,6 +741,11 @@ public class BrowserWindow extends QWidget {
                logger.log(logger.EXTREME, "Exiting BrowserWindow.clear()");\r
        }\r
 \r
+       public void setContent(QByteArray data) {\r
+               sourceEdit.blockSignals(true);\r
+               browser.setContent(data);\r
+               setSource();\r
+       }\r
        // get/set current note\r
        public void setNote(Note n) {\r
                currentNote = n;\r
@@ -663,7 +762,8 @@ public class BrowserWindow extends QWidget {
        // New Editor Button\r
        private QPushButton newEditorButton(String name, String toolTip) {\r
                QPushButton button = new QPushButton();\r
-               QIcon icon = new QIcon(iconPath + name + ".gif");\r
+//             QIcon icon = new QIcon(iconPath + name + ".gif");\r
+               QIcon icon = new QIcon(iconPath + name + ".png");\r
                button.setIcon(icon);\r
                button.setToolTip(toolTip);\r
                button.clicked.connect(this, name + "Clicked()");\r
@@ -672,7 +772,8 @@ public class BrowserWindow extends QWidget {
        // New Editor Button\r
        private QToolButton newToolButton(String name, String toolTip) {\r
                QToolButton button = new QToolButton();\r
-               QIcon icon = new QIcon(iconPath + name + ".gif");\r
+//             QIcon icon = new QIcon(iconPath + name + ".gif");\r
+               QIcon icon = new QIcon(iconPath + name + ".png");\r
                button.setIcon(icon);\r
                button.setToolTip(toolTip);\r
                button.clicked.connect(this, name + "Clicked()");\r
@@ -819,7 +920,27 @@ public class BrowserWindow extends QWidget {
        @SuppressWarnings("unused")\r
        private void linkClicked(QUrl url) {\r
                logger.log(logger.EXTREME, "URL Clicked: " +url.toString());\r
-               if (url.toString().substring(0,8).equals("nnres://")) {\r
+               if (url.toString().startsWith("latex:")) {\r
+                       int position = url.toString().lastIndexOf(".");\r
+                       String guid = url.toString().substring(0,position);\r
+                       position = guid.lastIndexOf("/");\r
+                       guid = guid.substring(position+1);\r
+                       editLatex(guid);\r
+                       return;\r
+               }\r
+               if (url.toString().startsWith("evernote:/view/")) {\r
+                       StringTokenizer tokens = new StringTokenizer(url.toString().replace("evernote:/view/", ""), "/");\r
+                       tokens.nextToken();\r
+                       tokens.nextToken();\r
+                       String sid = tokens.nextToken();\r
+                       String lid = tokens.nextToken();\r
+                       \r
+                       // Emit that we want to switch to a new note\r
+                       evernoteLinkClicked.emit(sid, lid);\r
+\r
+                       return;\r
+               }\r
+               if (url.toString().startsWith("nnres://")) {\r
                        logger.log(logger.EXTREME, "URL is NN resource");\r
                        if (url.toString().endsWith("/vnd.evernote.ink")) {\r
                                logger.log(logger.EXTREME, "Unable to open ink note");\r
@@ -978,11 +1099,10 @@ public class BrowserWindow extends QWidget {
                }\r
                QClipboard clipboard = QApplication.clipboard();\r
                QMimeData mime = clipboard.mimeData();\r
-               \r
-//              String x = mime.html();\r
 \r
                if (mime.hasImage()) {\r
                        logger.log(logger.EXTREME, "Image paste found");\r
+                       browser.setFocus();\r
                        insertImage(mime);\r
                        browser.setFocus();\r
                        return;\r
@@ -990,8 +1110,12 @@ public class BrowserWindow extends QWidget {
 \r
                if (mime.hasUrls()) {\r
                        logger.log(logger.EXTREME, "URL paste found");\r
-                       handleUrls(mime);\r
-                       browser.setFocus();\r
+                       if (mime.text().startsWith("evernote:")) {\r
+                               handleNoteLink(mime);\r
+                       } else {\r
+                               handleUrls(mime);\r
+                               browser.setFocus();\r
+                       }\r
                        return;\r
                }\r
                \r
@@ -1017,11 +1141,40 @@ public class BrowserWindow extends QWidget {
                if (!mime.hasText())\r
                        return;\r
                String text = mime.text();\r
-               clipboard.setText(text);\r
+               clipboard.clear();\r
+               clipboard.setText(text, Mode.Clipboard);\r
                browser.page().triggerAction(WebAction.Paste);\r
-               QApplication.clipboard().setMimeData(mime);\r
-               browser.setFocus();\r
 \r
+               // This is done because pasting into an encryption block\r
+               // can cause multiple cells (which can't happen).  It \r
+               // just goes through the table, extracts the data, & \r
+               // puts it back as one table cell.\r
+               if (insideEncryption) {\r
+                       String js = new String( "function fixEncryption() { "\r
+                                       +"   var selObj = window.getSelection();"\r
+                                       +"   var selRange = selObj.getRangeAt(0);"\r
+                                       +"   var workingNode = window.getSelection().anchorNode;"\r
+                                       +"   while(workingNode != null && workingNode.nodeName.toLowerCase() != 'table') { " \r
+                                       +"           workingNode = workingNode.parentNode;"\r
+                                       +"   } "\r
+                                       +"   workingNode.innerHTML = window.jambi.fixEncryptionPaste(workingNode.innerHTML);"\r
+                                       +"} fixEncryption();");\r
+                       browser.page().mainFrame().evaluateJavaScript(js);\r
+               }\r
+       }\r
+       \r
+       // This basically removes all the table tags and returns just the contents.\r
+       // This is called by JavaScript to fix encryption pastes.\r
+       public String fixEncryptionPaste(String data) {\r
+               data = data.replace("<tbody>", "");\r
+               data = data.replace("</tbody>", "");\r
+               data = data.replace("<tr>", "");\r
+               data = data.replace("</tr>", "");\r
+               data = data.replace("<td>", "");\r
+               data = data.replace("</td>", "<br>");\r
+               data = data.replace("<br><br>", "<br>");\r
+\r
+               return "<tbody><tr><td>"+data+"</td></tr></tbody>";\r
        }\r
        \r
        // insert date/time\r
@@ -1195,7 +1348,9 @@ public class BrowserWindow extends QWidget {
                                "document.execCommand('insertHtml', false, '");\r
                String script_end = new String("');");\r
                String todo = new String(\r
-                               "<input TYPE=\"CHECKBOX\" value=\"false\" onClick=\"value=checked; window.jambi.contentChanged(); \" />");\r
+                               "<input TYPE=\"CHECKBOX\" value=\"false\" " +\r
+                               "onMouseOver=\"style.cursor=\\'hand\\'\" " +\r
+                               "onClick=\"value=checked; window.jambi.contentChanged(); \" />");\r
                browser.page().mainFrame().evaluateJavaScript(\r
                                script_start + todo + script_end);\r
                browser.setFocus();\r
@@ -1207,6 +1362,7 @@ public class BrowserWindow extends QWidget {
                String text = browser.selectedText();\r
                if (text.trim().equalsIgnoreCase(""))\r
                        return;\r
+               text = new String(text.replaceAll("\n", "<br/>"));\r
 \r
                EnCryptDialog dialog = new EnCryptDialog();\r
                dialog.exec();\r
@@ -1216,6 +1372,7 @@ public class BrowserWindow extends QWidget {
 \r
                EnCrypt crypt = new EnCrypt();\r
                String encrypted = crypt.encrypt(text, dialog.getPassword().trim(), 64);\r
+               String decrypted = crypt.decrypt(encrypted, dialog.getPassword().trim(), 64);\r
 \r
                if (encrypted.trim().equals("")) {\r
                        QMessageBox.information(this, tr("Error"), tr("Error Encrypting String"));\r
@@ -1226,7 +1383,6 @@ public class BrowserWindow extends QWidget {
                                + dialog.getHint().replace("'","\\'") + "\" length=\"64\" ");\r
                buffer.append("contentEditable=\"false\" alt=\"");\r
                buffer.append(encrypted);\r
-               // NFC FIXME: should this be a file URL like in handleLocalAttachment and importAttachment?\r
                buffer.append("\" src=\"").append(FileUtils.toForwardSlashedPath(Global.getFileManager().getImageDirPath("encrypt.png") +"\""));\r
                Global.cryptCounter++;\r
                buffer.append(" id=\"crypt"+Global.cryptCounter.toString() +"\"");\r
@@ -1242,7 +1398,39 @@ public class BrowserWindow extends QWidget {
                                script_start + buffer.toString() + script_end);\r
        }\r
 \r
-       \r
+\r
+       // Insert a Quick hyperlink\r
+       public void insertQuickLink() {\r
+               logger.log(logger.EXTREME, "Inserting link");\r
+               String text = browser.selectedText();\r
+               if (text.trim().equalsIgnoreCase(""))\r
+                       return;\r
+\r
+               NoteQuickLinkDialog dialog = new NoteQuickLinkDialog(logger, conn, text);\r
+               if (dialog.getResults().size() == 0) {\r
+                       QMessageBox.critical(null, tr("No Matches Found") ,tr("No matching notes found."));\r
+                       return;\r
+               }\r
+               if (dialog.getResults().size() > 1) {\r
+                       dialog.exec();\r
+                       if (!dialog.okPressed) {\r
+                               logger.log(logger.EXTREME, "Insert link canceled");\r
+                               return;\r
+                       }\r
+               }\r
+\r
+               User user = Global.getUserInformation();\r
+               String dUrl = new String("evernote:///view/") + new String(user.getId() + "/" +user.getShardId() +"/"\r
+                               +dialog.getSelectedNote()+"/"+dialog.getSelectedNote() +"/ " +"style=\"color:#69aa35\"");\r
+               \r
+               String url = "<a title=\"" +dUrl\r
+                               +"\" href=" +dUrl \r
+                               +" >"+text +"</a>";\r
+               String script = "document.execCommand('insertHtml', false, '"+url+"');";\r
+               browser.page().mainFrame().evaluateJavaScript(script);  \r
+               contentChanged();\r
+       }\r
+\r
        // Insert a hyperlink\r
        public void insertLink() {\r
                logger.log(logger.EXTREME, "Inserting link");\r
@@ -1250,7 +1438,7 @@ public class BrowserWindow extends QWidget {
                if (text.trim().equalsIgnoreCase(""))\r
                        return;\r
 \r
-               InsertLinkDialog dialog = new InsertLinkDialog();\r
+               InsertLinkDialog dialog = new InsertLinkDialog(insertHyperlink);\r
                if (currentHyperlink != null && currentHyperlink != "") {\r
                        dialog.setUrl(currentHyperlink);\r
                }\r
@@ -1259,8 +1447,12 @@ public class BrowserWindow extends QWidget {
                        logger.log(logger.EXTREME, "Insert link canceled");\r
                        return;\r
                }\r
-               if (browser.insertLinkAction.text().equalsIgnoreCase("Insert Hyperlink")) {\r
+               \r
+               // Take care of inserting new links\r
+               if (insertHyperlink) {\r
                        String selectedText = browser.selectedText();\r
+                       if (dialog.getUrl().trim().equals(""))\r
+                               return;\r
                        logger.log(logger.EXTREME, "Inserting link on text "+selectedText);\r
                        logger.log(logger.EXTREME, "URL Link " +dialog.getUrl().trim());\r
                        String dUrl = StringUtils.replace(dialog.getUrl().trim(), "'", "\\'");\r
@@ -1270,24 +1462,205 @@ public class BrowserWindow extends QWidget {
                        String script = "document.execCommand('insertHtml', false, '"+url+"');";\r
                        browser.page().mainFrame().evaluateJavaScript(script);\r
                        return;\r
+               }\r
+               \r
+               // Edit existing links\r
+               String js = new String( "function getCursorPos() {"\r
+                               +"var cursorPos;"\r
+                               +"if (window.getSelection) {"\r
+                               +"   var selObj = window.getSelection();"\r
+                               +"   var selRange = selObj.getRangeAt(0);"\r
+                               +"   var workingNode = window.getSelection().anchorNode.parentNode;"\r
+                               +"   while(workingNode != null) { " \r
+                               +"      if (workingNode.nodeName.toLowerCase()=='a') workingNode.setAttribute('href','" +dialog.getUrl() +"');"\r
+                               +"      workingNode = workingNode.parentNode;"\r
+                               +"   }"\r
+                               +"}"\r
+                               +"} getCursorPos();");\r
+                       browser.page().mainFrame().evaluateJavaScript(js);\r
+               \r
+               if (!dialog.getUrl().trim().equals("")) {\r
+                       contentChanged();\r
+                       return;\r
+               }\r
+               \r
+               // Remove URL\r
+               js = new String( "function getCursorPos() {"\r
+                               +"var cursorPos;"\r
+                               +"if (window.getSelection) {"\r
+                               +"   var selObj = window.getSelection();"\r
+                               +"   var selRange = selObj.getRangeAt(0);"\r
+                               +"   var workingNode = window.getSelection().anchorNode.parentNode;"\r
+                               +"   while(workingNode != null) { " \r
+                               +"      if (workingNode.nodeName.toLowerCase()=='a') { "\r
+                               +"         workingNode.removeAttribute('href');"\r
+                               +"         workingNode.removeAttribute('title');"\r
+                               +"         var text = document.createTextNode(workingNode.innerText);"\r
+                               +"         workingNode.parentNode.insertBefore(text, workingNode);"\r
+                               +"         workingNode.parentNode.removeChild(workingNode);"\r
+                               +"      }"\r
+                               +"      workingNode = workingNode.parentNode;"\r
+                               +"   }"\r
+                               +"}"\r
+                               +"} getCursorPos();");\r
+                       browser.page().mainFrame().evaluateJavaScript(js);\r
+                       \r
+                       contentChanged();\r
+\r
+               \r
+       }\r
+       \r
+       \r
+       // Insert a hyperlink\r
+       public void insertLatex() {\r
+               editLatex(null);\r
+       }\r
+       public void editLatex(String guid) {\r
+               logger.log(logger.EXTREME, "Inserting latex");\r
+               String text = browser.selectedText();\r
+               if (text.trim().equalsIgnoreCase("\n") || text.trim().equalsIgnoreCase("")) {\r
+                       InsertLatexImage dialog = new InsertLatexImage();\r
+                       if (guid != null) {\r
+                               String formula = conn.getNoteTable().noteResourceTable.getNoteSourceUrl(guid).replace("http://latex.codecogs.com/gif.latex?", "");\r
+                               dialog.setFormula(formula);\r
+                       }\r
+                       dialog.exec();\r
+                       if (!dialog.okPressed()) {\r
+                               logger.log(logger.EXTREME, "Edit LaTex canceled");\r
+                               return;\r
+                       }\r
+                       text = dialog.getFormula().trim();\r
+               }\r
+               blockApplication.emit(this);\r
+               logger.log(logger.EXTREME, "Inserting LaTeX formula:" +text);\r
+               latexGuid = guid;\r
+               text = StringUtils.replace(text, "'", "\\'");\r
+               String url = "http://latex.codecogs.com/gif.latex?" +text;\r
+               logger.log(logger.EXTREME, "Sending request to codecogs --> " + url);\r
+               QNetworkAccessManager manager = new QNetworkAccessManager(this);\r
+               manager.finished.connect(this, "insertLatexImageReady(QNetworkReply)");\r
+               unblockTime = new GregorianCalendar().getTimeInMillis()+5000;\r
+               awaitingHttpResponse = true;\r
+               manager.get(new QNetworkRequest(new QUrl(url)));\r
+       }\r
+       \r
+       public void insertLatexImageReady(QNetworkReply reply) {\r
+               logger.log(logger.EXTREME, "Response received from CodeCogs");\r
+               if (reply.error() != NetworkError.NoError) \r
+                       return;\r
+\r
+               unblockTime = -1;\r
+               if (!awaitingHttpResponse)\r
+                       return;\r
+               \r
+               awaitingHttpResponse = false;\r
+               QUrl replyUrl = reply.url();            \r
+               QByteArray image = reply.readAll();\r
+               reply.close();\r
+               logger.log(logger.EXTREME, "New image size: " +image.size());\r
+\r
+               Resource newRes = null;\r
+               QFile tfile;\r
+               String path;\r
+               if (latexGuid == null) {\r
+                       logger.log(logger.EXTREME, "Creating temporary gif");                   \r
+                       path = Global.getFileManager().getResDirPath("latex-temp.gif");\r
+                       tfile = new QFile(path);\r
+                       tfile.open(new QIODevice.OpenMode(QIODevice.OpenModeFlag.WriteOnly));\r
+                       logger.log(logger.EXTREME, "File Open: " +tfile.errorString());\r
+                       tfile.write(image);\r
+                       logger.log(logger.EXTREME, "Bytes writtes: "+tfile.size());\r
+                       tfile.close();\r
+                       logger.log(logger.EXTREME, "Creating resource");\r
+                       int sequence = 0;\r
+                       if (currentNote.getResources() != null || currentNote.getResources().size() > 0)\r
+                               sequence = currentNote.getResources().size();\r
+                       newRes = createResource(path,sequence ,"image/gif", false);\r
+                       QImage pix = new QImage();\r
+                       pix.loadFromData(image);\r
+                       newRes.setHeight(new Integer(pix.height()).shortValue());\r
+                       newRes.setWidth(new Integer(pix.width()).shortValue());\r
+                       logger.log(logger.EXTREME, "Renaming temporary file to " +newRes.getGuid()+".gif");\r
+                       path = Global.getFileManager().getResDirPath(newRes.getGuid()+".gif");\r
+                       tfile.rename(path);\r
                } else {\r
-                       String js = new String( "function getCursorPos() {"\r
-                                       +"var cursorPos;"\r
-                                       +"if (window.getSelection) {"\r
-                                       +"   var selObj = window.getSelection();"\r
-                                       +"   var selRange = selObj.getRangeAt(0);"\r
-                                       +"   var workingNode = window.getSelection().anchorNode.parentNode;"\r
-                                       +"   while(workingNode != null) { " \r
-                                       +"      if (workingNode.nodeName.toLowerCase()=='a') workingNode.setAttribute('href','" +dialog.getUrl() +"');"\r
-                                       +"      workingNode = workingNode.parentNode;"\r
-                                       +"   }"\r
-                                       +"}"\r
-                                       +"} getCursorPos();");\r
-                               browser.page().mainFrame().evaluateJavaScript(js);\r
-                               contentChanged();\r
+                       newRes = conn.getNoteTable().noteResourceTable.getNoteResource(latexGuid, false);\r
+                       path = Global.getFileManager().getResDirPath(newRes.getGuid()+".gif");\r
+                       tfile = new QFile(path);\r
+                       tfile.open(new QIODevice.OpenMode(QIODevice.OpenModeFlag.WriteOnly));\r
+                       tfile.write(image);\r
+                       tfile.close();\r
+                       newRes.getData().setBody(image.toByteArray());\r
+                       // Calculate the new hash value\r
+               MessageDigest md;\r
+\r
+               logger.log(logger.EXTREME, "Generating MD5");\r
+               try {\r
+                               md = MessageDigest.getInstance("MD5");\r
+                       md.update(image.toByteArray());\r
+                       byte[] hash = md.digest();\r
+                       newRes.getData().setBodyHash(hash);\r
+                       } catch (NoSuchAlgorithmException e) {\r
+                               e.printStackTrace();\r
+                       }\r
+                       QImage pix = new QImage();\r
+                       pix.loadFromData(image);\r
+                       newRes.setHeight(new Integer(pix.height()).shortValue());\r
+                       newRes.setWidth(new Integer(pix.width()).shortValue());\r
+                       conn.getNoteTable().noteResourceTable.updateNoteResource(newRes, true);\r
+               }\r
+\r
+               logger.log(logger.EXTREME, "Setting source: " +replyUrl.toString());\r
+               newRes.getAttributes().setSourceURL(replyUrl.toString());\r
+               conn.getNoteTable().noteResourceTable.updateNoteSourceUrl(newRes.getGuid(), replyUrl.toString(), true);\r
+               \r
+               for(int i=0; i<currentNote.getResourcesSize(); i++) {\r
+                       if (currentNote.getResources().get(i).getGuid().equals(newRes.getGuid())) {\r
+                               currentNote.getResources().remove(i);\r
+                               i=currentNote.getResourcesSize();\r
+                       }\r
+               }\r
+               currentNote.getResources().add(newRes);\r
+               \r
+\r
+               // do the actual insert into the note.  We only do this on new formulas.  \r
+               if (latexGuid == null) {\r
+                       StringBuffer buffer = new StringBuffer(100);\r
+                       String formula = replyUrl.toString().toLowerCase().replace("http://latex.codecogs.com/gif.latex?", "");\r
+                       buffer.append("<a href=\"latex://"+path.replace("\\", "/")+"\" title=\""+formula+"\""\r
+                                       +"><img src=\"");\r
+                       buffer.append(path.replace("\\", "/"));\r
+                       buffer.append("\" en-tag=\"en-latex\" type=\"image/gif\""\r
+                               +" hash=\""+Global.byteArrayToHexString(newRes.getData().getBodyHash()) +"\""\r
+                               +" guid=\"" +newRes.getGuid() +"\""\r
+                               + " /></a>");\r
+               \r
+                       String script_start = new String("document.execCommand('insertHTML', false, '");\r
+                       String script_end = new String("');");\r
+                       browser.page().mainFrame().evaluateJavaScript(\r
+                                       script_start + buffer + script_end);\r
+               } else {\r
+                       HtmlTagModifier modifier = new HtmlTagModifier(getContent());\r
+                       modifier.modifyLatexTagHash(newRes);\r
+                       String newContent = modifier.getHtml();\r
+                       setContent(new QByteArray(newContent));\r
                }\r
+\r
+               logger.log(logger.EXTREME, "New HTML set\n" +browser.page().currentFrame().toHtml());\r
+               QWebSettings.setMaximumPagesInCache(0);\r
+               QWebSettings.setObjectCacheCapacities(0, 0, 0);\r
+               \r
+               browser.page().mainFrame().setHtml(browser.page().mainFrame().toHtml());\r
+               browser.reload();\r
+               contentChanged();\r
+//             resourceSignal.contentChanged.emit(path);\r
+               unblockTime = -1;\r
+       unblockApplication.emit();\r
+               return;\r
                \r
        }\r
+\r
+       \r
        \r
        // Insert a table\r
        public void insertTable() {\r
@@ -1326,6 +1699,7 @@ public class BrowserWindow extends QWidget {
        private void selectionChanged() {\r
                browser.encryptAction.setEnabled(true);\r
                browser.insertLinkAction.setEnabled(true);\r
+               browser.insertQuickLinkAction.setEnabled(true);\r
                String scriptStart = "var selection_text = (window.getSelection()).toString();"\r
                                + "var range = (window.getSelection()).getRangeAt(0);"\r
                                + "var parent_html = range.commonAncestorContainer.innerHTML;"\r
@@ -1355,6 +1729,7 @@ public class BrowserWindow extends QWidget {
                \r
                browser.encryptAction.setEnabled(enabled);\r
                browser.insertLinkAction.setEnabled(enabled);\r
+               browser.insertQuickLinkAction.setEnabled(enabled);\r
 //             selectedText = text;\r
        }\r
 \r
@@ -1368,7 +1743,7 @@ public class BrowserWindow extends QWidget {
                \r
                // First, try to decrypt with any keys we already have\r
                for (int i=0; i<Global.passwordRemember.size(); i++) {\r
-                       plainText = crypt.decrypt(text, Global.passwordRemember.get(i), 64);\r
+                       plainText = crypt.decrypt(text, Global.passwordRemember.get(i).getFirst(), 64);\r
                        if (plainText != null) {\r
                                slot = new String(Long.toString(l));\r
                                Global.passwordSafe.put(slot, Global.passwordRemember.get(i));\r
@@ -1387,13 +1762,21 @@ public class BrowserWindow extends QWidget {
                        }\r
                        plainText = crypt.decrypt(text, dialog.getPassword().trim(), 64);\r
                        if (plainText == null) {\r
-                               QMessageBox.warning(this, "Incorrect Password", "The password entered is not correct");\r
+                               QMessageBox.warning(this, tr("Incorrect Password"), tr("The password entered is not correct"));\r
                        }\r
                }\r
-               Global.passwordSafe.put(slot, dialog.getPassword());\r
+               Pair<String,String> passwordPair = new Pair<String,String>();\r
+               passwordPair.setFirst(dialog.getPassword());\r
+               passwordPair.setSecond(dialog.getHint());\r
+               Global.passwordSafe.put(slot, passwordPair);\r
+//             removeEncryption(id, plainText.replaceAll("\n", "<br/>"), dialog.permanentlyDecrypt(), slot);\r
                removeEncryption(id, plainText, dialog.permanentlyDecrypt(), slot);\r
-               if (dialog.rememberPassword())\r
-                       Global.passwordRemember.add(dialog.getPassword());\r
+               if (dialog.rememberPassword()) {\r
+                       Pair<String, String> pair = new Pair<String,String>();\r
+                       pair.setFirst(dialog.getPassword());\r
+                       pair.setSecond(dialog.getHint());\r
+                       Global.passwordRemember.add(pair);\r
+               }\r
 \r
        }\r
 \r
@@ -1405,7 +1788,7 @@ public class BrowserWindow extends QWidget {
        // Modify a note's tags\r
        @SuppressWarnings("unused")\r
        private void modifyTags() {\r
-               TagAssign tagWindow = new TagAssign(allTags, currentTags);\r
+               TagAssign tagWindow = new TagAssign(allTags, currentTags, !conn.getNotebookTable().isLinked(currentNote.getNotebookGuid()));\r
                tagWindow.exec();\r
                if (tagWindow.okClicked()) {\r
                        currentTags.clear();\r
@@ -1439,11 +1822,25 @@ public class BrowserWindow extends QWidget {
 \r
                // We know something has changed...\r
                String oldTagArray[] = saveTagList.split(Global.tagDelimeter);\r
-               String newTagArray[] = tagEdit.text().split(Global.tagDelimeter);\r
-               \r
-               if (!completionText.equals("") && newTagArray.length > 0) {\r
-                       newTagArray[newTagArray.length-1] = completionText;\r
+               String newTagArray[];\r
+               if (!completionText.equals("")) {\r
+                       String before = tagEdit.text().substring(0,tagEdit.cursorPosition());\r
+                       int lastDelimiter = before.lastIndexOf(Global.tagDelimeter);\r
+                       if (lastDelimiter > 0)\r
+                               before = before.substring(0,before.lastIndexOf(Global.tagDelimeter));\r
+                       else \r
+                               before = "";\r
+                       String after = tagEdit.text().substring(tagEdit.cursorPosition());\r
+                       newTagArray = (before+Global.tagDelimeter+completionText+Global.tagDelimeter+after).split(Global.tagDelimeter);\r
                }\r
+               else {\r
+                       newTagArray = tagEdit.text().split(Global.tagDelimeter);\r
+               }\r
+               \r
+               // Remove any traling or leading blanks\r
+               for (int i=0; i<newTagArray.length; i++)\r
+                       newTagArray[i] = newTagArray[i].trim().replaceAll("^\\s+", "");;\r
+               \r
                // Remove any potential duplicates from the new list\r
                for (int i=0; i<newTagArray.length; i++) {\r
                        boolean foundOnce = false;\r
@@ -1467,13 +1864,27 @@ public class BrowserWindow extends QWidget {
                        if (!newTagArray[i].trim().equals(""))\r
                                newTagList.add(newTagArray[i]);\r
 \r
+               if (conn.getNotebookTable().isLinked(currentNote.getNotebookGuid())) {\r
+                       for (int i=newTagList.size()-1; i>=0; i--) {\r
+                               boolean found = false;\r
+                               for (int j=0; j<allTags.size(); j++) {\r
+                                       if (allTags.get(j).getName().equalsIgnoreCase(newTagList.get(i))) {\r
+                                               found = true;\r
+                                               j=allTags.size();\r
+                                       }\r
+                               }\r
+                               if (!found)\r
+                                       newTagList.remove(i);\r
+                       }\r
+               }\r
+\r
                // Let's cleanup the appearance of the tag list\r
                Collections.sort(newTagList);\r
                String newDisplay = "";\r
                for (int i=0; i<newTagList.size(); i++) {\r
                        newDisplay = newDisplay+newTagList.get(i);\r
                        if (i<newTagList.size()-1)\r
-                               newDisplay = newDisplay+", ";\r
+                               newDisplay = newDisplay+Global.tagDelimeter +" ";\r
                }\r
                tagEdit.blockSignals(true);\r
                tagEdit.setText(newDisplay);\r
@@ -1507,19 +1918,110 @@ public class BrowserWindow extends QWidget {
 \r
        // Tab button was pressed\r
        public void tabPressed() {\r
-               if (!insideList) {\r
+               if (insideEncryption)\r
+                       return;\r
+               if (!insideList && !insideTable) {\r
                        String script_start = new String(\r
                        "document.execCommand('insertHtml', false, '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;');");\r
                        browser.page().mainFrame().evaluateJavaScript(script_start);\r
-               } else \r
+                       return;\r
+               }\r
+               if (insideList) {\r
                        indentClicked();\r
+               }\r
+               if (insideTable) {\r
+                       String js = new String( "function getCursorPosition() { "\r
+                                       +"   var selObj = window.getSelection();"\r
+                                       +"   var selRange = selObj.getRangeAt(0);"\r
+                                       +"   var workingNode = window.getSelection().anchorNode;"\r
+                                       +"   var rowCount = 0;"\r
+                                       +"   var colCount = 0;"\r
+                                       +"   while(workingNode != null && workingNode.nodeName.toLowerCase() != 'table') { " \r
+                                       +"      if (workingNode.nodeName.toLowerCase()=='tr') {"\r
+                                       +"         rowCount = rowCount+1;"\r
+                                       +"      }"\r
+                                       +"      if (workingNode.nodeName.toLowerCase() == 'td') {"\r
+                                       +"         colCount = colCount+1;"\r
+                                       +"      }"\r
+                                       +"      if (workingNode.previousSibling != null)"\r
+                                       +"          workingNode = workingNode.previousSibling;"\r
+                                       +"      else "\r
+                                       +"           workingNode = workingNode.parentNode;"\r
+                                       +"   }"\r
+                                       +"   var nodes = workingNode.getElementsByTagName('tr');"\r
+                                       +"   var tableRows = nodes.length;"\r
+                                       +"   nodes = nodes[0].getElementsByTagName('td');"\r
+                                       +"   var tableColumns = nodes.length;"\r
+                                       +"   window.jambi.setTableCursorPositionTab(rowCount, colCount, tableRows, tableColumns);"\r
+                                       +"} getCursorPosition();");\r
+                       browser.page().mainFrame().evaluateJavaScript(js);\r
+               }\r
        }\r
        \r
+       // If a user presses tab from within a table\r
+       public void setTableCursorPositionTab(int currentRow, int currentCol, int tableRows, int tableColumns) {\r
+               if (tableRows == currentRow && currentCol == tableColumns) {\r
+                       insertTableRow();\r
+               }\r
+               KeyboardModifiers modifiers = new KeyboardModifiers(KeyboardModifier.NoModifier);\r
+               QKeyEvent right = new QKeyEvent(Type.KeyPress, Qt.Key.Key_Right.value(), modifiers);\r
+               QKeyEvent end = new QKeyEvent(Type.KeyPress, Qt.Key.Key_End.value(), modifiers);\r
+               QKeyEvent end2 = new QKeyEvent(Type.KeyPress, Qt.Key.Key_End.value(), modifiers);\r
+               getBrowser().focusWidget();\r
+               QCoreApplication.postEvent(getBrowser(), end);\r
+               QCoreApplication.postEvent(getBrowser(), right);\r
+               QCoreApplication.postEvent(getBrowser(), end2);\r
+       }\r
+               \r
        public void backtabPressed() {\r
+               if (insideEncryption) \r
+                       return;\r
                if (insideList)\r
                        outdentClicked();\r
+               if (insideTable) {\r
+                       String js = new String( "function getCursorPosition() { "\r
+                                       +"   var selObj = window.getSelection();"\r
+                                       +"   var selRange = selObj.getRangeAt(0);"\r
+                                       +"   var workingNode = window.getSelection().anchorNode;"\r
+                                       +"   var rowCount = 0;"\r
+                                       +"   var colCount = 0;"\r
+                                       +"   while(workingNode != null && workingNode.nodeName.toLowerCase() != 'table') { " \r
+                                       +"      if (workingNode.nodeName.toLowerCase()=='tr') {"\r
+                                       +"         rowCount = rowCount+1;"\r
+                                       +"      }"\r
+                                       +"      if (workingNode.nodeName.toLowerCase() == 'td') {"\r
+                                       +"         colCount = colCount+1;"\r
+                                       +"      }"\r
+                                       +"      if (workingNode.previousSibling != null)"\r
+                                       +"          workingNode = workingNode.previousSibling;"\r
+                                       +"      else "\r
+                                       +"           workingNode = workingNode.parentNode;"\r
+                                       +"   }"\r
+                                       +"   var nodes = workingNode.getElementsByTagName('tr');"\r
+                                       +"   var tableRows = nodes.length;"\r
+                                       +"   nodes = nodes[0].getElementsByTagName('td');"\r
+                                       +"   var tableColumns = nodes.length;"\r
+                                       +"   window.jambi.setTableCursorPositionBackTab(rowCount, colCount, tableRows, tableColumns);"\r
+                                       +"} getCursorPosition();");\r
+                       browser.page().mainFrame().evaluateJavaScript(js);\r
+                       \r
+               }\r
        }\r
        \r
+       // If a user presses backtab from within a table\r
+       public void setTableCursorPositionBackTab(int currentRow, int currentCol, int tableRows, int tableColumns) {\r
+               if (currentRow  == 1 && currentCol == 1) {\r
+                       return;\r
+               }\r
+               KeyboardModifiers modifiers = new KeyboardModifiers(KeyboardModifier.NoModifier);\r
+               QKeyEvent left = new QKeyEvent(Type.KeyPress, Qt.Key.Key_Left.value(), modifiers);\r
+               QKeyEvent home = new QKeyEvent(Type.KeyPress, Qt.Key.Key_Home.value(), modifiers);\r
+               getBrowser().focusWidget();\r
+               QCoreApplication.postEvent(getBrowser(), home);\r
+               QCoreApplication.postEvent(getBrowser(), left);\r
+       }\r
+       \r
+       \r
        public void setInsideList() {\r
                insideList = true;\r
        }\r
@@ -1535,9 +2037,9 @@ public class BrowserWindow extends QWidget {
                        return;\r
                \r
                // If we have a real change, we need to save it.\r
-               noteSignal.titleChanged.emit(currentNote.getGuid(), titleLabel.text());\r
-               currentNote.setTitle(titleLabel.text());\r
-               saveNoteTitle = titleLabel.text();\r
+               noteSignal.titleChanged.emit(currentNote.getGuid(), titleLabel.text().trim());\r
+               currentNote.setTitle(titleLabel.text().trim());\r
+               saveNoteTitle = titleLabel.text().trim();\r
                checkNoteTitle();\r
        }\r
 \r
@@ -1575,6 +2077,13 @@ public class BrowserWindow extends QWidget {
                        }\r
                }\r
        }\r
+       \r
+       \r
+       // Set the notebook for a note\r
+       public void setNotebook(String notebook) {\r
+               currentNote.setNotebookGuid(notebook);\r
+               loadNotebookList();\r
+       }\r
 \r
        // Get the contents of the editor\r
        public String getContent() {\r
@@ -1584,6 +2093,20 @@ public class BrowserWindow extends QWidget {
        // The note contents have changed\r
        public void contentChanged() {\r
                String content = getContent();\r
+               \r
+               // This puts in a 1/2 second delay\r
+               // before updating the source editor.\r
+               // It improves response when someone is doing\r
+               // frequent updates on a large note.\r
+               // If the source editor isn't visible, then there\r
+               // is no point to doing any of this.\r
+               if (sourceEdit.isVisible()) {\r
+                       setSourceTimer.stop();\r
+                       setSourceTimer.setInterval(500);\r
+                       setSourceTimer.setSingleShot(true);\r
+                       setSourceTimer.start();\r
+               }\r
+               \r
                checkNoteTitle();\r
                noteSignal.noteChanged.emit(currentNote.getGuid(), content); \r
        }\r
@@ -1596,6 +2119,13 @@ public class BrowserWindow extends QWidget {
                for (int i = 0; i < notebookList.size(); i++) {\r
                        if (n.equals(notebookList.get(i).getName())) {\r
                                if (!notebookList.get(i).getGuid().equals(currentNote.getNotebookGuid())) {\r
+                                       String guid = conn.getNotebookTable().findNotebookByName(n);\r
+                                       if (conn.getNotebookTable().isLinked(guid)) {\r
+                                               tagEdit.setText("");\r
+                                               noteSignal.tagsChanged.emit(currentNote.getGuid(), new ArrayList<String>());\r
+                                               FilterEditorTags t = new FilterEditorTags(conn, logger);\r
+                                               setAllTags(t.getValidTags(currentNote));\r
+                                       }\r
                                        currentNote.setNotebookGuid(notebookList.get(i).getGuid());\r
                                        changed = true;\r
                                }\r
@@ -1612,6 +2142,8 @@ public class BrowserWindow extends QWidget {
        // Check the note title\r
        private void checkNoteTitle() {\r
                String text = browser.page().currentFrame().toPlainText();\r
+               if (saveNoteTitle == null)\r
+                       saveNoteTitle = new String();\r
                if (saveNoteTitle.trim().equals("") || saveNoteTitle.trim().equals("Untitled Note")) {\r
                        int newLine = text.indexOf("\n");\r
                        if (newLine > 0) {\r
@@ -1631,8 +2163,8 @@ public class BrowserWindow extends QWidget {
                                        titleLabel.blockSignals(false);\r
                                }\r
                        }\r
-                       noteSignal.titleChanged.emit(currentNote.getGuid(), titleLabel\r
-                                       .text());\r
+                       if (currentNote != null && titleLabel != null)\r
+                               noteSignal.titleChanged.emit(currentNote.getGuid(), titleLabel.text());\r
                }\r
        }\r
 \r
@@ -1670,7 +2202,10 @@ public class BrowserWindow extends QWidget {
                // Open the file & write the data\r
                QFile tfile = new QFile(path);\r
                tfile.open(new QIODevice.OpenMode(QIODevice.OpenModeFlag.WriteOnly));\r
-               img.save(tfile);\r
+               if (!img.save(tfile)) {\r
+                       tfile.close();\r
+                       return;\r
+               }\r
                tfile.close();\r
                \r
                Resource newRes = createResource(QUrl.fromLocalFile(path).toString(), 0, "image/jpeg", false);\r
@@ -1685,7 +2220,6 @@ public class BrowserWindow extends QWidget {
                buffer.append("\" en-tag=en-media type=\"image/jpeg\""\r
                                +" hash=\""+Global.byteArrayToHexString(newRes.getData().getBodyHash()) +"\""\r
                                +" guid=\"" +newRes.getGuid() +"\""\r
-//                             +" onContextMenu=\"window.jambi.imageContextMenu('" +tfile.fileName() +"');\""\r
                                +" onContextMenu=\"window.jambi.imageContextMenu(&amp." +tfile.fileName() +"&amp.);\""\r
                                + " />");\r
                \r
@@ -1695,6 +2229,41 @@ public class BrowserWindow extends QWidget {
                return;\r
        }\r
 \r
+       // Handle pasting of a note-to-note link\r
+       private void handleNoteLink(QMimeData mime) {\r
+               for (int i=0; i<mime.urls().size(); i++) {\r
+                       StringTokenizer tokens = new StringTokenizer(mime.urls().get(i).toString().replace("evernote:///view/", ""), "/");\r
+                       tokens.nextToken();\r
+                       tokens.nextToken();\r
+                       String sid = tokens.nextToken();\r
+                       String lid = tokens.nextToken();\r
+                       \r
+                       if (!sid.equals(currentNote.getGuid()) && !lid.equals(currentNote.getGuid())) {\r
+                               \r
+                               Note note = conn.getNoteTable().getNote(sid, false, false, false, false, false);\r
+                               if (note == null)\r
+                                       note = conn.getNoteTable().getNote(lid, false, false, false, false, false);\r
+               \r
+                               if (note == null)\r
+                                       return;\r
+\r
+                               // If we've gotten this far, we have a bunch of values.  We need to build the link.\r
+                               StringBuffer url = new StringBuffer(100);\r
+                               String script_start = new String(\r
+                                       "document.execCommand('insertHtml', false, '");\r
+                               String script_end = new String("');");\r
+       \r
+                               url.append("<a href=\""+mime.urls().get(i).toString() +"\" style=\"color:#69aa35\">");\r
+                               url.append(note.getTitle());\r
+                               url.append("</a>");\r
+                               if (mime.urls().size() > 1)\r
+                                       url.append("&nbsp;");\r
+                               browser.page().mainFrame().evaluateJavaScript(\r
+                                               script_start + url + script_end);\r
+                       }\r
+               }\r
+       }\r
+       \r
        // Handle URLs that are trying to be pasted\r
        public void handleUrls(QMimeData mime) {\r
                logger.log(logger.EXTREME, "Starting handleUrls");\r
@@ -1722,10 +2291,9 @@ public class BrowserWindow extends QWidget {
                                handleLocalImageURLPaste(mime, mimeType);\r
                                return;\r
                        }\r
-                       String[] type = mimeType.split("/");\r
-                       boolean valid = validAttachment(type[1]);\r
+\r
                        boolean smallEnough = checkFileAttachmentSize(url);\r
-                       if (smallEnough && valid\r
+                       if (smallEnough \r
                                        && url.substring(0, 5).equalsIgnoreCase("file:")\r
                                        && !mimeType.substring(0, 5).equalsIgnoreCase("image")) {\r
                                handleLocalAttachment(mime, mimeType);\r
@@ -1833,17 +2401,17 @@ public class BrowserWindow extends QWidget {
 \r
                                PDFPreview pdfPreview = new PDFPreview();\r
                                if (pdfPreview.setupPreview(Global.getFileManager().getResDirPath(fileName), "pdf",0)) {\r
-                               // NFC TODO: should this be a 'file://' url like the ones above?\r
                                imageURL = file.fileName() + ".png";\r
                                }\r
                        }\r
-                                               \r
+                       \r
                        logger.log(logger.EXTREME, "Generating link tags");\r
                        buffer.delete(0, buffer.length());\r
                        buffer.append("<a en-tag=\"en-media\" guid=\"" +newRes.getGuid()+"\" ");\r
                        buffer.append(" onContextMenu=\"window.jambi.imageContextMenu(&apos;")\r
                      .append(Global.getFileManager().getResDirPath(fileName))\r
-                     .append("&apos;);\" ");                   buffer.append("type=\"" + mimeType + "\" href=\"nnres://" + fileName +"\" hash=\""+Global.byteArrayToHexString(newRes.getData().getBodyHash()) +"\" >");\r
+                     .append("&apos;);\" ");                   \r
+                       buffer.append("type=\"" + mimeType + "\" href=\"nnres://" + fileName +"\" hash=\""+Global.byteArrayToHexString(newRes.getData().getBodyHash()) +"\" >");\r
                        buffer.append("<img src=\"" + imageURL + "\" title=\"" +newRes.getAttributes().getFileName());\r
                        buffer.append("\"></img>");\r
                        buffer.append("</a>");\r
@@ -1855,19 +2423,27 @@ public class BrowserWindow extends QWidget {
 \r
        private Resource createResource(String url, int sequence, String mime, boolean attachment) {\r
                logger.log(logger.EXTREME, "Inside create resource");\r
-               QFile resourceFile;\r
+               QFile resourceFile; \r
+               //These two lines are added to handle odd characters in the name like #.  Without it\r
+               // toLocalFile() chokes and returns the wrong name.\r
+               url = url.replace("file:///", "");\r
+               url = url.replace("file://", "");\r
                String urlTest = new QUrl(url).toLocalFile();\r
+               urlTest = url;\r
                if (!urlTest.equals(""))\r
                        url = urlTest;\r
-               url = url.replace("/", File.separator);\r
-       resourceFile = new QFile(url); \r
+//             url = url.replace("/", File.separator);\r
+               logger.log(logger.EXTREME, "Reading from file to create resource");\r
+               resourceFile = new QFile(url); \r
        resourceFile.open(new QIODevice.OpenMode(QIODevice.OpenModeFlag.ReadOnly));\r
+//     logger.log(logger.EXTREME, "Error opening file "+url.toString()  +": "+resourceFile.errorString());\r
        byte[] fileData = resourceFile.readAll().toByteArray();\r
        resourceFile.close();\r
        if (fileData.length == 0)\r
                return null;\r
        MessageDigest md;\r
        try {\r
+               logger.log(logger.EXTREME, "Generating MD5");\r
                md = MessageDigest.getInstance("MD5");\r
                md.update(fileData);\r
                byte[] hash = md.digest();\r
@@ -1925,6 +2501,7 @@ public class BrowserWindow extends QWidget {
                r.setAttributes(a);\r
                \r
                conn.getNoteTable().noteResourceTable.saveNoteResource(r, true);\r
+               logger.log(logger.EXTREME, "Resource created");\r
                return r;\r
        } catch (NoSuchAlgorithmException e1) {\r
                e1.printStackTrace();\r
@@ -1942,29 +2519,7 @@ public class BrowserWindow extends QWidget {
        return "attachment.png";\r
     }\r
 \r
-       // Check if the account supports this type of attachment\r
-       private boolean validAttachment(String type) {\r
-               if (Global.isPremium())\r
-                       return true;\r
-               if (type.equalsIgnoreCase("JPG"))\r
-                       return true;\r
-               if (type.equalsIgnoreCase("PNG"))\r
-                       return true;\r
-               if (type.equalsIgnoreCase("GIF"))\r
-                       return true;\r
-               if (type.equalsIgnoreCase("MP3"))\r
-                       return true;\r
-               if (type.equalsIgnoreCase("WAV"))\r
-                       return true;\r
-               if (type.equalsIgnoreCase("AMR"))\r
-                       return true;\r
-               if (type.equalsIgnoreCase("PDF"))\r
-                       return true;\r
-               String error = tr("Non-premium accounts can only attach JPG, PNG, GIF, MP3, WAV, AMR, or PDF files.");\r
-               QMessageBox.information(this, tr("Non-Premium Account"), error);\r
 \r
-               return false;\r
-       }\r
 \r
        // Check the file attachment to be sure it isn't over 25 mb\r
        private boolean checkFileAttachmentSize(String url) {\r
@@ -2091,6 +2646,8 @@ public class BrowserWindow extends QWidget {
                // Strip URL prefix and base dir\r
                guid = guid.replace("nnres://", "")\r
                        .replace(FileUtils.toForwardSlashedPath(Global.getFileManager().getResDirPath()), "");\r
+               guid = guid.replace("file://", "").replace("/", "")\r
+               .replace(FileUtils.toForwardSlashedPath(Global.getFileManager().getResDirPath()), "");\r
 \r
                pos = guid.lastIndexOf('.');\r
                if (pos > 0)\r
@@ -2115,7 +2672,6 @@ public class BrowserWindow extends QWidget {
        // * User chose to save an attachment. Pares out the request *\r
        // * into a guid & file. Save the result. --- DONE FROM downloadAttachment now!!!!!   \r
        // ************************************************************\r
-       // NFC TODO: unused? remove\r
        public void downloadImage(QNetworkRequest request) {\r
                QFileDialog fd = new QFileDialog(this);\r
                fd.setFileMode(FileMode.AnyFile);\r
@@ -2162,7 +2718,11 @@ public class BrowserWindow extends QWidget {
        // *************************************************************\r
        private void removeEncryption(String id, String plainText, boolean permanent, String slot) {\r
                if (!permanent) {\r
-                       plainText = " <en-crypt-temp slot=\""+slot  +"\">" +plainText+"</en-crypt-temp> ";\r
+                       plainText = " <table class=\"en-crypt-temp\" slot=\""\r
+                                       +slot \r
+                                       +"\""\r
+                                       +"border=1 width=100%><tbody><tr><td>"\r
+                                       +plainText+"</td></tr></tbody></table>";\r
                }\r
                \r
                String html = browser.page().mainFrame().toHtml();\r
@@ -2174,10 +2734,12 @@ public class BrowserWindow extends QWidget {
                        endPos = text.indexOf(">", imagePos);\r
                        String tag = text.substring(imagePos-1,endPos);\r
                        if (tag.indexOf("id=\""+id+"\"") > -1) {\r
-                                       text = text.substring(0,imagePos) +plainText+text.substring(endPos+1);\r
-                                                                               \r
-                                       browser.setContent(new QByteArray(text));\r
-                                       contentChanged();\r
+                                       text = text.substring(0,imagePos) +plainText+text.substring(endPos+1);  \r
+                                       QTextCodec codec = QTextCodec.codecForName("UTF-8");\r
+                               QByteArray unicode =  codec.fromUnicode(text);\r
+                                       setContent(unicode);\r
+                                       if (permanent)\r
+                                               contentChanged();\r
                        }\r
                        imagePos = text.indexOf("<img", imagePos+1);\r
                }\r
@@ -2235,11 +2797,17 @@ public class BrowserWindow extends QWidget {
                browser.rotateImageLeft.setEnabled(false);\r
                browser.rotateImageRight.setEnabled(false);\r
                browser.insertTableAction.setEnabled(true);\r
+               browser.deleteTableColumnAction.setEnabled(false);\r
                browser.insertTableRowAction.setEnabled(false);\r
+               browser.insertTableColumnAction.setEnabled(false);\r
                browser.deleteTableRowAction.setEnabled(false);\r
                browser.insertLinkAction.setText(tr("Insert Hyperlink"));\r
+               insertHyperlink = true;\r
+               browser.insertQuickLinkAction.setEnabled(true);\r
                currentHyperlink ="";\r
                insideList = false;\r
+               insideTable = false;\r
+               insideEncryption = false;\r
                forceTextPaste = false;\r
                \r
                String js = new String( "function getCursorPos() {"\r
@@ -2250,7 +2818,7 @@ public class BrowserWindow extends QWidget {
                        +"   var workingNode = window.getSelection().anchorNode.parentNode;"\r
                        +"   while(workingNode != null) { " \r
 //                     +"      window.jambi.printNode(workingNode.nodeName);"\r
-                       +"      if (workingNode.nodeName=='EN-CRYPT-TEMP') window.jambi.forceTextPaste();"\r
+                       +"      if (workingNode.nodeName=='TABLE') { if (workingNode.getAttribute('class').toLowerCase() == 'en-crypt-temp') window.jambi.insideEncryption(); }"\r
                        +"      if (workingNode.nodeName=='B') window.jambi.boldActive();"\r
                        +"      if (workingNode.nodeName=='I') window.jambi.italicActive();"\r
                        +"      if (workingNode.nodeName=='U') window.jambi.underlineActive();"\r
@@ -2273,6 +2841,10 @@ public class BrowserWindow extends QWidget {
                System.out.println("Node Vaule: " +n);\r
        }\r
        \r
+       public void insideEncryption() {\r
+               insideEncryption = true;\r
+               forceTextPaste();\r
+       }\r
        \r
        //****************************************************************\r
        //* Insert a table row\r
@@ -2302,8 +2874,34 @@ public class BrowserWindow extends QWidget {
                browser.page().mainFrame().evaluateJavaScript(js);\r
                contentChanged();\r
        }\r
+       \r
+       public void insertTableColumn() {\r
+               String js = new String( "function insertTableColumn() {"\r
+                               +"   var selObj = window.getSelection();"\r
+                               +"   var selRange = selObj.getRangeAt(0);"\r
+                               +"   var workingNode = window.getSelection().anchorNode.parentNode;"\r
+                               +"   var current = 0;"\r
+                               +"   while (workingNode.nodeName.toLowerCase() != 'table' && workingNode != null) {"\r
+                               +"       if (workingNode.nodeName.toLowerCase() == 'td') {"\r
+                               +"          var td = workingNode;"\r
+                               +"          while (td.previousSibling != null) { " \r
+                               +"             current = current+1; td = td.previousSibling;"\r
+                               +"          }"\r
+                               +"       }"\r
+                               +"       workingNode = workingNode.parentNode; "\r
+                               +"   }"\r
+                               +"   if (workingNode == null) return;"\r
+                               +"   for (var i=0; i<workingNode.rows.length; i++) { " \r
+                               +"      var cell = workingNode.rows[i].insertCell(current+1); "                 \r
+                               +"      cell.innerHTML = '&nbsp'; "\r
+                               +"   }"\r
+                               +"} insertTableColumn();");\r
+                       browser.page().mainFrame().evaluateJavaScript(js);\r
+                       contentChanged();\r
+       }\r
+       \r
        //****************************************************************\r
-       //* Insert a table row\r
+       //* Delete a table row\r
        //****************************************************************\r
        public void deleteTableRow() {\r
                \r
@@ -2323,16 +2921,46 @@ public class BrowserWindow extends QWidget {
                browser.page().mainFrame().evaluateJavaScript(js);\r
                contentChanged();\r
        }\r
+\r
+       public void deleteTableColumn() {\r
+               String js = new String( "function deleteTableColumn() {"\r
+                               +"   var selObj = window.getSelection();"\r
+                               +"   var selRange = selObj.getRangeAt(0);"\r
+                               +"   var workingNode = window.getSelection().anchorNode.parentNode;"\r
+                               +"   var current = 0;"\r
+                               +"   while (workingNode.nodeName.toLowerCase() != 'table' && workingNode != null) {"\r
+                               +"       if (workingNode.nodeName.toLowerCase() == 'td') {"\r
+                               +"          var td = workingNode;"\r
+                               +"          while (td.previousSibling != null) { " \r
+                               +"             current = current+1; td = td.previousSibling;"\r
+                               +"          }"\r
+                               +"       }"\r
+                               +"       workingNode = workingNode.parentNode; "\r
+                               +"   }"\r
+                               +"   if (workingNode == null) return;"\r
+                               +"   for (var i=0; i<workingNode.rows.length; i++) { " \r
+                               +"      workingNode.rows[i].deleteCell(current); "                      \r
+                               +"   }"\r
+                               +"} deleteTableColumn();");\r
+                       browser.page().mainFrame().evaluateJavaScript(js);\r
+                       contentChanged();\r
+       }\r
+       \r
+       \r
        public void setInsideTable() {\r
                browser.insertTableRowAction.setEnabled(true);\r
+               browser.insertTableColumnAction.setEnabled(true);\r
                browser.deleteTableRowAction.setEnabled(true);\r
+               browser.deleteTableColumnAction.setEnabled(true);\r
                browser.insertTableAction.setEnabled(false);\r
                browser.encryptAction.setEnabled(false);\r
+               insideTable = true;\r
        }\r
        \r
        public void setInsideLink(String link) {\r
                browser.insertLinkAction.setText(tr("Edit Hyperlink"));\r
                currentHyperlink = link;\r
+               insertHyperlink = false;\r
        }\r
        \r
        public void italicActive() {\r
@@ -2367,7 +2995,7 @@ public class BrowserWindow extends QWidget {
                browser.setHtml(browser.page().mainFrame().toHtml());\r
                browser.reload();\r
                contentChanged();\r
-//             resourceSignal.contentChanged.emit(selectedFile);\r
+               resourceSignal.contentChanged.emit(selectedFile);\r
 \r
        }\r
        public void rotateImageLeft() {\r
@@ -2379,15 +3007,21 @@ public class BrowserWindow extends QWidget {
                browser.setHtml(browser.page().mainFrame().toHtml());\r
                browser.reload();\r
                contentChanged();\r
-//             resourceSignal.contentChanged.emit(selectedFile);\r
+               resourceSignal.contentChanged.emit(selectedFile);\r
        }\r
        public void resourceContextMenu(String f) {\r
                browser.downloadAttachment.setEnabled(true);\r
                browser.openAction.setEnabled(true);\r
                selectedFile = f;\r
        }\r
-       \r
-       \r
+       public void latexContextMenu(String f) {\r
+               browser.downloadImage.setEnabled(true);\r
+               browser.rotateImageRight.setEnabled(true);\r
+               browser.rotateImageLeft.setEnabled(true);\r
+               browser.openAction.setEnabled(true);\r
+               selectedFile = f;\r
+       }\r
+\r
        //****************************************************************\r
        //* Apply CSS style to specified word\r
        //****************************************************************\r
@@ -2572,94 +3206,117 @@ public class BrowserWindow extends QWidget {
        }\r
 */\r
        \r
+       @SuppressWarnings("unused")\r
        private void toggleUndoVisible(Boolean toggle) {\r
                undoAction.setVisible(toggle);\r
                Global.saveEditorButtonsVisible("undo", toggle);\r
        }\r
+       @SuppressWarnings("unused")\r
        private void toggleRedoVisible(Boolean toggle) {\r
                redoAction.setVisible(toggle);\r
                Global.saveEditorButtonsVisible("redo", toggle);\r
        }\r
+       @SuppressWarnings("unused")\r
        private void toggleCutVisible(Boolean toggle) {\r
                cutAction.setVisible(toggle);\r
                Global.saveEditorButtonsVisible("cut", toggle);\r
        }\r
+       @SuppressWarnings("unused")\r
        private void toggleCopyVisible(Boolean toggle) {\r
                copyAction.setVisible(toggle);\r
                Global.saveEditorButtonsVisible("copy", toggle);\r
        }\r
+       @SuppressWarnings("unused")\r
        private void togglePasteVisible(Boolean toggle) {\r
                pasteAction.setVisible(toggle);\r
                Global.saveEditorButtonsVisible("paste", toggle);\r
        }\r
+       @SuppressWarnings("unused")\r
        private void toggleBoldVisible(Boolean toggle) {\r
                boldAction.setVisible(toggle);\r
                Global.saveEditorButtonsVisible("bold", toggle);\r
        }\r
+       @SuppressWarnings("unused")\r
        private void toggleItalicVisible(Boolean toggle) {\r
                italicAction.setVisible(toggle);\r
                Global.saveEditorButtonsVisible("italic", toggle);\r
        }\r
+       @SuppressWarnings("unused")\r
        private void toggleUnderlineVisible(Boolean toggle) {\r
                underlineAction.setVisible(toggle);\r
                Global.saveEditorButtonsVisible("underline", toggle);\r
        }\r
+       @SuppressWarnings("unused")\r
        private void toggleStrikethroughVisible(Boolean toggle) {\r
                strikethroughAction.setVisible(toggle);\r
                Global.saveEditorButtonsVisible("strikethrough", toggle);\r
        }\r
+       @SuppressWarnings("unused")\r
        private void toggleLeftAlignVisible(Boolean toggle) {\r
                leftAlignAction.setVisible(toggle);\r
                Global.saveEditorButtonsVisible("alignLeft", toggle);\r
        }\r
+       @SuppressWarnings("unused")\r
        private void toggleRightAlignVisible(Boolean toggle) {\r
                rightAlignAction.setVisible(toggle);\r
                Global.saveEditorButtonsVisible("alignRight", toggle);\r
        }       \r
+       @SuppressWarnings("unused")\r
        private void toggleCenterAlignVisible(Boolean toggle) {\r
                centerAlignAction.setVisible(toggle);\r
                Global.saveEditorButtonsVisible("alignCenter", toggle);\r
        }\r
+       @SuppressWarnings("unused")\r
        private void toggleHLineVisible(Boolean toggle) {\r
                hlineAction.setVisible(toggle);\r
                Global.saveEditorButtonsVisible("hline", toggle);\r
        }\r
+       @SuppressWarnings("unused")\r
        private void toggleIndentVisible(Boolean toggle) {\r
                indentAction.setVisible(toggle);\r
                Global.saveEditorButtonsVisible("indent", toggle);\r
        }\r
+       @SuppressWarnings("unused")\r
        private void toggleTodoVisible(Boolean toggle) {\r
                todoAction.setVisible(toggle);\r
                Global.saveEditorButtonsVisible("todo", toggle);\r
        }\r
+       @SuppressWarnings("unused")\r
        private void toggleOutdentVisible(Boolean toggle) {\r
                outdentAction.setVisible(toggle);\r
                Global.saveEditorButtonsVisible("outdent", toggle);\r
        }\r
+       @SuppressWarnings("unused")\r
        private void toggleBulletListVisible(Boolean toggle) {\r
                bulletListAction.setVisible(toggle);\r
                Global.saveEditorButtonsVisible("bulletList", toggle);\r
        }\r
+       @SuppressWarnings("unused")\r
        private void toggleNumberListVisible(Boolean toggle) {\r
                numberListAction.setVisible(toggle);\r
                Global.saveEditorButtonsVisible("numberList", toggle);\r
        }\r
+       @SuppressWarnings("unused")\r
        private void toggleFontListVisible(Boolean toggle) {\r
                fontListAction.setVisible(toggle);\r
                Global.saveEditorButtonsVisible("font", toggle);\r
        }\r
+       @SuppressWarnings("unused")\r
        private void toggleFontColorVisible(Boolean toggle) {\r
                fontColorAction.setVisible(toggle);\r
                Global.saveEditorButtonsVisible("fontColor", toggle);\r
        }\r
+       @SuppressWarnings("unused")\r
        private void toggleFontSizeVisible(Boolean toggle) {\r
                fontSizeAction.setVisible(toggle);\r
                Global.saveEditorButtonsVisible("fontSize", toggle);\r
        }\r
+       @SuppressWarnings("unused")\r
        private void toggleFontHilightVisible(Boolean toggle) {\r
                fontHilightAction.setVisible(toggle);\r
                Global.saveEditorButtonsVisible("fontHilight", toggle);\r
        }\r
+       @SuppressWarnings("unused")\r
        private void toggleSpellCheckVisible(Boolean toggle) {\r
                spellCheckAction.setVisible(toggle);\r
                Global.saveEditorButtonsVisible("spellCheck", toggle);\r
@@ -2671,6 +3328,7 @@ public class BrowserWindow extends QWidget {
                try {\r
                        dictionary = new SpellDictionaryHashMap(wordList);\r
                        spellChecker = new SpellChecker(dictionary);\r
+                       \r
                        File userWordList;\r
                        userWordList = new File(Global.getFileManager().getSpellDirPathUser()+"user.dic");\r
                        \r
@@ -2693,24 +3351,38 @@ public class BrowserWindow extends QWidget {
 \r
                } catch (FileNotFoundException e) {\r
                        QMessageBox.critical(this, tr("Spell Check Error"), \r
-                                       tr("Dictionary "+ Global.getFileManager().getSpellDirPath()+Locale.getDefault()+\r
-                                               ".dic was not found."));\r
+                                       tr("Dictionary ")+ Global.getFileManager().getSpellDirPath()+Locale.getDefault()+\r
+                                               tr(".dic was not found."));\r
                } catch (IOException e) {\r
                        QMessageBox.critical(this, tr("Spell Check Error"), \r
-                                       tr("Dictionary "+ Global.getFileManager().getSpellDirPath()+Locale.getDefault()+\r
-                                               ".dic is invalid."));\r
+                                       tr("Dictionary ")+ Global.getFileManager().getSpellDirPath()+Locale.getDefault()+\r
+                                               tr(".dic is invalid."));\r
                }\r
 \r
        }\r
        \r
        // Invoke spell checker dialog\r
+       @SuppressWarnings("unused")\r
        private void spellCheckClicked() {\r
 \r
                if (spellChecker == null) {\r
                        setupDictionary();      \r
                }\r
+               \r
+               // Read user settings\r
+               spellChecker.getConfiguration().setBoolean(Configuration.SPELL_IGNOREDIGITWORDS, \r
+                               Global.getSpellSetting(Configuration.SPELL_IGNOREDIGITWORDS));\r
+               spellChecker.getConfiguration().setBoolean(Configuration.SPELL_IGNOREINTERNETADDRESSES, \r
+                               Global.getSpellSetting(Configuration.SPELL_IGNOREINTERNETADDRESSES));\r
+               spellChecker.getConfiguration().setBoolean(Configuration.SPELL_IGNOREMIXEDCASE, \r
+                               Global.getSpellSetting(Configuration.SPELL_IGNOREMIXEDCASE));\r
+               spellChecker.getConfiguration().setBoolean(Configuration.SPELL_IGNOREUPPERCASE, \r
+                               Global.getSpellSetting(Configuration.SPELL_IGNOREUPPERCASE));\r
+               spellChecker.getConfiguration().setBoolean(Configuration.SPELL_IGNORESENTENCECAPITALIZATION, \r
+                               Global.getSpellSetting(Configuration.SPELL_IGNORESENTENCECAPITALIZATION));\r
 \r
                spellListener.abortSpellCheck = false;\r
+               spellListener.errorsFound = false;\r
                String content = getBrowser().page().mainFrame().toPlainText();\r
                StringWordTokenizer tokenizer = new StringWordTokenizer(content);\r
                if (!tokenizer.hasMoreWords())\r
@@ -2743,8 +3415,62 @@ public class BrowserWindow extends QWidget {
                browser.keyPressEvent(home);\r
                if (!spellListener.errorsFound)\r
                        QMessageBox.information(this, tr("Spell Check Complete"), \r
-                                       tr("No spelling errors found"));\r
+                                       tr("No Errors Found"));\r
 \r
     }\r
-\r
+       \r
+       // Source edited\r
+       @SuppressWarnings("unused")\r
+       private void sourceEdited() {\r
+               QTextCodec codec = QTextCodec.codecForLocale();\r
+               codec = QTextCodec.codecForName("UTF-8");\r
+        String content =  codec.fromUnicode(sourceEdit.toHtml()).toString();\r
+               content = StringEscapeUtils.unescapeHtml4(removeTags(content));\r
+               QByteArray data = new QByteArray(sourceEditHeader+content+"</body></html>");\r
+               getBrowser().setContent(data);\r
+               checkNoteTitle();\r
+               if (currentNote != null && sourceEdit != null)\r
+                       noteSignal.noteChanged.emit(currentNote.getGuid(), sourceEdit.toPlainText()); \r
+       }\r
+       \r
+       private void setSource() {\r
+               String text = getContent();\r
+               sourceEdit.blockSignals(true);\r
+               int body = text.indexOf("<body");\r
+               if (body > 0) {\r
+                       body = text.indexOf(">",body);\r
+                       if (body > 0) {\r
+                               sourceEditHeader =text.substring(0, body+1);\r
+                               text = text.substring(body+1);\r
+                       }\r
+               }\r
+               text = text.replace("</body></html>", "");\r
+               sourceEdit.setPlainText(text);\r
+               sourceEdit.setReadOnly(!getBrowser().page().isContentEditable());\r
+               //syntaxHighlighter.rehighlight();\r
+               sourceEdit.blockSignals(false);\r
+       }\r
+\r
+       // show/hide view source window\r
+       public void showSource(boolean value) {\r
+               setSource();\r
+               sourceEdit.setVisible(value);\r
+       }\r
+\r
+       // Remove HTML tags\r
+       private String removeTags(String text) {\r
+               StringBuffer buffer = new StringBuffer(text);\r
+               boolean inTag = false;\r
+               int bodyPosition = text.indexOf("<body");\r
+               for (int i=buffer.length()-1; i>=0; i--) {\r
+                       if (buffer.charAt(i) == '>')\r
+                               inTag = true;\r
+                       if (buffer.charAt(i) == '<')\r
+                               inTag = false;\r
+                       if (inTag || buffer.charAt(i) == '<' || i<bodyPosition)\r
+                               buffer.deleteCharAt(i);\r
+               }\r
+               \r
+               return buffer.toString();\r
+       }\r
 }\r