conduit r1340 - in trunk: . conduit conduit/dataproviders conduit/gtkui conduit/modules/BoxDotNetModule conduit/modules/FileModule

[jstowers svn gnome org]

Author: jstowers
Date: Wed Feb 27 03:58:58 2008
New Revision: 1340
URL: http://svn.gnome.org/viewvc/conduit?rev=1340&view=rev

Log:
2008-02-27  John Stowers  <john stowers gmail com>

	* conduit/ModuleWrapper.py:
	* conduit/dataproviders/DataProvider.py:
	* conduit/gtkui/Canvas.py: Add get_name() to the DataProviderBase class
	which provides a way for dataproviders to change the name they
	are displayed as on the Canvas.

	* conduit/modules/BoxDotNetModule/BoxDotNetModule.py:
	* conduit/modules/FileModule/FileModule.py: Use the selected folder as
	the display name. Fixes bug #512230



Modified:
   trunk/ChangeLog
   trunk/conduit/ModuleWrapper.py
   trunk/conduit/dataproviders/DataProvider.py
   trunk/conduit/gtkui/Canvas.py
   trunk/conduit/modules/BoxDotNetModule/BoxDotNetModule.py
   trunk/conduit/modules/FileModule/FileModule.py

Modified: trunk/conduit/ModuleWrapper.py
==============================================================================
--- trunk/conduit/ModuleWrapper.py	(original)
+++ trunk/conduit/ModuleWrapper.py	Wed Feb 27 03:58:58 2008
@@ -74,7 +74,10 @@
         """
         @returns: The dataproviders user readable name
         """
-        return self.name
+        if self.module == None:
+            return self.name
+        else:
+            return self.module.get_name()
         
     def set_name(self, name):
         """

Modified: trunk/conduit/dataproviders/DataProvider.py
==============================================================================
--- trunk/conduit/dataproviders/DataProvider.py	(original)
+++ trunk/conduit/dataproviders/DataProvider.py	Wed Feb 27 03:58:58 2008
@@ -358,8 +358,13 @@
             return self._out_type_
         else:
             return "%s?%s" % (self._out_type_, Utils.encode_conversion_args(args))
-
-
+            
+    def get_name(self):
+        """
+        @returns: The DataProvider name, to be displayed in the UI
+        """
+        return self._name_
+        
 class DataSource(DataProviderBase):
     """
     Base Class for DataSources.

Modified: trunk/conduit/gtkui/Canvas.py
==============================================================================
--- trunk/conduit/gtkui/Canvas.py	(original)
+++ trunk/conduit/gtkui/Canvas.py	Wed Feb 27 03:58:58 2008
@@ -420,6 +420,7 @@
         log.info("Configuring %s" % dp)
         #May block
         dp.configure(self.parentWindow)
+        self.selectedDataproviderItem.update_appearance()
 
     def on_refresh_dataprovider_clicked(self, widget):
         """
@@ -586,23 +587,6 @@
             else:
                 log.warn("Unknown module type: Cannot get fill color")
 
-    def _update_appearance(self):
-        #the image
-        pb = self._get_icon()
-        pbx = int((1*self.WIDGET_WIDTH/5) - (pb.get_width()/2))
-        pby = int((1*self.WIDGET_HEIGHT/3) - (pb.get_height()/2))
-        self.image.set_property("pixbuf",pb)
-
-        self.name.set_property("text",self.model.get_name())
-
-        if self.model.module == None:
-            statusText = self.PENDING_MESSAGE
-        else:
-            statusText = self.model.module.get_status_text()
-        self.statusText.set_property("text",statusText)
-
-        self.box.set_property("fill_color_rgba",self._get_fill_color())
-
     def _get_icon(self):
         return self.model.get_icon()        
 
@@ -655,10 +639,27 @@
     def _on_status_changed(self, dataprovider):
         msg = dataprovider.get_status_text()
         self.statusText.set_property("text", msg)
+        
+    def update_appearance(self):
+        #the image
+        pb = self._get_icon()
+        pbx = int((1*self.WIDGET_WIDTH/5) - (pb.get_width()/2))
+        pby = int((1*self.WIDGET_HEIGHT/3) - (pb.get_height()/2))
+        self.image.set_property("pixbuf",pb)
+
+        self.name.set_property("text",self.model.get_name())
+
+        if self.model.module == None:
+            statusText = self.PENDING_MESSAGE
+        else:
+            statusText = self.model.module.get_status_text()
+        self.statusText.set_property("text",statusText)
+
+        self.box.set_property("fill_color_rgba",self._get_fill_color())
 
     def set_model(self, model):
         self.model = model
-        self._update_appearance()
+        self.update_appearance()
         if self.model.module != None:
             self.model.module.connect("change-detected", self._on_change_detected)
             self.model.module.connect("status-changed", self._on_status_changed)
@@ -777,9 +778,7 @@
         except KeyError: pass
 
     def _on_conduit_parameters_changed(self, cond):
-        #update the twowayness of the connectors
-        for c in self.connectorItems.values():
-            c.set_two_way(self.model.is_two_way())
+        self.update_appearance()
 
     def _on_conduit_dataprovider_changed(self, cond, olddpw, newdpw):
         for item in [self.sourceItem] + self.sinkDpItems:
@@ -830,6 +829,11 @@
                         break
 
 
+    def update_appearance(self):
+        #update the twowayness of the connectors
+        for c in self.connectorItems.values():
+            c.set_two_way(self.model.is_two_way())
+
     def add_dataprovider_canvas_item(self, item):
         self._position_dataprovider(item)
 

Modified: trunk/conduit/modules/BoxDotNetModule/BoxDotNetModule.py
==============================================================================
--- trunk/conduit/modules/BoxDotNetModule/BoxDotNetModule.py	(original)
+++ trunk/conduit/modules/BoxDotNetModule/BoxDotNetModule.py	Wed Feb 27 03:58:58 2008
@@ -331,5 +331,11 @@
     def get_all(self):
         DataProvider.TwoWay.get_all(self)
         return self.files.keys()
+        
+    def get_name(self):
+        if len(self.foldername) > 0:
+            return self.foldername
+        else:
+            return self._name_
 
 

Modified: trunk/conduit/modules/FileModule/FileModule.py
==============================================================================
--- trunk/conduit/modules/FileModule/FileModule.py	(original)
+++ trunk/conduit/modules/FileModule/FileModule.py	Wed Feb 27 03:58:58 2008
@@ -105,6 +105,9 @@
 
     def get_UID(self):
         return "%s:%s" % (self.folder, self.folderGroupName)
+        
+    def get_name(self):
+        return self.folderGroupName
 
     def _monitor_folder(self):
         if self._monitor_folder_id != None: