Add fix for stack names when updating notebooks.

[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / NeverNote.java

diff --git a/src/cx/fbn/nevernote/NeverNote.java b/src/cx/fbn/nevernote/NeverNote.java
index 4ccdfa9..3b55dc0 100644 (file)
--- a/src/cx/fbn/nevernote/NeverNote.java
+++ b/src/cx/fbn/nevernote/NeverNote.java
@@ -154,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;
@@ -566,6 +567,7 @@ 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);
@@ -1227,13 +1229,15 @@ public class NeverNote extends QMainWindow{
        }    
        // 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);
@@ -1944,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())
@@ -1957,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);
@@ -2092,6 +2109,10 @@ 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);
@@ -2238,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();
@@ -2276,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();
+       }
        
     //***************************************************************
     //***************************************************************
@@ -2611,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
@@ -2731,6 +2785,7 @@ public class NeverNote extends QMainWindow{
                        currentNote = listManager.getNoteIndex().get(0);
                        currentNoteGuid = currentNote.getGuid();
                }
+               refreshEvernoteNote(true);
                if (currentNote != null)
                        loadNoteBrowserInformation(browserWindow);
        }
@@ -2755,6 +2810,7 @@ public class NeverNote extends QMainWindow{
                                listManager.loadNotesIndex();
                                refreshEvernoteNote(true);
                                noteIndexUpdated(false);
+                               refreshEvernoteNote(true);
                        }
                        searchPerformed = false;
                }
@@ -3979,6 +4035,7 @@ public class NeverNote extends QMainWindow{
                
        showColumns();
        noteTableView.load(false);
+       refreshEvernoteNote(true);
        scrollToCurrentGuid();
     }
     public void wideListView() {
@@ -4794,6 +4851,7 @@ public class NeverNote extends QMainWindow{
                        notebookTree.selectGuid("");
                }
                notebookTreeSelection();
+               refreshEvernoteNote(true);
        }
        // Merge notes
        @SuppressWarnings("unused")
@@ -5319,7 +5377,6 @@ public class NeverNote extends QMainWindow{
        }
        public void refreshLists() {
                logger.log(logger.EXTREME, "Entering NeverNote.refreshLists");
-               System.out.println("<><><><><><><><><><><><><><><><><><><><>");
                updateQuotaBar();
                listManager.refreshLists(currentNote, noteDirty, browserWindow.getContent());
                tagIndexUpdated(true);