Merge lp:~kaboom/wxbanker/advancedCategories into lp:wxbanker

[wolfer]

[wolfer (wolfer7)]

this branch is the implementation of blueprint "advanced Category Management". it adds categories to wxbankers functionality. categories are hierarchical and exclusive (one transaction - one category).

working features:
- adding / removing / renaming categories (via button and via context menu)
- subcategories
- assigning a category to a transaction (via context menu, via edit in listctrl and via drag-n-drop)
- display transactions with selected category
- drag-n-drop to change the category hierarchy
- search by category

not implemented:
- split transaction value across categories

[Michael Rooney (mrooney)]

Hello! I just have a few initial questions.

* Does this depend on lp:~kolmis/wxbanker/transaction-tagging being merged first?
* It says "TODO!!! By no means complete!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!", is that still the case?

review: Needs Information

[lp:~kaboom/wxbanker/advancedCategories]

294. By Wolfgang Steitz <wolfer@franzi> on 2009-06-11

remove todofile. bugs did not reappear

[wolfer (wolfer7)]

> Hello! I just have a few initial questions.
>
> * Does this depend on lp:~kolmis/wxbanker/transaction-tagging being merged
> first?
> * It says "TODO!!! By no means
> complete!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!", is that still
> the case?

* we started our branch from the lp:~kolmis/wxbanker/transaction-tagging branch, which was not the best idea i guess. so basically our categories to not depend on transaction-tagging, but all the tagging stuff is in our branch too. i think we should either remove all the tagging stuff from our branch, or wait for the transaction-tagging branch beeing merged.

* i just removed the todo-file. there were two bugs left, but they did not reappear and i was not able to reproduce them respectively.

[lp:~kaboom/wxbanker/advancedCategories]

295. By Wolfgang Steitz <wolfer@franzi> on 2009-06-11

merge trunk

[Michael Rooney (mrooney)]

> > Hello! I just have a few initial questions.
> >
> > * Does this depend on lp:~kolmis/wxbanker/transaction-tagging being merged
> > first?
> > * It says "TODO!!! By no means
> > complete!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!", is that
> still
> > the case?
>
>
> * we started our branch from the lp:~kolmis/wxbanker/transaction-tagging
> branch, which was not the best idea i guess. so basically our categories to
> not depend on transaction-tagging, but all the tagging stuff is in our branch
> too. i think we should either remove all the tagging stuff from our branch, or
> wait for the transaction-tagging branch beeing merged.
>
> * i just removed the todo-file. there were two bugs left, but they did not
> reappear and i was not able to reproduce them respectively.

I think you did the right thing, basing it on Karel's tagging branch is probably the right thing to do. I will talk to him and get that in good shape and merge that, then can better review this. Thanks for the clean up :)

[lp:~kaboom/wxbanker/advancedCategories]

296. By wolfer on 2010-02-11

merge lp:~kolmis/wxbanker/transaction-tagging

297. By wolfer on 2010-02-12

merged trunk

298. By wolfer on 2010-03-09

bugfix: saving category of a transaction

299. By wolfer on 2010-03-09

fixed loading of categories

Unmerged revisions

299. By wolfer on 2010-03-09

fixed loading of categories

298. By wolfer on 2010-03-09

bugfix: saving category of a transaction

297. By wolfer on 2010-02-12

merged trunk

296. By wolfer on 2010-02-11

merge lp:~kolmis/wxbanker/transaction-tagging

295. By Wolfgang Steitz <wolfer@franzi> on 2009-06-11

merge trunk

294. By Wolfgang Steitz <wolfer@franzi> on 2009-06-11

remove todofile. bugs did not reappear

293. By Wolfgang Steitz <wolfer@franzi> on 2009-06-11

remove prints in category treectrl

292. By Wolfgang Steitz <wolfer@franzi> on 2009-06-11

drag-n-drop bugfix

291. By Wolfgang Steitz <wolfer@franzi> on 2009-06-09

bugfix

290. By Wolfgang Steitz <wolfer@franzi> on 2009-06-08

category drag-n-drop now works for categories with child categories

=== modified file 'wxbanker/bankexceptions.py' (properties changed: +x to -x)
--- wxbanker/bankexceptions.py	2010-02-21 21:53:07 +0000
+++ wxbanker/bankexceptions.py	2010-03-09 19:09:26 +0000
@@ -29,6 +29,14 @@
 
     def __str__(self):
         return "Account '%s' already exists."%self.account
+        
+class CategoryAlreadyExistsException(Exception):
+    def __init__(self, category):
+        self.category = category
+    
+    def __str__(self):
+        return "Category '%s' already exists."%self.category
+
 
 class BlankAccountNameException(Exception):
     def __str__(self):
 
=== modified file 'wxbanker/bankobjects/account.py'
--- wxbanker/bankobjects/account.py	2010-02-22 00:32:00 +0000
+++ wxbanker/bankobjects/account.py	2010-03-09 19:09:26 +0000
@@ -265,6 +265,7 @@
         else:
             debug.debug("Ignoring transaction because I am %s: %s" % (self.Name, transaction))
 
+
     def float2str(self, *args, **kwargs):
         return self.Currency.float2str(*args, **kwargs)
 
@@ -286,4 +287,4 @@
     Name = property(GetName, SetName)
     Transactions = property(GetTransactions)
     RecurringTransactions = property(GetRecurringTransactions)
-    Currency = property(GetCurrency, SetCurrency)
 \ No newline at end of file
+    Currency = property(GetCurrency, SetCurrency)
 
=== modified file 'wxbanker/bankobjects/bankmodel.py'
--- wxbanker/bankobjects/bankmodel.py	2010-02-22 00:32:00 +0000
+++ wxbanker/bankobjects/bankmodel.py	2010-03-09 19:09:26 +0000
@@ -23,7 +23,11 @@
 
 from wxbanker import currencies
 from wxbanker.bankobjects.ormobject import ORMKeyValueObject
+<<<<<<< TREE
 from wxbanker.mint import MintDotCom
+=======
+from wxbanker.bankobjects.categorylist import CategoryList
+>>>>>>> MERGE-SOURCE
 
 class BankModel(ORMKeyValueObject):
     ORM_TABLE = "meta"
@@ -33,6 +37,8 @@
         ORMKeyValueObject.__init__(self, store)
         self.Store = store
         self.Accounts = accountList
+        self.Tags = store.getTags()
+        self.Categories = CategoryList(store, store.getCategories())
 
         self.Mint = None
         if self.MintEnabled:
@@ -46,7 +52,62 @@
 
     def GetBalance(self):
         return self.Accounts.Balance
+
+    def GetTagById(self, id):
+        for tag in self.Tags:
+            if tag.ID == id:
+                return tag
+        return None
+
+    def GetTagByName(self, name):
+        ''' returns a tag by name, creates a new one if none by that name exists '''
+        for tag in self.Tags:
+            if tag.Name == name:
+                return tag
+        newTag = self.Store.CreateTag(name)
+        self.Tags.append(newTag)
+        return newTag
+
+    def GetCategoryById(self, id):
+        return self.Categories.ByID(id)
+        
+    def GetTransactionById(self, id):
+        transactions = self.GetTransactions()
+        for t in transactions:
+            if t.ID == id:
+                return t
+        return None
+
+    def GetCategoryByName(self, name, parent = None):
+        ''' returns a category by name, creates a new one if none by that name exists '''
+        for cat in self.Categories:
+            if cat.Name == name:
+                return cat
+        newCat = self.Categories.Create(name, parent)
+        return newCat
     
+    def GetChildCategories(self, category):
+        childs = []
+        for cat in self.Categories:
+            if cat.ParentID == category.ID:
+                childs.append(cat)
+                childs.extend(self.GetChildCategories(cat))
+        return childs
+        
+    def GetTopCategories(self, sorted = False):
+        result = []
+        for cat in self.Categories:
+            if not cat.ParentID:
+                result.append(cat)
+        if sorted:
+            result.sort(foo)
+        return result
+          
+    def GetTransactionsByCategory(self, category):
+        transactions = self.GetTransactions()
+        return [t for t in transactions if category == t.Category]  
+
+
     def GetRecurringTransactions(self):
         return self.Accounts.GetRecurringTransactions()
 
@@ -131,10 +192,22 @@
 
     def RemoveAccount(self, accountName):
         return self.Accounts.Remove(accountName)
+        
+    def CreateCategory(self, name, parentID):
+        return self.Categories.Create(name, parentID)
+        
+    def RemoveCategory(self, cat):
+        for t in self.GetTransactionsByCategory(cat):
+            t.Category = None
+        return self.RemoveCategoryName(cat.Name)
+        
+    def RemoveCategoryName(self, catName):
+        
+        return self.Categories.Remove(catName)
 
     def Search(self, searchString, account=None, matchIndex=1):
         """
-        matchIndex: 0: Amount, 1: Description, 2: Date
+        matchIndex: 0: Amount, 1: Description, 2: Date, 3: Tags, 4: Category
         I originally used strings here but passing around and then validating on translated
         strings seems like a bad and fragile idea.
         """
@@ -194,4 +267,6 @@
             for t in a.Transactions:
                 print t
 
-    Balance = property(GetBalance)
 \ No newline at end of file
+    Balance = property(GetBalance)
+
+
 
=== added file 'wxbanker/bankobjects/category.py'
--- wxbanker/bankobjects/category.py	1970-01-01 00:00:00 +0000
+++ wxbanker/bankobjects/category.py	2010-03-09 19:09:26 +0000
@@ -0,0 +1,73 @@
+#!/usr/bin/env python
+#
+#    https://launchpad.net/wxbanker
+#    account.py: Copyright 2007-2009 Mike Rooney <[e-mail]>
+#
+#    This file is part of wxBanker.
+#
+#    wxBanker is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    wxBanker is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with wxBanker.  If not, see <http://www.gnu.org/licenses/>.
+
+from wx.lib.pubsub import Publisher
+
+from wxbanker.bankobjects.ormobject import ORMObject
+
+
+class Category(ORMObject):
+    ORM_TABLE = "categories"
+    ORM_ATTRIBUTES = ["Name", "ParentID"]
+    
+    
+    def __init__(self, cID, name, parent = None):
+        self.IsFrozen = True
+        self.ID = cID
+        self._Name = name
+        self._ParentID = parent
+        Publisher.sendMessage("category.created.%s" % name, self)
+        self.IsFrozen = False
+
+    def __str__(self):
+        return self._Name
+        
+    def __repr__(self):
+        return self.__class__.__name__ + '<' + 'ID=' + str(self.ID) + " Name=" + self._Name + " Parent=" + str(self._ParentID)+'>'
+
+    def __cmp__(self, other):
+        if other is not None:
+            if other == "":
+                return -1
+            else:
+                return cmp(self.ID, other.ID)
+        else:
+            return -1
+           
+    def GetParentID(self):
+        return self._ParentID
+        
+    def SetParentID(self, parent):
+        self._ParentID = parent
+        #print self._Name, "now has parentID ", self._ParentID
+        Publisher.sendMessage("category.parentID", (self, parent))
+        
+    ParentID = property(GetParentID, SetParentID)
+
+    def GetName(self):
+        return self._Name
+
+    def SetName(self, name):
+        #print "in Category.SetName", name
+        oldName = self._Name
+        self._Name = unicode(name)
+        Publisher.sendMessage("category.renamed", (oldName, self))
+
+    Name = property(GetName, SetName)
 
=== added file 'wxbanker/bankobjects/categorylist.py'
--- wxbanker/bankobjects/categorylist.py	1970-01-01 00:00:00 +0000
+++ wxbanker/bankobjects/categorylist.py	2010-03-09 19:09:26 +0000
@@ -0,0 +1,73 @@
+#!/usr/bin/env python
+#
+#    https://launchpad.net/wxbanker
+#    accountlist.py: Copyright 2007-2009 Mike Rooney <[e-mail]>
+#
+#    This file is part of wxBanker.
+#
+#    wxBanker is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    wxBanker is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with wxBanker.  If not, see <http://www.gnu.org/licenses/>.
+
+from wx.lib.pubsub import Publisher
+
+
+class CategoryList(list):
+    
+    def __init__(self, store, categories):
+        list.__init__(self,categories)
+        for cat in self:
+            cat.ParentList = self
+        self.Store = store
+        #print self
+        
+    def CategoryIndex(self, catName):
+        #print self
+        for i, cat in enumerate(self):
+            if cat.Name == catName:
+                return i
+        return -1
+        
+    def ByID(self, id):
+        for cat in self:
+            if cat.ID == id:
+                return cat
+        return None
+        
+    def Create(self, catName, parentID):
+        # First, ensure a category by that name doesn't already exist.
+        if self.CategoryIndex(catName) >= 0:
+            raise bankexceptions.CategoryAlreadyExistsException(catName)
+        cat = self.Store.CreateCategory(catName, parentID)
+        # Make sure this category knows its parent.
+        cat.ParentList = self
+        self.append(cat)
+        return cat
+
+    def Remove(self, catName):
+        index = self.CategoryIndex(catName)
+        if index == -1:
+            raise bankexceptions.InvalidCategoryException(catName)
+        cat = self.pop(index)
+        self.Store.RemoveCategory(cat)
+        Publisher.sendMessage("category.removed.%s"%catName, cat)
+
+    def __eq__(self, other):
+        if len(self) != len(other):
+            return False
+        for left, right in zip(self, other):
+            if not left == right:
+                return False
+        return True
+    
+    def __cmp__(self, other):
+        return cmp(self.Name.lower(), other.Name.lower())  
 
=== modified file 'wxbanker/bankobjects/recurringtransaction.py'
--- wxbanker/bankobjects/recurringtransaction.py	2009-12-06 03:14:06 +0000
+++ wxbanker/bankobjects/recurringtransaction.py	2010-03-09 19:09:26 +0000
@@ -37,8 +37,8 @@
     MONTLY = 2
     YEARLY = 3
     
-    def __init__(self, tID, parent, amount, description, date, repeatType, repeatEvery=1, repeatOn=None, endDate=None, source=None, lastTransacted=None):
-        Transaction.__init__(self, tID, parent, amount, description, date)
+    def __init__(self, store, tID, parent, amount, description, date, repeatType, repeatEvery=1, repeatOn=None, endDate=None, source=None, lastTransacted=None):
+        Transaction.__init__(self, store,  tID, parent, amount, description, date)
         ORMObject.__init__(self)
         
         # If the transaction recurs weekly and repeatsOn isn't specified, use the starting date.
@@ -217,4 +217,4 @@
     
     LastTransacted = property(GetLastTransacted, SetLastTransacted)
     EndDate = property(GetEndDate, SetEndDate)
-    
 \ No newline at end of file
+    
 
=== added file 'wxbanker/bankobjects/tag.py'
--- wxbanker/bankobjects/tag.py	1970-01-01 00:00:00 +0000
+++ wxbanker/bankobjects/tag.py	2010-03-09 19:09:26 +0000
@@ -0,0 +1,40 @@
+#!/usr/bin/env python
+#
+#    https://launchpad.net/wxbanker
+#    account.py: Copyright 2007-2009 Mike Rooney <[e-mail]>
+#
+#    This file is part of wxBanker.
+#
+#    wxBanker is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    wxBanker is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with wxBanker.  If not, see <http://www.gnu.org/licenses/>.
+
+from wx.lib.pubsub import Publisher
+
+from wxbanker.bankobjects.ormobject import ORMObject
+
+
+class Tag(ORMObject):
+    ORM_TABLE = "tags"
+    ORM_ATTRIBUTES = ["Name",]
+    
+    def __init__(self, aID, name):
+        self.IsFrozen = True
+        self.ID = aID
+        self.Name = name
+        Publisher.sendMessage("tag.created.%s" % name, self)
+
+    def __str__(self):
+        return self.Name
+
+    def __cmp__(self, other):
+        return cmp(self.ID, other.ID)
 
=== modified file 'wxbanker/bankobjects/transaction.py'
--- wxbanker/bankobjects/transaction.py	2010-01-19 00:17:01 +0000
+++ wxbanker/bankobjects/transaction.py	2010-03-09 19:09:26 +0000
@@ -34,20 +34,52 @@
     ORM_TABLE = "transactions"
     ORM_ATTRIBUTES = ["_Amount", "_Description", "_Date", "LinkedTransaction", "RecurringParent"]
     
-    def __init__(self, tID, parent, amount, description, date):
+    def __init__(self, store, tID, parent, amount, description, date, tags = None, category = None):
         ORMObject.__init__(self)
         self.IsFrozen = True
-
+        self.Store = store
         self.ID = tID
         self.LinkedTransaction = None
         self.Parent = parent
         self.Date = date
         self.Description = description
         self.Amount = amount
+        self._Tags = tags
+        self._Category = category
         self.RecurringParent = None
 
         self.IsFrozen = False
 
+    def GetTags(self):
+        if self._Tags is None:
+            self._Tags = self.Store.getTagsFrom(self)
+        return self._Tags
+
+    def SetTags(self, tags):
+        self._Tags = tags
+        for tag in tags: 
+            self.AddTag(tag)
+
+    def AddTag(self, tag):
+        if not tag in self.Tags:
+            self.Tags.append(tag)
+            Publisher.sendMessage("transaction.tags.added", (self, tag))
+
+    def RemoveTag(self, tag):
+        if tag in self.Tags:
+            self.Tags.remove(tag)
+            Publisher.sendMessage("transaction.tags.removed", (self, tag))
+
+    def GetCategory(self):
+        if self._Category is None:
+            self._Category = self.Store.getCategoryFrom(self)
+        return self._Category
+
+    def SetCategory(self, category):
+        self._Category = category
+        if not self.IsFrozen:
+            Publisher.sendMessage("transaction.category.updated", self)
+
     def GetDate(self):
         return self._Date
 
@@ -167,4 +199,6 @@
     Date = property(GetDate, SetDate)
     Description = property(GetDescription, SetDescription)
     Amount = property(GetAmount, SetAmount)
-    LinkedTransaction = property(GetLinkedTransaction, SetLinkedTransaction)
 \ No newline at end of file
+    Category = property(GetCategory, SetCategory)
+    LinkedTransaction = property(GetLinkedTransaction, SetLinkedTransaction)
+    Tags = property(GetTags, SetTags)
 
