Cleanup compiler warning messages and alter backup & restore to handle new database...

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

diff --git a/src/cx/fbn/nevernote/gui/NotebookTreeWidget.java b/src/cx/fbn/nevernote/gui/NotebookTreeWidget.java
index 5fcd3a1..e0d9763 100644 (file)
--- a/src/cx/fbn/nevernote/gui/NotebookTreeWidget.java
+++ b/src/cx/fbn/nevernote/gui/NotebookTreeWidget.java
@@ -56,7 +56,6 @@ public class NotebookTreeWidget extends QTreeWidget {
        public NoteSignal                               noteSignal;\r
        private HashMap<String, QIcon>  icons;\r
        private final DatabaseConnection                db;\r
-       private List<NotebookCounter> lastCounts;\r
        private final HashMap<String, QTreeWidgetItem>  stacks;\r
 //     private final QTreeWidgetItem                   previousMouseOver;\r
 //     private boolean                                 previousMouseOverWasSelected;\r
@@ -203,10 +202,13 @@ public class NotebookTreeWidget extends QTreeWidget {
        sortItems(0, SortOrder.AscendingOrder); \r
        if (Global.mimicEvernoteInterface) {\r
                String iconPath = new String("classpath:cx/fbn/nevernote/icons/");\r
-               QIcon greenIcon = new QIcon(iconPath+"notebook-green.png");\r
+               QIcon allIcon = db.getSystemIconTable().getIcon("All Notebooks", "ALLNOTEBOOK");\r
+               \r
+               if (allIcon == null)\r
+                       allIcon = new QIcon(iconPath+"notebook-green.png");\r
                \r
                child = new QTreeWidgetItem();\r
-               child.setIcon(0, greenIcon);\r
+               child.setIcon(0, allIcon);\r
                child.setText(0, "All Notebooks");\r
                child.setText(2, "");\r
                child.setTextAlignment(1, ra.value());\r
@@ -218,7 +220,6 @@ public class NotebookTreeWidget extends QTreeWidget {
 \r
        // update the display with the current number of notes\r
        public void updateCounts(List<Notebook> books, List<NotebookCounter> counts) {\r
-               lastCounts = counts;\r
                QTreeWidgetItem root = invisibleRootItem();\r
                QTreeWidgetItem child;\r
                \r
@@ -441,7 +442,11 @@ public class NotebookTreeWidget extends QTreeWidget {
 \r
        private QTreeWidgetItem createStackIcon(String stackName, Qt.Alignment ra) {\r
                String iconPath = new String("classpath:cx/fbn/nevernote/icons/");\r
-               QIcon stackIcon = new QIcon(iconPath+"books2.png");\r
+               QIcon stackIcon;\r
+               stackIcon = db.getSystemIconTable().getIcon(stackName, "STACK");\r
+               \r
+               if (stackIcon == null)\r
+                       stackIcon = new QIcon(iconPath+"books2.png");\r
                QTreeWidgetItem parent = new QTreeWidgetItem();\r
                stacks.put(stackName, parent);\r
                parent.setText(0, stackName);\r