OSDN Git Service

Correct java cast exceptions when doing a getUserInformation.
[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / NeverNote.java
index c541f33..f1cf5ae 100644 (file)
@@ -75,6 +75,7 @@ import com.trolltech.qt.core.QFileSystemWatcher;
 import com.trolltech.qt.core.QIODevice;
 import com.trolltech.qt.core.QIODevice.OpenModeFlag;
 import com.trolltech.qt.core.QLocale;
 import com.trolltech.qt.core.QIODevice;
 import com.trolltech.qt.core.QIODevice.OpenModeFlag;
 import com.trolltech.qt.core.QLocale;
+import com.trolltech.qt.core.QMimeData;
 import com.trolltech.qt.core.QModelIndex;
 import com.trolltech.qt.core.QSize;
 import com.trolltech.qt.core.QTemporaryFile;
 import com.trolltech.qt.core.QModelIndex;
 import com.trolltech.qt.core.QSize;
 import com.trolltech.qt.core.QTemporaryFile;
@@ -86,12 +87,15 @@ import com.trolltech.qt.core.QUrl;
 import com.trolltech.qt.core.Qt;
 import com.trolltech.qt.core.Qt.BGMode;
 import com.trolltech.qt.core.Qt.ItemDataRole;
 import com.trolltech.qt.core.Qt;
 import com.trolltech.qt.core.Qt.BGMode;
 import com.trolltech.qt.core.Qt.ItemDataRole;
+import com.trolltech.qt.core.Qt.KeyboardModifier;
+import com.trolltech.qt.core.Qt.MouseButton;
 import com.trolltech.qt.core.Qt.SortOrder;
 import com.trolltech.qt.core.Qt.WidgetAttribute;
 import com.trolltech.qt.gui.QAbstractItemView;
 import com.trolltech.qt.gui.QAbstractItemView.ScrollHint;
 import com.trolltech.qt.gui.QAction;
 import com.trolltech.qt.gui.QApplication;
 import com.trolltech.qt.core.Qt.SortOrder;
 import com.trolltech.qt.core.Qt.WidgetAttribute;
 import com.trolltech.qt.gui.QAbstractItemView;
 import com.trolltech.qt.gui.QAbstractItemView.ScrollHint;
 import com.trolltech.qt.gui.QAction;
 import com.trolltech.qt.gui.QApplication;
+import com.trolltech.qt.gui.QClipboard;
 import com.trolltech.qt.gui.QCloseEvent;
 import com.trolltech.qt.gui.QColor;
 import com.trolltech.qt.gui.QComboBox;
 import com.trolltech.qt.gui.QCloseEvent;
 import com.trolltech.qt.gui.QColor;
 import com.trolltech.qt.gui.QComboBox;
@@ -152,8 +156,11 @@ import cx.fbn.nevernote.dialog.PublishNotebook;
 import cx.fbn.nevernote.dialog.SavedSearchEdit;
 import cx.fbn.nevernote.dialog.SetIcon;
 import cx.fbn.nevernote.dialog.ShareNotebook;
 import cx.fbn.nevernote.dialog.SavedSearchEdit;
 import cx.fbn.nevernote.dialog.SetIcon;
 import cx.fbn.nevernote.dialog.ShareNotebook;
+import cx.fbn.nevernote.dialog.SharedNotebookSyncError;
 import cx.fbn.nevernote.dialog.StackNotebook;
 import cx.fbn.nevernote.dialog.StackNotebook;
+import cx.fbn.nevernote.dialog.SynchronizationRequiredWarning;
 import cx.fbn.nevernote.dialog.TagEdit;
 import cx.fbn.nevernote.dialog.TagEdit;
+import cx.fbn.nevernote.dialog.TagMerge;
 import cx.fbn.nevernote.dialog.ThumbnailViewer;
 import cx.fbn.nevernote.dialog.UpgradeAvailableDialog;
 import cx.fbn.nevernote.dialog.WatchFolder;
 import cx.fbn.nevernote.dialog.ThumbnailViewer;
 import cx.fbn.nevernote.dialog.UpgradeAvailableDialog;
 import cx.fbn.nevernote.dialog.WatchFolder;
@@ -331,7 +338,8 @@ public class NeverNote extends QMainWindow{
     private static Logger log = Logger.getLogger(NeverNote.class); 
     private String             saveLastPath;                           // last path we used
     private final QTimer               messageTimer;                           // Timer to clear the status message.
     private static Logger log = Logger.getLogger(NeverNote.class); 
     private String             saveLastPath;                           // last path we used
     private final QTimer               messageTimer;                           // Timer to clear the status message.
-    
+    private QTimer             blockTimer;
+    BrowserWindow              blockingWindow;
     
     String iconPath = new String("classpath:cx/fbn/nevernote/icons/");
        
     
     String iconPath = new String("classpath:cx/fbn/nevernote/icons/");
        
@@ -353,7 +361,7 @@ public class NeverNote extends QMainWindow{
             QMessageBox.critical(null, tr("Database Connection Error") ,msg);
                        System.exit(16);
                }
             QMessageBox.critical(null, tr("Database Connection Error") ,msg);
                        System.exit(16);
                }
-
+               setObjectName("mainWindow");
 //             thread().setPriority(Thread.MAX_PRIORITY);
                
                logger = new ApplicationLogger("nevernote.log");
 //             thread().setPriority(Thread.MAX_PRIORITY);
                
                logger = new ApplicationLogger("nevernote.log");
@@ -383,7 +391,7 @@ public class NeverNote extends QMainWindow{
                QApplication.setStyle(Global.getStyle());
                if (Global.useStandardPalette())
                        QApplication.setPalette(QApplication.style().standardPalette());
                QApplication.setStyle(Global.getStyle());
                if (Global.useStandardPalette())
                        QApplication.setPalette(QApplication.style().standardPalette());
-        setWindowTitle("NeverNote");
+        setWindowTitle(tr("NeverNote"));
 
         mainLeftRightSplitter = new QSplitter();
         setCentralWidget(mainLeftRightSplitter);
 
         mainLeftRightSplitter = new QSplitter();
         setCentralWidget(mainLeftRightSplitter);
@@ -394,9 +402,9 @@ public class NeverNote extends QMainWindow{
         browserIndexSplitter.setOrientation(Qt.Orientation.Vertical);
         
         //* Setup threads & thread timers
         browserIndexSplitter.setOrientation(Qt.Orientation.Vertical);
         
         //* Setup threads & thread timers
-        int indexRunnerCount = Global.getIndexThreads();
-        indexRunnerCount = 1;
-        QThreadPool.globalInstance().setMaxThreadCount(indexRunnerCount+5);    // increase max thread count
+//        int indexRunnerCount = Global.getIndexThreads();
+//       indexRunnerCount = 1;
+        QThreadPool.globalInstance().setMaxThreadCount(Global.threadCount);    // increase max thread count
 
                logger.log(logger.EXTREME, "Building list manager");
         listManager = new ListManager(conn, logger);
 
                logger.log(logger.EXTREME, "Building list manager");
         listManager = new ListManager(conn, logger);
@@ -407,6 +415,10 @@ public class NeverNote extends QMainWindow{
                        Global.getDatabaseUserid(), Global.getDatabaseUserPassword(), Global.cipherPassword);
                indexThread = new QThread(indexRunner, "Index Thread");
         indexRunner.indexAttachmentsLocally = Global.indexAttachmentsLocally();
                        Global.getDatabaseUserid(), Global.getDatabaseUserPassword(), Global.cipherPassword);
                indexThread = new QThread(indexRunner, "Index Thread");
         indexRunner.indexAttachmentsLocally = Global.indexAttachmentsLocally();
+        indexRunner.indexImageRecognition = Global.indexImageRecognition();
+        indexRunner.indexNoteBody = Global.indexNoteBody();
+        indexRunner.indexNoteTitle = Global.indexNoteTitle();
+        indexRunner.specialIndexCharacters = Global.getSpecialIndexCharacters();
                indexThread.start();
                
         synchronizeAnimationTimer = new QTimer();
                indexThread.start();
                
         synchronizeAnimationTimer = new QTimer();
@@ -565,6 +577,7 @@ public class NeverNote extends QMainWindow{
                emitLog = new ArrayList<String>();
                
                tagTree.setDeleteAction(menuBar.tagDeleteAction);
                emitLog = new ArrayList<String>();
                
                tagTree.setDeleteAction(menuBar.tagDeleteAction);
+               tagTree.setMergeAction(menuBar.tagMergeAction);
                tagTree.setEditAction(menuBar.tagEditAction);
                tagTree.setAddAction(menuBar.tagAddAction);
                tagTree.setIconAction(menuBar.tagIconAction);
                tagTree.setEditAction(menuBar.tagEditAction);
                tagTree.setAddAction(menuBar.tagAddAction);
                tagTree.setIconAction(menuBar.tagIconAction);
@@ -607,6 +620,7 @@ public class NeverNote extends QMainWindow{
                noteTableView.setNoteHistoryAction(menuBar.noteOnlineHistoryAction);
                noteTableView.noteSignal.titleColorChanged.connect(this, "titleColorChanged(Integer)");
                noteTableView.setMergeNotesAction(menuBar.noteMergeAction);
                noteTableView.setNoteHistoryAction(menuBar.noteOnlineHistoryAction);
                noteTableView.noteSignal.titleColorChanged.connect(this, "titleColorChanged(Integer)");
                noteTableView.setMergeNotesAction(menuBar.noteMergeAction);
+               noteTableView.setCopyAsUrlAction(menuBar.noteCopyAsUrlAction);
                noteTableView.doubleClicked.connect(this, "listDoubleClick()");
                listManager.trashSignal.countChanged.connect(trashTree, "updateCounts(Integer)");
                
                noteTableView.doubleClicked.connect(this, "listDoubleClick()");
                listManager.trashSignal.countChanged.connect(trashTree, "updateCounts(Integer)");
                
@@ -646,9 +660,9 @@ public class NeverNote extends QMainWindow{
                find.getOkButton().clicked.connect(this, "doFindText()");
                
                // Setup the tray icon menu bar
                find.getOkButton().clicked.connect(this, "doFindText()");
                
                // Setup the tray icon menu bar
-               trayShowAction = new QAction("Show/Hide", this);
-               trayExitAction = new QAction("Exit", this);
-               trayAddNoteAction = new QAction("Add Note", this);
+               trayShowAction = new QAction(tr("Show/Hide"), this);
+               trayExitAction = new QAction(tr("Exit"), this);
+               trayAddNoteAction = new QAction(tr("Add Note"), this);
                
                trayExitAction.triggered.connect(this, "closeNeverNote()");
                trayAddNoteAction.triggered.connect(this, "addNote()");
                
                trayExitAction.triggered.connect(this, "closeNeverNote()");
                trayAddNoteAction.triggered.connect(this, "addNote()");
@@ -661,7 +675,7 @@ public class NeverNote extends QMainWindow{
                
                
                trayIcon = new QSystemTrayIcon(this);
                
                
                trayIcon = new QSystemTrayIcon(this);
-               trayIcon.setToolTip("NeverNote");
+               trayIcon.setToolTip(tr("NeverNote"));
                trayIcon.setContextMenu(trayMenu);
                trayIcon.activated.connect(this, "trayActivated(com.trolltech.qt.gui.QSystemTrayIcon$ActivationReason)");
 
                trayIcon.setContextMenu(trayMenu);
                trayIcon.activated.connect(this, "trayActivated(com.trolltech.qt.gui.QSystemTrayIcon$ActivationReason)");
 
@@ -847,7 +861,9 @@ public class NeverNote extends QMainWindow{
                                QMessageBox.StandardButton.No) == StandardButton.Yes.value()) {
                        ChangeFileEncryption.execute(dbPath, dbName, encryptCipher, null, Global.cipherPassword.toCharArray(), true);
                        Global.setDatabaseUrl(Global.getDatabaseUrl() + ";CIPHER="+encryptCipher);
                                QMessageBox.StandardButton.No) == StandardButton.Yes.value()) {
                        ChangeFileEncryption.execute(dbPath, dbName, encryptCipher, null, Global.cipherPassword.toCharArray(), true);
                        Global.setDatabaseUrl(Global.getDatabaseUrl() + ";CIPHER="+encryptCipher);
-                       QMessageBox.information(this, "Encryption Complete", "Encryption is complete");
+                       Global.setDatabaseUrl(Global.getIndexDatabaseUrl() + ";CIPHER="+encryptCipher);
+                       Global.setDatabaseUrl(Global.getResourceDatabaseUrl() + ";CIPHER="+encryptCipher);
+                       QMessageBox.information(this, tr("Encryption Complete"), tr("Encryption is complete"));
                }
         } catch (SQLException e) {
                        e.printStackTrace();
                }
         } catch (SQLException e) {
                        e.printStackTrace();
@@ -902,7 +918,7 @@ public class NeverNote extends QMainWindow{
                }
         } else {
             DBEncryptDialog dialog = new DBEncryptDialog();
                }
         } else {
             DBEncryptDialog dialog = new DBEncryptDialog();
-            dialog.setWindowTitle("Database Decryption");
+            dialog.setWindowTitle(tr("Database Decryption"));
             dialog.hideEncryption();
             dialog.exec();
             if (dialog.okPressed()) {
             dialog.hideEncryption();
             dialog.exec();
             if (dialog.okPressed()) {
@@ -1141,8 +1157,11 @@ public class NeverNote extends QMainWindow{
            browser.noteSignal.geoChanged.connect(listManager, "updateNoteGeoTag(String, Double,Double,Double)");
            browser.noteSignal.geoChanged.connect(this, "setNoteDirty()");
            browser.noteSignal.sourceUrlChanged.connect(listManager, "updateNoteSourceUrl(String, String)");
            browser.noteSignal.geoChanged.connect(listManager, "updateNoteGeoTag(String, Double,Double,Double)");
            browser.noteSignal.geoChanged.connect(this, "setNoteDirty()");
            browser.noteSignal.sourceUrlChanged.connect(listManager, "updateNoteSourceUrl(String, String)");
+       browser.blockApplication.connect(this, "blockApplication(BrowserWindow)");
+       browser.unblockApplication.connect(this, "unblockApplication()");
            if (master) browser.focusLost.connect(this, "saveNote()");
            browser.resourceSignal.contentChanged.connect(this, "externalFileEdited(String)");
            if (master) browser.focusLost.connect(this, "saveNote()");
            browser.resourceSignal.contentChanged.connect(this, "externalFileEdited(String)");
+           browser.evernoteLinkClicked.connect(this, "evernoteLinkClick(String, String)");
        }
 
        //**************************************************
        }
 
        //**************************************************
@@ -1174,6 +1193,10 @@ public class NeverNote extends QMainWindow{
         
         settings.exec();
         indexRunner.indexAttachmentsLocally = Global.indexAttachmentsLocally();
         
         settings.exec();
         indexRunner.indexAttachmentsLocally = Global.indexAttachmentsLocally();
+        indexRunner.indexNoteBody = Global.indexNoteBody();
+        indexRunner.indexNoteTitle = Global.indexNoteTitle();
+        indexRunner.specialIndexCharacters = Global.getSpecialIndexCharacters();
+        indexRunner.indexImageRecognition = Global.indexImageRecognition();
         if (Global.showTrayIcon())
                trayIcon.show();
         else
         if (Global.showTrayIcon())
                trayIcon.show();
         else
@@ -1188,21 +1211,29 @@ public class NeverNote extends QMainWindow{
         else
                saveTimer.stop();
         
         else
                saveTimer.stop();
         
-        // This is a hack to force a reload of the index in case the date or time changed.
-//        if (!dateFormat.equals(Global.getDateFormat()) ||
-//                     !timeFormat.equals(Global.getTimeFormat())) {
-               noteCache.clear();
-               readOnlyCache.clear();
-               inkNoteCache.clear();
-               noteIndexUpdated(true);
-//        }
         
         
+        // Set special reloads
+        if (settings.getDebugPage().reloadSharedNotebooksClicked()) {
+               conn.executeSql("Delete from LinkedNotebook");
+               conn.executeSql("delete from SharedNotebook");
+               conn.executeSql("Delete from Notebook where linked=true");
+               conn.executeSql("Insert into Sync (key, value) values ('FullLinkedNotebookSync', 'true')");
+               conn.executeSql("Insert into Sync (key, value) values ('FullSharedNotebookSync', 'true')");
+        }
+
+        // Reload user data
+        noteCache.clear();
+        readOnlyCache.clear();
+        inkNoteCache.clear();
+        noteIndexUpdated(true);
+               
         logger.log(logger.HIGH, "Leaving NeverNote.settings");
        }
        // Restore things to the way they were
        private void restoreWindowState(boolean mainWindow) {
                // We need to name things or this doesn't work.
                setObjectName("NeverNote");
         logger.log(logger.HIGH, "Leaving NeverNote.settings");
        }
        // Restore things to the way they were
        private void restoreWindowState(boolean mainWindow) {
                // We need to name things or this doesn't work.
                setObjectName("NeverNote");
+        restoreState(Global.restoreState(objectName()));
                mainLeftRightSplitter.setObjectName("mainLeftRightSplitter");
                browserIndexSplitter.setObjectName("browserIndexSplitter");
                leftSplitter1.setObjectName("leftSplitter1");   
                mainLeftRightSplitter.setObjectName("mainLeftRightSplitter");
                browserIndexSplitter.setObjectName("browserIndexSplitter");
                leftSplitter1.setObjectName("leftSplitter1");   
@@ -1221,16 +1252,19 @@ public class NeverNote extends QMainWindow{
                Global.saveState(mainLeftRightSplitter.objectName(), mainLeftRightSplitter.saveState());
                Global.saveState(browserIndexSplitter.objectName(), browserIndexSplitter.saveState());
                Global.saveState(leftSplitter1.objectName(), leftSplitter1.saveState());
                Global.saveState(mainLeftRightSplitter.objectName(), mainLeftRightSplitter.saveState());
                Global.saveState(browserIndexSplitter.objectName(), browserIndexSplitter.saveState());
                Global.saveState(leftSplitter1.objectName(), leftSplitter1.saveState());
+               Global.saveState(objectName(), saveState());
        }    
        // Load the style sheet
        private void loadStyleSheet() {
        }    
        // Load the style sheet
        private void loadStyleSheet() {
+               String styleSheetName = "default.qss";
+               if (Global.getStyle().equalsIgnoreCase("cleanlooks"))
+                               styleSheetName = "default-cleanlooks.qss";
                String fileName = Global.getFileManager().getQssDirPathUser("default.qss");
                String fileName = Global.getFileManager().getQssDirPathUser("default.qss");
-               fileName = Global.getFileManager().getQssDirPath("default.qss");
                QFile file = new QFile(fileName);
                
                // If a user default.qss doesn't exist, we use the one shipped with NeverNote
                if (!file.exists()) {
                QFile file = new QFile(fileName);
                
                // If a user default.qss doesn't exist, we use the one shipped with NeverNote
                if (!file.exists()) {
-                       fileName = Global.getFileManager().getQssDirPath("default.qss");
+                       fileName = Global.getFileManager().getQssDirPath(styleSheetName);
                        file = new QFile(fileName);
                }
                file.open(OpenModeFlag.ReadOnly);
                        file = new QFile(fileName);
                }
                file.open(OpenModeFlag.ReadOnly);
@@ -1293,6 +1327,7 @@ public class NeverNote extends QMainWindow{
                Global.setColumnWidth("noteTableGuidPosition", width);
        }
        
                Global.setColumnWidth("noteTableGuidPosition", width);
        }
        
+       @SuppressWarnings("unused")
        private void toggleSearchWindow() {
                logger.log(logger.HIGH, "Entering NeverNote.toggleSearchWindow");
        searchLayout.toggleSearchField();
        private void toggleSearchWindow() {
                logger.log(logger.HIGH, "Entering NeverNote.toggleSearchWindow");
        searchLayout.toggleSearchField();
@@ -1300,6 +1335,7 @@ public class NeverNote extends QMainWindow{
        Global.saveWindowVisible("searchField", searchField.isVisible());
        logger.log(logger.HIGH, "Leaving NeverNote.toggleSearchWindow");
     }  
        Global.saveWindowVisible("searchField", searchField.isVisible());
        logger.log(logger.HIGH, "Leaving NeverNote.toggleSearchWindow");
     }  
+       @SuppressWarnings("unused")
        private void toggleQuotaWindow() {
                logger.log(logger.HIGH, "Entering NeverNote.toggleQuotaWindow");
        searchLayout.toggleQuotaBar();
        private void toggleQuotaWindow() {
                logger.log(logger.HIGH, "Entering NeverNote.toggleQuotaWindow");
        searchLayout.toggleQuotaBar();
@@ -1307,6 +1343,7 @@ public class NeverNote extends QMainWindow{
        Global.saveWindowVisible("quota", quotaBar.isVisible());
        logger.log(logger.HIGH, "Leaving NeverNote.toggleQuotaWindow");
     }  
        Global.saveWindowVisible("quota", quotaBar.isVisible());
        logger.log(logger.HIGH, "Leaving NeverNote.toggleQuotaWindow");
     }  
+       @SuppressWarnings("unused")
        private void toggleZoomWindow() {
                logger.log(logger.HIGH, "Entering NeverNote.toggleZoomWindow");
        searchLayout.toggleZoom();
        private void toggleZoomWindow() {
                logger.log(logger.HIGH, "Entering NeverNote.toggleZoomWindow");
        searchLayout.toggleZoom();
@@ -1383,6 +1420,7 @@ public class NeverNote extends QMainWindow{
        listManager.setSelectedNotebooks(selectedNotebookGUIDs);
        listManager.loadNotesIndex();
        noteIndexUpdated(false);
        listManager.setSelectedNotebooks(selectedNotebookGUIDs);
        listManager.loadNotesIndex();
        noteIndexUpdated(false);
+       refreshEvernoteNote(true);
        listManager.refreshCounters = true;
        listManager.refreshCounters();
                logger.log(logger.HIGH, "Leaving NeverNote.notebookTreeSelection");
        listManager.refreshCounters = true;
        listManager.refreshCounters();
                logger.log(logger.HIGH, "Leaving NeverNote.notebookTreeSelection");
@@ -1434,6 +1472,7 @@ public class NeverNote extends QMainWindow{
                logger.log(logger.HIGH, "Leaving NeverNote.notebookIndexUpdated");
     }
     // Show/Hide note information
                logger.log(logger.HIGH, "Leaving NeverNote.notebookIndexUpdated");
     }
     // Show/Hide note information
+       @SuppressWarnings("unused")
        private void toggleNotebookWindow() {
                logger.log(logger.HIGH, "Entering NeverNote.toggleNotebookWindow");
                searchLayout.toggleNotebook();
        private void toggleNotebookWindow() {
                logger.log(logger.HIGH, "Entering NeverNote.toggleNotebookWindow");
                searchLayout.toggleNotebook();
@@ -1936,6 +1975,14 @@ public class NeverNote extends QMainWindow{
                logger.log(logger.HIGH, "Inside NeverNote.addTag");
                TagEdit edit = new TagEdit();
                edit.setTagList(listManager.getTagIndex());
                logger.log(logger.HIGH, "Inside NeverNote.addTag");
                TagEdit edit = new TagEdit();
                edit.setTagList(listManager.getTagIndex());
+
+               List<QTreeWidgetItem> selections = tagTree.selectedItems();
+               QTreeWidgetItem currentSelection = null;
+               if (selections.size() > 0) {
+                       currentSelection = selections.get(0);
+                       edit.setParentTag(currentSelection.text(0));
+               }
+
                edit.exec();
        
                if (!edit.okPressed())
                edit.exec();
        
                if (!edit.okPressed())
@@ -1949,6 +1996,11 @@ public class NeverNote extends QMainWindow{
                newTag.setUpdateSequenceNum(0);
                newTag.setGuid(randint);
                newTag.setName(edit.getTag());
                newTag.setUpdateSequenceNum(0);
                newTag.setGuid(randint);
                newTag.setName(edit.getTag());
+               if (edit.getParentTag().isChecked()) {
+                       newTag.setParentGuid(currentSelection.text(2));
+                       newTag.setParentGuidIsSet(true);
+                       currentSelection.setExpanded(true);
+               }
                conn.getTagTable().addTag(newTag, true);
                listManager.getTagIndex().add(newTag);
                reloadTagTree(true);
                conn.getTagTable().addTag(newTag, true);
                listManager.getTagIndex().add(newTag);
                reloadTagTree(true);
@@ -2084,9 +2136,14 @@ public class NeverNote extends QMainWindow{
                menuBar.tagDeleteAction.setEnabled(false);
                menuBar.tagIconAction.setEnabled(true);
        }
                menuBar.tagDeleteAction.setEnabled(false);
                menuBar.tagIconAction.setEnabled(true);
        }
+       if (selections.size() > 1)
+               menuBar.tagMergeAction.setEnabled(true);
+       else
+               menuBar.tagMergeAction.setEnabled(false);
        listManager.setSelectedTags(selectedTagGUIDs);
        listManager.loadNotesIndex();
        noteIndexUpdated(false);
        listManager.setSelectedTags(selectedTagGUIDs);
        listManager.loadNotesIndex();
        noteIndexUpdated(false);
+       refreshEvernoteNote(true);
        listManager.refreshCounters = true;
        listManager.refreshCounters();
        logger.log(logger.HIGH, "Leaving NeverNote.tagTreeSelection");
        listManager.refreshCounters = true;
        listManager.refreshCounters();
        logger.log(logger.HIGH, "Leaving NeverNote.tagTreeSelection");
@@ -2120,6 +2177,7 @@ public class NeverNote extends QMainWindow{
        logger.log(logger.HIGH, "Leaving NeverNote.tagIndexUpdated");
     }  
     // Show/Hide note information
        logger.log(logger.HIGH, "Leaving NeverNote.tagIndexUpdated");
     }  
     // Show/Hide note information
+       @SuppressWarnings("unused")
        private void toggleTagWindow() {
                logger.log(logger.HIGH, "Entering NeverNote.toggleTagWindow");
        if (tagTree.isVisible())
        private void toggleTagWindow() {
                logger.log(logger.HIGH, "Entering NeverNote.toggleTagWindow");
        if (tagTree.isVisible())
@@ -2228,6 +2286,7 @@ public class NeverNote extends QMainWindow{
                tagTree.clearSelection();
                menuBar.noteRestoreAction.setVisible(false);
                menuBar.tagEditAction.setEnabled(false);
                tagTree.clearSelection();
                menuBar.noteRestoreAction.setVisible(false);
                menuBar.tagEditAction.setEnabled(false);
+               menuBar.tagMergeAction.setEnabled(false);
                menuBar.tagDeleteAction.setEnabled(false);
                menuBar.tagIconAction.setEnabled(false);
                selectedTagGUIDs.clear();
                menuBar.tagDeleteAction.setEnabled(false);
                menuBar.tagIconAction.setEnabled(false);
                selectedTagGUIDs.clear();
@@ -2266,7 +2325,37 @@ public class NeverNote extends QMainWindow{
                }
        
        }
                }
        
        }
+       // Merge tags
+       @SuppressWarnings("unused")
+       private void mergeTags() {
+               List<Tag> tags = new ArrayList<Tag>();
+               List<QTreeWidgetItem> selections = tagTree.selectedItems();
+               for (int i=0; i<selections.size(); i++) {
+                       Tag record = new Tag();
+                       record.setGuid(selections.get(i).text(2));
+                       record.setName(selections.get(i).text(0));
+                       tags.add(record);
+               }
 
 
+               TagMerge mergeDialog = new TagMerge(tags);
+               mergeDialog.exec();
+               if (!mergeDialog.okClicked())
+                       return;
+               String newGuid = mergeDialog.getNewTagGuid();
+               
+               for (int i=0; i<tags.size(); i++) {
+                       if (!tags.get(i).getGuid().equals(newGuid)) {
+                               List<String> noteGuids = conn.getNoteTable().noteTagsTable.getTagNotes(tags.get(i).getGuid());
+                               for (int j=0; j<noteGuids.size(); j++) {
+                                       String noteGuid = noteGuids.get(j);
+                                       conn.getNoteTable().noteTagsTable.deleteNoteTag(noteGuid);
+                                       if (!conn.getNoteTable().noteTagsTable.checkNoteNoteTags(noteGuid, newGuid))
+                                               conn.getNoteTable().noteTagsTable.saveNoteTag(noteGuid, newGuid);
+                               }
+                       }
+               }
+               listManager.reloadIndexes();
+       }
        
     //***************************************************************
     //***************************************************************
        
     //***************************************************************
     //***************************************************************
@@ -2341,7 +2430,7 @@ public class NeverNote extends QMainWindow{
        private void deleteSavedSearch() {
                logger.log(logger.HIGH, "Entering NeverNote.deleteSavedSearch");
                
        private void deleteSavedSearch() {
                logger.log(logger.HIGH, "Entering NeverNote.deleteSavedSearch");
                
-               if (QMessageBox.question(this, "Confirmation", "Delete the selected search?",
+               if (QMessageBox.question(this, tr("Confirmation"), tr("Delete the selected search?"),
                        QMessageBox.StandardButton.Yes, 
                        QMessageBox.StandardButton.No)==StandardButton.No.value()) {
                                                        return;
                        QMessageBox.StandardButton.Yes, 
                        QMessageBox.StandardButton.No)==StandardButton.No.value()) {
                                                        return;
@@ -2459,6 +2548,7 @@ public class NeverNote extends QMainWindow{
        
     }
     // Show/Hide note information
        
     }
     // Show/Hide note information
+       @SuppressWarnings("unused")
        private void toggleSavedSearchWindow() {
                logger.log(logger.HIGH, "Entering NeverNote.toggleSavedSearchWindow");
        if (savedSearchTree.isVisible())
        private void toggleSavedSearchWindow() {
                logger.log(logger.HIGH, "Entering NeverNote.toggleSavedSearchWindow");
        if (savedSearchTree.isVisible())
@@ -2600,7 +2690,9 @@ public class NeverNote extends QMainWindow{
                                                                +"JTidy is copyrighted under the World Wide Web Consortium<br>"
                                                                +"Apache Common Utilities licensed under the Apache License Version 2.0<br>"
                                                                +"Jazzy is licened under the LGPL<br>"
                                                                +"JTidy is copyrighted under the World Wide Web Consortium<br>"
                                                                +"Apache Common Utilities licensed under the Apache License Version 2.0<br>"
                                                                +"Jazzy is licened under the LGPL<br>"
-                                                               +"Java is a registered trademark of Oracle Corporation.<br><hr>"));     
+                                                               +"Java is a registered trademark of Oracle Corporation.<br><hr>"
+                                                               +"Special thanks to:<br>BitRock InstallBuilder for the Windows installer"
+                                                               +"<br>CodeCogs (www.codecogs.com) for the LaTeX image rendering."));
                logger.log(logger.HIGH, "Leaving NeverNote.about");
        }
        // Hide the entire left hand side
                logger.log(logger.HIGH, "Leaving NeverNote.about");
        }
        // Hide the entire left hand side
@@ -2720,8 +2812,9 @@ public class NeverNote extends QMainWindow{
                        currentNote = listManager.getNoteIndex().get(0);
                        currentNoteGuid = currentNote.getGuid();
                }
                        currentNote = listManager.getNoteIndex().get(0);
                        currentNoteGuid = currentNote.getGuid();
                }
+               refreshEvernoteNote(true);
                if (currentNote != null)
                if (currentNote != null)
-                       loadNoteBrowserInformation(browserWindow);
+                       loadNoteBrowserInformation(browserWindow, currentNoteGuid, currentNote);
        }
        // text in the search bar changed.  We only use this to tell if it was cleared, 
        // otherwise we trigger off searchFieldChanged.
        }
        // text in the search bar changed.  We only use this to tell if it was cleared, 
        // otherwise we trigger off searchFieldChanged.
@@ -2744,6 +2837,7 @@ public class NeverNote extends QMainWindow{
                                listManager.loadNotesIndex();
                                refreshEvernoteNote(true);
                                noteIndexUpdated(false);
                                listManager.loadNotesIndex();
                                refreshEvernoteNote(true);
                                noteIndexUpdated(false);
+                               refreshEvernoteNote(true);
                        }
                        searchPerformed = false;
                }
                        }
                        searchPerformed = false;
                }
@@ -2769,6 +2863,7 @@ public class NeverNote extends QMainWindow{
     private void setupToolBar() {
        logger.log(logger.HIGH, "Entering NeverNote.setupToolBar");
        toolBar = addToolBar(tr("Tool Bar"));   
     private void setupToolBar() {
        logger.log(logger.HIGH, "Entering NeverNote.setupToolBar");
        toolBar = addToolBar(tr("Tool Bar"));   
+       toolBar.setObjectName("toolBar");
        menuBar.setupToolBarVisible();
        if (!Global.isWindowVisible("toolBar"))
                toolBar.setVisible(false);
        menuBar.setupToolBarVisible();
        if (!Global.isWindowVisible("toolBar"))
                toolBar.setVisible(false);
@@ -2778,74 +2873,74 @@ public class NeverNote extends QMainWindow{
 //     toolBar.addWidget(menuBar);
 //     menuBar.setSizePolicy(Policy.Minimum, Policy.Minimum);
 //     toolBar.addSeparator();
 //     toolBar.addWidget(menuBar);
 //     menuBar.setSizePolicy(Policy.Minimum, Policy.Minimum);
 //     toolBar.addSeparator();
-       prevButton = toolBar.addAction("Previous");
+       prevButton = toolBar.addAction(tr("Previous"));
        QIcon prevIcon = new QIcon(iconPath+"back.png");
        prevButton.setIcon(prevIcon);
        prevButton.triggered.connect(this, "previousViewedAction()");   
        togglePrevArrowButton(Global.isToolbarButtonVisible("prevArrow"));
        
        QIcon prevIcon = new QIcon(iconPath+"back.png");
        prevButton.setIcon(prevIcon);
        prevButton.triggered.connect(this, "previousViewedAction()");   
        togglePrevArrowButton(Global.isToolbarButtonVisible("prevArrow"));
        
-       nextButton = toolBar.addAction("Next");
+       nextButton = toolBar.addAction(tr("Next"));
        QIcon nextIcon = new QIcon(iconPath+"forward.png");
        nextButton.setIcon(nextIcon);
        nextButton.triggered.connect(this, "nextViewedAction()");       
        toggleNextArrowButton(Global.isToolbarButtonVisible("nextArrow"));
        
        QIcon nextIcon = new QIcon(iconPath+"forward.png");
        nextButton.setIcon(nextIcon);
        nextButton.triggered.connect(this, "nextViewedAction()");       
        toggleNextArrowButton(Global.isToolbarButtonVisible("nextArrow"));
        
-       upButton = toolBar.addAction("Up");
+       upButton = toolBar.addAction(tr("Up"));
        QIcon upIcon = new QIcon(iconPath+"up.png");
        upButton.setIcon(upIcon);
        upButton.triggered.connect(this, "upAction()");         
        toggleUpArrowButton(Global.isToolbarButtonVisible("upArrow"));
 
        
        QIcon upIcon = new QIcon(iconPath+"up.png");
        upButton.setIcon(upIcon);
        upButton.triggered.connect(this, "upAction()");         
        toggleUpArrowButton(Global.isToolbarButtonVisible("upArrow"));
 
        
-       downButton = toolBar.addAction("Down");
+       downButton = toolBar.addAction(tr("Down"));
        QIcon downIcon = new QIcon(iconPath+"down.png");
        downButton.setIcon(downIcon);
        downButton.triggered.connect(this, "downAction()");
        toggleDownArrowButton(Global.isToolbarButtonVisible("downArrow"));
        
        QIcon downIcon = new QIcon(iconPath+"down.png");
        downButton.setIcon(downIcon);
        downButton.triggered.connect(this, "downAction()");
        toggleDownArrowButton(Global.isToolbarButtonVisible("downArrow"));
        
-       synchronizeButton = toolBar.addAction("Synchronize");
+       synchronizeButton = toolBar.addAction(tr("Synchronize"));
        synchronizeButton.setIcon(new QIcon(iconPath+"synchronize.png"));
        synchronizeIconAngle = 0;
        synchronizeButton.triggered.connect(this, "evernoteSync()");
        toggleSynchronizeButton(Global.isToolbarButtonVisible("synchronize"));
        
        synchronizeButton.setIcon(new QIcon(iconPath+"synchronize.png"));
        synchronizeIconAngle = 0;
        synchronizeButton.triggered.connect(this, "evernoteSync()");
        toggleSynchronizeButton(Global.isToolbarButtonVisible("synchronize"));
        
-       printButton = toolBar.addAction("Print");
+       printButton = toolBar.addAction(tr("Print"));
        QIcon printIcon = new QIcon(iconPath+"print.png");
        printButton.setIcon(printIcon);
        printButton.triggered.connect(this, "printNote()");
        togglePrintButton(Global.isToolbarButtonVisible("print"));
 
        QIcon printIcon = new QIcon(iconPath+"print.png");
        printButton.setIcon(printIcon);
        printButton.triggered.connect(this, "printNote()");
        togglePrintButton(Global.isToolbarButtonVisible("print"));
 
-       tagButton = toolBar.addAction("Tag"); 
+       tagButton = toolBar.addAction(tr("Tag")); 
        QIcon tagIcon = new QIcon(iconPath+"tag.png");
        tagButton.setIcon(tagIcon);
        tagButton.triggered.connect(browserWindow, "modifyTags()");
        toggleTagButton(Global.isToolbarButtonVisible("tag"));
 
        QIcon tagIcon = new QIcon(iconPath+"tag.png");
        tagButton.setIcon(tagIcon);
        tagButton.triggered.connect(browserWindow, "modifyTags()");
        toggleTagButton(Global.isToolbarButtonVisible("tag"));
 
-       attributeButton = toolBar.addAction("Attributes"); 
+       attributeButton = toolBar.addAction(tr("Attributes")); 
        QIcon attributeIcon = new QIcon(iconPath+"attribute.png");
        attributeButton.setIcon(attributeIcon);
        attributeButton.triggered.connect(this, "toggleNoteInformation()");
        toggleAttributeButton(Global.isToolbarButtonVisible("attribute"));
                
        QIcon attributeIcon = new QIcon(iconPath+"attribute.png");
        attributeButton.setIcon(attributeIcon);
        attributeButton.triggered.connect(this, "toggleNoteInformation()");
        toggleAttributeButton(Global.isToolbarButtonVisible("attribute"));
                
-       emailButton = toolBar.addAction("Email");
+       emailButton = toolBar.addAction(tr("Email"));
        QIcon emailIcon = new QIcon(iconPath+"email.png");
        emailButton.setIcon(emailIcon);
        emailButton.triggered.connect(this, "emailNote()");
        toggleEmailButton(Global.isToolbarButtonVisible("email"));
 
        QIcon emailIcon = new QIcon(iconPath+"email.png");
        emailButton.setIcon(emailIcon);
        emailButton.triggered.connect(this, "emailNote()");
        toggleEmailButton(Global.isToolbarButtonVisible("email"));
 
-       deleteButton = toolBar.addAction("Delete");     
+       deleteButton = toolBar.addAction(tr("Delete"));         
        QIcon deleteIcon = new QIcon(iconPath+"delete.png");
        deleteButton.setIcon(deleteIcon);
        deleteButton.triggered.connect(this, "deleteNote()");
        toggleDeleteButton(Global.isToolbarButtonVisible("delete"));
 
        QIcon deleteIcon = new QIcon(iconPath+"delete.png");
        deleteButton.setIcon(deleteIcon);
        deleteButton.triggered.connect(this, "deleteNote()");
        toggleDeleteButton(Global.isToolbarButtonVisible("delete"));
 
-       newButton = toolBar.addAction("New");
+       newButton = toolBar.addAction(tr("New"));
        QIcon newIcon = new QIcon(iconPath+"new.png");
        newButton.triggered.connect(this, "addNote()");
        newButton.setIcon(newIcon);
        toggleNewButton(Global.isToolbarButtonVisible("new"));
        
        QIcon newIcon = new QIcon(iconPath+"new.png");
        newButton.triggered.connect(this, "addNote()");
        newButton.setIcon(newIcon);
        toggleNewButton(Global.isToolbarButtonVisible("new"));
        
-       allNotesButton = toolBar.addAction("All Notes");
+       allNotesButton = toolBar.addAction(tr("All Notes"));
        QIcon allIcon = new QIcon(iconPath+"books.png");
        allNotesButton.triggered.connect(this, "allNotes()");
        allNotesButton.setIcon(allIcon);
        QIcon allIcon = new QIcon(iconPath+"books.png");
        allNotesButton.triggered.connect(this, "allNotes()");
        allNotesButton.setIcon(allIcon);
@@ -3038,7 +3133,7 @@ public class NeverNote extends QMainWindow{
        
     }
     // Synchronize with Evernote
        
     }
     // Synchronize with Evernote
-       @SuppressWarnings("unused")
+
        private void evernoteSync() {
        logger.log(logger.HIGH, "Entering NeverNote.evernoteSync");
        if (!Global.isConnected)
        private void evernoteSync() {
        logger.log(logger.HIGH, "Entering NeverNote.evernoteSync");
        if (!Global.isConnected)
@@ -3145,7 +3240,9 @@ public class NeverNote extends QMainWindow{
     @SuppressWarnings("unused")
        private void emptyTrash() {
 //     browserWindow.clear();
     @SuppressWarnings("unused")
        private void emptyTrash() {
 //     browserWindow.clear();
+       logger.log(logger.EXTREME, "Emptying Trash");
        listManager.emptyTrash();
        listManager.emptyTrash();
+       logger.log(logger.EXTREME, "Resetting view after trash empty");
        if (trashTree.selectedItems().size() > 0) {
                listManager.getSelectedNotebooks().clear();
                listManager.getSelectedTags().clear();
        if (trashTree.selectedItems().size() > 0) {
                listManager.getSelectedNotebooks().clear();
                listManager.getSelectedTags().clear();
@@ -3169,6 +3266,7 @@ public class NeverNote extends QMainWindow{
        }       
    }
     // Show/Hide trash window
        }       
    }
     // Show/Hide trash window
+       @SuppressWarnings("unused")
        private void toggleTrashWindow() {
                logger.log(logger.HIGH, "Entering NeverNote.toggleTrashWindow");
        if (trashTree.isVisible())
        private void toggleTrashWindow() {
                logger.log(logger.HIGH, "Entering NeverNote.toggleTrashWindow");
        if (trashTree.isVisible())
@@ -3372,6 +3470,7 @@ public class NeverNote extends QMainWindow{
     }
 
     // Show/Hide attribute search window
     }
 
     // Show/Hide attribute search window
+       @SuppressWarnings("unused")
        private void toggleAttributesWindow() {
                logger.log(logger.HIGH, "Entering NeverNote.toggleAttributesWindow");
        if (attributeTree.isVisible())
        private void toggleAttributesWindow() {
                logger.log(logger.HIGH, "Entering NeverNote.toggleAttributesWindow");
        if (attributeTree.isVisible())
@@ -3425,7 +3524,15 @@ public class NeverNote extends QMainWindow{
     @SuppressWarnings("unused")
        private void noteTableSelection() {
                logger.log(logger.HIGH, "Entering NeverNote.noteTableSelection");
     @SuppressWarnings("unused")
        private void noteTableSelection() {
                logger.log(logger.HIGH, "Entering NeverNote.noteTableSelection");
+
                saveNote();
                saveNote();
+               
+               // If the ctrl key is pressed, then they are selecting multiple 
+               // entries and we don't want to change the currently viewed note.
+               if (QApplication.keyboardModifiers().isSet(KeyboardModifier.ControlModifier) &&
+                               QApplication.mouseButtons().isSet(MouseButton.LeftButton)) 
+                       return;
+
                if (historyGuids.size() == 0) {
                        historyGuids.add(currentNoteGuid);
                        historyPosition = 1;
                if (historyGuids.size() == 0) {
                        historyGuids.add(currentNoteGuid);
                        historyPosition = 1;
@@ -3965,6 +4072,7 @@ public class NeverNote extends QMainWindow{
                
        showColumns();
        noteTableView.load(false);
                
        showColumns();
        noteTableView.load(false);
+       refreshEvernoteNote(true);
        scrollToCurrentGuid();
     }
     public void wideListView() {
        scrollToCurrentGuid();
     }
     public void wideListView() {
@@ -4005,28 +4113,59 @@ public class NeverNote extends QMainWindow{
     
     
     //***************************************************************
     
     
     //***************************************************************
+    @SuppressWarnings("unused")
+       private void evernoteLinkClick(String syncGuid, String locGuid) {
+       String guid = null;
+       if (conn.getNoteTable().guidExists(syncGuid)) {
+               guid = syncGuid;
+       } else {
+               // If we didn't find it via the synchronized guid, look under the local guid
+               // Iwe don't find it there, look to see if the GUID is posted under the local GUID, but was 
+               // later synchronized (that causes the guid to change so we need to find the new one).
+               if (conn.getNoteTable().guidExists(locGuid)) 
+                       guid = locGuid;
+               else
+                       guid = conn.getNoteTable().findAlternateGuid(locGuid);
+       }
+               if (guid != null) {
+                       openExternalEditor(guid);
+                       return;
+               }
+       
+       //If we've gotten this far, we can't find the note
+       QMessageBox.information(this, tr("Note Not Found"), tr("Sorry, but I can't"+
+                       " seem to find that note."));
+    }
+    //***************************************************************
     //***************************************************************
     //** External editor window functions                    
     //***************************************************************
     //***************************************************************
        private void listDoubleClick() {
     //***************************************************************
     //** External editor window functions                    
     //***************************************************************
     //***************************************************************
        private void listDoubleClick() {
-       saveNote();
-       if (externalWindows.containsKey(currentNoteGuid)) {
-               externalWindows.get(currentNoteGuid).raise();
+               saveNote();
+       openExternalEditor(currentNoteGuid);
+    }
+    private void openExternalEditor(String guid) {
+       
+       if (externalWindows.containsKey(guid)) {
+               externalWindows.get(guid).raise();
                return;
        }
                return;
        }
+       Note note = conn.getNoteTable().getNote(guid, true, true, false, true, true);
        // We have a new external editor to create
        QIcon appIcon = new QIcon(iconPath+"nevernote.png");
        ExternalBrowse newBrowser = new ExternalBrowse(conn);
        newBrowser.setWindowIcon(appIcon);
        // We have a new external editor to create
        QIcon appIcon = new QIcon(iconPath+"nevernote.png");
        ExternalBrowse newBrowser = new ExternalBrowse(conn);
        newBrowser.setWindowIcon(appIcon);
-       externalWindows.put(currentNoteGuid, newBrowser);
+       externalWindows.put(guid, newBrowser);
        showEditorButtons(newBrowser.getBrowserWindow());
        showEditorButtons(newBrowser.getBrowserWindow());
-       loadNoteBrowserInformation(newBrowser.getBrowserWindow());
+       loadNoteBrowserInformation(newBrowser.getBrowserWindow(), guid, note);
        setupBrowserWindowListeners(newBrowser.getBrowserWindow(), false);
        newBrowser.windowClosing.connect(this, "externalWindowClosing(String)");
        newBrowser.getBrowserWindow().noteSignal.titleChanged.connect(this, "externalWindowTitleEdited(String, String)");
        newBrowser.getBrowserWindow().noteSignal.tagsChanged.connect(this, "externalWindowTagsEdited(String, List)");
        newBrowser.contentsChanged.connect(this, "saveNoteExternalBrowser(String, String, Boolean, BrowserWindow)");
        setupBrowserWindowListeners(newBrowser.getBrowserWindow(), false);
        newBrowser.windowClosing.connect(this, "externalWindowClosing(String)");
        newBrowser.getBrowserWindow().noteSignal.titleChanged.connect(this, "externalWindowTitleEdited(String, String)");
        newBrowser.getBrowserWindow().noteSignal.tagsChanged.connect(this, "externalWindowTagsEdited(String, List)");
        newBrowser.contentsChanged.connect(this, "saveNoteExternalBrowser(String, String, Boolean, BrowserWindow)");
+       newBrowser.getBrowserWindow().blockApplication.connect(this, "blockApplication(BrowserWindow)");
+       newBrowser.getBrowserWindow().unblockApplication.connect(this, "unblockApplication()");
 
        browserWindow.noteSignal.tagsChanged.connect(newBrowser, "updateTags(String, List)");
        browserWindow.noteSignal.titleChanged.connect(newBrowser, "updateTitle(String, String)");
 
        browserWindow.noteSignal.tagsChanged.connect(newBrowser, "updateTags(String, List)");
        browserWindow.noteSignal.titleChanged.connect(newBrowser, "updateTitle(String, String)");
@@ -4056,7 +4195,7 @@ public class NeverNote extends QMainWindow{
        private void externalWindowClosing(String guid) {
                externalWindows.remove(guid);
     }
        private void externalWindowClosing(String guid) {
                externalWindows.remove(guid);
     }
-    
+
     
     
     //***************************************************************
     
     
     //***************************************************************
@@ -4073,7 +4212,7 @@ public class NeverNote extends QMainWindow{
                        QTextCodec codec = QTextCodec.codecForName("UTF-8");
                QByteArray unicode =  codec.fromUnicode(browserWindow.getContent());
                        ExternalBrowse window = externalWindows.get(currentNoteGuid);
                        QTextCodec codec = QTextCodec.codecForName("UTF-8");
                QByteArray unicode =  codec.fromUnicode(browserWindow.getContent());
                        ExternalBrowse window = externalWindows.get(currentNoteGuid);
-               window.getBrowserWindow().getBrowser().setContent(unicode);
+               window.getBrowserWindow().setContent(unicode);
                }
                
                // If the note is dirty, then it is unsynchronized by default.
                }
                
                // If the note is dirty, then it is unsynchronized by default.
@@ -4112,7 +4251,7 @@ public class NeverNote extends QMainWindow{
                noteCache.put(guid, unicode.toString());
        if (guid.equals(currentNoteGuid)) {
                noteDirty = true;
                noteCache.put(guid, unicode.toString());
        if (guid.equals(currentNoteGuid)) {
                noteDirty = true;
-               browserWindow.getBrowser().setContent(unicode);
+               browserWindow.setContent(unicode);
        } 
        if (save) {
                thumbnailRunner.addWork("GENERATE "+ guid);
        } 
        if (save) {
                thumbnailRunner.addWork("GENERATE "+ guid);
@@ -4125,11 +4264,10 @@ public class NeverNote extends QMainWindow{
                saveNote(currentNoteGuid, browserWindow);
                thumbnailRunner.addWork("GENERATE "+ currentNoteGuid);
                noteDirty = false;
                saveNote(currentNoteGuid, browserWindow);
                thumbnailRunner.addWork("GENERATE "+ currentNoteGuid);
                noteDirty = false;
-       }
+       } 
     }
     private void saveNote(String guid, BrowserWindow window) {
                logger.log(logger.EXTREME, "Inside NeverNote.saveNote()");
     }
     private void saveNote(String guid, BrowserWindow window) {
                logger.log(logger.EXTREME, "Inside NeverNote.saveNote()");
-               logger.log(logger.EXTREME, "Note is dirty.");
                waitCursor(true);
                
                logger.log(logger.EXTREME, "Saving to cache");
                waitCursor(true);
                
                logger.log(logger.EXTREME, "Saving to cache");
@@ -4164,10 +4302,10 @@ public class NeverNote extends QMainWindow{
                }
                inkNote = false;
                readOnly = false;
                }
                inkNote = false;
                readOnly = false;
-               if (Global.showDeleted)
+               if (Global.showDeleted || currentNoteGuid == null || currentNoteGuid.equals(""))
                        readOnly = true;
                Global.cryptCounter =0;
                        readOnly = true;
                Global.cryptCounter =0;
-               if (currentNoteGuid.equals("")) {
+               if (readOnly) {
                        browserWindow.setReadOnly(true);
                        return;
                }
                        browserWindow.setReadOnly(true);
                        return;
                }
@@ -4181,15 +4319,15 @@ public class NeverNote extends QMainWindow{
                currentNote = conn.getNoteTable().getNote(currentNoteGuid, true,true,false,false,true);
                if (currentNote == null) 
                        return;
                currentNote = conn.getNoteTable().getNote(currentNoteGuid, true,true,false,false,true);
                if (currentNote == null) 
                        return;
-               loadNoteBrowserInformation(browserWindow);
+               loadNoteBrowserInformation(browserWindow, currentNoteGuid, currentNote);
        }
 
        }
 
-       private void loadNoteBrowserInformation(BrowserWindow browser) {
+       private void loadNoteBrowserInformation(BrowserWindow browser, String guid, Note note) {
                NoteFormatter   formatter = new NoteFormatter(logger, conn, tempFiles);
                NoteFormatter   formatter = new NoteFormatter(logger, conn, tempFiles);
-               formatter.setNote(currentNote, Global.pdfPreview());
+               formatter.setNote(note, Global.pdfPreview());
                formatter.setHighlight(listManager.getEnSearch());
                QByteArray js;
                formatter.setHighlight(listManager.getEnSearch());
                QByteArray js;
-               if (!noteCache.containsKey(currentNoteGuid) || conn.getNoteTable().isThumbnailNeeded(currentNoteGuid)) {
+               if (!noteCache.containsKey(guid)) {
                        js = new QByteArray();
                        // We need to prepend the note with <HEAD></HEAD> or encoded characters are ugly 
                        js.append("<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">");               
                        js = new QByteArray();
                        // We need to prepend the note with <HEAD></HEAD> or encoded characters are ugly 
                        js.append("<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">");               
@@ -4198,35 +4336,45 @@ public class NeverNote extends QMainWindow{
                        js.append("<style> img { max-width:100%; }</style>");
                        js.append("<style type=\"text/css\">en-spell { text-decoration: none; border-bottom: dotted 1px #cc0000; }</style>");
                        js.append("</head>");
                        js.append("<style> img { max-width:100%; }</style>");
                        js.append("<style type=\"text/css\">en-spell { text-decoration: none; border-bottom: dotted 1px #cc0000; }</style>");
                        js.append("</head>");
-                       formatter.setNote(currentNote, Global.pdfPreview());
+                       formatter.setNote(note, Global.pdfPreview());
                        js.append(formatter.rebuildNoteHTML());
                        js.append("</HTML>");
                        js.replace("<!DOCTYPE en-note SYSTEM 'http://xml.evernote.com/pub/enml.dtd'>", "");
                        js.replace("<!DOCTYPE en-note SYSTEM 'http://xml.evernote.com/pub/enml2.dtd'>", "");
                        js.replace("<?xml version='1.0' encoding='UTF-8'?>", "");
                        js.append(formatter.rebuildNoteHTML());
                        js.append("</HTML>");
                        js.replace("<!DOCTYPE en-note SYSTEM 'http://xml.evernote.com/pub/enml.dtd'>", "");
                        js.replace("<!DOCTYPE en-note SYSTEM 'http://xml.evernote.com/pub/enml2.dtd'>", "");
                        js.replace("<?xml version='1.0' encoding='UTF-8'?>", "");
-                       browser.getBrowser().setContent(js);
-                       noteCache.put(currentNoteGuid, js.toString());
+//             if (Global.enableHTMLEntitiesFix) {
+//                     browser.getBrowser().setContent(new QByteArray(StringEscapeUtils.unescapeHtml(js.toString())));
+//             } else
+                       browser.setContent(js);
+                       noteCache.put(guid, js.toString());
 
                        if (formatter.resourceError)
                                resourceErrorMessage();
 
                        if (formatter.resourceError)
                                resourceErrorMessage();
+                       if (formatter.formatError) {
+                               waitCursor(false);
+                            QMessageBox.information(this, tr("Error"),
+                                               tr("NeverNote had issues formatting this note." +
+                                               " To protect your data this note is being marked as read-only."));      
+                            waitCursor(true);
+                       }
                        readOnly = formatter.readOnly;
                        inkNote = formatter.inkNote;
                        if (readOnly)
                        readOnly = formatter.readOnly;
                        inkNote = formatter.inkNote;
                        if (readOnly)
-                               readOnlyCache.put(currentNoteGuid, true);
+                               readOnlyCache.put(guid, true);
                        if (inkNote)
                        if (inkNote)
-                               inkNoteCache.put(currentNoteGuid, true);
+                               inkNoteCache.put(guid, true);
                } else {
                        logger.log(logger.HIGH, "Note content is being pulled from the cache");
                } else {
                        logger.log(logger.HIGH, "Note content is being pulled from the cache");
-                       String cachedContent = formatter.modifyCachedTodoTags(noteCache.get(currentNoteGuid));
+                       String cachedContent = formatter.modifyCachedTodoTags(noteCache.get(guid));
                        js = new QByteArray(cachedContent);
                        js = new QByteArray(cachedContent);
-                       browser.getBrowser().setContent(js);
-                       if (readOnlyCache.containsKey(currentNoteGuid))
+                       browser.setContent(js);
+                       if (readOnlyCache.containsKey(guid))
                                        readOnly = true;
                                        readOnly = true;
-                       if (inkNoteCache.containsKey(currentNoteGuid))
+                       if (inkNoteCache.containsKey(guid))
                                        inkNote = true;
                }
                                        inkNote = true;
                }
-               if (conn.getNoteTable().isThumbnailNeeded(currentNoteGuid)) {
-                       thumbnailHTMLReady(currentNoteGuid, js, Global.calculateThumbnailZoom(js.toString()));
+               if (conn.getNoteTable().isThumbnailNeeded(guid)) {
+                       thumbnailHTMLReady(guid, js, Global.calculateThumbnailZoom(js.toString()));
                }
                if (readOnly || inkNote)
                        browser.getBrowser().page().setContentEditable(false);  // We don't allow editing of ink notes
                }
                if (readOnly || inkNote)
                        browser.getBrowser().page().setContentEditable(false);  // We don't allow editing of ink notes
@@ -4237,10 +4385,10 @@ public class NeverNote extends QMainWindow{
                tagButton.setEnabled(!readOnly);
                menuBar.noteDelete.setEnabled(!readOnly);
                menuBar.noteTags.setEnabled(!readOnly);
                tagButton.setEnabled(!readOnly);
                menuBar.noteDelete.setEnabled(!readOnly);
                menuBar.noteTags.setEnabled(!readOnly);
-               browser.setNote(currentNote);
+               browser.setNote(note);
                
                
-               if (currentNote != null && currentNote.getNotebookGuid() != null && 
-                               conn.getNotebookTable().isLinked(currentNote.getNotebookGuid())) {
+               if (note != null && note.getNotebookGuid() != null && 
+                               conn.getNotebookTable().isLinked(note.getNotebookGuid())) {
                        deleteButton.setEnabled(false);
                        menuBar.notebookDeleteAction.setEnabled(false);
                } else {
                        deleteButton.setEnabled(false);
                        menuBar.notebookDeleteAction.setEnabled(false);
                } else {
@@ -4260,32 +4408,32 @@ public class NeverNote extends QMainWindow{
                                nbooks.add(listManager.getNotebookIndex().get(i));
                }
                
                                nbooks.add(listManager.getNotebookIndex().get(i));
                }
                
-               browser.setTitle(currentNote.getTitle());
-               browser.setTag(getTagNamesForNote(currentNote));
-               browser.setAuthor(currentNote.getAttributes().getAuthor());
+               browser.setTitle(note.getTitle());
+               browser.setTag(getTagNamesForNote(note));
+               browser.setAuthor(note.getAttributes().getAuthor());
 
 
-               browser.setAltered(currentNote.getUpdated());
-               browser.setCreation(currentNote.getCreated());
-               if (currentNote.getAttributes().getSubjectDate() > 0)
-                       browser.setSubjectDate(currentNote.getAttributes().getSubjectDate());
+               browser.setAltered(note.getUpdated());
+               browser.setCreation(note.getCreated());
+               if (note.getAttributes().getSubjectDate() > 0)
+                       browser.setSubjectDate(note.getAttributes().getSubjectDate());
                else
                else
-                       browser.setSubjectDate(currentNote.getCreated());
-               browser.setUrl(currentNote.getAttributes().getSourceURL());
+                       browser.setSubjectDate(note.getCreated());
+               browser.setUrl(note.getAttributes().getSourceURL());
                
                FilterEditorTags tagFilter = new FilterEditorTags(conn, logger);
                
                FilterEditorTags tagFilter = new FilterEditorTags(conn, logger);
-               List<Tag> tagList = tagFilter.getValidTags(currentNote);
+               List<Tag> tagList = tagFilter.getValidTags(note);
                browser.setAllTags(tagList);
                
                browser.setAllTags(tagList);
                
-               browser.setCurrentTags(currentNote.getTagNames());
+               browser.setCurrentTags(note.getTagNames());
                noteDirty = false;
                noteDirty = false;
-               scrollToGuid(currentNoteGuid);
+               scrollToGuid(guid);
                
                browser.loadingData(false);
                if (thumbnailViewer.isActiveWindow())
                        thumbnailView();
                
                FilterEditorNotebooks notebookFilter = new FilterEditorNotebooks(conn, logger);
                
                browser.loadingData(false);
                if (thumbnailViewer.isActiveWindow())
                        thumbnailView();
                
                FilterEditorNotebooks notebookFilter = new FilterEditorNotebooks(conn, logger);
-               browser.setNotebookList(notebookFilter.getValidNotebooks(currentNote, listManager.getNotebookIndex()));
+               browser.setNotebookList(notebookFilter.getValidNotebooks(note, listManager.getNotebookIndex()));
 
                waitCursor(false);
                logger.log(logger.HIGH, "Leaving NeverNote.refreshEvernoteNote");
 
                waitCursor(false);
                logger.log(logger.HIGH, "Leaving NeverNote.refreshEvernoteNote");
@@ -4520,7 +4668,7 @@ public class NeverNote extends QMainWindow{
        newNote.setUpdateSequenceNum(0);
        newNote.setGuid(randint);
        newNote.setNotebookGuid(notebook);
        newNote.setUpdateSequenceNum(0);
        newNote.setGuid(randint);
        newNote.setNotebookGuid(notebook);
-       newNote.setTitle("");
+       newNote.setTitle("Untitled Note");
        newNote.setContent(noteString.toString());
        newNote.setDeleted(0);
        newNote.setCreated(System.currentTimeMillis());
        newNote.setContent(noteString.toString());
        newNote.setDeleted(0);
        newNote.setCreated(System.currentTimeMillis());
@@ -4562,6 +4710,7 @@ public class NeverNote extends QMainWindow{
        // If the window is hidden, then we want to popup this in an external window & 
        if (!isVisible())
                listDoubleClick();
        // If the window is hidden, then we want to popup this in an external window & 
        if (!isVisible())
                listDoubleClick();
+       waitCursor(false);
        logger.log(logger.HIGH, "Leaving NeverNote.addNote");
     }
     // Restore a note from the trash;
        logger.log(logger.HIGH, "Leaving NeverNote.addNote");
     }
     // Restore a note from the trash;
@@ -4597,9 +4746,8 @@ public class NeverNote extends QMainWindow{
     // it from the cache.
     @SuppressWarnings("unused")
        private void invalidateNoteCache(String guid, String content) {
     // it from the cache.
     @SuppressWarnings("unused")
        private void invalidateNoteCache(String guid, String content) {
-       String v = noteCache.remove(guid);
-//             if (guid.equals(currentNoteGuid) && !noteDirty)
-                       refreshEvernoteNote(true);
+       noteCache.remove(guid);
+               refreshEvernoteNote(true);
     }
     // Signal received that a note guid has changed
     @SuppressWarnings("unused")
     }
     // Signal received that a note guid has changed
     @SuppressWarnings("unused")
@@ -4778,6 +4926,7 @@ public class NeverNote extends QMainWindow{
                        notebookTree.selectGuid("");
                }
                notebookTreeSelection();
                        notebookTree.selectGuid("");
                }
                notebookTreeSelection();
+               refreshEvernoteNote(true);
        }
        // Merge notes
        @SuppressWarnings("unused")
        }
        // Merge notes
        @SuppressWarnings("unused")
@@ -4861,7 +5010,7 @@ public class NeverNote extends QMainWindow{
        // A resource within a note has had a guid change 
        @SuppressWarnings("unused")
        private void noteResourceGuidChanged(String noteGuid, String oldGuid, String newGuid) {
        // A resource within a note has had a guid change 
        @SuppressWarnings("unused")
        private void noteResourceGuidChanged(String noteGuid, String oldGuid, String newGuid) {
-               if (!oldGuid.equals(newGuid))
+               if (oldGuid != null && !oldGuid.equals(newGuid))
                        Global.resourceMap.put(oldGuid, newGuid);
        }
        // View a thumbnail of the note
                        Global.resourceMap.put(oldGuid, newGuid);
        }
        // View a thumbnail of the note
@@ -4890,11 +5039,11 @@ public class NeverNote extends QMainWindow{
                                        i=listManager.getMasterNoteIndex().size();
                                }
                        }
                                        i=listManager.getMasterNoteIndex().size();
                                }
                        }
-                       msg = "An error has happened while saving the note \"" +title+
-                       "\".\n\nThis is probably due to a document that is too complex for Nevernote to process.  "+
+                       msg = tr("An error has happened while saving the note \"") +title+
+                       tr("\".\n\nThis is probably due to a document that is too complex for Nevernote to process.  "+
                        "As a result, changes to the note may not be saved properly in the database."+
                        "\n\nA cached copy is being preserved so you can recover any data, but data may" +
                        "As a result, changes to the note may not be saved properly in the database."+
                        "\n\nA cached copy is being preserved so you can recover any data, but data may" +
-                       "\nbe lost.  Please review the note to recover any critical data before restarting.";
+                       "\nbe lost.  Please review the note to recover any critical data before restarting.");
                        
                        QMessageBox.information(this, tr("Error Saving Note"), tr(msg));
                }
                        
                        QMessageBox.information(this, tr("Error Saving Note"), tr(msg));
                }
@@ -4971,7 +5120,7 @@ public class NeverNote extends QMainWindow{
                        return;
                } catch (EDAMNotFoundException e) {
                        setMessage(tr("Note not found on server."));
                        return;
                } catch (EDAMNotFoundException e) {
                        setMessage(tr("Note not found on server."));
-                       QMessageBox.information(this, "Error", "This note could not be found on Evernote's servers.");
+                       QMessageBox.information(this, tr("Error"), tr("This note could not be found on Evernote's servers."));
                        return;
                } catch (TException e) {
                        setMessage("EDAMTransactionException: " +e.getMessage());
                        return;
                } catch (TException e) {
                        setMessage("EDAMTransactionException: " +e.getMessage());
@@ -5215,6 +5364,7 @@ public class NeverNote extends QMainWindow{
        private void resourceErrorMessage() {
                if (inkNote)
                        return;
        private void resourceErrorMessage() {
                if (inkNote)
                        return;
+               waitCursor(false);
                QMessageBox.information(this, tr("DOUGH!!!"), tr("Well, this is embarrassing."+
                "\n\nSome attachments or images for this note appear to be missing from my database.\n"+
                "In a perfect world this wouldn't happen, but it has.\n" +
                QMessageBox.information(this, tr("DOUGH!!!"), tr("Well, this is embarrassing."+
                "\n\nSome attachments or images for this note appear to be missing from my database.\n"+
                "In a perfect world this wouldn't happen, but it has.\n" +
@@ -5227,6 +5377,7 @@ public class NeverNote extends QMainWindow{
                "\n\nP.S. You might want to re-synchronize to see if it corrects this problem.\nWho knows, you might get lucky."));
                inkNote = true;
                browserWindow.setReadOnly(true);
                "\n\nP.S. You might want to re-synchronize to see if it corrects this problem.\nWho knows, you might get lucky."));
                inkNote = true;
                browserWindow.setReadOnly(true);
+               waitCursor(true);
        }
 
        
        }
 
        
@@ -5286,6 +5437,42 @@ public class NeverNote extends QMainWindow{
                refreshEvernoteNote(false);
                scrollToGuid(currentNoteGuid);
                waitCursor(false);
                refreshEvernoteNote(false);
                scrollToGuid(currentNoteGuid);
                waitCursor(false);
+               
+               // Check to see if there were any shared notebook errors
+               if (syncRunner.error && syncRunner.errorSharedNotebooks.size() > 0) {
+                       String guid = syncRunner.errorSharedNotebooks.get(0);
+                       String notebookGuid = conn.getLinkedNotebookTable().getLocalNotebookGuid(guid);
+                       String localName = listManager.getNotebookNameByGuid(notebookGuid);
+                       SharedNotebookSyncError syncDialog = new SharedNotebookSyncError(localName);
+                       syncDialog.exec();
+                       if (syncDialog.okPressed()) {
+                               if (syncDialog.doNothing.isChecked()) {
+                                       syncRunner.errorSharedNotebooksIgnored.put(guid, guid);
+                                       evernoteSync();
+                               }
+                               if (syncDialog.deleteNotebook.isChecked()) {
+                                       conn.getNoteTable().expungeNotesByNotebook(notebookGuid, true, false);
+                                       conn.getNotebookTable().expungeNotebook(notebookGuid, false);
+                                       conn.getLinkedNotebookTable().expungeNotebook(guid, false);
+                                       conn.getLinkedNotebookTable().expungeNotebook(guid, false);
+                                       evernoteSync();
+                               }
+/*                             if (syncDialog.convertToLocal.isChecked()) {
+                                       conn.getNotebookTable().convertFromSharedNotebook(notebookGuid, true);
+                                       conn.getLinkedNotebookTable().expungeNotebook(guid, false);
+                                       evernoteSync();
+                               }
+                               if (syncDialog.convertToShared.isChecked()) {
+                                       conn.getLinkedNotebookTable().expungeNotebook(guid, false);
+                                       conn.getNotebookTable().convertFromSharedNotebook(notebookGuid, false);
+                                       evernoteSync();
+                               } */
+                               refreshLists();
+                               return;
+                       }
+               }
+               
+               // Finalize the synchronization
                if (!syncRunner.error)
                        setMessage(tr("Synchronization Complete"));
                else
                if (!syncRunner.error)
                        setMessage(tr("Synchronization Complete"));
                else
@@ -5303,7 +5490,6 @@ public class NeverNote extends QMainWindow{
        }
        public void refreshLists() {
                logger.log(logger.EXTREME, "Entering NeverNote.refreshLists");
        }
        public void refreshLists() {
                logger.log(logger.EXTREME, "Entering NeverNote.refreshLists");
-               System.out.println("<><><><><><><><><><><><><><><><><><><><>");
                updateQuotaBar();
                listManager.refreshLists(currentNote, noteDirty, browserWindow.getContent());
                tagIndexUpdated(true);
                updateQuotaBar();
                listManager.refreshLists(currentNote, noteDirty, browserWindow.getContent());
                tagIndexUpdated(true);
@@ -5396,7 +5582,7 @@ public class NeverNote extends QMainWindow{
                if (!alive) {
                        tagDeadCount++;
                        if (tagDeadCount > MAX && !disableTagThreadCheck) {
                if (!alive) {
                        tagDeadCount++;
                        if (tagDeadCount > MAX && !disableTagThreadCheck) {
-                               QMessageBox.information(this, tr("A thread his died."), tr("It appears as the tag counter thread has died.  I recommend "+
+                               QMessageBox.information(this, tr("A thread has died."), tr("It appears as the tag counter thread has died.  I recommend "+
                                "checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry."));
                                disableTagThreadCheck = true;
                        }
                                "checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry."));
                                disableTagThreadCheck = true;
                        }
@@ -5407,7 +5593,7 @@ public class NeverNote extends QMainWindow{
                if (!alive) {
                        notebookThreadDeadCount++;
                        if (notebookThreadDeadCount > MAX && !disableNotebookThreadCheck) {
                if (!alive) {
                        notebookThreadDeadCount++;
                        if (notebookThreadDeadCount > MAX && !disableNotebookThreadCheck) {
-                               QMessageBox.information(this, tr("A thread his died."), tr("It appears as the notebook counter thread has died.  I recommend "+
+                               QMessageBox.information(this, tr("A thread has died."), tr("It appears as the notebook counter thread has died.  I recommend "+
                                        "checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry."));
                                disableNotebookThreadCheck=true;
                        }
                                        "checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry."));
                                disableNotebookThreadCheck=true;
                        }
@@ -5418,7 +5604,7 @@ public class NeverNote extends QMainWindow{
                if (!alive) {
                        trashDeadCount++;
                        if (trashDeadCount > MAX && !disableTrashThreadCheck) {
                if (!alive) {
                        trashDeadCount++;
                        if (trashDeadCount > MAX && !disableTrashThreadCheck) {
-                               QMessageBox.information(this, tr("A thread his died."), ("It appears as the trash counter thread has died.  I recommend "+
+                               QMessageBox.information(this, tr("A thread has died."), ("It appears as the trash counter thread has died.  I recommend "+
                                        "checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry."));
                                disableTrashThreadCheck = true;
                        }
                                        "checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry."));
                                disableTrashThreadCheck = true;
                        }
@@ -5429,7 +5615,7 @@ public class NeverNote extends QMainWindow{
                if (!alive) {
                        saveThreadDeadCount++;
                        if (saveThreadDeadCount > MAX && !disableSaveThreadCheck) {
                if (!alive) {
                        saveThreadDeadCount++;
                        if (saveThreadDeadCount > MAX && !disableSaveThreadCheck) {
-                               QMessageBox.information(this, tr("A thread his died."), tr("It appears as the note saver thread has died.  I recommend "+
+                               QMessageBox.information(this, tr("A thread has died."), tr("It appears as the note saver thread has died.  I recommend "+
                                        "checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry."));
                                disableSaveThreadCheck = true;
                        }
                                        "checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry."));
                                disableSaveThreadCheck = true;
                        }
@@ -5439,7 +5625,7 @@ public class NeverNote extends QMainWindow{
                if (!syncThread.isAlive()) {
                        syncThreadDeadCount++;
                        if (syncThreadDeadCount > MAX && !disableSyncThreadCheck) {
                if (!syncThread.isAlive()) {
                        syncThreadDeadCount++;
                        if (syncThreadDeadCount > MAX && !disableSyncThreadCheck) {
-                               QMessageBox.information(this, tr("A thread his died."), tr("It appears as the synchronization thread has died.  I recommend "+
+                               QMessageBox.information(this, tr("A thread has died."), tr("It appears as the synchronization thread has died.  I recommend "+
                                        "checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry."));
                                disableSyncThreadCheck = true;
                        }
                                        "checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry."));
                                disableSyncThreadCheck = true;
                        }
@@ -5449,7 +5635,7 @@ public class NeverNote extends QMainWindow{
                if (!indexThread.isAlive()) {
                        indexThreadDeadCount++;
                        if (indexThreadDeadCount > MAX && !disableIndexThreadCheck) {
                if (!indexThread.isAlive()) {
                        indexThreadDeadCount++;
                        if (indexThreadDeadCount > MAX && !disableIndexThreadCheck) {
-                               QMessageBox.information(this, tr("A thread his died."), tr("It appears as the index thread has died.  I recommend "+
+                               QMessageBox.information(this, tr("A thread has died."), tr("It appears as the index thread has died.  I recommend "+
                                        "checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry."));
                                disableIndexThreadCheck = true;
                        }
                                        "checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry."));
                                disableIndexThreadCheck = true;
                        }
@@ -5603,7 +5789,7 @@ public class NeverNote extends QMainWindow{
                
                
        waitCursor(true);
                
                
        waitCursor(true);
-       setMessage("Importing Notes");
+       setMessage(tr("Importing Notes"));
        saveNote();
        
                if (selectedNoteGUIDs.size() == 0 && !currentNoteGuid.equals("")) 
        saveNote();
        
                if (selectedNoteGUIDs.size() == 0 && !currentNoteGuid.equals("")) 
@@ -5635,7 +5821,7 @@ public class NeverNote extends QMainWindow{
        setMessage(tr("Notes have been imported."));
        waitCursor(false);
        
        setMessage(tr("Notes have been imported."));
        waitCursor(false);
        
-       setMessage("Import completed.");
+       setMessage(tr("Import completed."));
  
 
        waitCursor(false);
  
 
        waitCursor(false);
@@ -5651,6 +5837,83 @@ public class NeverNote extends QMainWindow{
                duplicateNote(currentNoteGuid);
        }
 
                duplicateNote(currentNoteGuid);
        }
 
+       //**************************************************
+       //* Action from when a user clicks Copy As URL
+       //**************************************************
+       @SuppressWarnings("unused")
+       private void copyAsUrlClicked() {
+               QClipboard clipboard = QApplication.clipboard();
+               QMimeData mime = new QMimeData();
+               String url;
+               mime.setText(currentNoteGuid);
+               List<QUrl> urls = new ArrayList<QUrl>();
+               
+               // Start building the URL
+               User user = Global.getUserInformation();
+
+               // Check that we have everything we need
+               if ((user.getShardId().equals("") || user.getId() == 0) && !Global.bypassSynchronizationWarning()) {
+                       SynchronizationRequiredWarning warning = new SynchronizationRequiredWarning(this);
+                       warning.exec();
+                       if (!warning.neverSynchronize())
+                               return;
+                       else {
+                               Global.setBypassSynchronizationWarning(true);
+                               user.setShardId("s0");
+                               user.setId(0);
+                       }       
+               }
+
+               
+               // Start building a list of URLs based upon the selected notes
+       noteTableView.showColumn(Global.noteTableGuidPosition);
+       
+       List<QModelIndex> selections = noteTableView.selectionModel().selectedRows();
+       if (!Global.isColumnVisible("guid"))
+               noteTableView.hideColumn(Global.noteTableGuidPosition);
+
+               // Check that the note is either synchronized, or in a local notebook
+               for (int i=0; i<selections.size(); i++) {
+                       QModelIndex index;
+                       int row = selections.get(i).row();
+               index = noteTableView.proxyModel.index(row, Global.noteTableGuidPosition);
+               SortedMap<Integer, Object> ix = noteTableView.proxyModel.itemData(index);
+                       String selectedGuid = (String)ix.values().toArray()[0];
+                       
+                       Note n = conn.getNoteTable().getNote(selectedGuid, false, false, false, false, false);
+                       if (n.getUpdateSequenceNum() == 0 && !conn.getNotebookTable().isNotebookLocal(n.getNotebookGuid())) {
+                               QMessageBox.critical(this, tr("Please Synchronize") ,tr("Please either synchronize or move any " +
+                                               "new notes to a local notebook."));
+                               return; 
+                       }
+               }
+
+               // Start building the URLs
+       for (int i=0; i<selections.size(); i++) {
+               QModelIndex index;
+                       int row = selections.get(i).row();
+               index = noteTableView.proxyModel.index(row, Global.noteTableGuidPosition);
+               SortedMap<Integer, Object> ix = noteTableView.proxyModel.itemData(index);
+                       String selectedGuid = (String)ix.values().toArray()[0];
+                       mime.setText(selectedGuid);
+               
+                       String lid;
+                       String gid;
+                       Note selectedNote = conn.getNoteTable().getNote(selectedGuid, false, false, false, false, false);
+                       if (selectedNote.getUpdateSequenceNum() > 0) {
+                               gid = selectedGuid;
+                               lid = selectedGuid;
+                       } else {
+                               gid = "00000000-0000-0000-0000-000000000000";
+                               lid = selectedGuid;
+                       }
+                       url = new String("evernote://///view/") + new String(user.getId() + "/" +user.getShardId() +"/"
+                                       +gid+"/"+lid +"/");
+                       urls.add(new QUrl(url));
+       }
+               mime.setUrls(urls);
+               clipboard.setMimeData(mime);
+       }
        
        
        //**************************************************
        
        
        //**************************************************
@@ -5938,7 +6201,7 @@ public class NeverNote extends QMainWindow{
                                String content = browser.getContent().substring(0,position) +
                                                 newSegment +
                                                 browser.getContent().substring(endPos);
                                String content = browser.getContent().substring(0,position) +
                                                 newSegment +
                                                 browser.getContent().substring(endPos);
-                               browser.getBrowser().setContent(new QByteArray(content));;
+                               browser.setContent(new QByteArray(content));;
                        }
                        
                        position = browser.getContent().indexOf("en-tag=\"en-media\" guid=\""+guid+"\" type=", position+1);
                        }
                        
                        position = browser.getContent().indexOf("en-tag=\"en-media\" guid=\""+guid+"\" type=", position+1);
@@ -5995,4 +6258,39 @@ public class NeverNote extends QMainWindow{
                        return true;
        }
 
                        return true;
        }
 
+       //*************************************************
+       //* View / Hide source HTML for a note
+       //*************************************************
+       public void viewSource() {
+               browserWindow.showSource(menuBar.viewSource.isChecked());
+       }
+       //*************************************************
+       // Block the program.  This is used for things  
+       // like async web calls.
+       //*************************************************
+       @SuppressWarnings("unused")
+       private void blockApplication(BrowserWindow b) {
+               // Block all signals
+               waitCursor(true);
+               blockSignals(true);
+               
+               blockTimer = new QTimer();
+               blockTimer.setSingleShot(true);
+               blockTimer.setInterval(15000);
+               blockTimer.timeout.connect(this, "unblockApplication()");
+               blockingWindow  = b;
+               blockTimer.start();
+       }
+       
+       @SuppressWarnings("unused")
+       private void unblockApplication() {
+               waitCursor(false);
+               if (blockingWindow != null && new GregorianCalendar().getTimeInMillis() > blockingWindow.unblockTime && blockingWindow.unblockTime != -1) {
+                       QMessageBox.critical(null, tr("No Response from CodeCogs") ,tr("Unable to contact CodeCogs for LaTeX formula."));
+                       blockingWindow.unblockTime = -1;
+                       blockingWindow.awaitingHttpResponse = false;
+               }
+               blockingWindow = null;
+               blockSignals(false);
+       }
 }
 }