Change case sensitivity for notebooks, tags, & saved searches.

diff --git a/src/cx/fbn/nevernote/gui/NTreeWidgetItem.java b/src/cx/fbn/nevernote/gui/NTreeWidgetItem.java
new file mode 100644 (file)
index 0000000..3639670
--- /dev/null
+++ b/src/cx/fbn/nevernote/gui/NTreeWidgetItem.java
@@ -0,0 +1,32 @@
+/*\r
+ * This file is part of NeverNote \r
+ * Copyright 2011 Randy Baumgarte\r
+ * \r
+ * This file may be licensed under the terms of of the\r
+ * GNU General Public License Version 2 (the ``GPL'').\r
+ *\r
+ * Software distributed under the License is distributed\r
+ * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either\r
+ * express or implied. See the GPL for the specific language\r
+ * governing rights and limitations.\r
+ *\r
+ * You should have received a copy of the GPL along with this\r
+ * program. If not, go to http://www.gnu.org/licenses/gpl.html\r
+ * or write to the Free Software Foundation, Inc.,\r
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\r
+ *\r
+*/\r
+\r
+package cx.fbn.nevernote.gui;\r
+\r
+import com.trolltech.qt.gui.QTreeWidgetItem;\r
+\r
+public class NTreeWidgetItem extends QTreeWidgetItem {\r
+       @Override\r
+       public boolean operator_less(QTreeWidgetItem other) {\r
+               if (text(0).toLowerCase().compareTo(other.text(0).toLowerCase()) < 0)\r
+                       return true;\r
+               else\r
+                       return false;\r
+       }\r
+}\r

