SF.net SVN: fclient:[886] trunk/fclient/fclient/impl

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

Revision: 886
          http://fclient.svn.sourceforge.net/fclient/?rev=886&view=rev
Author:   jUrner
Date:     2008-08-10 07:54:24 +0000 (Sun, 10 Aug 2008)

Log Message:
-----------
enable/disable actions depending on Fcp connected

Modified Paths:
--------------
    trunk/fclient/fclient/impl/ViewBrowser.py
    trunk/fclient/fclient/impl/ViewDownloads.py

Modified: trunk/fclient/fclient/impl/ViewBrowser.py
===================================================================
--- trunk/fclient/fclient/impl/ViewBrowser.py	2008-08-10 07:53:22 UTC (rev 885)
+++ trunk/fclient/fclient/impl/ViewBrowser.py	2008-08-10 07:54:24 UTC (rev 886)
@@ -101,8 +101,6 @@
 	def createRequest(self, operation, request, outgoingData):
 		reply = QtNetwork.QNetworkAccessManager.createRequest(self, operation, request, outgoingData)
 		self.emit(QtCore.SIGNAL('networkRequestCreated(QNetworkReply*)'), reply)
-			
-			
 		#print 'createRequest', reply.url()
 		#self.connect(reply, QtCore.SIGNAL('downloadProgress(qint64, qint64)'), self.foo)
 		return reply
@@ -948,7 +946,8 @@
 		act.setText(self.trUtf8('Open image in new tab'))
 		act = browser.pageAction(page.OpenFrameInNewWindow)
 		act.setText(self.trUtf8('Open frame in new tab'))
-			
+		
+		
 		# customize page
 		page.setLinkDelegationPolicy(page.DelegateAllLinks)
 		
@@ -1042,6 +1041,7 @@
 		menu.addAction(self.fcActions['ActionObjectProperties'])
 					
 		#TODO: QwebView assumes we can download queries - we can't
+		browser.pageAction(page.DownloadLinkToDisk).setEnabled(config.fcpClient.isConnected())
 		if browser.pageAction(page.DownloadLinkToDisk).isEnabled():
 			result = config.qStringToFcpKey(hitTestResult.linkUrl().toString())
 			if result is None:
@@ -1303,17 +1303,19 @@
 		tabWidget = self.controlById(self.IdTabBrowsers)
 		pt = tabWidget.mapToGlobal(pt)
 		pt2 = tabWidget.tabBar().mapFromGlobal(pt)
-		i = tabWidget.tabBar().tabAt(pt2)
+		index = tabWidget.tabBar().tabAt(pt2)
 		
+		# setup actions
+		self.fcActions['ActionCloseBrowserUnderMouse'].setEnabled(index >-1)
+		self.fcActions['ActionDuplicateTab'].setEnabled(index >-1)
+		
 		# setup menu
-		actCloseBrowserUnderMouse = self.fcActions['ActionCloseBrowserUnderMouse']
-		actCloseBrowserUnderMouse.setEnabled(i >-1)
-		menu.addAction(actCloseBrowserUnderMouse)
+		menu.addAction(self.fcActions['ActionCloseBrowserUnderMouse'])
 		menu.addAction(self.fcActions['ActionCreateNewTab'])
 		menu.addAction(self.fcActions['ActionDuplicateTab'])
 		menu.addAction(self.fcActions['ActionCloseAllTabs'])
 		act = menu.exec_(pt)
-		if act == actCloseBrowserUnderMouse:
+		if act == self.fcActions['ActionCloseBrowserUnderMouse']:
 			tabWidget.removeTab(i)
 			self._adjustCurrentBrowserDependendStuff()
 		
@@ -1344,7 +1346,7 @@
 			browser.setTextSizeMultiplier(browser.textSizeMultiplier() - 0.2)
 			if browser.textSizeMultiplier() >= oldMultiplier:
 				menu.addAction(self.fcActions['ActionZoomOut']).setEnabled(False)
-	
+		
 #**********************************************************************************
 #
 #**********************************************************************************

Modified: trunk/fclient/fclient/impl/ViewDownloads.py
===================================================================
--- trunk/fclient/fclient/impl/ViewDownloads.py	2008-08-10 07:53:22 UTC (rev 885)
+++ trunk/fclient/fclient/impl/ViewDownloads.py	2008-08-10 07:54:24 UTC (rev 886)
@@ -227,16 +227,18 @@
 		self.fcActions = DownloadsWidgetActions(self)
 		self.fcViewObject = DownloadsViewObject(self)
 		self.fcGlobalFeedback = DownloadsWidgetGlobalFeedback(self, idGlobalFeedback)
