diff -Nru hamster-time-tracker-3.0really1.03.3+git2459/debian/bzr-builder.manifest hamster-time-tracker-3.0really1.03.3+git2460/debian/bzr-builder.manifest --- hamster-time-tracker-3.0really1.03.3+git2459/debian/bzr-builder.manifest 2015-06-25 21:32:54.000000000 +0000 +++ hamster-time-tracker-3.0really1.03.3+git2460/debian/bzr-builder.manifest 2015-07-03 15:31:46.000000000 +0000 @@ -1,3 +1,3 @@ -# bzr-builder format 0.3 deb-version 3.0really{debupstream}+git2459-0dylanmccall1 -lp:~dylanmccall/hamster-applet/hamster-time-tracker-git revid:git-v1:86c1c9556f83eb2b3a798fba95a670ed1f74b76b +# bzr-builder format 0.3 deb-version 3.0really{debupstream}+git2460-0dylanmccall1 +lp:~dylanmccall/hamster-applet/hamster-time-tracker-git revid:git-v1:c155929917effe040f7e474b93bcca0aa90712f5 nest-part packaging lp:~dylanmccall/+junk/hamster-time-tracker-packaging debian debian revid:dylanmccall@ubuntu.com-20130228201935-1ewmnl8ie3hbsl2f diff -Nru hamster-time-tracker-3.0really1.03.3+git2459/debian/changelog hamster-time-tracker-3.0really1.03.3+git2460/debian/changelog --- hamster-time-tracker-3.0really1.03.3+git2459/debian/changelog 2015-06-25 21:32:54.000000000 +0000 +++ hamster-time-tracker-3.0really1.03.3+git2460/debian/changelog 2015-07-03 15:31:46.000000000 +0000 @@ -1,8 +1,8 @@ -hamster-time-tracker (3.0really1.03.3+git2459-0dylanmccall1~ubuntu14.10.1) utopic; urgency=low +hamster-time-tracker (3.0really1.03.3+git2460-0dylanmccall1~ubuntu14.10.1) utopic; urgency=low * Auto build. - -- Dylan McCall Thu, 25 Jun 2015 21:32:54 +0000 + -- Dylan McCall Fri, 03 Jul 2015 15:31:46 +0000 hamster-time-tracker (1.03.3) quantal; urgency=low diff -Nru hamster-time-tracker-3.0really1.03.3+git2459/src/hamster/external.py hamster-time-tracker-3.0really1.03.3+git2460/src/hamster/external.py --- hamster-time-tracker-3.0really1.03.3+git2459/src/hamster/external.py 2015-06-25 21:32:53.000000000 +0000 +++ hamster-time-tracker-3.0really1.03.3+git2460/src/hamster/external.py 2015-07-03 15:31:45.000000000 +0000 @@ -29,6 +29,12 @@ except: evolution = None +try: + import taskw + from taskw import TaskWarrior +except: + taskw = None + class ActivitiesSource(gobject.GObject): def __init__(self): gobject.GObject.__init__(self) @@ -36,10 +42,13 @@ self.__gtg_connection = None if self.source == "evo" and not evolution: - self.source == "" # on failure pretend that there is no evolution + self.source = "" # on failure pretend that there is no evolution elif self.source == "gtg": gobject.GObject.__init__(self) dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) + elif self.source == "task" and not taskw: + self.source = "" + def get_activities(self, query = None): if not self.source: @@ -75,6 +84,30 @@ return activities + elif self.source == "task": + conn = TaskWarrior () + if not conn: + return [] + + activities = [] + tasks = [] + + task_filter = {'status':'pending'} + tasks = conn.filter_tasks(task_filter) + + for task in tasks: + name = task['description'].replace(",","") # replace comma + category = "" + if 'tags' in task: + name = "%s, %s " % (name, " ".join(task['tags'])) + + if 'project' in task: + category = task['project'] + + activities.append({"name":name,"category":category}) + + return activities + def __get_gtg_connection(self): bus = dbus.SessionBus() if self.__gtg_connection and bus.name_has_owner("org.gnome.GTG"): diff -Nru hamster-time-tracker-3.0really1.03.3+git2459/src/hamster/preferences.py hamster-time-tracker-3.0really1.03.3+git2460/src/hamster/preferences.py --- hamster-time-tracker-3.0really1.03.3+git2459/src/hamster/preferences.py 2015-06-25 21:32:53.000000000 +0000 +++ hamster-time-tracker-3.0really1.03.3+git2460/src/hamster/preferences.py 2015-07-03 15:31:45.000000000 +0000 @@ -92,7 +92,8 @@ # Translators: 'None' refers here to the Todo list choice in Hamster preferences (Tracking tab) self.activities_sources = [("", _("None")), ("evo", "Evolution"), - ("gtg", "Getting Things Gnome")] + ("gtg", "Getting Things Gnome"), + ("task", "Taskwarrior")] self.todo_combo = gtk.ComboBoxText() for code, label in self.activities_sources: self.todo_combo.append_text(label) Binary files /tmp/OTH0bO1vK_/hamster-time-tracker-3.0really1.03.3+git2459/wafadmin/ansiterm.pyc and /tmp/DSPuBJHoc1/hamster-time-tracker-3.0really1.03.3+git2460/wafadmin/ansiterm.pyc differ Binary files /tmp/OTH0bO1vK_/hamster-time-tracker-3.0really1.03.3+git2459/wafadmin/Build.pyc and /tmp/DSPuBJHoc1/hamster-time-tracker-3.0really1.03.3+git2460/wafadmin/Build.pyc differ Binary files /tmp/OTH0bO1vK_/hamster-time-tracker-3.0really1.03.3+git2459/wafadmin/Configure.pyc and /tmp/DSPuBJHoc1/hamster-time-tracker-3.0really1.03.3+git2460/wafadmin/Configure.pyc differ Binary files /tmp/OTH0bO1vK_/hamster-time-tracker-3.0really1.03.3+git2459/wafadmin/Constants.pyc and /tmp/DSPuBJHoc1/hamster-time-tracker-3.0really1.03.3+git2460/wafadmin/Constants.pyc differ Binary files /tmp/OTH0bO1vK_/hamster-time-tracker-3.0really1.03.3+git2459/wafadmin/Environment.pyc and /tmp/DSPuBJHoc1/hamster-time-tracker-3.0really1.03.3+git2460/wafadmin/Environment.pyc differ Binary files /tmp/OTH0bO1vK_/hamster-time-tracker-3.0really1.03.3+git2459/wafadmin/Logs.pyc and /tmp/DSPuBJHoc1/hamster-time-tracker-3.0really1.03.3+git2460/wafadmin/Logs.pyc differ Binary files /tmp/OTH0bO1vK_/hamster-time-tracker-3.0really1.03.3+git2459/wafadmin/Node.pyc and /tmp/DSPuBJHoc1/hamster-time-tracker-3.0really1.03.3+git2460/wafadmin/Node.pyc differ Binary files /tmp/OTH0bO1vK_/hamster-time-tracker-3.0really1.03.3+git2459/wafadmin/Options.pyc and /tmp/DSPuBJHoc1/hamster-time-tracker-3.0really1.03.3+git2460/wafadmin/Options.pyc differ Binary files /tmp/OTH0bO1vK_/hamster-time-tracker-3.0really1.03.3+git2459/wafadmin/Runner.pyc and /tmp/DSPuBJHoc1/hamster-time-tracker-3.0really1.03.3+git2460/wafadmin/Runner.pyc differ Binary files /tmp/OTH0bO1vK_/hamster-time-tracker-3.0really1.03.3+git2459/wafadmin/Scripting.pyc and /tmp/DSPuBJHoc1/hamster-time-tracker-3.0really1.03.3+git2460/wafadmin/Scripting.pyc differ Binary files /tmp/OTH0bO1vK_/hamster-time-tracker-3.0really1.03.3+git2459/wafadmin/TaskGen.pyc and /tmp/DSPuBJHoc1/hamster-time-tracker-3.0really1.03.3+git2460/wafadmin/TaskGen.pyc differ Binary files /tmp/OTH0bO1vK_/hamster-time-tracker-3.0really1.03.3+git2459/wafadmin/Task.pyc and /tmp/DSPuBJHoc1/hamster-time-tracker-3.0really1.03.3+git2460/wafadmin/Task.pyc differ Binary files /tmp/OTH0bO1vK_/hamster-time-tracker-3.0really1.03.3+git2459/wafadmin/Tools/config_c.pyc and /tmp/DSPuBJHoc1/hamster-time-tracker-3.0really1.03.3+git2460/wafadmin/Tools/config_c.pyc differ Binary files /tmp/OTH0bO1vK_/hamster-time-tracker-3.0really1.03.3+git2459/wafadmin/Tools/gnome.pyc and /tmp/DSPuBJHoc1/hamster-time-tracker-3.0really1.03.3+git2460/wafadmin/Tools/gnome.pyc differ Binary files /tmp/OTH0bO1vK_/hamster-time-tracker-3.0really1.03.3+git2459/wafadmin/Tools/gnu_dirs.pyc and /tmp/DSPuBJHoc1/hamster-time-tracker-3.0really1.03.3+git2460/wafadmin/Tools/gnu_dirs.pyc differ Binary files /tmp/OTH0bO1vK_/hamster-time-tracker-3.0really1.03.3+git2459/wafadmin/Tools/intltool.pyc and /tmp/DSPuBJHoc1/hamster-time-tracker-3.0really1.03.3+git2460/wafadmin/Tools/intltool.pyc differ Binary files /tmp/OTH0bO1vK_/hamster-time-tracker-3.0really1.03.3+git2459/wafadmin/Tools/misc.pyc and /tmp/DSPuBJHoc1/hamster-time-tracker-3.0really1.03.3+git2460/wafadmin/Tools/misc.pyc differ Binary files /tmp/OTH0bO1vK_/hamster-time-tracker-3.0really1.03.3+git2459/wafadmin/Tools/python.pyc and /tmp/DSPuBJHoc1/hamster-time-tracker-3.0really1.03.3+git2460/wafadmin/Tools/python.pyc differ Binary files /tmp/OTH0bO1vK_/hamster-time-tracker-3.0really1.03.3+git2459/wafadmin/Utils.pyc and /tmp/DSPuBJHoc1/hamster-time-tracker-3.0really1.03.3+git2460/wafadmin/Utils.pyc differ