diff --git a/src/cx/fbn/nevernote/gui/NotebookTreeWidget.java b/src/cx/fbn/nevernote/gui/NotebookTreeWidget.java
index e46baaa..b894d80 100644 (file)
--- a/src/cx/fbn/nevernote/gui/NotebookTreeWidget.java
+++ b/src/cx/fbn/nevernote/gui/NotebookTreeWidget.java
@@ -183,7 +183,7 @@ public class NotebookTreeWidget extends QTreeWidget {
        \r
        public void load(List<Notebook> books, List<String> localBooks) {\r
        Notebook book;\r
-       QTreeWidgetItem child;\r
+       NTreeWidgetItem child;\r
        \r
        /* First, let's find out which stacks are expanded */\r
        QTreeWidgetItem root =  invisibleRootItem();\r
@@ -201,7 +201,7 @@ public class NotebookTreeWidget extends QTreeWidget {
        Qt.Alignment ra = new Qt.Alignment(Qt.AlignmentFlag.AlignRight);\r
        for (int i=0; i<books.size(); i++) {\r
                        book = books.get(i);\r
-                       child = new QTreeWidgetItem();\r
+                       child = new NTreeWidgetItem();\r
                        child.setChildIndicatorPolicy(ChildIndicatorPolicy.DontShowIndicatorWhenChildless);\r
                        child.setText(0, book.getName());\r
                if (icons != null && !icons.containsKey(book.getGuid())) {\r
@@ -236,7 +236,7 @@ public class NotebookTreeWidget extends QTreeWidget {
                if (allIcon == null)\r
                        allIcon = new QIcon(iconPath+"notebook-green.png");\r
                \r
-               child = new QTreeWidgetItem();\r
+               child = new NTreeWidgetItem();\r
                child.setIcon(0, allIcon);\r
                child.setText(0, "All Notebooks");\r
                child.setText(2, "");\r

diff --git a/src/cx/fbn/nevernote/gui/SavedSearchTreeWidget.java b/src/cx/fbn/nevernote/gui/SavedSearchTreeWidget.java
index c30c5d4..5024d3f 100644 (file)
--- a/src/cx/fbn/nevernote/gui/SavedSearchTreeWidget.java
+++ b/src/cx/fbn/nevernote/gui/SavedSearchTreeWidget.java
@@ -70,7 +70,7 @@ public class SavedSearchTreeWidget extends QTreeWidget {
        \r
        public void load(List<SavedSearch> tempList) {\r
        SavedSearch search;\r
-       List<QTreeWidgetItem> index = new ArrayList<QTreeWidgetItem>();\r
+       List<NTreeWidgetItem> index = new ArrayList<NTreeWidgetItem>();\r
                \r
        //Clear out the tree & reload\r
        clear();\r
@@ -79,7 +79,7 @@ public class SavedSearchTreeWidget extends QTreeWidget {
        \r
                for (int i=0; i<tempList.size(); i++) {\r
                        search = tempList.get(i);\r
-                       QTreeWidgetItem child = new QTreeWidgetItem();\r
+                       NTreeWidgetItem child = new NTreeWidgetItem();\r
                        child.setText(0, search.getName());\r
                if (icons != null && !icons.containsKey(search.getGuid())) {\r
                        child.setIcon(0, icon);\r

diff --git a/src/cx/fbn/nevernote/gui/TagTreeWidget.java b/src/cx/fbn/nevernote/gui/TagTreeWidget.java
index 5cc0896..ee4d161 100644 (file)
--- a/src/cx/fbn/nevernote/gui/TagTreeWidget.java
+++ b/src/cx/fbn/nevernote/gui/TagTreeWidget.java
@@ -84,6 +84,7 @@ public class TagTreeWidget extends QTreeWidget {
                noteSignal = new NoteSignal();\r
                setDragDropMode(QAbstractItemView.DragDropMode.DragDrop);\r
        setHeaderLabels(headers);\r
+\r
 //     setSelectionMode(QAbstractItemView.SelectionMode.MultiSelection);\r
        setSelectionMode(QAbstractItemView.SelectionMode.ExtendedSelection);\r
        \r
@@ -93,6 +94,7 @@ public class TagTreeWidget extends QTreeWidget {
                if (width>0)\r
                        setColumnWidth(0, width);\r
 \r
+               \r
        }\r
        \r
        public void setEditAction(QAction e) {\r
@@ -114,11 +116,11 @@ public class TagTreeWidget extends QTreeWidget {
        public void insertTag(String name, String guid) {\r
        String iconPath = new String("classpath:cx/fbn/nevernote/icons/");\r
                QIcon icon = new QIcon(iconPath+"tag.png");\r
-               QTreeWidgetItem child;\r
+               NTreeWidgetItem child;\r
                Qt.Alignment ra = new Qt.Alignment(Qt.AlignmentFlag.AlignRight);\r
                \r
                // Build new tag & add it\r
-               child = new QTreeWidgetItem();\r
+               child = new NTreeWidgetItem();\r
                child.setText(0, name);\r
                child.setIcon(0,icon);\r
                child.setText(2, guid);\r
@@ -172,8 +174,8 @@ public class TagTreeWidget extends QTreeWidget {
        \r
        public void load(List<Tag> tags) {\r
        Tag tag;\r
-       List<QTreeWidgetItem> index = new ArrayList<QTreeWidgetItem>();\r
-       QTreeWidgetItem child;\r
+       List<NTreeWidgetItem> index = new ArrayList<NTreeWidgetItem>();\r
+       NTreeWidgetItem child;\r
                        \r
        /* First, let's find out which stacks are expanded */\r
        QTreeWidgetItem root =  invisibleRootItem();\r
@@ -198,7 +200,7 @@ public class TagTreeWidget extends QTreeWidget {
                for (int i=0; i<tempList.size(); i++) {\r
                        tag = tempList.get(i);\r
                        if (tag.getParentGuid()==null || tag.getParentGuid().equals("")) {\r
-                               child = new QTreeWidgetItem();\r
+                               child = new NTreeWidgetItem();\r
                                child.setText(0, tag.getName());\r
                                if (icons != null && !icons.containsKey(tag.getGuid())) {\r
                                        child.setIcon(0, findDefaultIcon(tag.getGuid()));\r
@@ -215,7 +217,7 @@ public class TagTreeWidget extends QTreeWidget {
                                // We need to find the parent\r
                                for (int j=0; j<index.size(); j++) {\r
                                        if (index.get(j).text(2).equals(tag.getParentGuid())) {\r
-                                       child = new QTreeWidgetItem();\r
+                                       child = new NTreeWidgetItem();\r
                                        child.setText(0, tag.getName());\r
                                        child.setIcon(0, icon);\r
                                        child.setText(2, tag.getGuid());\r
@@ -480,4 +482,6 @@ public class TagTreeWidget extends QTreeWidget {
                        rightButtonClicked = false;\r
                super.mousePressEvent(e);\r
        }\r
+\r
+       \r
 }\r