=== added file 'wxbanker/categoryTreectrl.py'
--- wxbanker/categoryTreectrl.py	1970-01-01 00:00:00 +0000
+++ wxbanker/categoryTreectrl.py	2010-03-09 19:09:26 +0000
@@ -0,0 +1,408 @@
+# -*- coding: utf-8 -*-
+#    https://launchpad.net/wxbanker
+#    calculator.py: Copyright 2007, 2008 Mike Rooney <[e-mail]>
+#
+#    This file is part of wxBanker.
+#
+#    wxBanker is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    wxBanker is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with wxBanker.  If not, see <http://www.gnu.org/licenses/>.
+
+import wx
+import bankcontrols, bankexceptions
+from wx.lib.pubsub import Publisher
+import pickle
+
+class CategoryBox(wx.Panel):
+    """
+    This control manages the list of categories.
+    """
+
+    def __init__(self, parent, bankController, autoPopulate=True):
+        wx.Panel.__init__(self, parent)
+        self.model = bankController.Model
+
+        # Initialize some attributes to their default values
+        self.boxLabel = _("Categories")
+        self.editCtrl = None
+        self.categories = {}
+
+        # Create the staticboxsizer which is the home for everything.
+        # This *MUST* be created first to ensure proper z-ordering (as per docs).
+        self.staticBox = wx.StaticBox(self, label=self.boxLabel)
+
+        # Create a single panel to be the "child" of the static box sizer,
+        # to work around a wxPython regression that prevents tooltips. lp: xxxxxx
+        self.childPanel = wx.Panel(self)
+        self.childSizer = childSizer = wx.BoxSizer(wx.VERTICAL)
+
+
+        ## Create and set up the buttons.
+        # The ADD category button.
+        BMP = self.addBMP = wx.ArtProvider.GetBitmap('wxART_add')
+        self.addButton = addButton = wx.BitmapButton(self.childPanel, bitmap=BMP)
+        addButton.SetToolTipString(_("Add a new category"))
+        # The REMOVE category button.
+        BMP = wx.ArtProvider.GetBitmap('wxART_delete')
+        self.removeButton = removeButton = wx.BitmapButton(self.childPanel, bitmap=BMP)
+        removeButton.SetToolTipString(_("Remove the selected category"))
+        removeButton.Enabled = False
+        # The EDIT category button.
+        BMP = wx.ArtProvider.GetBitmap('wxART_textfield_rename')
+        self.editButton = editButton = wx.BitmapButton(self.childPanel, bitmap=BMP)
+        editButton.SetToolTipString(_("Rename the selected category"))
+        editButton.Enabled = False
+        # the DESELECT category button
+        BMP = wx.ArtProvider.GetBitmap('wxART_UNDO', size=(16,16))
+        self.deselectButton = wx.BitmapButton(self.childPanel, bitmap = BMP)
+        self.deselectButton.SetToolTipString(_("Deselect any selected Category"))
+        
+        
+
+        # Layout the buttons.
+        buttonSizer = wx.BoxSizer()
+        buttonSizer.Add(addButton)
+        buttonSizer.Add(removeButton)
+        buttonSizer.Add(editButton)
+        buttonSizer.Add(self.deselectButton)
+
+         ## Create and set up the treectrl
+        self.treeCtrl = TreeCtrl(self, self.childPanel, style = (wx.TR_HIDE_ROOT + wx.TR_DEFAULT_STYLE+ wx.SUNKEN_BORDER))
+        self.root = self.treeCtrl.AddRoot("")
+        self.treeCtrl.SetIndent(5)
+        
+        self.staticBoxSizer = wx.StaticBoxSizer(self.staticBox, wx.VERTICAL)
+        childSizer.Add(buttonSizer, 0, wx.BOTTOM, 4)
+        childSizer.Add(self.treeCtrl, 1, wx.EXPAND)
+        self.childPanel.Sizer = childSizer
+        self.staticBoxSizer.Add(self.childPanel, 1, wx.EXPAND)
+        
+        #self.Sizer = aSizer = wx.BoxSizer()
+        #aSizer.Add(self.childPanel, 1, wx.EXPAND)
+
+        # Set up the button bindings.
+        addButton.Bind(wx.EVT_BUTTON, self.onAddButton)
+        removeButton.Bind(wx.EVT_BUTTON, self.onRemoveButton)
+        editButton.Bind(wx.EVT_BUTTON, self.onRenameButton)
+        self.deselectButton.Bind(wx.EVT_BUTTON, self.onDeselect)
+        # and others
+        self.treeCtrl.Bind(wx.EVT_TREE_SEL_CHANGED, self.onCategorySelected)
+        self.treeCtrl.Bind(wx.EVT_TREE_END_LABEL_EDIT, self.onRenameCategory)
+        self.treeCtrl.Bind(wx.EVT_TREE_ITEM_ACTIVATED, self.onRenameButton)
+        self.treeCtrl.Bind(wx.EVT_RIGHT_DOWN, self.onRightDown)
+
+        # Subscribe to messages we are concerned about.
+        Publisher().subscribe(self.onPushChars, "CATEGORYCTRL.PUSH_CHARS")
+        Publisher().subscribe(self.onCategoryCreated, "category.newToDisplay")
+
+        # Populate ourselves initially unless explicitly told not to.
+        if autoPopulate:
+            categories = self.model.Categories
+            for category in categories:
+                self._InsertItem(category)
+        
+        self.Sizer = self.staticBoxSizer
+
+
+    #Signal Handler
+    #---------------
+
+    def onDragBegin(self, event):
+        item, where = self.treeCtrl.HitTest(event.GetPoint())
+        cat = self.treeCtrl.get_category_from_item(item)
+        #print "Begin Drag at ", cat
+        
+    def onDragEnd(self, event):
+        item, where = self.treeCtrl.HitTest(event.GetPoint())
+        cat = self.treeCtrl.get_category_from_item(item)
+        #print "End Drag at ", cat
+
+    def onCategorySelected(self, event):
+        cat = self._get_category_from_event(event)
+        if cat:
+            self._disable_Buttons(True, True, True, True)
+            # Tell the parent we changed.
+            Publisher().sendMessage("view.category changed", cat)
+
+    def onPushChars(self, message):
+        print message
+
+    def onChar(self, event=None, char=None):
+        print event,char
+
+    def onAddButton(self, event):
+        self.showEditCtrl()
+        self._disable_Buttons()
+
+    def onAddCategoryFromContextMenu(self):
+        self.showEditCtrl()
+        self._disable_Buttons()
+
+    def onRemoveButton(self, event):
+        self.onRemoveCategory(self.treeCtrl.GetSelection())
+
+    def onRenameButton(self, event):
+        item = self.treeCtrl.GetSelection()
+        category = self.treeCtrl.get_selected_category()
+        self.treeCtrl.EditLabel(item)
+
+    def onRenameCategoryFromContextMenu(self, item):
+        self.treeCtrl.EditLabel(item)
+
+    def onRightDown(self, event):
+        item, where = self.treeCtrl.HitTest(event.Position)
+        self.treeCtrl.SelectItem(item, True)
+        self.show_context_menu(item)
+
+    def onEditCtrlKey(self, event):
+        if event.GetKeyCode() == wx.WXK_ESCAPE:
+            self.onHideEditCtrl()
+        else:
+            event.Skip()
+            
+    def onDeselect(self, even):
+        self.treeCtrl.UnselectAll()
+        self._disable_Buttons(add = True)
+
+    def onHideEditCtrl(self, event=None, restore=True):
+        # Hide and remove the control and re-layout.
+        self.childSizer.Hide(self.editCtrl)#, smooth=True)
+        self.childSizer.Detach(self.editCtrl)
+        self.Layout()
+        # Re-enable the add button.
+        self._disable_Buttons( add = True, deselect = True)
+
+    def onAddCategory(self, event):
+        # Grab the category name and add it.
+        categoryName = self.editCtrl.Value
+        if self.check_category_name(categoryName):
+            parent = self.treeCtrl.get_selected_category()
+            if parent:
+                category = self.model.GetCategoryByName(categoryName, parent.ID)
+            else:
+                category = self.model.GetCategoryByName(categoryName)
+            Publisher.sendMessage("category.newToDisplay.%s" % categoryName, category)
+            self.onHideEditCtrl()
+
+    def onCategoryCreated(self, message):
+        #print message
+        newcat = self.model.GetCategoryByName(message.topic[2])
+        self._InsertItem(newcat)
+
+    def onRemoveCategory(self, item):
+        category = self.treeCtrl.get_category_from_item(item)
+        if category:
+            warningMsg = _("This will permanently remove the category '%s'. Continue?")
+            dlg = wx.MessageDialog(self, warningMsg%category.Name, _("Warning"), style=wx.YES_NO|wx.ICON_EXCLAMATION)
+            if dlg.ShowModal() == wx.ID_YES:
+                # Remove the category from db
+                self.model.RemoveCategoryName(category.Name)
+                self._RemoveItem(item)
+                #print "verarschen?"
+                self._disable_Buttons(add = True)
+                self.treeCtrl.UnselectAll()
+
+    def onRenameCategory(self, event):
+        #print dir(event)
+        cat = self._get_category_from_event(event)
+        newName = event.GetLabel()
+        if self.check_category_name(newName):
+            cat.Name = newName
+        else:
+            #setting the label does not work (why?) ...
+            self.treeCtrl.SetItemText(event.GetItem(), cat.Name)
+
+    
+    def check_category_name(self, name):
+        """checks whether a category name is valid or not"""
+        if name == '':
+            wx.TipWindow(self, _("Empty category names are not allowed!"))
+            return False
+        return True
+        
+
+    # Helper Functions
+    #--------------------
+
+    def _get_category_from_event(self, event):
+        return self.treeCtrl.get_category_from_item(event.GetItem())
+
+    def _disable_Buttons(self, add = False, remove = False, edit = False, deselect = False):
+        #print "anscheinend.."
+        self.addButton.Enabled = add
+        self.removeButton.Enabled = remove
+        self.editButton.Enabled = edit
+        self.deselectButton.Enabled = deselect
+
+    def _InsertItemRecursive(self, category):
+        self._InsertItem(category)
+        for child in self.model.GetChildCategories(category):
+            self._InsertItemRecursive(child)
+
+
+    def _InsertItem(self, category):
+        """
+        Insert a category into the given position.
+        """
+        #print "inserting category: ", category, category.ParentID
+        if category.ParentID:
+            #print category, " has parent item ", category.ParentID
+            index = self.treeCtrl.AppendItem(self.categories[category.ParentID], category.Name)
+            self.treeCtrl.SortChildren(self.categories[category.ParentID])
+            self.treeCtrl.Expand(self.categories[category.ParentID])
+        else: 
+            index = self.treeCtrl.AppendItem(self.root, category.Name)
+        self.treeCtrl.SetItemPyData(index, category)
+        self.categories[category.ID] = index
+        self.treeCtrl.SortChildren(self.root)
+
+    def _RemoveItem(self, item):
+        self.treeCtrl.Delete(item)
+
+
+    def showEditCtrl(self, focus=True):
+        if self.editCtrl:
+            self.editCtrl.Value = ''
+            self.editCtrl.Show()
+        else:
+            self.editCtrl = wx.TextCtrl(self.childPanel, style=wx.TE_PROCESS_ENTER)
+            self.editCtrl.Bind(wx.EVT_KILL_FOCUS, self.onHideEditCtrl)
+            self.editCtrl.Bind(wx.EVT_KEY_DOWN, self.onEditCtrlKey)
+
+
+        self.editCtrl.Bind(wx.EVT_TEXT_ENTER, self.onAddCategory)
+        self.childSizer.Insert(0, self.editCtrl, 0, wx.EXPAND)#, smooth=True)
+        self.Parent.Layout()
+
+        if focus:
+            self.editCtrl.SetFocus()
+
+    def GetCount(self):
+        return self.treeCtrl.GetCount()
+
+    def show_context_menu(self, item):
+        menu = wx.Menu()
+
+        addItem = wx.MenuItem(menu, -1, _("Add category"))
+        menu.Bind(wx.EVT_MENU, lambda e: self.onAddCategoryFromContextMenu(), source = addItem )
+        addItem.SetBitmap(wx.ArtProvider.GetBitmap('wxART_add'))
+        menu.AppendItem(addItem)
+
+        removeItem = wx.MenuItem(menu, 0, _("Remove category"))
+        menu.Bind(wx.EVT_MENU, lambda e: self.onRemoveCategory(item), source = removeItem)
+        removeItem.SetBitmap(wx.ArtProvider.GetBitmap('wxART_delete'))
+        menu.AppendItem(removeItem)
+
+        editItem = wx.MenuItem(menu, 1, _("Rename category"))
+        menu.Bind(wx.EVT_MENU, lambda e: self.onRenameCategoryFromContextMenu(item), source = editItem)
+        editItem.SetBitmap(wx.ArtProvider.GetBitmap('wxART_textfield_rename'))
+        menu.AppendItem(editItem)
+
+        # Show the menu and then destroy it afterwards.
+        self.treeCtrl.PopupMenu(menu)
+        menu.Destroy()
+        
+    def process_transactions(self, transids , category):
+        for tid in transids:
+            transaction = self.model.GetTransactionById(tid)
+            transaction.Category = category
+        
+
+class CategoryViewDropTarget(wx.TextDropTarget):
+    def __init__(self, obj):
+        wx.TextDropTarget.__init__(self)
+        self.obj = obj
+
+    def OnDropText(self, x,y,dragResult):
+        self.obj.process_drop_transaction((x,y), dragResult)
+
+class TreeCtrl(wx.TreeCtrl):
+    
+    def __init__(self, parent, *args, **kwargs):
+        wx.TreeCtrl.__init__(self, *args, **kwargs)
+        self.parent = parent
+        self.dropTarget = CategoryViewDropTarget(self)
+        self.SetDropTarget(self.dropTarget)
+        self.Bind(wx.EVT_TREE_BEGIN_DRAG, self.on_drag_begin)
+        
+    def process_drop_transaction(self, point, drag):
+        item = self.HitTest(wx.Point(*point))
+        category = self.get_category_from_item(item[0])
+        unpickled = pickle.loads(str(drag))
+        flag = unpickled[0]
+        data = unpickled[1:]
+        if category:
+            if flag == 'transaction':
+                self.parent.process_transactions(data, category)
+            elif flag == 'category':
+                self.process_category_drop(data, category)
+        else:
+            pass
+            #print "No Category found for point ", point
+            
+    def process_category_drop(self, id_list, target):
+        newID = id_list[0]
+        item = self.parent.categories[newID]
+        cat = self.parent.model.GetCategoryById(id_list[0])
+        if cat == target:
+            #print "No Dragging on oneself!!"
+            return
+        self.parent._RemoveItem(item)
+        if target:
+            cat.ParentID = target.ID
+        else:
+            cat.ParentID = None
+        self.parent._InsertItemRecursive(cat)
+        
+    def get_category_from_item(self, item):
+        return self.GetItemPyData(item)
+
+    def get_selected_category(self):
+        if self.hasSelected():
+            return self.GetItemPyData(self.Selection)
+        else:
+            return None
+    
+    def OnCompareItems(self, item1, item2):
+        if not self.get_category_from_item(item1):
+            return -1
+        else:
+            if not self.get_category_from_item(item2):
+                return 1
+            else:
+                return cmp(self.get_category_from_item(item1).Name.lower(),self.get_category_from_item(item2).Name.lower())
+            
+    def hasSelected(self):
+        selection = self.Selection
+        if selection:
+            if selection.IsOk():
+                if self.GetItemPyData(selection):
+                    return True
+        return False
+    
+    def _dropData(self):
+        return pickle.dumps(['category',self.get_selected_category().ID])
+    
+    def on_drag_begin(self, event):
+        item, where = self.HitTest(event.GetPoint())
+        #print item, item.IsOk()
+        if self.IsExpanded(item):
+            self.Collapse(item)
+            #return
+        if not item.IsOk():
+            #print "Not an okay Item to drag"
+            return
+        text = self._dropData()
+        do = wx.PyTextDataObject(text)
+        dropSource = wx.DropSource(self)
+        dropSource.SetData(do)
+        dropSource.DoDragDrop(True)
 
