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

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

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
- * 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
@@ -33,11 +33,15 @@ import cx.fbn.nevernote.Global;
 \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
+               boolean blocked = false;\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
@@ -67,8 +71,12 @@ public class NoteSortFilterProxyModel extends QSortFilterProxyModel {
        \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
+               }\r
        }\r
        \r
        @Override\r