OSDN Git Service

Add fix for stack names when updating notebooks.
[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / NeverNote.java
index 8ee35d5..3b55dc0 100644 (file)
@@ -95,7 +95,6 @@ import com.trolltech.qt.gui.QApplication;
 import com.trolltech.qt.gui.QCloseEvent;
 import com.trolltech.qt.gui.QColor;
 import com.trolltech.qt.gui.QComboBox;
-import com.trolltech.qt.gui.QComboBox.InsertPolicy;
 import com.trolltech.qt.gui.QCursor;
 import com.trolltech.qt.gui.QDesktopServices;
 import com.trolltech.qt.gui.QDialog;
@@ -106,8 +105,8 @@ import com.trolltech.qt.gui.QGridLayout;
 import com.trolltech.qt.gui.QHBoxLayout;
 import com.trolltech.qt.gui.QIcon;
 import com.trolltech.qt.gui.QImage;
+import com.trolltech.qt.gui.QKeySequence;
 import com.trolltech.qt.gui.QLabel;
-import com.trolltech.qt.gui.QListWidget;
 import com.trolltech.qt.gui.QMainWindow;
 import com.trolltech.qt.gui.QMenu;
 import com.trolltech.qt.gui.QMessageBox;
@@ -117,6 +116,7 @@ import com.trolltech.qt.gui.QPalette.ColorRole;
 import com.trolltech.qt.gui.QPixmap;
 import com.trolltech.qt.gui.QPrintDialog;
 import com.trolltech.qt.gui.QPrinter;
+import com.trolltech.qt.gui.QShortcut;
 import com.trolltech.qt.gui.QSizePolicy;
 import com.trolltech.qt.gui.QSizePolicy.Policy;
 import com.trolltech.qt.gui.QSpinBox;
@@ -143,6 +143,7 @@ import cx.fbn.nevernote.dialog.DatabaseLoginDialog;
 import cx.fbn.nevernote.dialog.DatabaseStatus;
 import cx.fbn.nevernote.dialog.FindDialog;
 import cx.fbn.nevernote.dialog.IgnoreSync;
+import cx.fbn.nevernote.dialog.LogFileDialog;
 import cx.fbn.nevernote.dialog.LoginDialog;
 import cx.fbn.nevernote.dialog.NotebookArchive;
 import cx.fbn.nevernote.dialog.NotebookEdit;
@@ -153,6 +154,7 @@ import cx.fbn.nevernote.dialog.SetIcon;
 import cx.fbn.nevernote.dialog.ShareNotebook;
 import cx.fbn.nevernote.dialog.StackNotebook;
 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;
@@ -165,6 +167,7 @@ import cx.fbn.nevernote.gui.ExternalBrowse;
 import cx.fbn.nevernote.gui.MainMenuBar;
 import cx.fbn.nevernote.gui.NotebookTreeWidget;
 import cx.fbn.nevernote.gui.SavedSearchTreeWidget;
+import cx.fbn.nevernote.gui.SearchPanel;
 import cx.fbn.nevernote.gui.TableView;
 import cx.fbn.nevernote.gui.TagTreeWidget;
 import cx.fbn.nevernote.gui.Thumbnailer;
@@ -212,6 +215,7 @@ public class NeverNote extends QMainWindow{
     public BrowserWindow       browserWindow;                          // Window containing browser & labels
     public QToolBar            toolBar;                                        // The tool bar under the menu
     QComboBox                          searchField;                            // search filter bar on the toolbar;
+    QShortcut                          searchShortcut;                         // Shortcut to search bar
     boolean                                    searchPerformed = false;        // Search was done?
     QuotaProgressBar           quotaBar;                                       // The current quota usage
     
@@ -280,6 +284,8 @@ public class NeverNote extends QMainWindow{
     QSpinBox                   zoomSpinner;                            // Zoom zoom
     QAction                            searchClearButton;                      // Clear the search field
     
+    SearchPanel                        searchLayout;                           // Widget to hold search field, zoom, & quota
+    
     QSplitter                  mainLeftRightSplitter;          // main splitter for left/right side
     QSplitter                  leftSplitter1;                          // first left hand splitter
     QSplitter                  browserIndexSplitter;           // splitter between note index & note text
@@ -299,6 +305,12 @@ public class NeverNote extends QMainWindow{
     int                                        tagDeadCount=0;                         // number of consecutive dead times for the tag thread
     int                                        trashDeadCount=0;                       // number of consecutive dead times for the trash thread
     int                                saveThreadDeadCount=0;          // number of consecutive dead times for the save thread
+    boolean                            disableTagThreadCheck=false;
+    boolean                            disableNotebookThreadCheck=false;
+    boolean                            disableTrashThreadCheck=false;
+    boolean                            disableSaveThreadCheck=false;
+    boolean                            disableSyncThreadCheck=false;
+    boolean                            disableIndexThreadCheck=false;
     
     HashMap<String, String>            noteCache;                      // Cash of note content 
     HashMap<String, Boolean>   readOnlyCache;          // List of cashe notes that are read-only
@@ -319,6 +331,8 @@ public class NeverNote extends QMainWindow{
     private boolean            closeAction = false;            // Used to say when to close or when to minimize
     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 long               blockTime;                                      // When the app. is blocked, this is the time to unblock it.
     
     
     String iconPath = new String("classpath:cx/fbn/nevernote/icons/");
@@ -341,8 +355,8 @@ public class NeverNote extends QMainWindow{
             QMessageBox.critical(null, tr("Database Connection Error") ,msg);
                        System.exit(16);
                }
-
-               thread().setPriority(Thread.MAX_PRIORITY);
+               setObjectName("mainWindow");
+//             thread().setPriority(Thread.MAX_PRIORITY);
                
                logger = new ApplicationLogger("nevernote.log");
                logger.log(logger.HIGH, "Starting Application");
@@ -390,7 +404,9 @@ public class NeverNote extends QMainWindow{
         listManager = new ListManager(conn, logger);
         
                logger.log(logger.EXTREME, "Building index runners & timers");
-        indexRunner = new IndexRunner("indexRunner.log", Global.getDatabaseUrl(), Global.getDatabaseUserid(), Global.getDatabaseUserPassword(), Global.cipherPassword);
+        indexRunner = new IndexRunner("indexRunner.log", 
+                       Global.getDatabaseUrl(), Global.getIndexDatabaseUrl(), Global.getResourceDatabaseUrl(),
+                       Global.getDatabaseUserid(), Global.getDatabaseUserPassword(), Global.cipherPassword);
                indexThread = new QThread(indexRunner, "Index Thread");
         indexRunner.indexAttachmentsLocally = Global.indexAttachmentsLocally();
                indexThread.start();
@@ -407,7 +423,9 @@ public class NeverNote extends QMainWindow{
                                
                logger.log(logger.EXTREME, "Setting sync thread & timers");
                syncThreadsReady=1;
-               syncRunner = new SyncRunner("syncRunner.log", Global.getDatabaseUrl(), Global.getDatabaseUserid(), Global.getDatabaseUserPassword(), Global.cipherPassword);
+               syncRunner = new SyncRunner("syncRunner.log", 
+                               Global.getDatabaseUrl(), Global.getIndexDatabaseUrl(), Global.getResourceDatabaseUrl(),
+                               Global.getDatabaseUserid(), Global.getDatabaseUserPassword(), Global.cipherPassword);
                syncTime = new SyncTimes().timeValue(Global.getSyncInterval());
                syncTimer = new QTimer();
                syncTimer.timeout.connect(this, "syncTimer()");
@@ -429,7 +447,9 @@ public class NeverNote extends QMainWindow{
                
                logger.log(logger.EXTREME, "Starting thumnail thread");
                pdfReadyQueue = new ArrayList<String>();
-               thumbnailRunner = new ThumbnailRunner("thumbnailRunner.log", Global.getDatabaseUrl(), Global.getDatabaseUserid(), Global.getDatabaseUserPassword(), Global.cipherPassword);
+               thumbnailRunner = new ThumbnailRunner("thumbnailRunner.log", 
+                               Global.getDatabaseUrl(), Global.getIndexDatabaseUrl(), Global.getResourceDatabaseUrl(),
+                               Global.getDatabaseUserid(), Global.getDatabaseUserPassword(), Global.cipherPassword);
                thumbnailThread = new QThread(thumbnailRunner, "Thumbnail Thread");
                thumbnailRunner.noteSignal.thumbnailPageReady.connect(this, "thumbnailHTMLReady(String,QByteArray,Integer)");
                thumbnailThread.start();
@@ -471,13 +491,39 @@ public class NeverNote extends QMainWindow{
         trashTree = new TrashTreeWidget();
         noteTableView = new TableView(logger, listManager);
         
+        
+        searchField = new QComboBox();
+        searchField.setObjectName("searchField");
+        //setStyleSheet("QComboBox#searchField { background-color: yellow }");
+        searchField.setEditable(true);
+       searchField.activatedIndex.connect(this, "searchFieldChanged()");
+       searchField.setDuplicatesEnabled(false);
+       searchField.editTextChanged.connect(this,"searchFieldTextChanged(String)");
+       searchShortcut = new QShortcut(this);
+       setupShortcut(searchShortcut, "Focus_Search");
+       searchShortcut.activated.connect(this, "focusSearch()");
+        
+       quotaBar = new QuotaProgressBar();
+       // Setup the zoom
+       zoomSpinner = new QSpinBox();
+       zoomSpinner.setMinimum(10);
+       zoomSpinner.setMaximum(1000);
+       zoomSpinner.setAccelerated(true);
+       zoomSpinner.setSingleStep(10);
+       zoomSpinner.setValue(100);
+       zoomSpinner.valueChanged.connect(this, "zoomChanged()");
+       
+       searchLayout = new SearchPanel(searchField, quotaBar, notebookTree, zoomSpinner);
+        
+        
         QGridLayout leftGrid = new QGridLayout();
+        leftSplitter1.setContentsMargins(5, 0, 0, 7);
         leftSplitter1.setLayout(leftGrid);
-        leftGrid.addWidget(notebookTree, 1, 1);
+       leftGrid.addWidget(searchLayout,1,1);
         leftGrid.addWidget(tagTree,2,1);
         leftGrid.addWidget(attributeTree,3,1);
         leftGrid.addWidget(savedSearchTree,4,1);
-        leftGrid.addWidget(trashTree, 5, 1);
+        leftGrid.addWidget(trashTree,5, 1);
         
         // Setup the browser window
         noteCache = new HashMap<String,String>();
@@ -495,14 +541,6 @@ public class NeverNote extends QMainWindow{
                mainLeftRightSplitter.addWidget(noteTableView);
                mainLeftRightSplitter.addWidget(browserWindow); 
         }
-        
-        searchField = new QComboBox();
-        searchField.setEditable(true);
-       searchField.activatedIndex.connect(this, "searchFieldChanged()");
-       searchField.setDuplicatesEnabled(false);
-       searchField.editTextChanged.connect(this,"searchFieldTextChanged(String)");
-        
-       quotaBar = new QuotaProgressBar();
        
        // Setup the thumbnail viewer
        thumbnailViewer = new ThumbnailViewer();
@@ -529,13 +567,20 @@ public class NeverNote extends QMainWindow{
                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.setVisible(Global.isWindowVisible("tagTree"));
+               leftSplitter1.setVisible(Global.isWindowVisible("leftPanel"));
                tagTree.noteSignal.tagsAdded.connect(this, "tagsAdded(String, String)");
                menuBar.hideTags.setChecked(Global.isWindowVisible("tagTree"));
                listManager.tagSignal.listChanged.connect(this, "reloadTagTree()");
+               
+               if (!Global.isWindowVisible("zoom")) {
+                       searchLayout.hideZoom();
+                       menuBar.hideZoom.setChecked(false);
+               } 
        
                notebookTree.setDeleteAction(menuBar.notebookDeleteAction);
                notebookTree.setEditAction(menuBar.notebookEditAction);
@@ -565,8 +610,6 @@ public class NeverNote extends QMainWindow{
                noteTableView.setNoteHistoryAction(menuBar.noteOnlineHistoryAction);
                noteTableView.noteSignal.titleColorChanged.connect(this, "titleColorChanged(Integer)");
                noteTableView.setMergeNotesAction(menuBar.noteMergeAction);
-               noteTableView.rowChanged.connect(this, "scrollToGuid(String)");
-               noteTableView.resetViewport.connect(this, "scrollToCurrentGuid()");
                noteTableView.doubleClicked.connect(this, "listDoubleClick()");
                listManager.trashSignal.countChanged.connect(trashTree, "updateCounts(Integer)");
                
@@ -590,6 +633,15 @@ public class NeverNote extends QMainWindow{
                        menuBar.hideLeftSide.setChecked(true);
                if (Global.isWindowVisible("noteInformation"))
                        toggleNoteInformation();
+               quotaBar.setVisible(Global.isWindowVisible("quota"));
+               if (!quotaBar.isVisible())
+                       menuBar.hideQuota.setChecked(false);
+               searchField.setVisible(Global.isWindowVisible("searchField"));
+               if (!searchField.isVisible())
+                       menuBar.hideSearch.setChecked(false);
+               
+               if (searchField.isHidden() && quotaBar.isHidden() && zoomSpinner.isHidden() && notebookTree.isHidden())
+                       searchLayout.hide();
                
                setMenuBar(menuBar);
                setupToolBar();
@@ -694,6 +746,11 @@ public class NeverNote extends QMainWindow{
                mainLeftRightSplitter.addWidget(browserWindow); 
         }
         
+               messageTimer = new QTimer();
+               messageTimer.timeout.connect(this, "clearMessage()");
+               messageTimer.setInterval(1000*15);
+               clearMessage();
+        
        int sortCol = Global.getSortColumn();
                int sortOrder = Global.getSortOrder();
                noteTableView.sortByColumn(sortCol, SortOrder.resolve(sortOrder));
@@ -774,7 +831,9 @@ public class NeverNote extends QMainWindow{
                         Global.getDatabaseUserPassword(), Global.cipherPassword);
             }
         }
-               DatabaseConnection dbConn = new DatabaseConnection(logger,Global.getDatabaseUrl(), Global.getDatabaseUserid(), Global.getDatabaseUserPassword(), Global.cipherPassword, 0);
+               DatabaseConnection dbConn = new DatabaseConnection(logger,Global.getDatabaseUrl(), 
+                               Global.getIndexDatabaseUrl(), Global.getResourceDatabaseUrl(),
+                               Global.getDatabaseUserid(), Global.getDatabaseUserPassword(), Global.cipherPassword, 0);
        return dbConn;
     }
     
@@ -785,8 +844,8 @@ public class NeverNote extends QMainWindow{
         try {
                Statement st = conn.getConnection().createStatement();  
                st.execute("shutdown");
-               if (QMessageBox.question(this, "Are you sure"
-                               "Are you sure you wish to encrypt the database?",
+               if (QMessageBox.question(this, tr("Are you sure")
+                               tr("Are you sure you wish to encrypt the database?"),
                                QMessageBox.StandardButton.Yes, 
                                QMessageBox.StandardButton.No) == StandardButton.Yes.value()) {
                        ChangeFileEncryption.execute(dbPath, dbName, encryptCipher, null, Global.cipherPassword.toCharArray(), true);
@@ -907,17 +966,17 @@ public class NeverNote extends QMainWindow{
                externalFileEditedSaver();
                if (Global.isConnected && Global.synchronizeOnClose()) {
                        setMessage(tr("Performing synchronization before closing."));
+                       syncRunner.syncNeeded = true;
                        syncRunner.addWork("SYNC");
+               } else {
+                       syncRunner.keepRunning = false;
                }
+               syncRunner.addWork("STOP");
                setMessage("Closing Program.");
                threadMonitorTimer.stop();
 
-               syncRunner.addWork("STOP");
-               syncRunner.keepRunning = false;
                thumbnailRunner.addWork("STOP");
-               syncRunner.keepRunning = false;
                indexRunner.addWork("STOP");
-               syncRunner.keepRunning = false;
                saveNote();
                listManager.stop();
                saveWindowState();
@@ -970,14 +1029,20 @@ public class NeverNote extends QMainWindow{
                } catch (InterruptedException e1) {
                        e1.printStackTrace();
                }
-               if (!syncRunner.isIdle()) {
-                       try {
-                               logger.log(logger.MEDIUM, "Waiting for syncThread to stop");
-                               syncThread.join();
-                               logger.log(logger.MEDIUM, "Sync thread has stopped");
-                       } catch (InterruptedException e1) {
-                               e1.printStackTrace();
+               
+               if (!syncRunner.thread().isAlive()) {
+                       logger.log(logger.MEDIUM, "Waiting for syncThread to stop");
+                       if (syncRunner.thread().isAlive()) {
+                               System.out.println(tr("Synchronizing.  Please be patient."));
+                               for(;syncRunner.thread().isAlive();) {
+                                       try {
+                                               wait(10);
+                                       } catch (InterruptedException e) {
+                                               e.printStackTrace();
+                                       }
+                               }
                        }
+                       logger.log(logger.MEDIUM, "Sync thread has stopped");
                }
 
                if (encryptOnShutdown) {
@@ -1002,11 +1067,25 @@ public class NeverNote extends QMainWindow{
        }
        public void setMessage(String s) {
                logger.log(logger.HIGH, "Entering NeverNote.setMessage");
+               
+               statusBar.show();
                logger.log(logger.HIGH, "Message: " +s);
                statusBar.showMessage(s);
                emitLog.add(s);
+               
+
+               messageTimer.stop();
+               messageTimer.setSingleShot(true);
+               messageTimer.start();
+               
+               
                logger.log(logger.HIGH, "Leaving NeverNote.setMessage");
        }
+       
+       private void clearMessage() {
+               statusBar.clearMessage();
+               statusBar.hide();
+       }
                
        private void waitCursor(boolean wait) {
                if (wait) {
@@ -1017,6 +1096,7 @@ public class NeverNote extends QMainWindow{
                        while (QApplication.overrideCursor() != null)
                                QApplication.restoreOverrideCursor();
                }
+               listManager.refreshCounters();
        }
        
        private void setupIndexListeners() {
@@ -1068,6 +1148,15 @@ public class NeverNote extends QMainWindow{
            browser.resourceSignal.contentChanged.connect(this, "externalFileEdited(String)");
        }
 
+       //**************************************************
+       //* Setup shortcuts
+       //**************************************************
+       private void setupShortcut(QShortcut action, String text) {
+               if (!Global.shortcutKeys.containsAction(text))
+                       return;
+               action.setKey(new QKeySequence(Global.shortcutKeys.getShortcut(text)));
+       }
+       
        //***************************************************************
        //***************************************************************
        //* Settings and look & feel
@@ -1117,6 +1206,7 @@ public class NeverNote extends QMainWindow{
        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");   
@@ -1135,16 +1225,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(objectName(), saveState());
        }    
        // 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");
-               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()) {
-                       fileName = Global.getFileManager().getQssDirPath("default.qss");
+                       fileName = Global.getFileManager().getQssDirPath(styleSheetName);
                        file = new QFile(fileName);
                }
                file.open(OpenModeFlag.ReadOnly);
@@ -1207,6 +1300,32 @@ public class NeverNote extends QMainWindow{
                Global.setColumnWidth("noteTableGuidPosition", width);
        }
        
+       @SuppressWarnings("unused")
+       private void toggleSearchWindow() {
+               logger.log(logger.HIGH, "Entering NeverNote.toggleSearchWindow");
+       searchLayout.toggleSearchField();
+       menuBar.hideSearch.setChecked(searchField.isVisible());
+       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();
+       menuBar.hideQuota.setChecked(quotaBar.isVisible());
+       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();
+       menuBar.hideZoom.setChecked(zoomSpinner.isVisible());
+       Global.saveWindowVisible("zoom", zoomSpinner.isVisible());
+       logger.log(logger.HIGH, "Leaving NeverNote.toggleZoomWindow");
+    }  
+       
+       
        
     //***************************************************************
     //***************************************************************
@@ -1274,6 +1393,9 @@ public class NeverNote extends QMainWindow{
        listManager.setSelectedNotebooks(selectedNotebookGUIDs);
        listManager.loadNotesIndex();
        noteIndexUpdated(false);
+       refreshEvernoteNote(true);
+       listManager.refreshCounters = true;
+       listManager.refreshCounters();
                logger.log(logger.HIGH, "Leaving NeverNote.notebookTreeSelection");
 
     }
@@ -1316,17 +1438,17 @@ public class NeverNote extends QMainWindow{
                if (!found)
                        selectedNotebookGUIDs.remove(i);
        }
+       listManager.refreshCounters = true;
+       listManager.refreshCounters();
        notebookTree.blockSignals(false);
        
                logger.log(logger.HIGH, "Leaving NeverNote.notebookIndexUpdated");
     }
     // Show/Hide note information
+       @SuppressWarnings("unused")
        private void toggleNotebookWindow() {
                logger.log(logger.HIGH, "Entering NeverNote.toggleNotebookWindow");
-       if (notebookTree.isVisible())
-               notebookTree.hide();
-       else
-               notebookTree.show();
+               searchLayout.toggleNotebook();
        menuBar.hideNotebooks.setChecked(notebookTree.isVisible());
        Global.saveWindowVisible("notebookTree", notebookTree.isVisible());
        logger.log(logger.HIGH, "Leaving NeverNote.toggleNotebookWindow");
@@ -1441,7 +1563,8 @@ public class NeverNote extends QMainWindow{
                if (guid.equalsIgnoreCase("STACK")) {
                        conn.getNotebookTable().renameStacks(currentSelection.text(0), edit.getNotebook());
                        for (int j=0; j<listManager.getNotebookIndex().size(); j++) {
-                               if (listManager.getNotebookIndex().get(j).getStack().equalsIgnoreCase(currentSelection.text(0)))
+                               if (listManager.getNotebookIndex().get(j).getStack() != null && 
+                                       listManager.getNotebookIndex().get(j).getStack().equalsIgnoreCase(currentSelection.text(0)))
                                                listManager.getNotebookIndex().get(j).setStack(edit.getNotebook());
                        }
                        conn.getNotebookTable().renameStacks(currentSelection.text(0), edit.getNotebook());
@@ -1825,6 +1948,14 @@ public class NeverNote extends QMainWindow{
                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())
@@ -1838,6 +1969,11 @@ public class NeverNote extends QMainWindow{
                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);
@@ -1852,7 +1988,8 @@ public class NeverNote extends QMainWindow{
                logger.log(logger.HIGH, "Entering NeverNote.reloadTagTree");
                tagIndexUpdated(reload);
                boolean filter = false;
-               listManager.countTagResults(listManager.getNoteIndex());
+               if (reload)
+                       listManager.countTagResults(listManager.getNoteIndex());
                if (notebookTree.selectedItems().size() > 0 
                                                  && !notebookTree.selectedItems().get(0).text(0).equalsIgnoreCase("All Notebooks"))
                                                  filter = true;
@@ -1972,9 +2109,16 @@ public class NeverNote extends QMainWindow{
                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);
+       refreshEvernoteNote(true);
+       listManager.refreshCounters = true;
+       listManager.refreshCounters();
        logger.log(logger.HIGH, "Leaving NeverNote.tagTreeSelection");
     }
     // trigger the tag index to be refreshed
@@ -1994,6 +2138,7 @@ public class NeverNote extends QMainWindow{
                        tagTree.setIcons(conn.getTagTable().getAllIcons());
                        tagTree.load(listManager.getTagIndex());
                }
+
        for (int i=selectedTagGUIDs.size()-1; i>=0; i--) {
                boolean found = tagTree.selectGuid(selectedTagGUIDs.get(i));
                if (!found)
@@ -2005,6 +2150,7 @@ public class NeverNote extends QMainWindow{
        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())
@@ -2113,6 +2259,7 @@ public class NeverNote extends QMainWindow{
                tagTree.clearSelection();
                menuBar.noteRestoreAction.setVisible(false);
                menuBar.tagEditAction.setEnabled(false);
+               menuBar.tagMergeAction.setEnabled(false);
                menuBar.tagDeleteAction.setEnabled(false);
                menuBar.tagIconAction.setEnabled(false);
                selectedTagGUIDs.clear();
@@ -2151,7 +2298,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();
+       }
        
     //***************************************************************
     //***************************************************************
@@ -2344,6 +2521,7 @@ public class NeverNote extends QMainWindow{
        
     }
     // Show/Hide note information
+       @SuppressWarnings("unused")
        private void toggleSavedSearchWindow() {
                logger.log(logger.HIGH, "Entering NeverNote.toggleSavedSearchWindow");
        if (savedSearchTree.isVisible())
@@ -2401,7 +2579,6 @@ public class NeverNote extends QMainWindow{
        private void databaseStatus() {
                waitCursor(true);
                indexRunner.interrupt = true;
-               thumbnailRunner.interrupt = true;
                int dirty = conn.getNoteTable().getDirtyCount();
                int unindexed = conn.getNoteTable().getUnindexedCount();
                DatabaseStatus status = new DatabaseStatus();
@@ -2465,15 +2642,8 @@ public class NeverNote extends QMainWindow{
        @SuppressWarnings("unused")
        private void logger() {
                logger.log(logger.HIGH, "Entering NeverNote.logger");
-               QDialog dialog = new QDialog(this);
-               QHBoxLayout layout = new QHBoxLayout();
-               QListWidget textBox = new QListWidget();
-               layout.addWidget(textBox);
-               textBox.addItems(emitLog);
-               
-               dialog.setLayout(layout);
-               dialog.setWindowTitle(tr("Mesasge Log"));
-               dialog.show();
+               LogFileDialog dialog = new LogFileDialog(emitLog);
+               dialog.exec();
                logger.log(logger.HIGH, "Leaving NeverNote.logger");
        }
        // Menu option "help/about" was selected
@@ -2493,7 +2663,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>"
-                                                               +"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
@@ -2504,16 +2676,10 @@ public class NeverNote extends QMainWindow{
                hidden = !menuBar.hideLeftSide.isChecked();
                menuBar.hideLeftSide.setChecked(!hidden);
                
-               if (notebookTree.isVisible() != hidden)
-                       toggleNotebookWindow();
-               if (savedSearchTree.isVisible() != hidden)
-                       toggleSavedSearchWindow();
-               if (tagTree.isVisible() != hidden)
-                       toggleTagWindow();
-               if (attributeTree.isVisible() != hidden)
-                       toggleAttributesWindow();
-               if (trashTree.isVisible() != hidden)
-                       toggleTrashWindow();
+               if (!hidden) 
+                       leftSplitter1.setHidden(true);
+               else
+                       leftSplitter1.setHidden(false);
                
                Global.saveWindowVisible("leftPanel", hidden);
                
@@ -2575,8 +2741,10 @@ public class NeverNote extends QMainWindow{
                }
                
                
-               if (Global.version.equals(version))
-                       return;
+               for (String validVersion : Global.validVersions) {
+                       if (version.equals(validVersion))
+                               return;
+               }
                
                UpgradeAvailableDialog dialog = new UpgradeAvailableDialog();
                dialog.exec();
@@ -2591,7 +2759,12 @@ public class NeverNote extends QMainWindow{
     //***************************************************************
     //** These functions deal with the Toolbar
     //***************************************************************
-    //***************************************************************  
+    //*************************************************************** 
+       @SuppressWarnings("unused")
+       private void focusSearch() {
+               searchField.setFocus();
+       }
+
        // Text in the search bar has been cleared
        private void searchFieldCleared() {
                saveNote();
@@ -2612,6 +2785,7 @@ public class NeverNote extends QMainWindow{
                        currentNote = listManager.getNoteIndex().get(0);
                        currentNoteGuid = currentNote.getGuid();
                }
+               refreshEvernoteNote(true);
                if (currentNote != null)
                        loadNoteBrowserInformation(browserWindow);
        }
@@ -2636,6 +2810,7 @@ public class NeverNote extends QMainWindow{
                                listManager.loadNotesIndex();
                                refreshEvernoteNote(true);
                                noteIndexUpdated(false);
+                               refreshEvernoteNote(true);
                        }
                        searchPerformed = false;
                }
@@ -2651,7 +2826,6 @@ public class NeverNote extends QMainWindow{
        String text = searchField.currentText();
        listManager.setEnSearch(text.trim());
        listManager.loadNotesIndex();
-//--->>>       noteIndexUpdated(true);
        noteIndexUpdated(false);
        refreshEvernoteNote(true);
        searchPerformed = true;
@@ -2662,12 +2836,16 @@ public class NeverNote extends QMainWindow{
     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);
        else
                toolBar.setVisible(true);
 
+//     toolBar.addWidget(menuBar);
+//     menuBar.setSizePolicy(Policy.Minimum, Policy.Minimum);
+//     toolBar.addSeparator();
        prevButton = toolBar.addAction("Previous");
        QIcon prevIcon = new QIcon(iconPath+"back.png");
        prevButton.setIcon(prevIcon);
@@ -2741,38 +2919,32 @@ public class NeverNote extends QMainWindow{
        allNotesButton.setIcon(allIcon);
        toggleAllNotesButton(Global.isToolbarButtonVisible("allNotes"));
        
-       toolBar.addSeparator();
-       toolBar.addWidget(new QLabel(tr("Quota:")));
-       toolBar.addWidget(quotaBar);
+       //toolBar.addSeparator();
+       //toolBar.addWidget(new QLabel(tr("Quota:")));
+       //toolBar.addWidget(quotaBar);
        //quotaBar.setSizePolicy(Policy.Minimum, Policy.Minimum);
        updateQuotaBar();
-       toolBar.addSeparator();
+       //toolBar.addSeparator();
        
-       // Setup the zoom
-       zoomSpinner = new QSpinBox();
-       zoomSpinner.setMinimum(10);
-       zoomSpinner.setMaximum(1000);
-       zoomSpinner.setAccelerated(true);
-       zoomSpinner.setSingleStep(10);
-       zoomSpinner.setValue(100);
-       zoomSpinner.valueChanged.connect(this, "zoomChanged()");
-       toolBar.addWidget(new QLabel(tr("Zoom")));
-       toolBar.addWidget(zoomSpinner);
+       //toolBar.addWidget(new QLabel(tr("Zoom")));
+       //toolBar.addWidget(zoomSpinner);
        
        //toolBar.addWidget(new QLabel("                    "));
-       toolBar.addSeparator();
-       toolBar.addWidget(new QLabel(tr("  Search:")));
-       toolBar.addWidget(searchField);
+       //toolBar.addSeparator();
+       //toolBar.addWidget(new QLabel(tr("  Search:")));
+       //toolBar.addWidget(searchField);
        QSizePolicy sizePolicy = new QSizePolicy();
        sizePolicy.setHorizontalPolicy(Policy.MinimumExpanding);
-       searchField.setSizePolicy(sizePolicy);
-       searchField.setInsertPolicy(InsertPolicy.InsertAtTop);
+       QLabel spacer = new QLabel("");
+       spacer.setSizePolicy(sizePolicy);
+       toolBar.addWidget(spacer);
+       //searchField.setInsertPolicy(InsertPolicy.InsertAtTop);
 
-       searchClearButton = toolBar.addAction("Search Clear");
-       QIcon searchClearIcon = new QIcon(iconPath+"searchclear.png");
-       searchClearButton.setIcon(searchClearIcon);
-       searchClearButton.triggered.connect(this, "searchFieldCleared()");
-       toggleSearchClearButton(Global.isToolbarButtonVisible("searchClear"));
+       //searchClearButton = toolBar.addAction("Search Clear");
+       //QIcon searchClearIcon = new QIcon(iconPath+"searchclear.png");
+       //searchClearButton.setIcon(searchClearIcon);
+       //searchClearButton.triggered.connect(this, "searchFieldCleared()");
+       //toggleSearchClearButton(Global.isToolbarButtonVisible("searchClear"));
 
        logger.log(logger.HIGH, "Leaving NeverNote.setupToolBar");
     }
@@ -2892,7 +3064,8 @@ public class NeverNote extends QMainWindow{
                allNotesButton.setVisible(toggle);
                Global.saveToolbarButtonsVisible("allNotes", toggle);
     }
-    private void toggleSearchClearButton(Boolean toggle) {
+    @SuppressWarnings("unused")
+       private void toggleSearchClearButton(Boolean toggle) {
                searchClearButton.setVisible(toggle);
                Global.saveToolbarButtonsVisible("searchClear", toggle);
     }
@@ -3060,11 +3233,11 @@ public class NeverNote extends QMainWindow{
                menuBar.noteRestoreAction.setVisible(false);
                
                listManager.loadNotesIndex();
-//--->>>               noteIndexUpdated(true);
                noteIndexUpdated(false);
        }       
    }
     // Show/Hide trash window
+       @SuppressWarnings("unused")
        private void toggleTrashWindow() {
                logger.log(logger.HIGH, "Entering NeverNote.toggleTrashWindow");
        if (trashTree.isVisible())
@@ -3121,56 +3294,67 @@ public class NeverNote extends QMainWindow{
                } catch (FileNotFoundException e) {
                        // File not found, so we'll just get empty strings anyway. 
                }
+
+               if (Global.getProxyValue("url").equals("")) {
+                       System.setProperty("http.proxyHost","") ;
+                       System.setProperty("http.proxyPort", "") ;
+                       System.setProperty("https.proxyHost","") ;
+                       System.setProperty("https.proxyPort", "") ;         
+               } else {
+                       // PROXY
+                       System.setProperty("http.proxyHost",Global.getProxyValue("url")) ;
+                       System.setProperty("http.proxyPort", Global.getProxyValue("port")) ;
+                       System.setProperty("https.proxyHost",Global.getProxyValue("url")) ;
+                       System.setProperty("https.proxyPort", Global.getProxyValue("port")) ;
+                       if (Global.getProxyValue("userid").equals("")) {
+                               Authenticator.setDefault(new Authenticator() {
+                       @Override
+                       protected PasswordAuthentication getPasswordAuthentication() {
+                               return new
+                               PasswordAuthentication(Global.getProxyValue("userid"),Global.getProxyValue("password").toCharArray());
+                               }
+                       });
+               }
+       }
+
+               syncRunner.userStoreUrl = Global.userStoreUrl;
+               syncRunner.noteStoreUrl = Global.noteStoreUrl;
+               syncRunner.noteStoreUrlBase = Global.noteStoreUrlBase;
+
                String userid = aes.getUserid();
                String password = aes.getPassword();
                if (!userid.equals("") && !password.equals("")) {
                Global.username = userid;
                Global.password = password;
+                       syncRunner.username = Global.username;
+                       syncRunner.password = Global.password;
+               syncRunner.enConnect();
                }               
 
-        // Show the login dialog box
-               if (!Global.automaticLogin() || userid.equals("")|| password.equals("")) {
-                       LoginDialog login = new LoginDialog();
-                       login.exec();
+               Global.isConnected = syncRunner.isConnected;
                
-                       if (!login.okPressed()) {
-                               return;
-                       }
+               if (!Global.isConnected) {
+                       // Show the login dialog box
+                       if (!Global.automaticLogin() || userid.equals("")|| password.equals("")) {
+                               LoginDialog login = new LoginDialog();
+                               login.exec();
+               
+                               if (!login.okPressed()) {
+                                       return;
+                               }
         
-                       Global.username = login.getUserid();
-                       Global.password = login.getPassword();
+                               Global.username = login.getUserid();
+                               Global.password = login.getPassword();
+                       }
+                       syncRunner.username = Global.username;
+                       syncRunner.password = Global.password;
+                       syncRunner.enConnect();
+                       Global.isConnected = syncRunner.isConnected;
                }
-               syncRunner.username = Global.username;
-               syncRunner.password = Global.password;
-               syncRunner.userStoreUrl = Global.userStoreUrl;
-               syncRunner.noteStoreUrl = Global.noteStoreUrl;
-               syncRunner.noteStoreUrlBase = Global.noteStoreUrlBase;
                
-           if (Global.getProxyValue("url").equals("")) {
-               System.setProperty("http.proxyHost","") ;
-               System.setProperty("http.proxyPort", "") ;
-               System.setProperty("https.proxyHost","") ;
-               System.setProperty("https.proxyPort", "") ;         
-           } else {
-                       // PROXY
-               System.setProperty("http.proxyHost",Global.getProxyValue("url")) ;
-               System.setProperty("http.proxyPort", Global.getProxyValue("port")) ;
-               System.setProperty("https.proxyHost",Global.getProxyValue("url")) ;
-               System.setProperty("https.proxyPort", Global.getProxyValue("port")) ;
-        
-               if (Global.getProxyValue("userid").equals("")) {
-                       Authenticator.setDefault(new Authenticator() {
-                               @Override
-                               protected PasswordAuthentication getPasswordAuthentication() {
-                                       return new
-                                       PasswordAuthentication(Global.getProxyValue("userid"),Global.getProxyValue("password").toCharArray());
-                                       }});
-                       }
-               }
-               
-               
-               syncRunner.enConnect();
-               Global.isConnected = syncRunner.isConnected;
+               if (!Global.isConnected)
+                       return;
                setupOnlineMenu();
                setupConnectMenuOptions();
                logger.log(logger.HIGH, "Leaving NeverNote.remoteConnect");
@@ -3257,6 +3441,7 @@ public class NeverNote extends QMainWindow{
     }
 
     // Show/Hide attribute search window
+       @SuppressWarnings("unused")
        private void toggleAttributesWindow() {
                logger.log(logger.HIGH, "Entering NeverNote.toggleAttributesWindow");
        if (attributeTree.isVisible())
@@ -3392,12 +3577,12 @@ public class NeverNote extends QMainWindow{
                        QModelIndex i = noteTableView.proxyModel.index(pos-1, Global.noteTableGuidPosition);
                        if (i!=null) {
                                currentNoteGuid = (String)i.data();
-                               noteTableView.selectRow(pos-1);
                        }
                }
        }               
-       showColumns();
-       scrollToGuid(currentNoteGuid);
+               if (!noteTableView.isColumnHidden(Global.noteTableGuidPosition))
+                       showColumns();
+               scrollToGuid(currentNoteGuid);
                logger.log(logger.HIGH, "Leaving NeverNote.noteIndexUpdated");
     }
        // Called when the list of notes is updated
@@ -3732,6 +3917,7 @@ public class NeverNote extends QMainWindow{
        String guid = (String)index.model().index(row, Global.noteTableGuidPosition).data();
        scrollToGuid(guid);
     }
+       // Scroll to the current GUID in tthe list.
     // Scroll to a particular index item
     private void scrollToGuid(String guid) {
        if (currentNote == null || guid == null) 
@@ -3745,7 +3931,6 @@ public class NeverNote extends QMainWindow{
                        }
                }
        }
-       
        if (!currentNote.isActive() && !Global.showDeleted) {
                for (int i=0; i<listManager.getNoteIndex().size(); i++) {
                        if (listManager.getNoteIndex().get(i).isActive()) {
@@ -3755,13 +3940,13 @@ public class NeverNote extends QMainWindow{
                        }
                }
        }
-       
        QModelIndex index; 
        for (int i=0; i<noteTableView.model().rowCount(); i++) {
                index = noteTableView.model().index(i, Global.noteTableGuidPosition);
                if (currentNoteGuid.equals(index.data())) {
-//                     noteTableView.setCurrentIndex(index);
+//                     noteTableView.selectionModel().blockSignals(true);
                                noteTableView.selectRow(i);
+//                             noteTableView.selectionModel().blockSignals(false);
                        noteTableView.scrollTo(index, ScrollHint.EnsureVisible);  // This should work, but it doesn't
                                i=listManager.getNoteTableModel().rowCount();
                }
@@ -3850,6 +4035,7 @@ public class NeverNote extends QMainWindow{
                
        showColumns();
        noteTableView.load(false);
+       refreshEvernoteNote(true);
        scrollToCurrentGuid();
     }
     public void wideListView() {
@@ -3916,6 +4102,8 @@ public class NeverNote extends QMainWindow{
        browserWindow.noteSignal.tagsChanged.connect(newBrowser, "updateTags(String, List)");
        browserWindow.noteSignal.titleChanged.connect(newBrowser, "updateTitle(String, String)");
        browserWindow.noteSignal.notebookChanged.connect(newBrowser, "updateNotebook(String, String)");
+       browserWindow.blockApplication.connect(this, "blockApplication(Long)");
+       browserWindow.unblockApplication.connect(this, "unblockApplication()");
        
        newBrowser.show();
     }
@@ -3952,9 +4140,6 @@ public class NeverNote extends QMainWindow{
     @SuppressWarnings("unused")
        private void setNoteDirty() {
                logger.log(logger.EXTREME, "Entering NeverNote.setNoteDirty()");
-               // Interrupt indexing & thumbnails to improve performance
-               indexRunner.interrupt = true;
-               thumbnailRunner.interrupt = true;
                
                // Find if the note is being edited externally.  If it is, update it.
                if (externalWindows.containsKey(currentNoteGuid)) {
@@ -4052,10 +4237,10 @@ public class NeverNote extends QMainWindow{
                }
                inkNote = false;
                readOnly = false;
-               if (Global.showDeleted)
+               if (Global.showDeleted || currentNoteGuid == null || currentNoteGuid.equals(""))
                        readOnly = true;
                Global.cryptCounter =0;
-               if (currentNoteGuid.equals("")) {
+               if (readOnly) {
                        browserWindow.setReadOnly(true);
                        return;
                }
@@ -4069,7 +4254,6 @@ public class NeverNote extends QMainWindow{
                currentNote = conn.getNoteTable().getNote(currentNoteGuid, true,true,false,false,true);
                if (currentNote == null) 
                        return;
-               
                loadNoteBrowserInformation(browserWindow);
        }
 
@@ -4117,7 +4301,6 @@ public class NeverNote extends QMainWindow{
                if (conn.getNoteTable().isThumbnailNeeded(currentNoteGuid)) {
                        thumbnailHTMLReady(currentNoteGuid, js, Global.calculateThumbnailZoom(js.toString()));
                }
-
                if (readOnly || inkNote)
                        browser.getBrowser().page().setContentEditable(false);  // We don't allow editing of ink notes
                else
@@ -4129,7 +4312,8 @@ public class NeverNote extends QMainWindow{
                menuBar.noteTags.setEnabled(!readOnly);
                browser.setNote(currentNote);
                
-               if (conn.getNotebookTable().isLinked(currentNote.getNotebookGuid())) {
+               if (currentNote != null && currentNote.getNotebookGuid() != null && 
+                               conn.getNotebookTable().isLinked(currentNote.getNotebookGuid())) {
                        deleteButton.setEnabled(false);
                        menuBar.notebookDeleteAction.setEnabled(false);
                } else {
@@ -4152,7 +4336,7 @@ public class NeverNote extends QMainWindow{
                browser.setTitle(currentNote.getTitle());
                browser.setTag(getTagNamesForNote(currentNote));
                browser.setAuthor(currentNote.getAttributes().getAuthor());
-               
+
                browser.setAltered(currentNote.getUpdated());
                browser.setCreation(currentNote.getCreated());
                if (currentNote.getAttributes().getSubjectDate() > 0)
@@ -4269,11 +4453,23 @@ public class NeverNote extends QMainWindow{
                return;
        if (currentNoteGuid.equals(""))
                return;
-       
+       String title = null;
+       if (selectedNoteGUIDs.size() == 1)
+               title = conn.getNoteTable().getNote(selectedNoteGUIDs.get(0),false,false,false,false,false).getTitle();
+
        // If we are deleting non-trash notes
        if (currentNote.isActive()) { 
                if (Global.verifyDelete()) {
-                       if (QMessageBox.question(this, tr("Confirmation"), tr("Delete selected note(s)?"),
+                       String msg;
+                       if (selectedNoteGUIDs.size() > 1) {
+                               msg = new String(tr("Delete ") +selectedNoteGUIDs.size() +" notes?");
+                       } else {
+                               if (title != null)
+                                       msg = new String(tr("Delete note \"") +title +"\"?");
+                               else                            
+                                       msg = new String(tr("Delete note selected note?"));
+                       }
+                       if (QMessageBox.question(this, tr("Confirmation"), msg,
                                        QMessageBox.StandardButton.Yes, 
                                        QMessageBox.StandardButton.No)==StandardButton.No.value() && Global.verifyDelete() == true) {
                                        return;
@@ -4287,7 +4483,16 @@ public class NeverNote extends QMainWindow{
        } else { 
                // If we are deleting from the trash.
                if (Global.verifyDelete()) {
-                       if (QMessageBox.question(this, "Confirmation", "Permanently delete selected note(s)?",
+                       String msg;
+                       if (selectedNoteGUIDs.size() > 1) {
+                               msg = new String(tr("Permanently delete ") +selectedNoteGUIDs.size() +" notes?");
+                       } else {
+                               if (title != null)
+                               msg = new String(tr("Permanently delete note \"") +title +"\"?");
+                               else
+                                       msg = new String(tr("Permanently delete note selected note?"));
+                       }
+                       if (QMessageBox.question(this, "Confirmation", msg,
                                QMessageBox.StandardButton.Yes, 
                                        QMessageBox.StandardButton.No)==StandardButton.No.value()) {
                                        return;
@@ -4364,7 +4569,8 @@ public class NeverNote extends QMainWindow{
                                }
                        }
                        if (!match)
-                               goodNotebooks.add(listManager.getNotebookIndex().get(i).deepCopy());
+                               //goodNotebooks.add(listManager.getNotebookIndex().get(i).deepCopy());
+                               goodNotebooks.add((Notebook)Global.deepCopy(listManager.getNotebookIndex().get(i)));
                }
                // Now we have a list of good notebooks, so we can look for the default
                        found = false;
@@ -4419,6 +4625,7 @@ public class NeverNote extends QMainWindow{
        
        currentNote = newNote;
        currentNoteGuid = currentNote.getGuid();
+       noteTableView.clearSelection();
        refreshEvernoteNote(true);
        listManager.countNotebookResults(listManager.getNoteIndex());
        browserWindow.titleLabel.setFocus();
@@ -4554,7 +4761,7 @@ public class NeverNote extends QMainWindow{
     }
     private void duplicateNote(String guid) {
                
-               Note oldNote = conn.getNoteTable().getNote(guid, true, true, false, false, false);
+               Note oldNote = conn.getNoteTable().getNote(guid, true, false,false,false,true);
                List<Resource> resList = conn.getNoteTable().noteResourceTable.getNoteResources(guid, true);
                oldNote.setContent(conn.getNoteTable().getNoteContentBinary(guid));
                oldNote.setResources(resList);
@@ -4568,11 +4775,37 @@ public class NeverNote extends QMainWindow{
                Long l = new Long(currentTime.getTimeInMillis());
                String newGuid = new String(Long.toString(l));
                                        
-               Note newNote = oldNote.deepCopy();
+//             Note newNote = oldNote.deepCopy();
+               Note newNote = (Note)Global.deepCopy(oldNote);
                newNote.setUpdateSequenceNum(0);
                newNote.setGuid(newGuid);
                newNote.setDeleted(0);
                newNote.setActive(true);
+               
+               /*
+               List<String> tagNames = new ArrayList<String>();
+               List<String> tagGuids = new ArrayList<String>();;
+               for (int i=0; i<oldNote.getTagGuidsSize(); i++) {
+                       tagNames.add(oldNote.getTagNames().get(i));
+                       tagGuids.add(oldNote.getTagGuids().get(i));
+               }
+
+               // Sort note Tags to make them look nice
+               for (int i=0; i<tagNames.size()-1; i++) {
+                       if (tagNames.get(i).compareTo(tagNames.get(i+1))<0) {
+                               String n1 = tagNames.get(i);
+                               String n2 = tagNames.get(i+1);
+                               tagNames.set(i, n2);
+                               tagNames.set(i+1, n1);
+                       }
+               }
+               newNote.setTagGuids(tagGuids);
+               newNote.setTagNames(tagNames);
+               
+               // Add tag guids to note
+               */
+               
+               // Duplicate resources
                List<Resource> resList = oldNote.getResources();
                if (resList == null)
                        resList = new ArrayList<Resource>();
@@ -4589,13 +4822,19 @@ public class NeverNote extends QMainWindow{
                        resList.get(i).setGuid(newResGuid);
                        resList.get(i).setUpdateSequenceNum(0);
                        resList.get(i).setActive(true);
-                       conn.getNoteTable().noteResourceTable.saveNoteResource(new Resource(resList.get(i).deepCopy()), true);
+                       conn.getNoteTable().noteResourceTable.saveNoteResource(
+                                       (Resource)Global.deepCopy(resList.get(i)), true);
                }
                newNote.setResources(resList);
+               
+               // Add note to the database
                listManager.addNote(newNote);
                conn.getNoteTable().addNote(newNote, true);
                listManager.getUnsynchronizedNotes().add(newNote.getGuid());
                noteTableView.insertRow(newNote, true, -1);
+               currentNoteGuid = newNote.getGuid();
+               currentNote = newNote;
+               refreshEvernoteNote(true);
                listManager.countNotebookResults(listManager.getNoteIndex());
                waitCursor(false);
        }
@@ -4612,6 +4851,7 @@ public class NeverNote extends QMainWindow{
                        notebookTree.selectGuid("");
                }
                notebookTreeSelection();
+               refreshEvernoteNote(true);
        }
        // Merge notes
        @SuppressWarnings("unused")
@@ -4793,10 +5033,10 @@ public class NeverNote extends QMainWindow{
        versions = null;
        try {
                if (Global.isPremium())
-                       versions = syncRunner.noteStore.listNoteVersions(syncRunner.authToken, currentNoteGuid);
+                       versions = syncRunner.localNoteStore.listNoteVersions(syncRunner.authToken, currentNoteGuid);
                else
                        versions = new ArrayList<NoteVersionId>();
-               currentOnlineNote = syncRunner.noteStore.getNote(syncRunner.authToken, currentNoteGuid, true, true, false, false);
+               currentOnlineNote = syncRunner.localNoteStore.getNote(syncRunner.authToken, currentNoteGuid, true, true, false, false);
                } catch (EDAMUserException e) {
                        setMessage("EDAMUserException: " +e.getMessage());
                        return;
@@ -4851,9 +5091,9 @@ public class NeverNote extends QMainWindow{
                        try {
                                if (index > -1) {
                                        usn = versions.get(index).getUpdateSequenceNum();
-                                       historyNote = syncRunner.noteStore.getNoteVersion(syncRunner.authToken, currentNoteGuid, usn, true, true, true);
+                                       historyNote = syncRunner.localNoteStore.getNoteVersion(syncRunner.authToken, currentNoteGuid, usn, true, true, true);
                                } else
-                                       historyNote = syncRunner.noteStore.getNote(syncRunner.authToken, currentNoteGuid, true,true,true,true);
+                                       historyNote = syncRunner.localNoteStore.getNote(syncRunner.authToken, currentNoteGuid, true,true,true,true);
                        } catch (EDAMUserException e) {
                                setMessage("EDAMUserException: " +e.getMessage());
                                waitCursor(false);
@@ -4914,9 +5154,9 @@ public class NeverNote extends QMainWindow{
        List<Tag> tags = null;
        List<LinkedNotebook> linkedNotebooks = null;
        try {
-                       notebooks = syncRunner.noteStore.listNotebooks(syncRunner.authToken);
-                       tags = syncRunner.noteStore.listTags(syncRunner.authToken);
-                       linkedNotebooks = syncRunner.noteStore.listLinkedNotebooks(syncRunner.authToken);
+                       notebooks = syncRunner.localNoteStore.listNotebooks(syncRunner.authToken);
+                       tags = syncRunner.localNoteStore.listTags(syncRunner.authToken);
+                       linkedNotebooks = syncRunner.localNoteStore.listLinkedNotebooks(syncRunner.authToken);
                } catch (EDAMUserException e) {
                        setMessage("EDAMUserException: " +e.getMessage());
                        return;
@@ -5088,7 +5328,6 @@ public class NeverNote extends QMainWindow{
                        syncRunner.syncDeletedContent = Global.synchronizeDeletedContent();
                        
                        if (syncThreadsReady > 0) {
-                               indexRunner.interrupt = true;
                                thumbnailRunner.interrupt = true;
                                saveNoteIndexWidth();
                                saveNoteColumnPositions();
@@ -5229,47 +5468,64 @@ public class NeverNote extends QMainWindow{
                alive = listManager.threadCheck(Global.tagCounterThreadId);
                if (!alive) {
                        tagDeadCount++;
-                       if (tagDeadCount > MAX)
+                       if (tagDeadCount > MAX && !disableTagThreadCheck) {
                                QMessageBox.information(this, tr("A thread his 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;
+                       }
                } else
                        tagDeadCount=0;
                
                alive = listManager.threadCheck(Global.notebookCounterThreadId);
                if (!alive) {
                        notebookThreadDeadCount++;
-                       QMessageBox.information(this, tr("A thread his 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."));
+                       if (notebookThreadDeadCount > MAX && !disableNotebookThreadCheck) {
+                               QMessageBox.information(this, tr("A thread his 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;
+                       }
                } else
                        notebookThreadDeadCount=0;
                
                alive = listManager.threadCheck(Global.trashCounterThreadId);
                if (!alive) {
                        trashDeadCount++;
-                       QMessageBox.information(this, tr("A thread his died."), ("It appears as the trash counter thread has died.  I recommend "+
-                       "checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry."));
+                       if (trashDeadCount > MAX && !disableTrashThreadCheck) {
+                               QMessageBox.information(this, tr("A thread his 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;
+                       }
                } else
                        trashDeadCount = 0;
 
                alive = listManager.threadCheck(Global.saveThreadId);
                if (!alive) {
                        saveThreadDeadCount++;
-                       QMessageBox.information(this, tr("A thread his 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."));
+                       if (saveThreadDeadCount > MAX && !disableSaveThreadCheck) {
+                               QMessageBox.information(this, tr("A thread his 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;
+                       }
                } else
                        saveThreadDeadCount=0;
 
                if (!syncThread.isAlive()) {
                        syncThreadDeadCount++;
-                       QMessageBox.information(this, tr("A thread his died."), tr("It appears as the synchronization thread has died.  I recommend "+
-                       "checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry."));
+                       if (syncThreadDeadCount > MAX && !disableSyncThreadCheck) {
+                               QMessageBox.information(this, tr("A thread his 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;
+                       }
                } else
                        syncThreadDeadCount=0;
 
                if (!indexThread.isAlive()) {
                        indexThreadDeadCount++;
-                       QMessageBox.information(this, tr("A thread his died."), tr("It appears as the index thread has died.  I recommend "+
-                       "checking stopping NeverNote, saving the logs for later viewing, and restarting.  Sorry."));
+                       if (indexThreadDeadCount > MAX && !disableIndexThreadCheck) {
+                               QMessageBox.information(this, tr("A thread his 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;
+                       }
                } else
                        indexThreadDeadCount=0;
 
@@ -5812,4 +6068,29 @@ public class NeverNote extends QMainWindow{
                        return true;
        }
 
+       
+       //*************************************************
+       // Block the program.  This is used for things  
+       // like async web calls.
+       //*************************************************
+       @SuppressWarnings("unused")
+       private void blockApplication(Long time) {
+               Calendar currentTime = new GregorianCalendar();
+               waitCursor(true);
+               blockTime = new Long(currentTime.getTimeInMillis())+time;
+
+               for (;currentTime.getTimeInMillis()>blockTime;) {
+                       try {
+                               wait(1);
+                       } catch (InterruptedException e) {
+                               e.printStackTrace();
+                       }
+                       waitCursor(false);
+               }
+               
+       }
+       @SuppressWarnings("unused")
+       private void unblockApplication() {
+               blockTime = -1;
+       }
 }