Add notebook specific sorting and alter some NeverNote labels to say NixNote.

diff --git a/src/cx/fbn/nevernote/Global.java b/src/cx/fbn/nevernote/Global.java
index 136b4e8..278744f 100644 (file)
--- a/src/cx/fbn/nevernote/Global.java
+++ b/src/cx/fbn/nevernote/Global.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/NeverNote.java b/src/cx/fbn/nevernote/NeverNote.java
index 0f5a1b4..76c373d 100644 (file)
--- a/src/cx/fbn/nevernote/NeverNote.java
+++ b/src/cx/fbn/nevernote/NeverNote.java
@@ -1,5 +1,5 @@
 /*
 /*

- * This file is part of NeverNote 
+ * This file is part of NixNote 

  * Copyright 2009 Randy Baumgarte
  * 
  * This file may be licensed under the terms of of the
  * Copyright 2009 Randy Baumgarte
  * 
  * This file may be licensed under the terms of of the


@@ -355,8 +355,8 @@ public class NeverNote extends QMainWindow{
                conn = dbConn;          
                if (conn.getConnection() == null) {
                        String msg = new String(tr("Unable to connect to the database.\n\nThe most probable reason is that some other process\n" +
                conn = dbConn;          
                if (conn.getConnection() == null) {
                        String msg = new String(tr("Unable to connect to the database.\n\nThe most probable reason is that some other process\n" +

-                               "is accessing the database or NeverNote is already running.\n\n" +
-                               "Please end any other process or shutdown the other NeverNote before starting.\n\nExiting program."));
+                               "is accessing the database or NixNote is already running.\n\n" +
+                               "Please end any other process or shutdown the other NixNote before starting.\n\nExiting program."));

                        
             QMessageBox.critical(null, tr("Database Connection Error") ,msg);
                        System.exit(16);
                        
             QMessageBox.critical(null, tr("Database Connection Error") ,msg);
                        System.exit(16);


@@ -391,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(tr("NeverNote"));
+        setWindowTitle(tr("NixNote"));

 
         mainLeftRightSplitter = new QSplitter();
         setCentralWidget(mainLeftRightSplitter);
 
         mainLeftRightSplitter = new QSplitter();
         setCentralWidget(mainLeftRightSplitter);


@@ -499,8 +499,7 @@ public class NeverNote extends QMainWindow{
         tagTree = new TagTreeWidget(conn);
         savedSearchTree = new SavedSearchTreeWidget();
         trashTree = new TrashTreeWidget();
         tagTree = new TagTreeWidget(conn);
         savedSearchTree = new SavedSearchTreeWidget();
         trashTree = new TrashTreeWidget();

-        noteTableView = new TableView(logger, listManager);
-        
+        noteTableView = new TableView(logger, listManager);        

         
         searchField = new QComboBox();
         searchField.setObjectName("searchField");
         
         searchField = new QComboBox();
         searchField.setObjectName("searchField");


@@ -675,7 +674,7 @@ public class NeverNote extends QMainWindow{
                
                
                trayIcon = new QSystemTrayIcon(this);
                
                
                trayIcon = new QSystemTrayIcon(this);

-               trayIcon.setToolTip(tr("NeverNote"));
+               trayIcon.setToolTip(tr("NixNote"));

                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)");
 


@@ -764,7 +763,11 @@ public class NeverNote extends QMainWindow{
         
        int sortCol = Global.getSortColumn();
                int sortOrder = Global.getSortOrder();
         
        int sortCol = Global.getSortColumn();
                int sortOrder = Global.getSortOrder();

+               noteTableView.proxyModel.blocked = true;

                noteTableView.sortByColumn(sortCol, SortOrder.resolve(sortOrder));
                noteTableView.sortByColumn(sortCol, SortOrder.resolve(sortOrder));

+               noteTableView.proxyModel.blocked = false;
+               noteTableView.proxyModel.sortChanged.connect(this, "tableSortOrderChanged(Integer,Integer)");
+               

                if (Global.checkVersionUpgrade())
                        checkForUpdates();
        }
                if (Global.checkVersionUpgrade())
                        checkForUpdates();
        }


@@ -1384,7 +1387,8 @@ public class NeverNote extends QMainWindow{
     // Listener when a notebook is selected
        private void notebookTreeSelection() {
                logger.log(logger.HIGH, "Entering NeverNote.notebookTreeSelection");
     // Listener when a notebook is selected
        private void notebookTreeSelection() {
                logger.log(logger.HIGH, "Entering NeverNote.notebookTreeSelection");

-
+               noteTableView.proxyModel.blocked = true;
+               

                clearTrashFilter();
                clearAttributeFilter();
                clearSavedSearchFilter();
                clearTrashFilter();
                clearAttributeFilter();
                clearSavedSearchFilter();


@@ -1437,6 +1441,18 @@ public class NeverNote extends QMainWindow{
        refreshEvernoteNote(true);
        listManager.refreshCounters = true;
        listManager.refreshCounters();
        refreshEvernoteNote(true);
        listManager.refreshCounters = true;
        listManager.refreshCounters();

+       if (selectedNotebookGUIDs.size() == 1) {
+               int col = conn.getNotebookTable().getSortColumn(selectedNotebookGUIDs.get(0));
+               int order = conn.getNotebookTable().getSortOrder(selectedNotebookGUIDs.get(0));
+               if (col != -1) {
+                       noteTableView.proxyModel.blocked = true;
+                       if (order == 1)
+                               noteTableView.sortByColumn(col, Qt.SortOrder.DescendingOrder);
+                       else
+                               noteTableView.sortByColumn(col, Qt.SortOrder.AscendingOrder);
+               }
+       }
+       noteTableView.proxyModel.blocked = false;

                logger.log(logger.HIGH, "Leaving NeverNote.notebookTreeSelection");
 
     }
                logger.log(logger.HIGH, "Leaving NeverNote.notebookTreeSelection");
 
     }


@@ -2641,7 +2657,7 @@ public class NeverNote extends QMainWindow{
        logger.log(logger.HIGH, "Entering NeverNote.compactDatabase");
                if (QMessageBox.question(this, tr("Confirmation"), tr("This will free unused space in the database, "+
                                "but please be aware that depending upon the size of your database this can be time consuming " +
        logger.log(logger.HIGH, "Entering NeverNote.compactDatabase");
                if (QMessageBox.question(this, tr("Confirmation"), tr("This will free unused space in the database, "+
                                "but please be aware that depending upon the size of your database this can be time consuming " +

-                               "and NeverNote will be unresponsive until it is complete.  Do you wish to continue?"),
+                               "and NixNote will be unresponsive until it is complete.  Do you wish to continue?"),

                                QMessageBox.StandardButton.Yes, 
                                QMessageBox.StandardButton.No)==StandardButton.No.value() && Global.verifyDelete() == true) {
                                                        return;
                                QMessageBox.StandardButton.Yes, 
                                QMessageBox.StandardButton.No)==StandardButton.No.value() && Global.verifyDelete() == true) {
                                                        return;


@@ -4082,7 +4098,10 @@ public class NeverNote extends QMainWindow{
        
        sortCol = Global.getSortColumn();
                sortOrder = Global.getSortOrder();
        
        sortCol = Global.getSortColumn();
                sortOrder = Global.getSortOrder();

+               noteTableView.proxyModel.blocked = true;

                noteTableView.sortByColumn(sortCol, SortOrder.resolve(sortOrder));
                noteTableView.sortByColumn(sortCol, SortOrder.resolve(sortOrder));

+               noteTableView.proxyModel.blocked = false;
+

                
        showColumns();
        noteTableView.load(false);
                
        showColumns();
        noteTableView.load(false);


@@ -4118,13 +4137,26 @@ public class NeverNote extends QMainWindow{
        
        sortCol = Global.getSortColumn();
                sortOrder = Global.getSortOrder();
        
        sortCol = Global.getSortColumn();
                sortOrder = Global.getSortOrder();

+               noteTableView.proxyModel.blocked = true;

                noteTableView.sortByColumn(sortCol, SortOrder.resolve(sortOrder));
                noteTableView.sortByColumn(sortCol, SortOrder.resolve(sortOrder));

-       
+               noteTableView.proxyModel.blocked = false;
+

        showColumns();
        noteTableView.load(false);
        scrollToCurrentGuid();
     }
        showColumns();
        noteTableView.load(false);
        scrollToCurrentGuid();
     }

-    
+    // Sort order for the notebook has changed   
+    public void tableSortOrderChanged(Integer column, Integer order) {
+       
+       // Find what notebook (if any) is selected.  We ignore stacks & the "All Notebooks".
+       List<QTreeWidgetItem> selectedNotebook = notebookTree.selectedItems();
+       if (selectedNotebook.size() > 0 && !selectedNotebook.get(0).text(0).equalsIgnoreCase("All Notebooks") && !selectedNotebook.get(0).text(2).equalsIgnoreCase("STACK")) {
+               QTreeWidgetItem currentSelectedNotebook = selectedNotebook.get(0);
+               String notebook;
+               notebook = currentSelectedNotebook.text(2);
+               conn.getNotebookTable().setSortOrder(notebook, column, order);
+       }       
+    }

     
     //***************************************************************
     @SuppressWarnings("unused")
     
     //***************************************************************
     @SuppressWarnings("unused")


@@ -4367,7 +4399,7 @@ public class NeverNote extends QMainWindow{
                        if (formatter.formatError) {
                                waitCursor(false);
                             QMessageBox.information(this, tr("Error"),
                        if (formatter.formatError) {
                                waitCursor(false);
                             QMessageBox.information(this, tr("Error"),

-                                               tr("NeverNote had issues formatting this note." +
+                                               tr("NixNote had issues formatting this note." +

                                                " To protect your data this note is being marked as read-only."));      
                             waitCursor(true);
                        }
                                                " To protect your data this note is being marked as read-only."));      
                             waitCursor(true);
                        }


@@ -5054,7 +5086,7 @@ public class NeverNote extends QMainWindow{
                                }
                        }
                        msg = tr("An error has happened while saving the note \"") +title+
                                }
                        }
                        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.  "+
+                       tr("\".\n\nThis is probably due to a document that is too complex for NixNote 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" +
                        "\nbe lost.  Please review the note to recover any critical data before restarting.");
                        "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.");


@@ -5563,7 +5595,7 @@ public class NeverNote extends QMainWindow{
                        thumbnailRunner.interrupt = true;
                        indexRunner.addWork("SCAN");
                }
                        thumbnailRunner.interrupt = true;
                        indexRunner.addWork("SCAN");
                }

-               logger.log(logger.EXTREME, "Leaving neverNote index timer");
+               logger.log(logger.EXTREME, "Leaving NixNote index timer");

        }
 
        @SuppressWarnings("unused")
        }
 
        @SuppressWarnings("unused")


@@ -5597,7 +5629,7 @@ public class NeverNote extends QMainWindow{
                        tagDeadCount++;
                        if (tagDeadCount > MAX && !disableTagThreadCheck) {
                                QMessageBox.information(this, tr("A thread has died."), tr("It appears as the tag counter thread has died.  I recommend "+
                        tagDeadCount++;
                        if (tagDeadCount > MAX && !disableTagThreadCheck) {
                                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."));
+                               "checking stopping NixNote, saving the logs for later viewing, and restarting.  Sorry."));

                                disableTagThreadCheck = true;
                        }
                } else
                                disableTagThreadCheck = true;
                        }
                } else


@@ -5608,7 +5640,7 @@ public class NeverNote extends QMainWindow{
                        notebookThreadDeadCount++;
                        if (notebookThreadDeadCount > MAX && !disableNotebookThreadCheck) {
                                QMessageBox.information(this, tr("A thread has died."), tr("It appears as the notebook counter thread has died.  I recommend "+
                        notebookThreadDeadCount++;
                        if (notebookThreadDeadCount > MAX && !disableNotebookThreadCheck) {
                                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."));
+                                       "checking stopping NixNote, saving the logs for later viewing, and restarting.  Sorry."));

                                disableNotebookThreadCheck=true;
                        }
                } else
                                disableNotebookThreadCheck=true;
                        }
                } else


@@ -5619,7 +5651,7 @@ public class NeverNote extends QMainWindow{
                        trashDeadCount++;
                        if (trashDeadCount > MAX && !disableTrashThreadCheck) {
                                QMessageBox.information(this, tr("A thread has died."), ("It appears as the trash counter thread has died.  I recommend "+
                        trashDeadCount++;
                        if (trashDeadCount > MAX && !disableTrashThreadCheck) {
                                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."));
+                                       "checking stopping NixNote, saving the logs for later viewing, and restarting.  Sorry."));

                                disableTrashThreadCheck = true;
                        }
                } else
                                disableTrashThreadCheck = true;
                        }
                } else


@@ -5630,7 +5662,7 @@ public class NeverNote extends QMainWindow{
                        saveThreadDeadCount++;
                        if (saveThreadDeadCount > MAX && !disableSaveThreadCheck) {
                                QMessageBox.information(this, tr("A thread has died."), tr("It appears as the note saver thread has died.  I recommend "+
                        saveThreadDeadCount++;
                        if (saveThreadDeadCount > MAX && !disableSaveThreadCheck) {
                                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."));
+                                       "checking stopping NixNote, saving the logs for later viewing, and restarting.  Sorry."));

                                disableSaveThreadCheck = true;
                        }
                } else
                                disableSaveThreadCheck = true;
                        }
                } else


@@ -5640,7 +5672,7 @@ public class NeverNote extends QMainWindow{
                        syncThreadDeadCount++;
                        if (syncThreadDeadCount > MAX && !disableSyncThreadCheck) {
                                QMessageBox.information(this, tr("A thread has died."), tr("It appears as the synchronization thread has died.  I recommend "+
                        syncThreadDeadCount++;
                        if (syncThreadDeadCount > MAX && !disableSyncThreadCheck) {
                                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."));
+                                       "checking stopping NixNote, saving the logs for later viewing, and restarting.  Sorry."));

                                disableSyncThreadCheck = true;
                        }
                } else
                                disableSyncThreadCheck = true;
                        }
                } else


@@ -5650,7 +5682,7 @@ public class NeverNote extends QMainWindow{
                        indexThreadDeadCount++;
                        if (indexThreadDeadCount > MAX && !disableIndexThreadCheck) {
                                QMessageBox.information(this, tr("A thread has died."), tr("It appears as the index thread has died.  I recommend "+
                        indexThreadDeadCount++;
                        if (indexThreadDeadCount > MAX && !disableIndexThreadCheck) {
                                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."));
+                                       "checking stopping NixNote, saving the logs for later viewing, and restarting.  Sorry."));

                                disableIndexThreadCheck = true;
                        }
                } else
                                disableIndexThreadCheck = true;
                        }
                } else


@@ -5674,7 +5706,7 @@ public class NeverNote extends QMainWindow{
                fd.setFileMode(FileMode.AnyFile);
                fd.setConfirmOverwrite(true);
                fd.setWindowTitle(tr("Backup Database"));
                fd.setFileMode(FileMode.AnyFile);
                fd.setConfirmOverwrite(true);
                fd.setWindowTitle(tr("Backup Database"));

-               fd.setFilter(tr("NeverNote Export (*.nnex);;All Files (*.*)"));
+               fd.setFilter(tr("NixNote Export (*.nnex);;All Files (*.*)"));

                fd.setAcceptMode(AcceptMode.AcceptSave);
                if (saveLastPath == null || saveLastPath.equals(""))
                        fd.setDirectory(System.getProperty("user.home"));
                fd.setAcceptMode(AcceptMode.AcceptSave);
                if (saveLastPath == null || saveLastPath.equals(""))
                        fd.setDirectory(System.getProperty("user.home"));


@@ -5720,7 +5752,7 @@ public class NeverNote extends QMainWindow{
                fd.setFileMode(FileMode.ExistingFile);
                fd.setConfirmOverwrite(true);
                fd.setWindowTitle(tr("Restore Database"));
                fd.setFileMode(FileMode.ExistingFile);
                fd.setConfirmOverwrite(true);
                fd.setWindowTitle(tr("Restore Database"));

-               fd.setFilter(tr("NeverNote Export (*.nnex);;All Files (*.*)"));
+               fd.setFilter(tr("NixNote Export (*.nnex);;All Files (*.*)"));

                fd.setAcceptMode(AcceptMode.AcceptOpen);
                if (saveLastPath == null || saveLastPath.equals(""))
                        fd.setDirectory(System.getProperty("user.home"));
                fd.setAcceptMode(AcceptMode.AcceptOpen);
                if (saveLastPath == null || saveLastPath.equals(""))
                        fd.setDirectory(System.getProperty("user.home"));


@@ -5758,7 +5790,7 @@ public class NeverNote extends QMainWindow{
                fd.setFileMode(FileMode.AnyFile);
                fd.setConfirmOverwrite(true);
                fd.setWindowTitle(tr("Backup Database"));
                fd.setFileMode(FileMode.AnyFile);
                fd.setConfirmOverwrite(true);
                fd.setWindowTitle(tr("Backup Database"));

-               fd.setFilter(tr("NeverNote Export (*.nnex);;All Files (*.*)"));
+               fd.setFilter(tr("NixNote Export (*.nnex);;All Files (*.*)"));

                fd.setAcceptMode(AcceptMode.AcceptSave);
                fd.setDirectory(System.getProperty("user.home"));
                if (fd.exec() == 0 || fd.selectedFiles().size() == 0) {
                fd.setAcceptMode(AcceptMode.AcceptSave);
                fd.setDirectory(System.getProperty("user.home"));
                if (fd.exec() == 0 || fd.selectedFiles().size() == 0) {


@@ -5791,7 +5823,7 @@ public class NeverNote extends QMainWindow{
                fd.setFileMode(FileMode.ExistingFile);
                fd.setConfirmOverwrite(true);
                fd.setWindowTitle(tr("Import Notes"));
                fd.setFileMode(FileMode.ExistingFile);
                fd.setConfirmOverwrite(true);
                fd.setWindowTitle(tr("Import Notes"));

-               fd.setFilter(tr("NeverNote Export (*.nnex);;All Files (*.*)"));
+               fd.setFilter(tr("NixNote Export (*.nnex);;All Files (*.*)"));

                fd.setAcceptMode(AcceptMode.AcceptOpen);
                if (saveLastPath == null || saveLastPath.equals(""))
                        fd.setDirectory(System.getProperty("user.home"));
                fd.setAcceptMode(AcceptMode.AcceptOpen);
                if (saveLastPath == null || saveLastPath.equals(""))
                        fd.setDirectory(System.getProperty("user.home"));

diff --git a/src/cx/fbn/nevernote/dialog/AccountDialog.java b/src/cx/fbn/nevernote/dialog/AccountDialog.java
index bca5931..4a44ec4 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/AccountDialog.java
+++ b/src/cx/fbn/nevernote/dialog/AccountDialog.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java b/src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java
index 19a5a0c..ba99e54 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java
+++ b/src/cx/fbn/nevernote/dialog/ConfigAppearancePage.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/dialog/ConfigConnectionPage.java b/src/cx/fbn/nevernote/dialog/ConfigConnectionPage.java
index d905ba7..8ec11d6 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/ConfigConnectionPage.java
+++ b/src/cx/fbn/nevernote/dialog/ConfigConnectionPage.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/dialog/ConfigDebugPage.java b/src/cx/fbn/nevernote/dialog/ConfigDebugPage.java
index e2bfc67..ee9f61b 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/ConfigDebugPage.java
+++ b/src/cx/fbn/nevernote/dialog/ConfigDebugPage.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/dialog/ConfigDialog.java b/src/cx/fbn/nevernote/dialog/ConfigDialog.java
index c28df9a..3ce5ac6 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/ConfigDialog.java
+++ b/src/cx/fbn/nevernote/dialog/ConfigDialog.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/dialog/ConfigFontPage.java b/src/cx/fbn/nevernote/dialog/ConfigFontPage.java
index a520eca..28879ac 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/ConfigFontPage.java
+++ b/src/cx/fbn/nevernote/dialog/ConfigFontPage.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/dialog/ConfigIndexPage.java b/src/cx/fbn/nevernote/dialog/ConfigIndexPage.java
index 06947bb..4669a23 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/ConfigIndexPage.java
+++ b/src/cx/fbn/nevernote/dialog/ConfigIndexPage.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/dialog/ConfigShowColumnsPage.java b/src/cx/fbn/nevernote/dialog/ConfigShowColumnsPage.java
index e338e93..ffe2257 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/ConfigShowColumnsPage.java
+++ b/src/cx/fbn/nevernote/dialog/ConfigShowColumnsPage.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/dialog/ConfigShowEditorButtonsPage.java b/src/cx/fbn/nevernote/dialog/ConfigShowEditorButtonsPage.java
index e234f96..93bf1aa 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/ConfigShowEditorButtonsPage.java
+++ b/src/cx/fbn/nevernote/dialog/ConfigShowEditorButtonsPage.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/dialog/ConfigSpellPage.java b/src/cx/fbn/nevernote/dialog/ConfigSpellPage.java
index c150cf8..40bc351 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/ConfigSpellPage.java
+++ b/src/cx/fbn/nevernote/dialog/ConfigSpellPage.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/dialog/DBEncryptDialog.java b/src/cx/fbn/nevernote/dialog/DBEncryptDialog.java
index 1a3f961..a01836a 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/DBEncryptDialog.java
+++ b/src/cx/fbn/nevernote/dialog/DBEncryptDialog.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/dialog/DatabaseLoginDialog.java b/src/cx/fbn/nevernote/dialog/DatabaseLoginDialog.java
index d6e3f8c..95d111a 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/DatabaseLoginDialog.java
+++ b/src/cx/fbn/nevernote/dialog/DatabaseLoginDialog.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/dialog/DatabaseStatus.java b/src/cx/fbn/nevernote/dialog/DatabaseStatus.java
index a9cf76c..a91561b 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/DatabaseStatus.java
+++ b/src/cx/fbn/nevernote/dialog/DatabaseStatus.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/dialog/EnCryptDialog.java b/src/cx/fbn/nevernote/dialog/EnCryptDialog.java
index 08174e8..37001d9 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/EnCryptDialog.java
+++ b/src/cx/fbn/nevernote/dialog/EnCryptDialog.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/dialog/EnDecryptDialog.java b/src/cx/fbn/nevernote/dialog/EnDecryptDialog.java
index 3d3684b..5d95d8a 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/EnDecryptDialog.java
+++ b/src/cx/fbn/nevernote/dialog/EnDecryptDialog.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/dialog/FindDialog.java b/src/cx/fbn/nevernote/dialog/FindDialog.java
index 4c0a9f4..bd8817b 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/FindDialog.java
+++ b/src/cx/fbn/nevernote/dialog/FindDialog.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/dialog/GeoDialog.java b/src/cx/fbn/nevernote/dialog/GeoDialog.java
index d78cf46..6afd837 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/GeoDialog.java
+++ b/src/cx/fbn/nevernote/dialog/GeoDialog.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/dialog/IgnoreSync.java b/src/cx/fbn/nevernote/dialog/IgnoreSync.java
index 5f33f13..929bd09 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/IgnoreSync.java
+++ b/src/cx/fbn/nevernote/dialog/IgnoreSync.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/dialog/InsertLatexImage.java b/src/cx/fbn/nevernote/dialog/InsertLatexImage.java
index 8221a25..7c5b719 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/InsertLatexImage.java
+++ b/src/cx/fbn/nevernote/dialog/InsertLatexImage.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/dialog/InsertLinkDialog.java b/src/cx/fbn/nevernote/dialog/InsertLinkDialog.java
index 5e0e171..f5e8a50 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/InsertLinkDialog.java
+++ b/src/cx/fbn/nevernote/dialog/InsertLinkDialog.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/dialog/LogFileDialog.java b/src/cx/fbn/nevernote/dialog/LogFileDialog.java
index 3cd75ae..5240994 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/LogFileDialog.java
+++ b/src/cx/fbn/nevernote/dialog/LogFileDialog.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r


@@ -84,7 +84,7 @@ public class LogFileDialog extends QDialog {
                fileCombo.addItem(tr("Index Log"), "IndexLog");\r
                fileCombo.addItem(tr("Database Connection Log"), "DatabaseLog");\r
                fileCombo.addItem(tr("Thumbnail Generator Log"), "ThumbnailLog");\r
                fileCombo.addItem(tr("Index Log"), "IndexLog");\r
                fileCombo.addItem(tr("Database Connection Log"), "DatabaseLog");\r
                fileCombo.addItem(tr("Thumbnail Generator Log"), "ThumbnailLog");\r

-               fileCombo.addItem(tr("NeverNote Database SQL Trace File"), "NeverNoteDBLog");\r
+               fileCombo.addItem(tr("NixNote Database SQL Trace File"), "NeverNoteDBLog");\r

                fileCombo.addItem(tr("Index Database SQL Trace File"), "IndexDBLog");\r
                fileCombo.addItem(tr("Resource Database SQL Trace File"), "ResourceDBLog");\r
                \r
                fileCombo.addItem(tr("Index Database SQL Trace File"), "IndexDBLog");\r
                fileCombo.addItem(tr("Resource Database SQL Trace File"), "ResourceDBLog");\r
                \r

diff --git a/src/cx/fbn/nevernote/dialog/LoginDialog.java b/src/cx/fbn/nevernote/dialog/LoginDialog.java
index 0b65be6..238e96e 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/LoginDialog.java
+++ b/src/cx/fbn/nevernote/dialog/LoginDialog.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r


@@ -45,7 +45,7 @@ public class LoginDialog extends QDialog {
        // Constructor\r
        public LoginDialog() {\r
                okPressed = false;\r
        // Constructor\r
        public LoginDialog() {\r
                okPressed = false;\r

-               setWindowTitle(tr("NeverNote Login"));\r
+               setWindowTitle(tr("NixNote Login"));\r

                setWindowIcon(new QIcon(iconPath+"password.png"));\r
                QGridLayout grid = new QGridLayout();\r
                setLayout(grid);\r
                setWindowIcon(new QIcon(iconPath+"password.png"));\r
                QGridLayout grid = new QGridLayout();\r
                setLayout(grid);\r

diff --git a/src/cx/fbn/nevernote/dialog/NotebookArchive.java b/src/cx/fbn/nevernote/dialog/NotebookArchive.java
index 0b2e752..93644c8 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/NotebookArchive.java
+++ b/src/cx/fbn/nevernote/dialog/NotebookArchive.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/dialog/NotebookEdit.java b/src/cx/fbn/nevernote/dialog/NotebookEdit.java
index ed0446f..e91246b 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/NotebookEdit.java
+++ b/src/cx/fbn/nevernote/dialog/NotebookEdit.java
@@ -1,5 +1,5 @@
 /*
 /*

- * This file is part of NeverNote 
+ * This file is part of NixNote 

  * Copyright 2009 Randy Baumgarte
  * 
  * This file may be licensed under the terms of of the
  * Copyright 2009 Randy Baumgarte
  * 
  * This file may be licensed under the terms of of the

diff --git a/src/cx/fbn/nevernote/dialog/OnlineNoteHistory.java b/src/cx/fbn/nevernote/dialog/OnlineNoteHistory.java
index cba5d73..6307ab8 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/OnlineNoteHistory.java
+++ b/src/cx/fbn/nevernote/dialog/OnlineNoteHistory.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/dialog/PreviewDialog.java b/src/cx/fbn/nevernote/dialog/PreviewDialog.java
index 3733320..aff4138 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/PreviewDialog.java
+++ b/src/cx/fbn/nevernote/dialog/PreviewDialog.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/dialog/PublishNotebook.java b/src/cx/fbn/nevernote/dialog/PublishNotebook.java
index 30979f1..6e3fc27 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/PublishNotebook.java
+++ b/src/cx/fbn/nevernote/dialog/PublishNotebook.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/dialog/SavedSearchEdit.java b/src/cx/fbn/nevernote/dialog/SavedSearchEdit.java
index 932bad3..692b85c 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/SavedSearchEdit.java
+++ b/src/cx/fbn/nevernote/dialog/SavedSearchEdit.java
@@ -1,5 +1,5 @@
 /*
 /*

- * This file is part of NeverNote 
+ * This file is part of NixNote 

  * Copyright 2009 Randy Baumgarte
  * 
  * This file may be licensed under the terms of of the
  * Copyright 2009 Randy Baumgarte
  * 
  * This file may be licensed under the terms of of the

diff --git a/src/cx/fbn/nevernote/dialog/SetIcon.java b/src/cx/fbn/nevernote/dialog/SetIcon.java
index bdacc29..d44d3a0 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/SetIcon.java
+++ b/src/cx/fbn/nevernote/dialog/SetIcon.java
@@ -1,5 +1,5 @@
 /*
 /*

- * This file is part of NeverNote 
+ * This file is part of NixNote 

  * Copyright 2009 Randy Baumgarte
  * 
  * This file may be licensed under the terms of of the
  * Copyright 2009 Randy Baumgarte
  * 
  * This file may be licensed under the terms of of the

diff --git a/src/cx/fbn/nevernote/dialog/ShareNotebook.java b/src/cx/fbn/nevernote/dialog/ShareNotebook.java
index ab24ed5..e7c3340 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/ShareNotebook.java
+++ b/src/cx/fbn/nevernote/dialog/ShareNotebook.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/dialog/SharedNotebookSyncError.java b/src/cx/fbn/nevernote/dialog/SharedNotebookSyncError.java
index 98448eb..45a3f20 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/SharedNotebookSyncError.java
+++ b/src/cx/fbn/nevernote/dialog/SharedNotebookSyncError.java
@@ -1,5 +1,5 @@
 /*
 /*

- * This file is part of NeverNote 
+ * This file is part of NixNote 

  * Copyright 2009 Randy Baumgarte
  * 
  * This file may be licensed under the terms of of the
  * Copyright 2009 Randy Baumgarte
  * 
  * This file may be licensed under the terms of of the

diff --git a/src/cx/fbn/nevernote/dialog/SpellCheck.java b/src/cx/fbn/nevernote/dialog/SpellCheck.java
index 501cf0a..9ee3b6f 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/SpellCheck.java
+++ b/src/cx/fbn/nevernote/dialog/SpellCheck.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/dialog/StackNotebook.java b/src/cx/fbn/nevernote/dialog/StackNotebook.java
index 1a57119..b73ba5b 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/StackNotebook.java
+++ b/src/cx/fbn/nevernote/dialog/StackNotebook.java
@@ -1,5 +1,5 @@
 /*
 /*

- * This file is part of NeverNote 
+ * This file is part of NixNote 

  * Copyright 2009 Randy Baumgarte
  * 
  * This file may be licensed under the terms of of the
  * Copyright 2009 Randy Baumgarte
  * 
  * This file may be licensed under the terms of of the

diff --git a/src/cx/fbn/nevernote/dialog/SynchronizationRequiredWarning.java b/src/cx/fbn/nevernote/dialog/SynchronizationRequiredWarning.java
index 21dc95a..337bb91 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/SynchronizationRequiredWarning.java
+++ b/src/cx/fbn/nevernote/dialog/SynchronizationRequiredWarning.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/dialog/TableDialog.java b/src/cx/fbn/nevernote/dialog/TableDialog.java
index ea9794c..864b790 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/TableDialog.java
+++ b/src/cx/fbn/nevernote/dialog/TableDialog.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/dialog/TagAssign.java b/src/cx/fbn/nevernote/dialog/TagAssign.java
index 42cf38f..6ba720d 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/TagAssign.java
+++ b/src/cx/fbn/nevernote/dialog/TagAssign.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/dialog/TagEdit.java b/src/cx/fbn/nevernote/dialog/TagEdit.java
index 2d8ba8a..5c7f537 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/TagEdit.java
+++ b/src/cx/fbn/nevernote/dialog/TagEdit.java
@@ -1,5 +1,5 @@
 /*
 /*

- * This file is part of NeverNote 
+ * This file is part of NixNote 

  * Copyright 2009 Randy Baumgarte
  * 
  * This file may be licensed under the terms of of the
  * Copyright 2009 Randy Baumgarte
  * 
  * This file may be licensed under the terms of of the

diff --git a/src/cx/fbn/nevernote/dialog/TagMerge.java b/src/cx/fbn/nevernote/dialog/TagMerge.java
index f48ad60..7cc0a29 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/TagMerge.java
+++ b/src/cx/fbn/nevernote/dialog/TagMerge.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/dialog/ThumbnailViewer.java b/src/cx/fbn/nevernote/dialog/ThumbnailViewer.java
index e94e3db..ecaffca 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/ThumbnailViewer.java
+++ b/src/cx/fbn/nevernote/dialog/ThumbnailViewer.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/dialog/UpgradeAvailableDialog.java b/src/cx/fbn/nevernote/dialog/UpgradeAvailableDialog.java
index d54d0cb..591df13 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/UpgradeAvailableDialog.java
+++ b/src/cx/fbn/nevernote/dialog/UpgradeAvailableDialog.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/dialog/WatchFolder.java b/src/cx/fbn/nevernote/dialog/WatchFolder.java
index dbc38bb..4fb1a72 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/WatchFolder.java
+++ b/src/cx/fbn/nevernote/dialog/WatchFolder.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/dialog/WatchFolderAdd.java b/src/cx/fbn/nevernote/dialog/WatchFolderAdd.java
index 529530f..4022516 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/WatchFolderAdd.java
+++ b/src/cx/fbn/nevernote/dialog/WatchFolderAdd.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/evernote/EnCrypt.java b/src/cx/fbn/nevernote/evernote/EnCrypt.java
index 83f7e61..e1bbd83 100644 (file)
--- a/src/cx/fbn/nevernote/evernote/EnCrypt.java
+++ b/src/cx/fbn/nevernote/evernote/EnCrypt.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/evernote/EnmlConverter.java b/src/cx/fbn/nevernote/evernote/EnmlConverter.java
index f9bb988..36e8129 100644 (file)
--- a/src/cx/fbn/nevernote/evernote/EnmlConverter.java
+++ b/src/cx/fbn/nevernote/evernote/EnmlConverter.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r


@@ -187,7 +187,7 @@ public class EnmlConverter {
                }\r
                \r
                // Second pass through the data.  The goal of this pass is to \r
                }\r
                \r
                // Second pass through the data.  The goal of this pass is to \r

-               // remove any things we added in NeverNote that do not match\r
+               // remove any things we added in NixNote that do not match\r

                // the ENML schema\r
                XMLCleanup v = new XMLCleanup();\r
                v.setValue(newContent);\r
                // the ENML schema\r
                XMLCleanup v = new XMLCleanup();\r
                v.setValue(newContent);\r

diff --git a/src/cx/fbn/nevernote/filters/AttributeFilter.java b/src/cx/fbn/nevernote/filters/AttributeFilter.java
index 97ff31f..da2b01e 100644 (file)
--- a/src/cx/fbn/nevernote/filters/AttributeFilter.java
+++ b/src/cx/fbn/nevernote/filters/AttributeFilter.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/filters/ContainsAttributeFilter.java b/src/cx/fbn/nevernote/filters/ContainsAttributeFilter.java
index 5403e3a..aab962e 100644 (file)
--- a/src/cx/fbn/nevernote/filters/ContainsAttributeFilter.java
+++ b/src/cx/fbn/nevernote/filters/ContainsAttributeFilter.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009,2010 Randy Baumgarte\r
  * Copyright 2010 Hiroshi Miura\r
  * \r
  * Copyright 2009,2010 Randy Baumgarte\r
  * Copyright 2010 Hiroshi Miura\r
  * \r


@@ -22,8 +22,6 @@ package cx.fbn.nevernote.filters;
 \r
 import com.evernote.edam.type.Note;\r
 \r
 \r
 import com.evernote.edam.type.Note;\r
 \r

-import cx.fbn.nevernote.filters.AttributeFilter;\r
-\r

 \r
 public abstract class ContainsAttributeFilter extends AttributeFilter {\r
        protected String label;\r
 \r
 public abstract class ContainsAttributeFilter extends AttributeFilter {\r
        protected String label;\r


@@ -31,7 +29,9 @@ public abstract class ContainsAttributeFilter extends AttributeFilter {
                super();\r
                label=n;\r
        }\r
                super();\r
                label=n;\r
        }\r

+       @Override\r

        public abstract boolean attributeCheck(Note n);\r
        public abstract boolean attributeCheck(Note n);\r

+       @Override\r

        public String getLabel() {\r
                return label;\r
        }\r
        public String getLabel() {\r
                return label;\r
        }\r

diff --git a/src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java b/src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java
index 4971ec6..883e51a 100644 (file)
--- a/src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java
+++ b/src/cx/fbn/nevernote/filters/ContainsAttributeFilterFactory.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009,2010 Randy Baumgarte\r
  * Copyright 2010 Hiroshi Miura\r
  * \r
  * Copyright 2009,2010 Randy Baumgarte\r
  * Copyright 2010 Hiroshi Miura\r
  * \r


@@ -20,9 +20,8 @@
 \r
 package cx.fbn.nevernote.filters;\r
 \r
 \r
 package cx.fbn.nevernote.filters;\r
 \r

-import com.trolltech.qt.core.QCoreApplication;\r

 import com.evernote.edam.type.Note;\r
 import com.evernote.edam.type.Note;\r

-import cx.fbn.nevernote.filters.ContainsAttributeFilter;\r
+import com.trolltech.qt.core.QCoreApplication;\r

 \r
 public class ContainsAttributeFilterFactory {\r
        private ContainsAttributeFilterFactory() {\r
 \r
 public class ContainsAttributeFilterFactory {\r
        private ContainsAttributeFilterFactory() {\r


@@ -66,11 +65,12 @@ public class ContainsAttributeFilterFactory {
 \r
 // Contains filter strategies\r
 class ContainsAttributeFilterMime extends ContainsAttributeFilter {\r
 \r
 // Contains filter strategies\r
 class ContainsAttributeFilterMime extends ContainsAttributeFilter {\r

-       private String _mime;\r
+       private final String _mime;\r

        public ContainsAttributeFilterMime(String n, String m) {\r
                super(n);\r
                _mime = m; \r
        }\r
        public ContainsAttributeFilterMime(String n, String m) {\r
                super(n);\r
                _mime = m; \r
        }\r

+       @Override\r

        public boolean attributeCheck(Note n) {\r
         for (int i=0; i<n.getResourcesSize(); i++) {\r
                    if (n.getResources().get(i).getMime().startsWith(_mime))\r
        public boolean attributeCheck(Note n) {\r
         for (int i=0; i<n.getResourcesSize(); i++) {\r
                    if (n.getResources().get(i).getMime().startsWith(_mime))\r


@@ -81,11 +81,12 @@ class ContainsAttributeFilterMime extends ContainsAttributeFilter {
 }\r
 \r
 class ContainsAttributeFilterContent extends ContainsAttributeFilter {\r
 }\r
 \r
 class ContainsAttributeFilterContent extends ContainsAttributeFilter {\r

-       private String _text;\r
+       private final String _text;\r

        public ContainsAttributeFilterContent(String n, String text) {\r
                super(n);\r
                _text = text;\r
        }\r
        public ContainsAttributeFilterContent(String n, String text) {\r
                super(n);\r
                _text = text;\r
        }\r

+       @Override\r

        public boolean attributeCheck(Note n) {\r
         if (n.getContent().indexOf(_text) > -1)\r
             return true;\r
        public boolean attributeCheck(Note n) {\r
         if (n.getContent().indexOf(_text) > -1)\r
             return true;\r


@@ -95,11 +96,12 @@ class ContainsAttributeFilterContent extends ContainsAttributeFilter {
 }\r
 \r
 class ContainsAttributeFilterTodo extends ContainsAttributeFilter {\r
 }\r
 \r
 class ContainsAttributeFilterTodo extends ContainsAttributeFilter {\r

-       private boolean _checked;\r
+       private final boolean _checked;\r

        public ContainsAttributeFilterTodo(String n, boolean checked) {\r
                super(n);\r
                _checked = checked;\r
        }\r
        public ContainsAttributeFilterTodo(String n, boolean checked) {\r
                super(n);\r
                _checked = checked;\r
        }\r

+               @Override\r

                public boolean attributeCheck(Note n) {\r
                        String content = n.getContent();\r
                        int pos = content.indexOf("<en-todo");\r
                public boolean attributeCheck(Note n) {\r
                        String content = n.getContent();\r
                        int pos = content.indexOf("<en-todo");\r


@@ -121,6 +123,7 @@ class ContainsAttributeFilterAttachment extends ContainsAttributeFilter {
                public ContainsAttributeFilterAttachment(String n) {\r
                        super(n);\r
                }\r
                public ContainsAttributeFilterAttachment(String n) {\r
                        super(n);\r
                }\r

+               @Override\r

                public boolean attributeCheck(Note n) {\r
                        for (int i=0; i<n.getResourcesSize(); i++) {\r
                                if (n.getResources().get(i).getAttributes() != null \r
                public boolean attributeCheck(Note n) {\r
                        for (int i=0; i<n.getResourcesSize(); i++) {\r
                                if (n.getResources().get(i).getAttributes() != null \r

diff --git a/src/cx/fbn/nevernote/filters/DateAttributeFilter.java b/src/cx/fbn/nevernote/filters/DateAttributeFilter.java
index 732b6d8..3409954 100644 (file)
--- a/src/cx/fbn/nevernote/filters/DateAttributeFilter.java
+++ b/src/cx/fbn/nevernote/filters/DateAttributeFilter.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java b/src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java
index 59b11bb..775ce3e 100644 (file)
--- a/src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java
+++ b/src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009,2010 Randy Baumgarte\r
  * Copyright 2010 Hiroshi Miura\r
  * \r
  * Copyright 2009,2010 Randy Baumgarte\r
  * Copyright 2010 Hiroshi Miura\r
  * \r


@@ -20,11 +20,9 @@
 \r
 package cx.fbn.nevernote.filters;\r
 \r
 \r
 package cx.fbn.nevernote.filters;\r
 \r

+import com.evernote.edam.type.Note;\r

 import com.trolltech.qt.core.QCoreApplication;\r
 import com.trolltech.qt.core.QDateTime;\r
 import com.trolltech.qt.core.QCoreApplication;\r
 import com.trolltech.qt.core.QDateTime;\r

-import com.evernote.edam.type.Note;\r
-\r
-import cx.fbn.nevernote.filters.DateAttributeFilter;\r

 \r
 public class DateAttributeFilterFactory {\r
     private DateAttributeFilterFactory () {};\r
 \r
 public class DateAttributeFilterFactory {\r
     private DateAttributeFilterFactory () {};\r


@@ -58,6 +56,7 @@ class checkToday extends DateAttributeFilter {
         super(since, created);\r
     }\r
        // Check if it was within the last day\r
         super(since, created);\r
     }\r
        // Check if it was within the last day\r

+       @Override\r

        public boolean attributeCheck(Note n) {\r
                QDateTime noteDate, current;\r
                noteDate = noteTime(n);\r
        public boolean attributeCheck(Note n) {\r
                QDateTime noteDate, current;\r
                noteDate = noteTime(n);\r


@@ -67,6 +66,7 @@ class checkToday extends DateAttributeFilter {
                else \r
                        return noteDate.daysTo(current) > 0;\r
        }\r
                else \r
                        return noteDate.daysTo(current) > 0;\r
        }\r

+       @Override\r

        public String getLabel(){\r
                return QCoreApplication.translate("cx.fbn.nevernote.filters.DateAttributeFilter", "Today");\r
        }\r
        public String getLabel(){\r
                return QCoreApplication.translate("cx.fbn.nevernote.filters.DateAttributeFilter", "Today");\r
        }\r


@@ -78,7 +78,8 @@ class checkYesterday extends DateAttributeFilter {
     }\r
 \r
        // Check if it was within the last two days\r
     }\r
 \r
        // Check if it was within the last two days\r

-    public boolean attributeCheck(Note n) {\r
+    @Override\r
+       public boolean attributeCheck(Note n) {\r

         QDateTime noteDate, current;\r
         noteDate = noteTime(n);\r
         current = currentTime();\r
         QDateTime noteDate, current;\r
         noteDate = noteTime(n);\r
         current = currentTime();\r


@@ -87,6 +88,7 @@ class checkYesterday extends DateAttributeFilter {
                else\r
                        return noteDate.daysTo(current) > 1;\r
        }\r
                else\r
                        return noteDate.daysTo(current) > 1;\r
        }\r

+       @Override\r

        public String getLabel(){\r
                return QCoreApplication.translate("cx.fbn.nevernote.filters.DateAttributeFilter", "Yesterday");\r
        }\r
        public String getLabel(){\r
                return QCoreApplication.translate("cx.fbn.nevernote.filters.DateAttributeFilter", "Yesterday");\r
        }\r


@@ -98,7 +100,8 @@ class checkThisWeek extends DateAttributeFilter {
     }\r
 \r
        // Check if it was within the last two days\r
     }\r
 \r
        // Check if it was within the last two days\r

-    public boolean attributeCheck(Note n) {\r
+    @Override\r
+       public boolean attributeCheck(Note n) {\r

         QDateTime noteDate, current;\r
         noteDate = noteTime(n);\r
         current = currentTime();\r
         QDateTime noteDate, current;\r
         noteDate = noteTime(n);\r
         current = currentTime();\r


@@ -108,6 +111,7 @@ class checkThisWeek extends DateAttributeFilter {
                else\r
                        return noteDate.daysTo(current) > 7;\r
        }\r
                else\r
                        return noteDate.daysTo(current) > 7;\r
        }\r

+       @Override\r

        public String getLabel(){\r
                return QCoreApplication.translate("cx.fbn.nevernote.filters.DateAttributeFilter", "This Week");\r
        }\r
        public String getLabel(){\r
                return QCoreApplication.translate("cx.fbn.nevernote.filters.DateAttributeFilter", "This Week");\r
        }\r


@@ -119,7 +123,8 @@ class checkLastWeek extends DateAttributeFilter {
     }\r
 \r
        // Check if it was within the last two weeks\r
     }\r
 \r
        // Check if it was within the last two weeks\r

-    public boolean attributeCheck(Note n) {\r
+    @Override\r
+       public boolean attributeCheck(Note n) {\r

         QDateTime noteDate, current;\r
         noteDate = noteTime(n);\r
         current = currentTime();\r
         QDateTime noteDate, current;\r
         noteDate = noteTime(n);\r
         current = currentTime();\r


@@ -129,6 +134,7 @@ class checkLastWeek extends DateAttributeFilter {
                else\r
                        return noteDate.daysTo(current) > 14;\r
        }\r
                else\r
                        return noteDate.daysTo(current) > 14;\r
        }\r

+       @Override\r

        public String getLabel(){\r
                return QCoreApplication.translate("cx.fbn.nevernote.filters.DateAttributeFilter", "Last Week");\r
        }\r
        public String getLabel(){\r
                return QCoreApplication.translate("cx.fbn.nevernote.filters.DateAttributeFilter", "Last Week");\r
        }\r


@@ -140,7 +146,8 @@ class checkMonth extends DateAttributeFilter {
     }\r
 \r
        // Check if it was within the last month\r
     }\r
 \r
        // Check if it was within the last month\r

-    public boolean attributeCheck(Note n) {\r
+    @Override\r
+       public boolean attributeCheck(Note n) {\r

         QDateTime noteDate, current;\r
         noteDate = noteTime(n);\r
         current = currentTime();\r
         QDateTime noteDate, current;\r
         noteDate = noteTime(n);\r
         current = currentTime();\r


@@ -157,6 +164,7 @@ class checkMonth extends DateAttributeFilter {
                                return noteDate.date().month() - current.date().month() != 0;\r
                }\r
        }\r
                                return noteDate.date().month() - current.date().month() != 0;\r
                }\r
        }\r

+       @Override\r

        public String getLabel(){\r
                return QCoreApplication.translate("cx.fbn.nevernote.filters.DateAttributeFilter", "This Month");\r
        }\r
        public String getLabel(){\r
                return QCoreApplication.translate("cx.fbn.nevernote.filters.DateAttributeFilter", "This Month");\r
        }\r


@@ -168,7 +176,8 @@ class checkLastMonth extends DateAttributeFilter {
     }\r
 \r
        // Check if it was within the last two months\r
     }\r
 \r
        // Check if it was within the last two months\r

-    public boolean attributeCheck(Note n) {\r
+    @Override\r
+       public boolean attributeCheck(Note n) {\r

         QDateTime noteDate, current;\r
         noteDate = noteTime(n);\r
         current = currentTime();\r
         QDateTime noteDate, current;\r
         noteDate = noteTime(n);\r
         current = currentTime();\r


@@ -189,6 +198,7 @@ class checkLastMonth extends DateAttributeFilter {
                        return cm-nm > 1;\r
                }\r
        }\r
                        return cm-nm > 1;\r
                }\r
        }\r

+       @Override\r

        public String getLabel(){\r
                return QCoreApplication.translate("cx.fbn.nevernote.filters.DateAttributeFilter", "Last Month");\r
        }\r
        public String getLabel(){\r
                return QCoreApplication.translate("cx.fbn.nevernote.filters.DateAttributeFilter", "Last Month");\r
        }\r


@@ -199,7 +209,8 @@ class checkYear extends DateAttributeFilter {
                super(since,created);\r
        }\r
        // Check if it was within this year\r
                super(since,created);\r
        }\r
        // Check if it was within this year\r

-    public boolean attributeCheck(Note n) {\r
+    @Override\r
+       public boolean attributeCheck(Note n) {\r

         QDateTime noteDate, current;\r
         noteDate = noteTime(n);\r
         current = currentTime();\r
         QDateTime noteDate, current;\r
         noteDate = noteTime(n);\r
         current = currentTime();\r


@@ -212,6 +223,7 @@ class checkYear extends DateAttributeFilter {
                        return cy-ny > 0;\r
        }       \r
 \r
                        return cy-ny > 0;\r
        }       \r
 \r

+       @Override\r

        public String getLabel(){\r
                return QCoreApplication.translate("cx.fbn.nevernote.filters.DateAttributeFilter", "This Year");\r
        }\r
        public String getLabel(){\r
                return QCoreApplication.translate("cx.fbn.nevernote.filters.DateAttributeFilter", "This Year");\r
        }\r


@@ -223,7 +235,8 @@ class checkLastYear extends DateAttributeFilter {
     }\r
 \r
        // Check if it was within the last year\r
     }\r
 \r
        // Check if it was within the last year\r

-    public boolean attributeCheck(Note n) {\r
+    @Override\r
+       public boolean attributeCheck(Note n) {\r

         QDateTime noteDate, current;\r
         noteDate = noteTime(n);\r
         current = currentTime();\r
         QDateTime noteDate, current;\r
         noteDate = noteTime(n);\r
         current = currentTime();\r


@@ -236,6 +249,7 @@ class checkLastYear extends DateAttributeFilter {
                        return cy-ny > 1;\r
        }\r
 \r
                        return cy-ny > 1;\r
        }\r
 \r

+       @Override\r

        public String getLabel(){\r
                return QCoreApplication.translate("cx.fbn.nevernote.filters.DateAttributeFilter", "Last Year");\r
        }\r
        public String getLabel(){\r
                return QCoreApplication.translate("cx.fbn.nevernote.filters.DateAttributeFilter", "Last Year");\r
        }\r

diff --git a/src/cx/fbn/nevernote/filters/EnSearch.java b/src/cx/fbn/nevernote/filters/EnSearch.java
index e4c7ab3..df8c27c 100644 (file)
--- a/src/cx/fbn/nevernote/filters/EnSearch.java
+++ b/src/cx/fbn/nevernote/filters/EnSearch.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/filters/FilterEditorNotebooks.java b/src/cx/fbn/nevernote/filters/FilterEditorNotebooks.java
index 4e32354..52bfebe 100644 (file)
--- a/src/cx/fbn/nevernote/filters/FilterEditorNotebooks.java
+++ b/src/cx/fbn/nevernote/filters/FilterEditorNotebooks.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/filters/FilterEditorTags.java b/src/cx/fbn/nevernote/filters/FilterEditorTags.java
index 0ed9c3d..4a417f5 100644 (file)
--- a/src/cx/fbn/nevernote/filters/FilterEditorTags.java
+++ b/src/cx/fbn/nevernote/filters/FilterEditorTags.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/filters/NoteSortFilterProxyModel.java b/src/cx/fbn/nevernote/filters/NoteSortFilterProxyModel.java
index bc168d4..bb2c4da 100644 (file)
--- a/src/cx/fbn/nevernote/filters/NoteSortFilterProxyModel.java
+++ b/src/cx/fbn/nevernote/filters/NoteSortFilterProxyModel.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r


@@ -33,11 +33,15 @@ import cx.fbn.nevernote.Global;
 \r
 public class NoteSortFilterProxyModel extends QSortFilterProxyModel {\r
        private final TreeSet<String> guids;\r
 \r
 public class NoteSortFilterProxyModel extends QSortFilterProxyModel {\r
        private final TreeSet<String> guids;\r

+       public Signal2<Integer,Integer> sortChanged;\r
+       public boolean blocked;\r

        \r
        public NoteSortFilterProxyModel(QObject parent) {\r
                super(parent);\r
        \r
        public NoteSortFilterProxyModel(QObject parent) {\r
                super(parent);\r

+               boolean blocked = false;\r

                guids = new TreeSet<String>();\r
                setDynamicSortFilter(true);\r
                guids = new TreeSet<String>();\r
                setDynamicSortFilter(true);\r

+               sortChanged = new Signal2<Integer,Integer>();\r

 //             logger = new ApplicationLogger("filter.log");\r
        }\r
        public void clear() {\r
 //             logger = new ApplicationLogger("filter.log");\r
        }\r
        public void clear() {\r


@@ -67,8 +71,12 @@ public class NoteSortFilterProxyModel extends QSortFilterProxyModel {
        \r
        @Override\r
        public void sort(int col, Qt.SortOrder order) {\r
        \r
        @Override\r
        public void sort(int col, Qt.SortOrder order) {\r

-               if (col != Global.noteTableThumbnailPosition)\r
+               if (col != Global.noteTableThumbnailPosition) {\r
+                       if (!blocked)   {\r
+                               sortChanged.emit(col, order.value());    // Signal that the sort order has been modified\r
+                       }\r

                        super.sort(col,order);\r
                        super.sort(col,order);\r

+               }\r

        }\r
        \r
        @Override\r
        }\r
        \r
        @Override\r

diff --git a/src/cx/fbn/nevernote/filters/NotebookCounter.java b/src/cx/fbn/nevernote/filters/NotebookCounter.java
index f748426..40e5928 100644 (file)
--- a/src/cx/fbn/nevernote/filters/NotebookCounter.java
+++ b/src/cx/fbn/nevernote/filters/NotebookCounter.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/filters/TagCounter.java b/src/cx/fbn/nevernote/filters/TagCounter.java
index db94809..e84e96e 100644 (file)
--- a/src/cx/fbn/nevernote/filters/TagCounter.java
+++ b/src/cx/fbn/nevernote/filters/TagCounter.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/filters/WordFilter.java b/src/cx/fbn/nevernote/filters/WordFilter.java
index f81d64b..7c66391 100644 (file)
--- a/src/cx/fbn/nevernote/filters/WordFilter.java
+++ b/src/cx/fbn/nevernote/filters/WordFilter.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/gui/AttributeTreeWidget.java b/src/cx/fbn/nevernote/gui/AttributeTreeWidget.java
index 7707b36..715f342 100644 (file)
--- a/src/cx/fbn/nevernote/gui/AttributeTreeWidget.java
+++ b/src/cx/fbn/nevernote/gui/AttributeTreeWidget.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009,2010 Randy Baumgarte\r
  * Copyright 2010 Hiroshi Miura\r
  * \r
  * Copyright 2009,2010 Randy Baumgarte\r
  * Copyright 2010 Hiroshi Miura\r
  * \r

diff --git a/src/cx/fbn/nevernote/gui/BrowserWindow.java b/src/cx/fbn/nevernote/gui/BrowserWindow.java
index 0fb75aa..2741c49 100644 (file)
--- a/src/cx/fbn/nevernote/gui/BrowserWindow.java
+++ b/src/cx/fbn/nevernote/gui/BrowserWindow.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/gui/ColorMenu.java b/src/cx/fbn/nevernote/gui/ColorMenu.java
index 7144b85..759b96a 100644 (file)
--- a/src/cx/fbn/nevernote/gui/ColorMenu.java
+++ b/src/cx/fbn/nevernote/gui/ColorMenu.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/gui/ContainsAttributeFilterTable.java b/src/cx/fbn/nevernote/gui/ContainsAttributeFilterTable.java
index 24a3377..033f850 100644 (file)
--- a/src/cx/fbn/nevernote/gui/ContainsAttributeFilterTable.java
+++ b/src/cx/fbn/nevernote/gui/ContainsAttributeFilterTable.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009,2010 Randy Baumgarte\r
  * Copyright 2010 Hiroshi Miura \r
  * \r
  * Copyright 2009,2010 Randy Baumgarte\r
  * Copyright 2010 Hiroshi Miura \r
  * \r

diff --git a/src/cx/fbn/nevernote/gui/ContentView.java b/src/cx/fbn/nevernote/gui/ContentView.java
index 4c09bf0..b270e01 100644 (file)
--- a/src/cx/fbn/nevernote/gui/ContentView.java
+++ b/src/cx/fbn/nevernote/gui/ContentView.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/gui/DateAttributeFilterTable.java b/src/cx/fbn/nevernote/gui/DateAttributeFilterTable.java
index 2003bad..5319e97 100644 (file)
--- a/src/cx/fbn/nevernote/gui/DateAttributeFilterTable.java
+++ b/src/cx/fbn/nevernote/gui/DateAttributeFilterTable.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r


@@ -20,7 +20,9 @@
 package cx.fbn.nevernote.gui;\r
 \r
 import java.util.ArrayList;\r
 package cx.fbn.nevernote.gui;\r
 \r
 import java.util.ArrayList;\r

+\r

 import com.evernote.edam.type.Note;\r
 import com.evernote.edam.type.Note;\r

+\r

 import cx.fbn.nevernote.filters.DateAttributeFilter;\r
 import cx.fbn.nevernote.filters.DateAttributeFilterFactory;\r
 \r
 import cx.fbn.nevernote.filters.DateAttributeFilter;\r
 import cx.fbn.nevernote.filters.DateAttributeFilterFactory;\r
 \r

diff --git a/src/cx/fbn/nevernote/gui/ExternalBrowse.java b/src/cx/fbn/nevernote/gui/ExternalBrowse.java
index 2d760e8..a16e7c6 100644 (file)
--- a/src/cx/fbn/nevernote/gui/ExternalBrowse.java
+++ b/src/cx/fbn/nevernote/gui/ExternalBrowse.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r


@@ -48,7 +48,7 @@ public class ExternalBrowse extends QMdiSubWindow {
        // Constructor\r
        public ExternalBrowse(DatabaseConnection c) {\r
                setAttribute(WidgetAttribute.WA_QuitOnClose, false);\r
        // Constructor\r
        public ExternalBrowse(DatabaseConnection c) {\r
                setAttribute(WidgetAttribute.WA_QuitOnClose, false);\r

-               setWindowTitle(tr("NeverNote"));\r
+               setWindowTitle(tr("NixNote"));\r

                conn = c;\r
                contentsChanged = new Signal4<String, String, Boolean, BrowserWindow>();\r
                windowClosing = new Signal1<String>();\r
                conn = c;\r
                contentsChanged = new Signal4<String, String, Boolean, BrowserWindow>();\r
                windowClosing = new Signal1<String>();\r


@@ -86,7 +86,7 @@ public class ExternalBrowse extends QMdiSubWindow {
     \r
     @SuppressWarnings("unused")\r
        private void titleChanged(String value) {\r
     \r
     @SuppressWarnings("unused")\r
        private void titleChanged(String value) {\r

-       setWindowTitle(tr("NeverNote - ") +value);\r
+       setWindowTitle(tr("NixNote - ") +value);\r

     }\r
     \r
        @SuppressWarnings("unused")\r
     }\r
     \r
        @SuppressWarnings("unused")\r

diff --git a/src/cx/fbn/nevernote/gui/ExternalBrowserMenuBar.java b/src/cx/fbn/nevernote/gui/ExternalBrowserMenuBar.java
index 933fb63..e6694e6 100644 (file)
--- a/src/cx/fbn/nevernote/gui/ExternalBrowserMenuBar.java
+++ b/src/cx/fbn/nevernote/gui/ExternalBrowserMenuBar.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/gui/Highlighter.java b/src/cx/fbn/nevernote/gui/Highlighter.java
index b5ed928..8513ceb 100644 (file)
--- a/src/cx/fbn/nevernote/gui/Highlighter.java
+++ b/src/cx/fbn/nevernote/gui/Highlighter.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/gui/MainMenuBar.java b/src/cx/fbn/nevernote/gui/MainMenuBar.java
index 2bb8edd..ced7c2d 100644 (file)
--- a/src/cx/fbn/nevernote/gui/MainMenuBar.java
+++ b/src/cx/fbn/nevernote/gui/MainMenuBar.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r


@@ -649,7 +649,7 @@ public class MainMenuBar extends QMenuBar {
                setupShortcut(checkForUpdates, "Help_Check_For_Updates");\r
                \r
                aboutAction = new QAction(tr("About"), this);\r
                setupShortcut(checkForUpdates, "Help_Check_For_Updates");\r
                \r
                aboutAction = new QAction(tr("About"), this);\r

-               aboutAction.setToolTip(tr("About NeverNote"));\r
+               aboutAction.setToolTip(tr("About NixNote"));\r

                aboutAction.triggered.connect(parent, "about()"); \r
                setupShortcut(aboutAction, "About_About");\r
                \r
                aboutAction.triggered.connect(parent, "about()"); \r
                setupShortcut(aboutAction, "About_About");\r
                \r

diff --git a/src/cx/fbn/nevernote/gui/NTreeWidgetItem.java b/src/cx/fbn/nevernote/gui/NTreeWidgetItem.java
index 3639670..1356de4 100644 (file)
--- a/src/cx/fbn/nevernote/gui/NTreeWidgetItem.java
+++ b/src/cx/fbn/nevernote/gui/NTreeWidgetItem.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2011 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2011 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/gui/NotebookTreeWidget.java b/src/cx/fbn/nevernote/gui/NotebookTreeWidget.java
index 2002719..e45a2c5 100644 (file)
--- a/src/cx/fbn/nevernote/gui/NotebookTreeWidget.java
+++ b/src/cx/fbn/nevernote/gui/NotebookTreeWidget.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/gui/PDFPreview.java b/src/cx/fbn/nevernote/gui/PDFPreview.java
index 000eaa9..525d11b 100644 (file)
--- a/src/cx/fbn/nevernote/gui/PDFPreview.java
+++ b/src/cx/fbn/nevernote/gui/PDFPreview.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/gui/SavedSearchTreeWidget.java b/src/cx/fbn/nevernote/gui/SavedSearchTreeWidget.java
index d0fd615..ec0952b 100644 (file)
--- a/src/cx/fbn/nevernote/gui/SavedSearchTreeWidget.java
+++ b/src/cx/fbn/nevernote/gui/SavedSearchTreeWidget.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/gui/ShortcutKeys.java b/src/cx/fbn/nevernote/gui/ShortcutKeys.java
index 906cee3..e7d44ed 100644 (file)
--- a/src/cx/fbn/nevernote/gui/ShortcutKeys.java
+++ b/src/cx/fbn/nevernote/gui/ShortcutKeys.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/gui/TableView.java b/src/cx/fbn/nevernote/gui/TableView.java
index fb9eff0..4c86a16 100644 (file)
--- a/src/cx/fbn/nevernote/gui/TableView.java
+++ b/src/cx/fbn/nevernote/gui/TableView.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r


@@ -544,6 +544,5 @@ public class TableView extends QTableView {
                        \r
                setColumnHidden(Global.noteTableThumbnailPosition, !toggle);\r
        }\r
                        \r
                setColumnHidden(Global.noteTableThumbnailPosition, !toggle);\r
        }\r

-\r

        \r
 }\r
        \r
 }\r

diff --git a/src/cx/fbn/nevernote/gui/TagLineCompleter.java b/src/cx/fbn/nevernote/gui/TagLineCompleter.java
index cbab749..07c7d13 100644 (file)
--- a/src/cx/fbn/nevernote/gui/TagLineCompleter.java
+++ b/src/cx/fbn/nevernote/gui/TagLineCompleter.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/gui/TagLineEdit.java b/src/cx/fbn/nevernote/gui/TagLineEdit.java
index 78a6f62..49d476d 100644 (file)
--- a/src/cx/fbn/nevernote/gui/TagLineEdit.java
+++ b/src/cx/fbn/nevernote/gui/TagLineEdit.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/gui/TagTreeWidget.java b/src/cx/fbn/nevernote/gui/TagTreeWidget.java
index 4ffa009..9ca9c34 100644 (file)
--- a/src/cx/fbn/nevernote/gui/TagTreeWidget.java
+++ b/src/cx/fbn/nevernote/gui/TagTreeWidget.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009,2010 Randy Baumgarte\r
  * Copyright 2010 Hiroshi Miura\r
  * \r
  * Copyright 2009,2010 Randy Baumgarte\r
  * Copyright 2010 Hiroshi Miura\r
  * \r

diff --git a/src/cx/fbn/nevernote/gui/TrashTreeWidget.java b/src/cx/fbn/nevernote/gui/TrashTreeWidget.java
index eda60ca..99c349e 100644 (file)
--- a/src/cx/fbn/nevernote/gui/TrashTreeWidget.java
+++ b/src/cx/fbn/nevernote/gui/TrashTreeWidget.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/signals/DBRunnerSignal.java b/src/cx/fbn/nevernote/signals/DBRunnerSignal.java
index 4a1de62..9bd22eb 100644 (file)
--- a/src/cx/fbn/nevernote/signals/DBRunnerSignal.java
+++ b/src/cx/fbn/nevernote/signals/DBRunnerSignal.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/signals/IndexSignal.java b/src/cx/fbn/nevernote/signals/IndexSignal.java
index b1a480f..d58ee8c 100644 (file)
--- a/src/cx/fbn/nevernote/signals/IndexSignal.java
+++ b/src/cx/fbn/nevernote/signals/IndexSignal.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/signals/NoteIndexSignal.java b/src/cx/fbn/nevernote/signals/NoteIndexSignal.java
index 942fecd..a2c3980 100644 (file)
--- a/src/cx/fbn/nevernote/signals/NoteIndexSignal.java
+++ b/src/cx/fbn/nevernote/signals/NoteIndexSignal.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/signals/NoteResourceSignal.java b/src/cx/fbn/nevernote/signals/NoteResourceSignal.java
index c809ea3..4483ba6 100644 (file)
--- a/src/cx/fbn/nevernote/signals/NoteResourceSignal.java
+++ b/src/cx/fbn/nevernote/signals/NoteResourceSignal.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/signals/NoteSignal.java b/src/cx/fbn/nevernote/signals/NoteSignal.java
index 90434a9..0148168 100644 (file)
--- a/src/cx/fbn/nevernote/signals/NoteSignal.java
+++ b/src/cx/fbn/nevernote/signals/NoteSignal.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/signals/NotebookSignal.java b/src/cx/fbn/nevernote/signals/NotebookSignal.java
index cce0090..44cba84 100644 (file)
--- a/src/cx/fbn/nevernote/signals/NotebookSignal.java
+++ b/src/cx/fbn/nevernote/signals/NotebookSignal.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/signals/SavedSearchSignal.java b/src/cx/fbn/nevernote/signals/SavedSearchSignal.java
index 17b7598..8a9fbb0 100644 (file)
--- a/src/cx/fbn/nevernote/signals/SavedSearchSignal.java
+++ b/src/cx/fbn/nevernote/signals/SavedSearchSignal.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/signals/StatusSignal.java b/src/cx/fbn/nevernote/signals/StatusSignal.java
index f0d13dc..7306e68 100644 (file)
--- a/src/cx/fbn/nevernote/signals/StatusSignal.java
+++ b/src/cx/fbn/nevernote/signals/StatusSignal.java
@@ -1,5 +1,5 @@
 /*
 /*

- * This file is part of NeverNote 
+ * This file is part of NixNote 

  * Copyright 2009 Randy Baumgarte
  * 
  * This file may be licensed under the terms of of the
  * Copyright 2009 Randy Baumgarte
  * 
  * This file may be licensed under the terms of of the

diff --git a/src/cx/fbn/nevernote/signals/SyncSignal.java b/src/cx/fbn/nevernote/signals/SyncSignal.java
index d9019db..0521d6f 100644 (file)
--- a/src/cx/fbn/nevernote/signals/SyncSignal.java
+++ b/src/cx/fbn/nevernote/signals/SyncSignal.java
@@ -1,5 +1,5 @@
 /*
 /*

- * This file is part of NeverNote 
+ * This file is part of NixNote 

  * Copyright 2009 Randy Baumgarte
  * 
  * This file may be licensed under the terms of of the
  * Copyright 2009 Randy Baumgarte
  * 
  * This file may be licensed under the terms of of the

diff --git a/src/cx/fbn/nevernote/signals/TagSignal.java b/src/cx/fbn/nevernote/signals/TagSignal.java
index 141ea1d..f2a5662 100644 (file)
--- a/src/cx/fbn/nevernote/signals/TagSignal.java
+++ b/src/cx/fbn/nevernote/signals/TagSignal.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/signals/ThreadSignal.java b/src/cx/fbn/nevernote/signals/ThreadSignal.java
index da1db06..924b584 100644 (file)
--- a/src/cx/fbn/nevernote/signals/ThreadSignal.java
+++ b/src/cx/fbn/nevernote/signals/ThreadSignal.java
@@ -1,5 +1,5 @@
 /*
 /*

- * This file is part of NeverNote 
+ * This file is part of NixNote 

  * Copyright 2009 Randy Baumgarte
  * 
  * This file may be licensed under the terms of of the
  * Copyright 2009 Randy Baumgarte
  * 
  * This file may be licensed under the terms of of the

diff --git a/src/cx/fbn/nevernote/signals/TrashSignal.java b/src/cx/fbn/nevernote/signals/TrashSignal.java
index a6d82a7..d3d3825 100644 (file)
--- a/src/cx/fbn/nevernote/signals/TrashSignal.java
+++ b/src/cx/fbn/nevernote/signals/TrashSignal.java
@@ -1,5 +1,5 @@
 /*
 /*

- * This file is part of NeverNote 
+ * This file is part of NixNote 

  * Copyright 2009 Randy Baumgarte
  * 
  * This file may be licensed under the terms of of the
  * Copyright 2009 Randy Baumgarte
  * 
  * This file may be licensed under the terms of of the

diff --git a/src/cx/fbn/nevernote/sql/DatabaseConnection.java b/src/cx/fbn/nevernote/sql/DatabaseConnection.java
index 21b852a..2315180 100644 (file)
--- a/src/cx/fbn/nevernote/sql/DatabaseConnection.java
+++ b/src/cx/fbn/nevernote/sql/DatabaseConnection.java
@@ -1,5 +1,5 @@
 /*
 /*

- * This file is part of NeverNote 
+ * This file is part of NixNote 

  * Copyright 2009 Randy Baumgarte
  * 
  * This file may be licensed under the terms of of the
  * Copyright 2009 Randy Baumgarte
  * 
  * This file may be licensed under the terms of of the


@@ -239,6 +239,19 @@ public class DatabaseConnection {
                        executeSql("alter table note add column ORIGINAL_GUID VarChar");
                        executeSql("create index NOTE_ORIGINAL_GUID_INDEX on note (original_guid, guid);");
                }
                        executeSql("alter table note add column ORIGINAL_GUID VarChar");
                        executeSql("create index NOTE_ORIGINAL_GUID_INDEX on note (original_guid, guid);");
                }

+               if (!dbTableColumnExists("NOTEBOOK", "NARROW_SORT_ORDER")) {
+                       executeSql("alter table notebook add column NARROW_SORT_ORDER integer");
+                       executeSql("update notebook set NARROW_SORT_ORDER = -1");
+
+                       executeSql("alter table notebook add column WIDE_SORT_ORDER integer");
+                       executeSql("update notebook set WIDE_SORT_ORDER = -1");
+                       
+                       executeSql("alter table notebook add column WIDE_SORT_COLUMN integer");
+                       executeSql("update notebook set WIDE_SORT_COLUMN = -1");
+                       
+                       executeSql("alter table notebook add column NARROW_SORT_COLUMN integer");
+                       executeSql("update notebook set NARROW_SORT_COLUMN = -1");
+               }

 
                
        }
 
                
        }

diff --git a/src/cx/fbn/nevernote/sql/DeletedItemRecord.java b/src/cx/fbn/nevernote/sql/DeletedItemRecord.java
index 5fa3fee..e73f61c 100644 (file)
--- a/src/cx/fbn/nevernote/sql/DeletedItemRecord.java
+++ b/src/cx/fbn/nevernote/sql/DeletedItemRecord.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/sql/DeletedTable.java b/src/cx/fbn/nevernote/sql/DeletedTable.java
index 5331646..1fbbcdf 100644 (file)
--- a/src/cx/fbn/nevernote/sql/DeletedTable.java
+++ b/src/cx/fbn/nevernote/sql/DeletedTable.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/sql/InkImagesTable.java b/src/cx/fbn/nevernote/sql/InkImagesTable.java
index 1dc2a03..f5bea0f 100644 (file)
--- a/src/cx/fbn/nevernote/sql/InkImagesTable.java
+++ b/src/cx/fbn/nevernote/sql/InkImagesTable.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/sql/InvalidXMLTable.java b/src/cx/fbn/nevernote/sql/InvalidXMLTable.java
index 6bc373a..7663d46 100644 (file)
--- a/src/cx/fbn/nevernote/sql/InvalidXMLTable.java
+++ b/src/cx/fbn/nevernote/sql/InvalidXMLTable.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/sql/LinkedNotebookTable.java b/src/cx/fbn/nevernote/sql/LinkedNotebookTable.java
index 5c5fed9..cbdfd1e 100644 (file)
--- a/src/cx/fbn/nevernote/sql/LinkedNotebookTable.java
+++ b/src/cx/fbn/nevernote/sql/LinkedNotebookTable.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/sql/NoteResourceTable.java b/src/cx/fbn/nevernote/sql/NoteResourceTable.java
index 8162a67..e22bda8 100644 (file)
--- a/src/cx/fbn/nevernote/sql/NoteResourceTable.java
+++ b/src/cx/fbn/nevernote/sql/NoteResourceTable.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/sql/NoteTable.java b/src/cx/fbn/nevernote/sql/NoteTable.java
index c76b0b9..6e919f4 100644 (file)
--- a/src/cx/fbn/nevernote/sql/NoteTable.java
+++ b/src/cx/fbn/nevernote/sql/NoteTable.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/sql/NoteTagsRecord.java b/src/cx/fbn/nevernote/sql/NoteTagsRecord.java
index 4a33b4e..65dbefb 100644 (file)
--- a/src/cx/fbn/nevernote/sql/NoteTagsRecord.java
+++ b/src/cx/fbn/nevernote/sql/NoteTagsRecord.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/sql/NoteTagsTable.java b/src/cx/fbn/nevernote/sql/NoteTagsTable.java
index 232bd7d..4abd696 100644 (file)
--- a/src/cx/fbn/nevernote/sql/NoteTagsTable.java
+++ b/src/cx/fbn/nevernote/sql/NoteTagsTable.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/sql/NotebookTable.java b/src/cx/fbn/nevernote/sql/NotebookTable.java
index 21602e0..6671a52 100644 (file)
--- a/src/cx/fbn/nevernote/sql/NotebookTable.java
+++ b/src/cx/fbn/nevernote/sql/NotebookTable.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r


@@ -37,6 +37,7 @@ import com.trolltech.qt.gui.QIcon;
 import com.trolltech.qt.gui.QImage;\r
 import com.trolltech.qt.gui.QPixmap;\r
 \r
 import com.trolltech.qt.gui.QImage;\r
 import com.trolltech.qt.gui.QPixmap;\r
 \r

+import cx.fbn.nevernote.Global;\r

 import cx.fbn.nevernote.sql.driver.NSqlQuery;\r
 import cx.fbn.nevernote.utilities.ApplicationLogger;\r
 import cx.fbn.nevernote.utilities.Pair;\r
 import cx.fbn.nevernote.sql.driver.NSqlQuery;\r
 import cx.fbn.nevernote.utilities.ApplicationLogger;\r
 import cx.fbn.nevernote.utilities.Pair;\r


@@ -803,6 +804,71 @@ public class NotebookTable {
                }       \r
                return null;\r
        }       \r
                }       \r
                return null;\r
        }       \r

+       // Get a notebook's sort order\r
+       public int getSortColumn(String guid) {\r
+               boolean check;\r
+                                       \r
+        NSqlQuery query = new NSqlQuery(db.getConnection());\r
+                                       \r
+        if (Global.getSortOrder() != Global.View_List_Wide)\r
+               check = query.prepare("Select wide_sort_column " \r
+                               +"from "+dbName+" where guid=:guid");\r
+        else\r
+               check = query.prepare("Select narrow_sort_column " \r
+                       +"from "+dbName+" where guid=:guid");\r
+               query.bindValue(":guid", guid);\r
+               check = query.exec();\r
+               if (!check) {\r
+                       logger.log(logger.EXTREME, "Notebook SQL retrieve sort order has failed.");\r
+                       return -1;\r
+               }\r
+               if (query.next()) {\r
+                       return query.valueInteger(0);\r
+               }       \r
+               return -1;\r
+       }       \r
+\r
+       // Get a notebook's sort order\r
+       public int getSortOrder(String guid) {\r
+               boolean check;\r
+                                       \r
+        NSqlQuery query = new NSqlQuery(db.getConnection());\r
+                                       \r
+        if (Global.getSortOrder() != Global.View_List_Wide)\r
+               check = query.prepare("Select wide_sort_order " \r
+                               +"from "+dbName+" where guid=:guid");\r
+        else\r
+               check = query.prepare("Select narrow_sort_order " \r
+                       +"from "+dbName+" where guid=:guid");\r
+               query.bindValue(":guid", guid);\r
+               check = query.exec();\r
+               if (!check) {\r
+                       logger.log(logger.EXTREME, "Notebook SQL retrieve sort order has failed.");\r
+                       return -1;\r
+               }\r
+               if (query.next()) {\r
+                       return query.valueInteger(0);\r
+               }       \r
+               return -1;\r
+       }       \r
+       // Get a notebook's sort order\r
+       public void setSortOrder(String guid, int column, int order) {\r
+               boolean check;\r
+                                       \r
+        NSqlQuery query = new NSqlQuery(db.getConnection());\r
+                                       \r
+        if (Global.getSortOrder() != Global.View_List_Wide)\r
+               check = query.prepare("Update "+dbName+" set wide_sort_order=:order, wide_sort_column=:column where guid=:guid");\r
+        else\r
+               check = query.prepare("Update "+dbName+" set narrow_sort_order=:order, narrow_sort_column=:column where guid=:guid");\r
+\r
+               query.bindValue(":guid", guid);\r
+               query.bindValue(":order", order);\r
+               query.bindValue(":column", column);\r
+               check = query.exec();\r
+               if (!check)\r
+                       logger.log(logger.EXTREME, "Notebook SQL set sort order has failed.");\r
+       }       \r

        // Is a notebook a linked notebook?\r
        public boolean isLinked(String guid) {\r
                boolean check;\r
        // Is a notebook a linked notebook?\r
        public boolean isLinked(String guid) {\r
                boolean check;\r

diff --git a/src/cx/fbn/nevernote/sql/REnSearch.java b/src/cx/fbn/nevernote/sql/REnSearch.java
index ebbbaaf..70eae3e 100644 (file)
--- a/src/cx/fbn/nevernote/sql/REnSearch.java
+++ b/src/cx/fbn/nevernote/sql/REnSearch.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/sql/SavedSearchTable.java b/src/cx/fbn/nevernote/sql/SavedSearchTable.java
index df2d765..b85dd65 100644 (file)
--- a/src/cx/fbn/nevernote/sql/SavedSearchTable.java
+++ b/src/cx/fbn/nevernote/sql/SavedSearchTable.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/sql/SharedNotebookTable.java b/src/cx/fbn/nevernote/sql/SharedNotebookTable.java
index c74c2e2..ed29b09 100644 (file)
--- a/src/cx/fbn/nevernote/sql/SharedNotebookTable.java
+++ b/src/cx/fbn/nevernote/sql/SharedNotebookTable.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/sql/SyncTable.java b/src/cx/fbn/nevernote/sql/SyncTable.java
index 21f90ea..f421a4e 100644 (file)
--- a/src/cx/fbn/nevernote/sql/SyncTable.java
+++ b/src/cx/fbn/nevernote/sql/SyncTable.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/sql/SystemIconTable.java b/src/cx/fbn/nevernote/sql/SystemIconTable.java
index e9ffc0d..ed38095 100644 (file)
--- a/src/cx/fbn/nevernote/sql/SystemIconTable.java
+++ b/src/cx/fbn/nevernote/sql/SystemIconTable.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/sql/TagTable.java b/src/cx/fbn/nevernote/sql/TagTable.java
index 6fb443e..b783578 100644 (file)
--- a/src/cx/fbn/nevernote/sql/TagTable.java
+++ b/src/cx/fbn/nevernote/sql/TagTable.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/sql/WatchFolderRecord.java b/src/cx/fbn/nevernote/sql/WatchFolderRecord.java
index 0dfa47f..44fce41 100644 (file)
--- a/src/cx/fbn/nevernote/sql/WatchFolderRecord.java
+++ b/src/cx/fbn/nevernote/sql/WatchFolderRecord.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/sql/WatchFolderTable.java b/src/cx/fbn/nevernote/sql/WatchFolderTable.java
index 3781168..b463b29 100644 (file)
--- a/src/cx/fbn/nevernote/sql/WatchFolderTable.java
+++ b/src/cx/fbn/nevernote/sql/WatchFolderTable.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/sql/WordsTable.java b/src/cx/fbn/nevernote/sql/WordsTable.java
index af8e60d..f9ddf72 100644 (file)
--- a/src/cx/fbn/nevernote/sql/WordsTable.java
+++ b/src/cx/fbn/nevernote/sql/WordsTable.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/sql/driver/NSqlQuery.java b/src/cx/fbn/nevernote/sql/driver/NSqlQuery.java
index 587a9e1..c1b57b0 100644 (file)
--- a/src/cx/fbn/nevernote/sql/driver/NSqlQuery.java
+++ b/src/cx/fbn/nevernote/sql/driver/NSqlQuery.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/threads/CounterRunner.java b/src/cx/fbn/nevernote/threads/CounterRunner.java
index 8c7e562..dc1fb57 100644 (file)
--- a/src/cx/fbn/nevernote/threads/CounterRunner.java
+++ b/src/cx/fbn/nevernote/threads/CounterRunner.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/threads/IndexRunner.java b/src/cx/fbn/nevernote/threads/IndexRunner.java
index d362f45..938aac7 100644 (file)
--- a/src/cx/fbn/nevernote/threads/IndexRunner.java
+++ b/src/cx/fbn/nevernote/threads/IndexRunner.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/threads/SaveRunner.java b/src/cx/fbn/nevernote/threads/SaveRunner.java
index 3e9d060..1bc484e 100644 (file)
--- a/src/cx/fbn/nevernote/threads/SaveRunner.java
+++ b/src/cx/fbn/nevernote/threads/SaveRunner.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/threads/SyncRunner.java b/src/cx/fbn/nevernote/threads/SyncRunner.java
index 70e2f7c..8acd108 100644 (file)
--- a/src/cx/fbn/nevernote/threads/SyncRunner.java
+++ b/src/cx/fbn/nevernote/threads/SyncRunner.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r


@@ -98,7 +98,7 @@ public class SyncRunner extends QObject implements Runnable {
                public volatile boolean                 keepRunning;\r
                public volatile String                  authToken;\r
                private long                                    evernoteUpdateCount;\r
                public volatile boolean                 keepRunning;\r
                public volatile String                  authToken;\r
                private long                                    evernoteUpdateCount;\r

-               private final String userAgent = "NeverNote/" + System.getProperty("os.name")\r
+               private final String userAgent = "NixNote/" + System.getProperty("os.name")\r

                                                                +"/"+System.getProperty("java.vendor") + "/"\r
                                                                + System.getProperty("java.version") +";";\r
                \r
                                                                +"/"+System.getProperty("java.vendor") + "/"\r
                                                                + System.getProperty("java.version") +";";\r
                \r


@@ -1532,7 +1532,7 @@ public class SyncRunner extends QObject implements Runnable {
                \r
            boolean versionOk = false;\r
                try {\r
                \r
            boolean versionOk = false;\r
                try {\r

-                       versionOk = userStore.checkVersion("NeverNote", \r
+                       versionOk = userStore.checkVersion("NixNote", \r

                    com.evernote.edam.userstore.Constants.EDAM_VERSION_MAJOR, \r
                      com.evernote.edam.userstore.Constants.EDAM_VERSION_MINOR);\r
                } catch (TException e) {\r
                    com.evernote.edam.userstore.Constants.EDAM_VERSION_MAJOR, \r
                      com.evernote.edam.userstore.Constants.EDAM_VERSION_MINOR);\r
                } catch (TException e) {\r

diff --git a/src/cx/fbn/nevernote/threads/ThumbnailRunner.java b/src/cx/fbn/nevernote/threads/ThumbnailRunner.java
index 1417ebb..a8c7d8d 100644 (file)
--- a/src/cx/fbn/nevernote/threads/ThumbnailRunner.java
+++ b/src/cx/fbn/nevernote/threads/ThumbnailRunner.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/utilities/AESEncrypter.java b/src/cx/fbn/nevernote/utilities/AESEncrypter.java
index 0fdfa23..0d39afe 100644 (file)
--- a/src/cx/fbn/nevernote/utilities/AESEncrypter.java
+++ b/src/cx/fbn/nevernote/utilities/AESEncrypter.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/utilities/ApplicationLogger.java b/src/cx/fbn/nevernote/utilities/ApplicationLogger.java
index 8bedd27..bf7c6f1 100644 (file)
--- a/src/cx/fbn/nevernote/utilities/ApplicationLogger.java
+++ b/src/cx/fbn/nevernote/utilities/ApplicationLogger.java
@@ -1,5 +1,5 @@
 /*
 /*

- * This file is part of NeverNote 
+ * This file is part of NixNote 

  * Copyright 2009 Randy Baumgarte
  * 
  * This file may be licensed under the terms of of the
  * Copyright 2009 Randy Baumgarte
  * 
  * This file may be licensed under the terms of of the

diff --git a/src/cx/fbn/nevernote/utilities/FileImporter.java b/src/cx/fbn/nevernote/utilities/FileImporter.java
index 709d824..eacdfcc 100644 (file)
--- a/src/cx/fbn/nevernote/utilities/FileImporter.java
+++ b/src/cx/fbn/nevernote/utilities/FileImporter.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/utilities/ListManager.java b/src/cx/fbn/nevernote/utilities/ListManager.java
index 3ed0039..608ad9a 100644 (file)
--- a/src/cx/fbn/nevernote/utilities/ListManager.java
+++ b/src/cx/fbn/nevernote/utilities/ListManager.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/utilities/OutStream.java b/src/cx/fbn/nevernote/utilities/OutStream.java
index 36cdd9b..d5c22bc 100644 (file)
--- a/src/cx/fbn/nevernote/utilities/OutStream.java
+++ b/src/cx/fbn/nevernote/utilities/OutStream.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/utilities/Pair.java b/src/cx/fbn/nevernote/utilities/Pair.java
index da1c9de..e29e558 100644 (file)
--- a/src/cx/fbn/nevernote/utilities/Pair.java
+++ b/src/cx/fbn/nevernote/utilities/Pair.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/utilities/StringUtils.java b/src/cx/fbn/nevernote/utilities/StringUtils.java
index dc0da52..4d0d2c9 100644 (file)
--- a/src/cx/fbn/nevernote/utilities/StringUtils.java
+++ b/src/cx/fbn/nevernote/utilities/StringUtils.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/utilities/SyncTimes.java b/src/cx/fbn/nevernote/utilities/SyncTimes.java
index 035e7a4..82357df 100644 (file)
--- a/src/cx/fbn/nevernote/utilities/SyncTimes.java
+++ b/src/cx/fbn/nevernote/utilities/SyncTimes.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/xml/EnmlException.java b/src/cx/fbn/nevernote/xml/EnmlException.java
index 5500e1b..bc16a44 100644 (file)
--- a/src/cx/fbn/nevernote/xml/EnmlException.java
+++ b/src/cx/fbn/nevernote/xml/EnmlException.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/xml/ExportData.java b/src/cx/fbn/nevernote/xml/ExportData.java
index effdcb6..ee36b19 100644 (file)
--- a/src/cx/fbn/nevernote/xml/ExportData.java
+++ b/src/cx/fbn/nevernote/xml/ExportData.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/xml/HtmlTagModifier.java b/src/cx/fbn/nevernote/xml/HtmlTagModifier.java
index 8eb8bd3..9a4eeeb 100644 (file)
--- a/src/cx/fbn/nevernote/xml/HtmlTagModifier.java
+++ b/src/cx/fbn/nevernote/xml/HtmlTagModifier.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/xml/ImportData.java b/src/cx/fbn/nevernote/xml/ImportData.java
index 30f9a38..8070b9a 100644 (file)
--- a/src/cx/fbn/nevernote/xml/ImportData.java
+++ b/src/cx/fbn/nevernote/xml/ImportData.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/xml/XMLCleanup.java b/src/cx/fbn/nevernote/xml/XMLCleanup.java
index 2fd872c..159381d 100644 (file)
--- a/src/cx/fbn/nevernote/xml/XMLCleanup.java
+++ b/src/cx/fbn/nevernote/xml/XMLCleanup.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/xml/XMLInsertHilight.java b/src/cx/fbn/nevernote/xml/XMLInsertHilight.java
index cab8c07..17b9270 100644 (file)
--- a/src/cx/fbn/nevernote/xml/XMLInsertHilight.java
+++ b/src/cx/fbn/nevernote/xml/XMLInsertHilight.java
@@ -1,5 +1,5 @@
 /*\r
 /*\r

- * This file is part of NeverNote \r
+ * This file is part of NixNote \r

  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r

diff --git a/src/cx/fbn/nevernote/xml/XMLNoteRepair.java b/src/cx/fbn/nevernote/xml/XMLNoteRepair.java
index 9d5de24..8cae052 100644 (file)
--- a/src/cx/fbn/nevernote/xml/XMLNoteRepair.java
+++ b/src/cx/fbn/nevernote/xml/XMLNoteRepair.java
@@ -1,5 +1,5 @@
 /*
 /*

- * This file is part of NeverNote 
+ * This file is part of NixNote 

  * Copyright 2009 Randy Baumgarte
  * 
  * This file may be licensed under the terms of of the
  * Copyright 2009 Randy Baumgarte
  * 
  * This file may be licensed under the terms of of the

diff --git a/src/cx/fbn/nevernote/xml/XMLNoteRepairHandler.java b/src/cx/fbn/nevernote/xml/XMLNoteRepairHandler.java
index 9ff1233..6dc41dd 100644 (file)
--- a/src/cx/fbn/nevernote/xml/XMLNoteRepairHandler.java
+++ b/src/cx/fbn/nevernote/xml/XMLNoteRepairHandler.java
@@ -1,5 +1,5 @@
 /*
 /*

- * This file is part of NeverNote 
+ * This file is part of NixNote 

  * Copyright 2009 Randy Baumgarte
  * 
  * This file may be licensed under the terms of of the
  * Copyright 2009 Randy Baumgarte
  * 
  * This file may be licensed under the terms of of the