conduit r1359 - in trunk: . conduit/gtkui

[jstowers svn gnome org]

Author: jstowers
Date: Sun Mar  9 08:47:36 2008
New Revision: 1359
URL: http://svn.gnome.org/viewvc/conduit?rev=1359&view=rev

Log:
2008-03-09  John Stowers  <john stowers gmail com>

	* conduit/gtkui/Tree.py: Print category name in debug message
		
	* conduit/gtkui/UI.py: Tidy up the code for animating the status icon.



Modified:
   trunk/ChangeLog
   trunk/conduit/gtkui/Tree.py
   trunk/conduit/gtkui/UI.py

Modified: trunk/conduit/gtkui/Tree.py
==============================================================================
--- trunk/conduit/gtkui/Tree.py	(original)
+++ trunk/conduit/gtkui/Tree.py	Sun Mar  9 08:47:36 2008
@@ -103,7 +103,7 @@
         #Do we need to create a category first?
         i = self._get_category_index_by_name(dpw.category)
         if i == None:
-            log.debug("Creating Category %s" % dpw.category)
+            log.debug("Creating Category: %s" % dpw.category.name)
             new_cat = CategoryWrapper(dpw.category)
             self.cats.append(new_cat)
             i = self.cats.index(new_cat)

Modified: trunk/conduit/gtkui/UI.py
==============================================================================
--- trunk/conduit/gtkui/UI.py	(original)
+++ trunk/conduit/gtkui/UI.py	Sun Mar  9 08:47:36 2008
@@ -175,13 +175,9 @@
         cond.connect("sync-completed", self.on_sync_completed)
         cond.connect("sync-conflict", self.conflictResolver.on_conflict)
 
-    def on_conduit_removed(self, syncset, cond):
-        pass
-
     def set_model(self, syncSet):
         self.syncSet = syncSet
         self.syncSet.connect("conduit-added", self.on_conduit_added)
-        self.syncSet.connect("conduit-removed", self.on_conduit_removed)
         self.canvas.set_sync_set(syncSet)
 
     def present(self):
@@ -593,52 +589,50 @@
         self.connect('popup-menu', self.on_popup_menu)
         self.connect('activate', self.on_click)
 
+        self.animating = False
+        self.conflict = False
+        self.animated_idx = 0
+        self.animated_icons = range(1,8)
+
         #start with the application icon
-        self._reset_states()
+        self.cancelButton.set_property("sensitive", False)
         self.set_from_icon_name("conduit")
         self.set_tooltip("Conduit")
         self.set_visible(True)
 
-    def _reset_states(self):
-        self.running = False
-        self.conflict = False
-        self.animated_idx = 0
-        self.animated_icons = range(1,8)
-
     def _animate_icon_timeout(self):
-        self.set_tooltip(_("Synchronizing"))
-        if self.animated_idx == self.animated_icons[-1]:
-            self.animated_idx = 1
-        else:
-            self.animated_idx += 1
-        self.set_from_icon_name("conduit-progress-%d" % self.animated_idx)
-        if not self.animating:
+        #FIXME: When will gtk support animated gtk status icons?
+        if self.animating:
+            if self.animated_idx == self.animated_icons[-1]:
+                self.animated_idx = 1
+            else:
+                self.animated_idx += 1
+                self.set_from_icon_name("conduit-progress-%d" % self.animated_idx)
+            return True
+        else: 
             if self.conflict:
-                self._reset_states()
                 self.set_from_icon_name("dialog-error")
                 self.set_tooltip(_("Synchronization Error"))
             else:
-                self._reset_states()
                 self.set_from_icon_name("conduit")
                 self.set_tooltip(_("Synchronization Complete"))
+            self.conflict = False
             self.cancelButton.set_property("sensitive", False)
             return False
-        else:
-            self.cancelButton.set_property("sensitive", True)
-            return True
 
     def on_conduit_added(self, syncset, cond):
         cond.connect("sync-started", self._on_sync_started)
         cond.connect("sync-completed", self._on_sync_completed)
         cond.connect("sync-conflict", self._on_sync_conflict)
-        #cond.connect("sync-progress", self._on_sync_progress)
-
+        
     def on_conduit_removed(self, syncset, cond):
         pass
 
     def _on_sync_started(self, cond):
         if not self.animating:
             self.animating = True
+            self.set_tooltip(_("Synchronizing"))
+            self.cancelButton.set_property("sensitive", True)
             gobject.timeout_add(100, self._animate_icon_timeout)
 
     def _on_sync_completed(self, cond, aborted, error, conflict):