=== modified file 'wxbanker/main.py' (properties changed: +x to -x)
=== modified file 'wxbanker/managetab.py' (properties changed: +x to -x)
--- wxbanker/managetab.py	2010-02-03 06:26:15 +0000
+++ wxbanker/managetab.py	2010-03-09 19:09:26 +0000
@@ -21,6 +21,7 @@
 from wxbanker import searchctrl, accountlistctrl, transactionctrl
 from wxbanker.transactionolv import TransactionOLV as TransactionCtrl
 from wxbanker.calculator import CollapsableWidget, SimpleCalculator
+from wxbanker.categoryTreectrl import CategoryBox
 from wx.lib.pubsub import Publisher
 from wxbanker import localization, summarytab
 from wxbanker.plots.plotfactory import PlotFactory
@@ -34,16 +35,17 @@
     def __init__(self, parent, bankController):
         wx.Panel.__init__(self, parent)
 
-        ## Left side, the account list and calculator
+        ## Left side, the account list, category list and calculator
         self.leftPanel = leftPanel = wx.Panel(self)
         leftPanel.Sizer = wx.BoxSizer(wx.VERTICAL)
 
         self.accountCtrl = accountCtrl = accountlistctrl.AccountListCtrl(leftPanel, bankController)
-        
+        self.categoryCtrl = categoryCtrl = CategoryBox(leftPanel, bankController)
         calcWidget = CollapsableWidget(leftPanel, SimpleCalculator, (_("Show Calculator"), _("Hide Calculator")))
 
         leftPanel.Sizer.Add(accountCtrl, 0, wx.EXPAND)
-        leftPanel.Sizer.AddStretchSpacer(1)
+        leftPanel.Sizer.Add(categoryCtrl, 1, wx.EXPAND|wx.ALL)
+        #leftPanel.Sizer.AddStretchSpacer(1)
         leftPanel.Sizer.Add(calcWidget, 0, wx.EXPAND)
 
         # Force the calculator widget (and parent) to take on the desired size.
@@ -59,6 +61,7 @@
 
         # Subscribe to messages that interest us.
         Publisher.subscribe(self.onChangeAccount, "view.account changed")
+        Publisher.subscribe(self.onChangeCategory, "view.category changed")
         Publisher.subscribe(self.onCalculatorToggled, "CALCULATOR.TOGGLED")
 
         # Select the last-selected account.
@@ -81,6 +84,10 @@
     def onChangeAccount(self, message):
         account = message.data
         self.rightPanel.transactionPanel.setAccount(account)
+    
+    def onChangeCategory(self, message):
+        category = message.data
+        self.rightPanel.transactionPanel.setCategory(category)
 
     def getCurrentAccount(self):
         return self.accountCtrl.GetCurrentAccount()
@@ -142,7 +149,10 @@
 
     def setAccount(self, *args, **kwargs):
         self.transactionCtrl.setAccount(*args, **kwargs)
-
+        
+    def setCategory(self, *args, **kwargs):
+        self.transactionCtrl.setCategory(*args, **kwargs)
+        
     def onSearchInvalidatingChange(self, event):
         """
         Some event has occurred which trumps any active search, so make the
 
=== modified file 'wxbanker/menubar.py' (properties changed: +x to -x)
=== modified file 'wxbanker/persistentstore.py' (properties changed: +x to -x)
--- wxbanker/persistentstore.py	2010-02-21 21:53:07 +0000
+++ wxbanker/persistentstore.py	2010-03-09 19:09:26 +0000
@@ -30,6 +30,28 @@
 |------------------------+-------------------+--------------+--------------------------+----------------|----------------|
 | 1                      | 1                 | 100.00       | "Initial Balance"        | "2007/01/06"   | null           |
 +-------------------------------------------------------------------------------------------------------+----------------+
+
+Table: categories
++--------------------------------------------+
+| id INTEGER PRIMARY KEY | name VARCHAR(255) |
+|------------------------+-------------------|
+| 1                      | "Some Category"   |
++--------------------------------------------+
+
+Table: categories_hierarchy
++--------------------------------------------+------------------+
+| id INTEGER PRIMARY KEY | parentID INTEGER  | childID INTEGER  |
+|------------------------+-------------------+------------------|
+| 1                      | 2                 | 1                |
++--------------------------------------------+------------------+
+
+Table: transactions_categories_link
++------------------------------------------------+--------------------+
+| id INTEGER PRIMARY KEY | transactionID INTEGER | categoryID INTEGER |
+|------------------------+-----------------------+--------------------|
+| 1                      | 2                     | 1                  |
++------------------------------------------------+--------------------s+
+
 """
 import sys, os, datetime
 from sqlite3 import dbapi2 as sqlite
@@ -38,6 +60,8 @@
 
 from wxbanker import currencies, debug
 from wxbanker.bankobjects.account import Account
+from wxbanker.bankobjects.category import Category
+from wxbanker.bankobjects.tag import Tag
 from wxbanker.bankobjects.accountlist import AccountList
 from wxbanker.bankobjects.bankmodel import BankModel
 from wxbanker.bankobjects.transaction import Transaction
