[Pytrainer-svn] SF.net SVN: pytrainer:[854] pytrainer/trunk/pytrainer

[<nc...@us...>]

Revision: 854
          http://pytrainer.svn.sourceforge.net/pytrainer/?rev=854&view=rev
Author:   ncjones
Date:     2011-08-18 03:14:26 +0000 (Thu, 18 Aug 2011)

Log Message:
-----------
Use sport service for list view sport filter.

ticket:138

Modified Paths:
--------------
    pytrainer/trunk/pytrainer/gui/windowmain.py
    pytrainer/trunk/pytrainer/lib/listview.py
    pytrainer/trunk/pytrainer/main.py

Modified: pytrainer/trunk/pytrainer/gui/windowmain.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowmain.py	2011-08-18 03:13:58 UTC (rev 853)
+++ pytrainer/trunk/pytrainer/gui/windowmain.py	2011-08-18 03:14:26 UTC (rev 854)
@@ -57,7 +57,7 @@
 
 
 class Main(SimpleGladeApp):
-    def __init__(self, data_path = None, parent = None, version = None, gpxDir = None):
+    def __init__(self, sport_service, data_path = None, parent = None, version = None, gpxDir = None):
         def url_hook(dialog, url):
             pytrainer.lib.webUtils.open_url_in_browser(url)
         # Available in PyGTK 2.6 and above
@@ -87,7 +87,7 @@
         self.y1_color = None
         self.y1_linewidth = 1
         # setup Search ListView
-        self.listsearch = ListSearch(self, self.pytrainer_main)
+        self.listsearch = ListSearch(sport_service, self, self.pytrainer_main)
         
         self.aboutwindow = None
 

Modified: pytrainer/trunk/pytrainer/lib/listview.py
===================================================================
--- pytrainer/trunk/pytrainer/lib/listview.py	2011-08-18 03:13:58 UTC (rev 853)
+++ pytrainer/trunk/pytrainer/lib/listview.py	2011-08-18 03:14:26 UTC (rev 854)
@@ -17,7 +17,7 @@
                     }
 class ListSearch(object):
     """ Builds SQLite condition out of search parameters"""
-    def __init__(self,  parent = None, pytrainer_main = None):
+    def __init__(self, sport_service, parent = None, pytrainer_main = None):
         self.parent = parent    
         self.pytrainer_main = pytrainer_main
         self.uc = self.pytrainer_main.uc
@@ -27,7 +27,7 @@
         self.past = 0
         self.duration = 0
         self.distance = 0        
-        self.listSport = self.pytrainer_main.profile.getSportList()
+        self.listSport = sport_service.get_all_sports()
         
         self.listPast = [[_('All Time'), -99999], [_('Last 4 Weeks'), -31],
                          [_('Last 6 Months'), -183], [_('Last 12 Months'), -366]]
@@ -70,7 +70,7 @@
             _search = "title like '%" +self.title + "%'"
             _add_and = True
         if self.sport > 0:
-            _sport = self.listSport[self.sport-1][3]
+            _sport = self.listSport[self.sport-1].id
             _here = "sport=%s" % _sport
             if _add_and:
                 _search += " and " + _here
@@ -130,8 +130,8 @@
         #Re-add "All Sports"
         liststore_lsa.append([firstEntry])
         #Re-add all sports in listSport
-        for i in self.listSport:
-            liststore_lsa.append([i[0]])
+        for sport in self.listSport:
+            liststore_lsa.append([sport.name])
         self.parent.lsa_sport.set_active(0)
         #Add handler manually, so above changes do not trigger recursive loop
         self.parent.lsa_sport.connect("changed", self.parent.on_listareasearch_clicked)

Modified: pytrainer/trunk/pytrainer/main.py
===================================================================
--- pytrainer/trunk/pytrainer/main.py	2011-08-18 03:13:58 UTC (rev 853)
+++ pytrainer/trunk/pytrainer/main.py	2011-08-18 03:14:26 UTC (rev 854)
@@ -88,7 +88,7 @@
         pool_size = self.profile.getIntValue("pytraining","activitypool_size", default=1)
         self.activitypool = ActivityPool(self, size=pool_size)
         #preparamos la ventana principal
-        self.windowmain = Main(data_path,self,self.version, gpxDir=self.profile.gpxdir)
+        self.windowmain = Main(self._sport_service, data_path,self,self.version, gpxDir=self.profile.gpxdir)
         self.date = Date(self.windowmain.calendar)
         self.waypoint = Waypoint(data_path,self)
         self.extension = Extension(data_path, self)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.