SF.net SVN: fclient: [50] trunk/fclient/fclient_widgets/peer_widget.py

[<jU...@us...>]

Revision: 50
          http://fclient.svn.sourceforge.net/fclient/?rev=50&view=rev
Author:   jUrner
Date:     2007-11-06 04:38:50 -0800 (Tue, 06 Nov 2007)

Log Message:
-----------
added connectionName param

Modified Paths:
--------------
    trunk/fclient/fclient_widgets/peer_widget.py

Modified: trunk/fclient/fclient_widgets/peer_widget.py
===================================================================
--- trunk/fclient/fclient_widgets/peer_widget.py	2007-11-06 12:35:18 UTC (rev 49)
+++ trunk/fclient/fclient_widgets/peer_widget.py	2007-11-06 12:38:50 UTC (rev 50)
@@ -34,7 +34,6 @@
 		"""
 		"""
 		QtGui.QTreeWidgetItem.__init__(self, *args)
-		
 		self._peerData = None
 		
 	def peerData(self):
@@ -66,10 +65,15 @@
 	ShowPeersAll = ShowPeersOpennet | ShowPeersDarknet
 	
 		
-	def __init__(self, parent, cfg=None):
+	def __init__(self, 
+			parent, 
+			cfg=None
+			connectionName='',
+			):
 		"""
 		"""
-		self._cfg = cfg
+		self._connectionName = connectionName
+		self._cfg = cfg if cfg is None else config.Config(self)
 		self._fcpClient = None
 		self._fcpEvents = None
 		self._isCreated = False
@@ -79,10 +83,6 @@
 				
 		QtGui.QWidget.__init__(self, parent)
 				
-		# setup config
-		if self._cfg is None:
-			self._cfg = config.Config(self)
-		
 		# setup tree
 		self.setUniformRowHeights(True)
 		headerLabels = [
@@ -112,7 +112,7 @@
 		"""
 		if not self._isCreated:
 			self._isCreated = True
-			self._fcpClient = self._cfg.fcpClientManager.newClient('MeName', self.handleClientConnected)
+			self._fcpClient = self._cfg.fcpClientManager.newClient(self._connectionName, self.handleClientConnected)
 			
 	#############################################################
 	##
@@ -147,7 +147,7 @@
 			(self._fcpClient.events.EndListPeerNotes, self.handleEndListPeerNotes),
 			
 			)
-		# take care to not connect twice
+		# take care not to connect twice
 		for event, observer in self._fcpEvents:
 			if not observer in event:
 				event += observer
@@ -155,9 +155,7 @@
 		##
 		self.listPeers()
 		
-	
-
-	
+		
 	def handleClientDisconnected(self, event, params):
 		"""
 		"""
@@ -210,8 +208,7 @@
 					pollPriority=self._cfg.fcpClientManager.priorities['Lowest']
 					)
 	
-				
-	
+		
 	def handlePeerRemoved(self, peer):
 		"""
 		"""
@@ -258,7 +255,7 @@
 		"""
 		# disconnect Fcp events
 		for event, observer in self._fcpEvents:
-			if not observer in event:
+			if observer in event:
 				event -= observer
 				
 		self._cfg.fcpClientHandler.closeClient(self._fcpClient.connectionName())
@@ -528,7 +525,7 @@
 	
 	app = QtGui.QApplication(sys.argv)
 	w = QtGui.QMainWindow()
-	peers = PeerWidget(None)
+	peers = PeerWidget(None, connectionName='TestPeerWidget')
 	w.setCentralWidget(peers)
 
 	m = w.menuBar()


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