SF.net SVN: fclient:[677] trunk/fclient/src/fclient/Ui_ViewBrowser.py

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

Revision: 677
          http://fclient.svn.sourceforge.net/fclient/?rev=677&view=rev
Author:   jUrner
Date:     2008-07-19 07:49:30 +0000 (Sat, 19 Jul 2008)

Log Message:
-----------
set busy cursor if necessary

Modified Paths:
--------------
    trunk/fclient/src/fclient/Ui_ViewBrowser.py

Modified: trunk/fclient/src/fclient/Ui_ViewBrowser.py
===================================================================
--- trunk/fclient/src/fclient/Ui_ViewBrowser.py	2008-07-19 06:48:49 UTC (rev 676)
+++ trunk/fclient/src/fclient/Ui_ViewBrowser.py	2008-07-19 07:49:30 UTC (rev 677)
@@ -192,8 +192,6 @@
 				)
 
 
-
-
 class Page(QtWebKit.QWebPage):
 	def __init__(self, parent):
 		QtWebKit.QWebPage.__init__(self, parent)
@@ -242,6 +240,9 @@
 		act = self.pageAction(page.OpenFrameInNewWindow)
 		act.setText(self.trUtf8('Open frame in new tab'))
 				
+		self.connect(self.pageAction(QtWebKit.QWebPage.Stop), QtCore.SIGNAL('triggered()'), self.onActionStopTriggered)
+		
+		
 		self.connect(self, QtCore.SIGNAL('loadStarted()'), self.onLoadStarted)
 		self.connect(self, QtCore.SIGNAL('loadProgress(int)'), self.onLoadProgress)
 		self.connect(self, QtCore.SIGNAL('loadFinished(bool)'), self.onLoadFinished)
@@ -281,8 +282,8 @@
 		page = self.page()
 		hitTest = frame.hitTestContent(event.pos())
 		
-		#if not hitTest.isNull():		#TODO: hitTest.isNull() returns alwas True?
-				
+		#if not hitTest.isNull():		#TODO: looks like hitTest.isNull() alwas returns True				
+		
 		menu = QtGui.QMenu()
 		
 		menu.addAction(self.pageAction(page.OpenLink))
@@ -334,9 +335,15 @@
 	def hideEvent(self, event):
 		self.fcGlobalFeedback.setVisible(False)
 		
-	#################################
-	## overwritten events
+	def mouseMoveEvent(self, event):
+		if self.lastProgress < 100:
+			self.setCursor(QtCore.Qt.BusyCursor)
+		else:
+			QtWebKit.QWebView.mouseMoveEvent(self, event)
+		
 	################################
+	## methods
+	################################
 	def isCurrentBrowser(self):
 		if self.tabWidget is not None:
 			return self.tabWidget.currentWidget() == self
@@ -363,6 +370,20 @@
 	##############################################
 	## event handlers
 	##############################################
+	def onActionStopTriggered(self):
+		# check wich cursor to set cos we may have busy cursor set
+		pt = self.mapFromGlobal(self.cursor().pos())		#TODO: self.mapFromGlobal(self.viewPort().cursor().pos()) ??
+		frame = self.page().currentFrame()
+		hitTest = frame.hitTestContent(pt)
+				
+		#if not hitTest.isNull():		#TODO: looks like hitTest.isNull() alwas returns True
+		
+		if hitTest.linkUrl().isValid() or hitTest.imageUrl().isValid():
+			self.setCursor(QtCore.Qt.PointingHandCursor)
+		else:
+			self.setCursor(QtCore.Qt.ArrowCursor)
+		
+		
 	def onIconChanged(self):
 		i = self.tabIndex()
 		if i > -1:
@@ -390,6 +411,7 @@
 	
 	
 	def onLoadFinished(self, ok):
+		self.onActionStopTriggered()
 		self.setProgress(100)
 		if ok:
 			self.setStatusMessage(self.trUtf8('Complete'))
@@ -420,6 +442,7 @@
 	
 	
 	def onLoadStarted(self):
+		self.setCursor(QtCore.Qt.BusyCursor)
 		self.setProgress(0)
 		self.setStatusMessage(self.trUtf8('Loading'))
 				
@@ -427,8 +450,8 @@
 	def onStatusBarMessage(self, text):
 		if not text.isEmpty():
 			self.setStatusMessage(text)
+	
 		
-	
 	def onUrlChanged(self, url):
 		self.lastUrl = QtCore.QUrl(url)		# copy url. qt nukes it on return
 		if self.navBar is not None and self.isCurrentBrowser():


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