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

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

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

Log Message:
-----------
fix global feedback for browser

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:37:43 UTC (rev 675)
+++ trunk/fclient/src/fclient/Ui_ViewBrowser.py	2008-07-19 06:48:49 UTC (rev 676)
@@ -61,8 +61,8 @@
 				trigger=parent.onActionGoToFProxy,
 				isEnabled=True,
 				)
-		
 
+
 class GlobalFeedback(config.GlobalFeedbackBase):
 	"""wrapper for global statusbar widgets, menus"""
 	
@@ -77,39 +77,14 @@
 			self.menus.append(menu)
 			self.menuBar.addViewMenu(menu)
 				
-		# status bar widgets
-		self.label1 = None
-		self.progress = None
-		if self.statusBar is not None:
-			self.label1 = QtGui.QLabel(parent.trUtf8('progress: '), self.statusBar)
-			self.statusBar.addWidget(self.label1)
 			
-			self.progress = QtGui.QProgressBar(self.statusBar)
-			self.progress.setRange(0, 100)
-			self.progress.setValue(0)
-			self.statusBar.addWidget(self.progress)
-			
-			self.labelStatus = QtGui.QLabel(QtCore.QString(), self.statusBar)
-			self.statusBar.addWidget(self.labelStatus)
-			
-			
 	def setVisible(self, flag):
 		if self.menuBar is not None:
 			for menu in self.menus:
 				menu.children()[0].setVisible(flag)			
-		if self.statusBar is not None:
-			self.label1.setVisible(flag)
-			self.progress.setVisible(flag)
-			self.labelStatus.setVisible(flag)
-			
-	def setProgress(self, n):
-		if self.progress is not None:
-			self.progress.setValue(n)
-			
-	def setStatusMessage(self, text):
-		if self.labelStatus is not None:
-			self.labelStatus.setText(text)
+		
 
+
 class Settings(config.SettingsBase):
 		_key_ = config.IdViewBrowserWidget
 		_settings_ = (
@@ -159,6 +134,55 @@
 	def __init__(self, webView):
 		config.ActionsBase.__init__(self, webView)
 
+
+class BrowserGlobalFeedback(config.GlobalFeedbackBase):
+	"""wrapper for global statusbar widgets, menus"""
+	
+	def __init__(self, parent, idGlobalFeedback):
+		config.GlobalFeedbackBase.__init__(self, parent, idGlobalFeedback)
+				
+		# menus
+		self.menus = []
+		if self.menuBar is not None and hasattr(parent, 'fcViewObject'):
+			menu = QtGui.QMenu(parent.fcViewObject.displayName, self.menuBar)
+			parent.populateMenu(menu)
+			self.menus.append(menu)
+			self.menuBar.addViewMenu(menu)
+				
+		# status bar widgets
+		self.label1 = None
+		self.progress = None
+		if self.statusBar is not None:
+			self.label1 = QtGui.QLabel(parent.trUtf8('progress: '), self.statusBar)
+			self.statusBar.addWidget(self.label1)
+			
+			self.progress = QtGui.QProgressBar(self.statusBar)
+			self.progress.setRange(0, 100)
+			self.progress.setValue(0)
+			self.statusBar.addWidget(self.progress)
+			
+			self.labelStatus = QtGui.QLabel(QtCore.QString(), self.statusBar)
+			self.statusBar.addWidget(self.labelStatus)
+			
+			
+	def setVisible(self, flag):
+		if self.menuBar is not None:
+			for menu in self.menus:
+				menu.children()[0].setVisible(flag)			
+		if self.statusBar is not None:
+			self.label1.setVisible(flag)
+			self.progress.setVisible(flag)
+			self.labelStatus.setVisible(flag)
+			
+	def setProgress(self, n):
+		if self.progress is not None:
+			self.progress.setValue(n)
+			
+	def setStatusMessage(self, text):
+		if self.labelStatus is not None:
+			self.labelStatus.setText(text)
+
+
 class BrowserSettings(config.SettingsBase):
 		_key_ = config.IdViewBrowserWidget
 		_settings_ = (
@@ -169,6 +193,7 @@
 
 
 
+
 class Page(QtWebKit.QWebPage):
 	def __init__(self, parent):
 		QtWebKit.QWebPage.__init__(self, parent)
@@ -185,7 +210,7 @@
 		
 		self.fcActions = BrowserActions(self)
 		self.fcSettings = BrowserSettings(self)
-		self.fcGlobalFeedback = GlobalFeedback(self, idGlobalFeedback)
+		self.fcGlobalFeedback = BrowserGlobalFeedback(self, idGlobalFeedback)
 		
 		self.navBar = navBar
 		self.tabWidget = tabWidget
@@ -299,11 +324,16 @@
 	
 	
 	def showEvent(self, event):
+		self.fcGlobalFeedback.setVisible(True)
 		self.setProgress(self.lastProgress)
 		self.setStatusMessage(self.lastStatusMessage)
 		if self.navBar is not None:
 			self.navBar.setText(self.lastUrl.toString())
 	
+	
+	def hideEvent(self, event):
+		self.fcGlobalFeedback.setVisible(False)
+		
 	#################################
 	## overwritten events
 	################################


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