SF.net SVN: fclient:[674] trunk/fclient/src/fclient/Ui_ViewLogger.py

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

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

Log Message:
-----------
naming

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

Modified: trunk/fclient/src/fclient/Ui_ViewLogger.py
===================================================================
--- trunk/fclient/src/fclient/Ui_ViewLogger.py	2008-07-19 06:36:58 UTC (rev 673)
+++ trunk/fclient/src/fclient/Ui_ViewLogger.py	2008-07-19 06:37:06 UTC (rev 674)
@@ -71,13 +71,12 @@
 class GlobalFeedback(config.GlobalFeedbackBase):
 	"""wrapper for global statusbar widgets, menus"""
 	
-	def __init__(self, parent, idFeedbackParent):
-		config.GlobalFeedbackBase.__init__(self, parent, idFeedbackParent)
+	def __init__(self, parent, idGlobalFeedback):
+		config.GlobalFeedbackBase.__init__(self, parent, idGlobalFeedback)
 		
-		
 		# menus
 		self.menus = []
-		if self.menuBar is not None:
+		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)
@@ -145,7 +144,7 @@
 	IdEdLogger = 'edLogger'
 	
 	
-	def __init__(self, parent, idFeedbackParent=config.IdMainWindow):
+	def __init__(self, parent, idGlobalFeedback=config.IdMainWindow):
 		QtGui.QWidget.__init__(self, parent)
 		self._isCreated = False
 		self._mainWindowMenus = {}			#TODO: wrap along with toolbars to a handy class MainWindowStuff
@@ -156,7 +155,7 @@
 		self.fcActions = Actions(self)
 		self.fcSettings = Settings(self).restore()
 		self.fcViewObject = LoggerViewObject(self)
-		self.fcGlobalFeedback = GlobalFeedback(self, idFeedbackParent)
+		self.fcGlobalFeedback = GlobalFeedback(self, idGlobalFeedback)
 				
 					
 		# setup editbox


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