-		self.fcpEvents = (
+		self.fcpClientEvents = (
+				(config.fcpClient.events.ClientConnected, self.onFcpClientConnected),
+				(config.fcpClient.events.ClientDisconnected, self.onFcpClientDisconnected),
 				(config.fcpClient.events.ConfigData, self.onFcpConfigData),
-				(config.fcpClient.events.RequestCompleted, self.onFcpRequestCompleted),
-				(config.fcpClient.events.RequestFailed, self.onFcpRequestFailed),
-				(config.fcpClient.events.RequestModified, self.onFcpRequestModified),
-				(config.fcpClient.events.RequestProgress, self.onFcpRequestProgress),
-				(config.fcpClient.events.RequestStarted, self.onFcpRequestStarted),
-				(config.fcpClient.events.RequestRemoved, self.onFcpRequestRemoved),
+				(config.fcpClient.events.RequestCompleted, self.onFcpClientRequestCompleted),
+				(config.fcpClient.events.RequestFailed, self.onFcpClientRequestFailed),
+				(config.fcpClient.events.RequestModified, self.onFcpClientRequestModified),
+				(config.fcpClient.events.RequestProgress, self.onFcpClientRequestProgress),
+				(config.fcpClient.events.RequestStarted, self.onFcpClientRequestStarted),
+				(config.fcpClient.events.RequestRemoved, self.onFcpClientRequestRemoved),
 				)
-		config.fcpClient.events += self.fcpEvents
+		config.fcpClient.events += self.fcpClientEvents
 		
 	############################
 	## private methods
@@ -323,7 +325,7 @@
 			self.connect(tree, QtCore.SIGNAL('itemSelectionChanged() '), self.onTreeItemSelectionChanged)
 	
 	def viewClose(self):
-		config.fcpClient.events -= self.fcpEvents
+		config.fcpClient.events -= self.fcpClientEvents
 		
 	#########################################
 	## methods
@@ -428,11 +430,20 @@
 	#########################################
 	## fcp event handlers
 	#########################################
+	def onFcpClientConnected(self, event, msg):
+		for action in self.fcActions:
+			action.setEnabled(True)
+		
+		
+	def onFcpClientDisconnected(self, event, msg):
+		for action in self.fcActions:
+			action.setEnabled(False)
+	
 	def onFcpConfigData(self, fcpEvent, fcpRequest):
 		pass
 		
 	
-	def onFcpRequestCompleted(self, fcpEvent, fcpRequest):
+	def onFcpClientRequestCompleted(self, fcpEvent, fcpRequest):
 		item = self.fcpRequests.get(fcpRequest['Identifier'], None)
 		if item is not None:
 			item.setData(
@@ -452,7 +463,7 @@
 							)
 			self._adjustStatusBar(item, 'complete')
 				
-	def onFcpRequestFailed(self, fcpEvent, fcpRequest):
+	def onFcpClientRequestFailed(self, fcpEvent, fcpRequest):
 		item = self.fcpRequests.get(rfcpRequest['Identifier'], None)
 		if item is not None:
 			self._adjustStatusBar(item, 'error')
@@ -464,7 +475,7 @@
 		
 		
 	#TODO: not tested
-	def onFcpRequestModified(self, fcpEvent, fcpRequest):
+	def onFcpClientRequestModified(self, fcpEvent, fcpRequest):
 		
 		requestIdentifier = fcpRequest['Modified'].get(fcp2.ConstRequestModified.Identifier, None)
 		if requestIdentifier is None:
@@ -485,7 +496,7 @@
 						)
 		
 	
-	def onFcpRequestProgress(self, fcpEvent, fcpRequest):
+	def onFcpClientRequestProgress(self, fcpEvent, fcpRequest):
 		item = self.fcpRequests.get(fcpRequest['Identifier'], None)
 		if item is not None:
 			progressBar = self.tree.itemWidget(item, self.HeaderIndexProgress)
@@ -502,10 +513,10 @@
 					)
 		
 	
-	def onFcpRequestRemoved(self, fcpEvent, fcpRequest):
+	def onFcpClientRequestRemoved(self, fcpEvent, fcpRequest):
 		pass
 	
-	def onFcpRequestStarted(self, fcpEvent, fcpRequest):
+	def onFcpClientRequestStarted(self, fcpEvent, fcpRequest):
 		if fcpRequest['RequestStatus'] & fcp2.ConstRequestStatus.Restored:
 			try:
 				requestData = PersistentRequestData.load(fcpRequest['PersistentUserData'])


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