@@ -91,8 +115,12 @@
         # We have to subscribe before syncing otherwise it won't get synced if there aren't other changes.
         self.Subscriptions = (
             (self.onORMObjectUpdated, "ormobject.updated"),
+            (self.onCategoryRenamed, "category.renamed"),
             (self.onAccountBalanceChanged, "account.balance changed"),
             (self.onAccountRemoved, "account.removed"),
+            (self.onTransactionCategory, "transaction.category"),
+            (self.onTransactionTagAdded, "transaction.tags.added"),
+            (self.onTransactionTagRemoved, "transaction.tags.removed"),
             (self.onBatchEvent, "batch"),
             (self.onExit, "exiting"),
         )
@@ -135,6 +163,24 @@
 
         return account
 
+
+    def RemoveChildCategories(self, categoryID):
+        children = self.dbconn.cursor().execute('''
+        SELECT childId FROM categories_hierarchy
+        WHERE parentID=?''',(categoryID, )).fetchall() 
+        for child in children:
+            self.RemoveChildCategories(child[0])
+            self.dbconn.cursor().execute('DELETE FROM categories WHERE id=?',(child[0],))
+            self.dbconn.cursor().execute('DELETE FROM categories_hierarchy WHERE childId=?',(child[0],))
+            self.commitIfAppropriate()
+
+    def RemoveCategory(self, category):
+        category.SetParentID(None)
+        self.RemoveChildCategories(category.ID)
+        self.dbconn.cursor().execute('DELETE FROM categories WHERE id=?',(category.ID,))
+        self.dbconn.cursor().execute('DELETE FROM categories_hierarchy WHERE childId=?',(category.ID,))
+        self.commitIfAppropriate()
+
     def RemoveAccount(self, account):
         self.dbconn.cursor().execute('DELETE FROM accounts WHERE id=?',(account.ID,))
         self.commitIfAppropriate()
@@ -154,6 +200,7 @@
         return transaction
 
     def RemoveTransaction(self, transaction):
+        self.dbconn.cursor().execute('DELETE FROM transactions_categories_link WHERE transactionId=?', (transaction.ID,))
         result = self.dbconn.cursor().execute('DELETE FROM transactions WHERE id=?', (transaction.ID,)).fetchone()
         self.commitIfAppropriate()
         # The result doesn't appear to be useful here, it is None regardless of whether the DELETE matched anything
@@ -161,6 +208,28 @@
         # everything is fine. So just return True, as there we no errors that we are aware of.
         return True
 
+    def CreateTag(self, name):
+        cursor = self.dbconn.cursor()
+        cursor.execute('INSERT INTO tags (name) VALUES (?)', [name])
+        ID = cursor.lastrowid
+        self.commitIfAppropriate()
+
+        return Tag(ID, name)
+
+    def CreateCategory(self, name, parent):
+        cursor = self.dbconn.cursor()
+        cursor.execute('INSERT INTO categories (name) VALUES (?)', [name])
+        ID = cursor.lastrowid
+        if parent:
+            cursor.execute('INSERT INTO categories_hierarchy (parentId, childId) VALUES (?,?)', [parent, ID])
+        self.commitIfAppropriate()
+        return Category(ID, name, parent)
+
+    def DeleteUnusedTags(self):
+        cursor = self.dbconn.cursor()
+        cursor.execute('DELETE FROM tags WHERE NOT EXISTS (SELECT 1 FROM transactions_tags_link l WHERE tagId = tags.id)')
+        self.commitIfAppropriate()
+
     def Save(self):
         import time; t = time.time()
         self.dbconn.commit()
@@ -258,12 +327,20 @@
         elif fromVer == 3:
             # Add `linkId` column to transactions for transfers.
             cursor.execute('ALTER TABLE transactions ADD linkId INTEGER')
+# tags table; transactions - tags link table
+            cursor.execute('CREATE TABLE tags (id INTEGER PRIMARY KEY, name VARCHAR(255))')
+            cursor.execute('CREATE TABLE transactions_tags_link (id INTEGER PRIMARY KEY, transactionId INTEGER, tagId INTEGER)')
+            cursor.execute('CREATE INDEX transactions_tags_transactionId_idx ON transactions_tags_link(transactionId)')
+            cursor.execute('CREATE INDEX transactions_tags_tagId_idx ON transactions_tags_link(tagId)')
         elif fromVer == 4:
+            cursor.execute('CREATE TABLE categories (id INTEGER PRIMARY KEY, name VARCHAR(255))')
+            cursor.execute('CREATE TABLE transactions_categories_link (id INTEGER PRIMARY KEY, transactionId INTEGER, categoryId INTEGER)')
             # Add recurring transactions table.
             transactionBase = "id INTEGER PRIMARY KEY, accountId INTEGER, amount FLOAT, description VARCHAR(255), date CHAR(10)"
             recurringExtra = "repeatType INTEGER, repeatEvery INTEGER, repeatsOn VARCHAR(255), endDate CHAR(10)"
             cursor.execute('CREATE TABLE recurring_transactions (%s, %s)' % (transactionBase, recurringExtra))
         elif fromVer == 5:
+            cursor.execute('CREATE TABLE categories_hierarchy(id INTEGER PRIMARY KEY, parentId INTEGER, childId INTEGER)')
             cursor.execute('ALTER TABLE recurring_transactions ADD sourceId INTEGER')
             cursor.execute('ALTER TABLE recurring_transactions ADD lastTransacted CHAR(10)')
         elif fromVer == 6:
@@ -326,7 +403,7 @@
         else:
             sourceAccount = None
 
-        return RecurringTransaction(rId, parentAccount, amount, description, date, repeatType, repeatEvery, repeatOn, endDate, sourceAccount, lastTransacted)
+        return RecurringTransaction(self, rId, parentAccount, amount, description, date, repeatType, repeatEvery, repeatOn, endDate, sourceAccount, lastTransacted)
 
     def getAccounts(self):
         # Fetch all the accounts.
@@ -350,7 +427,7 @@
 
     def result2transaction(self, result, parentObj, linkedTransaction=None, recurringCache=None):
         tid, pid, amount, description, date, linkId, recurringId = result
-        t = Transaction(tid, parentObj, amount, description, date)
+        t = Transaction(self, tid, parentObj, amount, description, date)
 
         # Handle a linked transaction being passed in, a special case called from a few lines down.
         if linkedTransaction:
@@ -377,6 +454,72 @@
                     t.LinkedTransaction.RecurringParent = t.RecurringParent
         return t
 
+    def getCategories(self, check = False):
+        categories = [self.result2cat(result) for result in self.dbconn.cursor().execute("SELECT * FROM categories").fetchall()]
+        if check:
+            categories = self._check_for_orphans(categories)
+        #return categories
+        return self._sort_categories(categories)
+        
+    def getCategoriesForParent(self, parent):
+        #print parent.ID
+        results = self.dbconn.cursor().execute('select categories.id, categories.name from categories, categories_hierarchy where categories.id = categories_hierarchy.childId and categories_hierarchy.parentID = ?', (parent.ID,)).fetchall()
+        return [self.result2cat(result) for result in results]
+        
+    def _check_for_orphans(self, categories):
+        ''' Check for categories whose parents don't exist'''
+        for category in categories:
+            if not self._parent_in_list(category, categories):
+                category.ParentID = None
+        return categories
+        
+    def _sort_categories(self, categories):
+        result = []
+        while len(categories) > 0:
+            #print categories
+            current = categories.pop(0)
+            if not current.ParentID or self._parent_in_list(current, result):
+                result.append(current)
+            else:
+                categories.append(current)
+        #print result
+        return result
+        
+    def _parent_in_list(self, item, list):
+        for possible in list:
+            if possible.ID == item.ParentID:
+                return True
+        return False
+    
+    def result2cat(self, result):
+        ID, name = result
+        res = self.dbconn.cursor().execute("Select parentID from categories_hierarchy where childId =?", (ID,)).fetchone()
+        if res:
+             parent = res[0]
+        else:
+            parent = None
+        return Category(ID, name, parent)    
+
+    def getTags(self):
+        return [self.result2tag(result) for result in self.dbconn.cursor().execute("SELECT * FROM tags").fetchall()]
+
+    def result2tag(self, result):
+        ID, name = result
+        return Tag(ID, name)
+
+    def getTagsFrom(self, trans):
+        result = self.dbconn.cursor().execute(
+            'SELECT tagId FROM transactions_tags_link WHERE transactionId=?', (trans.ID, )).fetchall()
+        return [self.cachedModel.GetTagById(row[0]) for row in result]
+        
+    def getCategoryFrom(self, trans):
+        result = self.dbconn.cursor().execute(
+            'SELECT categoryId FROM transactions_categories_link WHERE transactionId=?', (trans.ID, )).fetchone()
+        if result:
+            return self.cachedModel.GetCategoryById(result[0])
+        else:
+            return None
+
     def getTransactionsFrom(self, account):
         transactions = TransactionList()
         # Generate a map of recurring transaction IDs to the objects for fast look-up.
@@ -407,10 +550,36 @@
         transaction = self.result2transaction(result, linkedParent, linkedTransaction=linked)
         return transaction, linkedParent
 
+    def getTransactionForCategory(self, category):
+        transactions = bankobjects.TransactionList()
+        for result in self.dbconn.cursor().execute('SELECT transactionId FROM transactions_tags_link, WHERE categoryId=?', (category.ID,)).fetchall():
+            tid, pif, amount, description, date = self.dbconn.cursor().execute('SELECT * FROM transactions WHERE id=?', (tid,)).fetchone()
+            transactions.append(bankobjects.Transaction(tid, account, amount, description, date, self.getTagsForTransaction(tid), category ))
+
+    def onTransactionCategory(self, msg):
+        transObj = msg.data
+        #result = self.transaction2result(transObj)
+        #result.append( result.pop(0) ) # Move the uid to the back as it is last in the args below.
+        self.dbconn.cursor().execute('DELETE FROM transactions_categories_link WHERE transactionId= ?', (transObj.ID, ))
+        self.dbconn.cursor().execute('INSERT INTO transactions_categories_link (transactionId, categoryId) VALUES (?, ?)', (transObj.ID, transObj.Category.ID))
+        self.commitIfAppropriate()
+    
+    def onTransactionTagAdded(self, msg):
+        trans, tag = msg.data
+        self.dbconn.cursor().execute('INSERT INTO transactions_tags_link (transactionId, tagId) VALUES (?, ?)', (trans.ID, tag.ID))
+    
+    def onTransactionTagRemoved(self, msg):
+        trans, tag = msg.data
+        self.dbconn.cursor().execute('DELETE FROM transactions_tags_link WHERE transactionId=? AND tagId=?', (trans.ID, tag.ID))
+    
     def renameAccount(self, oldName, account):
         self.dbconn.cursor().execute("UPDATE accounts SET name=? WHERE name=?", (account.Name, oldName))
         self.commitIfAppropriate()
 
+    def renameCategory(self, oldName, category):
+        self.dbconn.cursor().execute("UPDATE categories SET name=? WHERE name=?", (category.Name, oldName))
+        self.commitIfAppropriate()
+
     def setCurrency(self, currencyIndex):
         self.dbconn.cursor().execute('UPDATE accounts SET currency=?', (currencyIndex,))
         self.commitIfAppropriate()
@@ -422,6 +591,16 @@
             for trans in cursor.execute("SELECT * FROM transactions WHERE accountId=?", (account[0],)).fetchall():
                 print '  -',trans
 
+
+    def onCategoryRenamed(self, message):
+        #debug.debug("in PersistentStore.onCategoryRenamed", message)
+        oldName, category = message.data
+        self.renameCategory(oldName, category)
+        
+    def onCategoryParent(self, message):
+        child, parent = message.data
+        self.changeCategoryParent(child, parent)
+
     def onAccountRenamed(self, message):
         oldName, account = message.data
         self.renameAccount(oldName, account)
 
=== modified file 'wxbanker/searchctrl.py' (properties changed: +x to -x)
=== added file 'wxbanker/tests/categorytests.py'
--- wxbanker/tests/categorytests.py	1970-01-01 00:00:00 +0000
+++ wxbanker/tests/categorytests.py	2010-03-09 19:09:26 +0000
@@ -0,0 +1,62 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#    https://launchpad.net/wxbanker
+#    testbase.py: Copyright 2007-2009 Mike Rooney <[e-mail]>
+#
+#    This file is part of wxBanker.
+#
+#    wxBanker is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    wxBanker is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with wxBanker.  If not, see <http://www.gnu.org/licenses/>.
+
+import testbase
+import unittest, random
+
+class CategoryTests(testbase.wxBankerComplexTestCase):
+    
+    def testTrivia(self):
+        # no initial categories should be in the db
+        self.assertEquals(len(self.Model.Categories),0)
+        
+    def testCRUD(self):
+        names = ['FirstTopLevel', 'SecondTopLevel', 'ThirdTopLevel']
+        # create, read
+        for name in names:
+            self.Model.GetCategoryByName(name)
+        #print self.Model.Categories
+        self.assertEquals(len(names), len(self.Model.Categories))
+        self.assertEquals(len(names), len(self.Model.GetTopCategories()))
+        createdNames = [c.Name for c in self.Model.Categories]
+        for name in createdNames:
+            self.assertTrue(name in names)
+        max = 3
+        for cat in self.Model.GetTopCategories():
+            for i in range(0,max):
+                self.Model.CreateCategory("Child " + str(i) + " of " + cat.Name, cat.ID)
+        self.assertEquals(len(self.Model.Categories), len(names)*max + len(names))
+        # delete
+        oldLength = len(self.Model.Categories)
+        toDelete = random.choice(self.Model.Categories)
+        deletions = max + 1
+        self.Model.RemoveCategory(toDelete)
+        self.assertTrue(oldLength, len(self.Model.Categories) + deletions)
+        self.assertTrue(toDelete not in self.Model.Categories)
+        # update
+        toRename = random.choice(self.Model.Categories)
+        newname = "RENAMED"
+        oldname = toRename.Name
+        toRename.Name = newname
+        self.assertTrue(oldname not in [cat.Name for cat in self.Model.Categories])
+        self.assertTrue(newname in [cat.Name for cat in self.Model.Categories])
+        
+if __name__ == "__main__":
+    unittest.main()
 
=== modified file 'wxbanker/tests/testbase.py' (properties changed: +x to -x)
=== modified file 'wxbanker/transactionctrl.py'
--- wxbanker/transactionctrl.py	2010-01-27 09:14:20 +0000
+++ wxbanker/transactionctrl.py	2010-03-09 19:09:26 +0000
@@ -33,7 +33,7 @@
     def __init__(self, parent, editing=None):
         wx.Panel.__init__(self, parent)
         # Create the recurring object we will use internally.
-        self.recurringObj = RecurringTransaction(None, None, 0, "", datetime.date.today(), RecurringTransaction.DAILY)
+        self.recurringObj = RecurringTransaction(None, None, None, 0, "", datetime.date.today(), RecurringTransaction.DAILY)
         
         self.Sizer = wx.GridBagSizer(0, 3)
         self.Sizer.SetEmptyCellSize((0,0))
 
=== modified file 'wxbanker/transactionolv.py' (properties changed: +x to -x)
--- wxbanker/transactionolv.py	2010-01-19 00:01:20 +0000
+++ wxbanker/transactionolv.py	2010-03-09 19:09:26 +0000
@@ -32,7 +32,7 @@
 from wx.lib.pubsub import Publisher
 from wxbanker.ObjectListView import GroupListView, ColumnDefn, CellEditorRegistry
 from wxbanker import bankcontrols
-
+import pickle
 
 class TransactionOLV(GroupListView):
     def __init__(self, parent, bankController):
@@ -46,6 +46,7 @@
         self.oddRowsBackColor = wx.WHITE
         self.cellEditMode = GroupListView.CELLEDIT_DOUBLECLICK
         self.SetEmptyListMsg(_("No transactions entered."))
+        self.TagSeparator = ','
 
         # Calculate the necessary width for the date column.
         dateStr = str(datetime.date.today())
