conduit r1612 - in trunk: . conduit/hildonui

[jstowers svn gnome org]

Author: jstowers
Date: Thu Jul 31 13:58:27 2008
New Revision: 1612
URL: http://svn.gnome.org/viewvc/conduit?rev=1612&view=rev

Log:
	* conduit/hildonui/Canvas.py: Fix hildon build. The hildon UI does
	not used gradients or anything slow like that.


Modified:
   trunk/   (props changed)
   trunk/ChangeLog
   trunk/conduit/hildonui/Canvas.py

Modified: trunk/conduit/hildonui/Canvas.py
==============================================================================
--- trunk/conduit/hildonui/Canvas.py	(original)
+++ trunk/conduit/hildonui/Canvas.py	Thu Jul 31 13:58:27 2008
@@ -38,6 +38,9 @@
                                 None,None)
         self.position = -1
         
+    def _update_for_theme(self, *args):
+        pass
+
     def _setup_popup_menus(self, dataproviderPopupXML, conduitPopupXML):
         # dp context menu
         self.dataproviderMenu = DataProviderMenu(self)
@@ -86,6 +89,25 @@
     def on_conduit_removed(self, sender, conduitRemoved):
         self.move_previous ()
 
+    def on_dataprovider_removed(self, sender, dataproviderRemoved, conduitCanvasItem):
+        for item in self._get_child_dataprovider_canvas_items():
+            if item.model == dataproviderRemoved:
+                conduitCanvasItem.delete_dataprovider_canvas_item(item)
+        self._remove_overlap()
+
+    def on_dataprovider_added(self, sender, dataproviderAdded, conduitCanvasItem):
+        #check for duplicates to eliminate race condition in set_sync_set
+        if dataproviderAdded in [i.model for i in self._get_child_dataprovider_canvas_items()]:
+            return
+
+        item = DataProviderCanvasItem(
+                            parent=conduitCanvasItem, 
+                            model=dataproviderAdded
+                            )
+        item.connect('button-press-event', self._on_dataprovider_button_press)
+        conduitCanvasItem.add_dataprovider_canvas_item(item)
+        self._remove_overlap()
+
     def set_sync_set(self, syncSet):
         conduit.gtkui.Canvas.Canvas.set_sync_set(self, syncSet)
         if len(self.model.get_all_conduits()) > 0:
@@ -285,7 +307,7 @@
                 "font":"Sans 7",
                 "fill_color_rgba":GtkUtil.TANGO_COLOR_ALUMINIUM2_MID
             }
-        
+       
         return kwargs
 
 class ConduitCanvasItem(conduit.gtkui.Canvas.ConduitCanvasItem):
@@ -307,6 +329,8 @@
         else:
             kwargs = {}
 
+        return kwargs
+
 class ConnectorCanvasItem(conduit.gtkui.Canvas.ConnectorCanvasItem):
 
     def get_styled_item_names(self):