@@ -61,6 +62,8 @@
             ColumnDefn(_("Description"), valueGetter="Description", isSpaceFilling=True, editFormatter=self.renderEditDescription),
             ColumnDefn(_("Amount"), "right", valueGetter="Amount", stringConverter=self.renderFloat, editFormatter=self.renderEditFloat),
             ColumnDefn(_("Total"), "right", valueGetter=self.getTotal, stringConverter=self.renderFloat, isEditable=False),
+            ColumnDefn(_("Category"), valueGetter="Category", valueSetter=self.setCategoryFromString),
+            ColumnDefn(_("Tags"), valueGetter=self.getTagsString, valueSetter=self.setTagsFromString),
         ])
         # Our custom hack in OLV.py:2017 will render amount floats appropriately as %.2f when editing.
 
@@ -70,6 +73,8 @@
         
         self.Bind(wx.EVT_RIGHT_DOWN, self.onRightDown)
 
+        self.Bind(wx.EVT_LIST_BEGIN_DRAG, self.onDragBegin)
+
         self.Subscriptions = (
             (self.onSearch, "SEARCH.INITIATED"),
             (self.onSearchCancelled, "SEARCH.CANCELLED"),
@@ -84,6 +89,19 @@
         for callback, topic in self.Subscriptions:
             Publisher.subscribe(callback, topic)
 
+    def onDragBegin(self, event):
+        text = self._get_selection_ids(flag = "transaction")
+        do = wx.PyTextDataObject(text)
+        dropSource = wx.DropSource(self)
+        dropSource.SetData(do)
+        dropSource.DoDragDrop(True)
+        
+    def _get_selection_ids(self, flag = None):
+        data = [t.ID for t in self.GetSelectedObjects()]
+        if flag:
+            data.insert(0,flag)
+        return pickle.dumps(data)
+
     def SetObjects(self, objs, *args, **kwargs):
         """
         Override the default SetObjects to properly refresh the auto-size,
@@ -119,6 +137,16 @@
         self.SortBy(self.SORT_COL)
         self.Thaw()
 
+    def getTagsString(self, transaction):
+        return (self.TagSeparator + ' ').join([tag.Name for tag in transaction.Tags])
+
+    def setTagsFromString(self, transaction, tags):
+        tagNames = [tag.strip() for tag in tags.split(self.TagSeparator) if tag.strip()]
+        transaction.Tags = [self.BankController.Model.GetTagByName(name) for name in tagNames]
+
+    def setCategoryFromString(self, transaction, name):
+        transaction.Category = self.BankController.Model.GetCategoryByName(name)
+
     def getTotal(self, transObj):
         if not hasattr(transObj, "_Total"):
             self.updateTotals()
@@ -159,7 +187,10 @@
             transactions = self.BankController.Model.GetTransactions()
         else:
             transactions = account.Transactions
-
+        self.loadTransactions(transactions, scrollToBottom=True)
+
+
+    def loadTransactions(self, transactions, scrollToBottom=True):
         self.SetObjects(transactions)
         # Unselect everything.
         self.SelectObjects([], deselectOthers=True)
@@ -169,6 +200,13 @@
         if self.IsSearchActive():
             self.doSearch(self.LastSearch)
 
+    def setCategory(self, category, scrollToBottom=True):
+        if category is None:
+            transactions = []
+        else:
+            transactions = self.BankController.Model.GetTransactionsByCategory(category)
+        self.loadTransactions(transactions, scrollToBottom=True)
+
     def ensureVisible(self, index):
         length = self.GetItemCount()
         # If there are no items, ensure a no-op (LP: #338697)
@@ -217,9 +255,15 @@
         if len(transactions) == 1:
             removeStr = _("Remove this transaction")
             moveStr = _("Move this transaction to account")
+            addTagStr = _("Tag the transaction with")
+            removeTagStr = _("Untag the transaction with")
+            categoryStr = _("Move to category")
         else:
             removeStr = _("Remove these %i transactions") % len(transactions)
             moveStr = _("Move these %i transactions to account") % len(transactions)
+            addTagStr = _("Tag these %i transactions with") % len(transactions)
+            removeTagStr = _("Untag these %i transactions with") % len(transactions)
+            categoryStr = _("Move these %i to category") % len(transactions)
 
         removeItem = wx.MenuItem(menu, -1, removeStr)
         menu.Bind(wx.EVT_MENU, lambda e: self.onRemoveTransactions(transactions), source=removeItem)
@@ -243,6 +287,55 @@
             # If there are no siblings, disable the item, but leave it there for consistency.
             if not siblings:
                 menu.Enable(moveMenuItem.Id, False)
+            # Tagging
+            tags = sorted(self.BankController.Model.Tags, key=lambda x: x.Name)
+
+            tagActionItem = wx.MenuItem(menu, -1, addTagStr)
+            tagsMenu = wx.Menu()
+            for tag in tags:
+                tagItem = wx.MenuItem(menu, -1, tag.Name)
+                tagsMenu.AppendItem(tagItem)
+                tagsMenu.Bind(wx.EVT_MENU, lambda e, tag=tag: self.onTagTransactions(transactions, tag), source=tagItem)
+
+            tagsMenu.AppendSeparator()
+
+            newTagItem = wx.MenuItem(menu,-1, _("New Tag"))
+            tagsMenu.AppendItem(newTagItem)
+            tagsMenu.Bind(wx.EVT_MENU, lambda e: self.onTagTransactions(transactions), source=newTagItem)
+
+            tagActionItem.SetSubMenu(tagsMenu)
+            menu.AppendItem(tagActionItem)
+
+            # get the tags currently applied to the selected transactions
+            currentTags = set()
+            for t in transactions:
+                currentTags.update(t.Tags)
+            currentTags = sorted(currentTags, key=lambda x: x.Name)
+
+            if len(currentTags) > 0:
+                tagActionItem = wx.MenuItem(menu, -1, removeTagStr)
+                tagsMenu = wx.Menu()
+
+                for tag in currentTags:
+                    tagItem = wx.MenuItem(menu, -1, tag.Name)
+                    tagsMenu.AppendItem(tagItem)
+                    tagsMenu.Bind(wx.EVT_MENU, lambda e, tag=tag: self.onUntagTransactions(transactions, tag), source=tagItem)
+                tagActionItem.SetSubMenu(tagsMenu)
+                menu.AppendItem(tagActionItem)
+
+            # Categories
+            menu.AppendSeparator()
+            cats = sorted(self.BankController.Model.Categories, key=lambda x: x.Name)
+
+            catActionItem = wx.MenuItem(menu, -1, categoryStr)
+            catMenu = wx.Menu()
+            for cat in cats:
+                catItem = wx.MenuItem(menu, -1, cat.Name)
+                catMenu.AppendItem(catItem)
+                catMenu.Bind(wx.EVT_MENU, lambda e, cat=cat: self.onCategoryTransactions(transactions, cat), source=catItem)
+
+            catActionItem.SetSubMenu(catMenu)
+            menu.AppendItem(catActionItem)
 
         # Show the menu and then destroy it afterwards.
         self.PopupMenu(menu)
@@ -273,6 +366,31 @@
         """Move the transactions to the target account."""
         self.CurrentAccount.MoveTransactions(transactions, targetAccount)
 
+    def onTagTransactions(self, transactions, tag=None):
+        if tag is None:
+            dialog = wx.TextEntryDialog(self, _("Enter new tag"), _("New Tag"))
+            dialog.ShowModal()
+            dialog.Destroy()
+            tagName = dialog.GetValue().strip()
+            if len(tagName) == 0:
+                return
+            tag = self.BankController.Model.GetTagByName(tagName)
+        Publisher.sendMessage("batch.start")
+        for t in transactions:
+            t.AddTag(tag)
+        Publisher.sendMessage("batch.end")
+        
+    def onCategoryTransactions(self, transactions, category=None):
+        for t in transactions:
+            t.Category = category
+
+    def onUntagTransactions(self, transactions, tag):
+        self.CurrentAccount.UntagTransactions(transactions, tag)
+        Publisher.sendMessage("batch.start")
+        for t in transactions:
+            t.RemoveTag(tag)
+        Publisher.sendMessage("batch.end")  
+
     def frozenResize(self):
         self.Parent.Layout()
         self.Parent.Thaw()