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

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

Revision: 663
          http://fclient.svn.sourceforge.net/fclient/?rev=663&view=rev
Author:   jUrner
Date:     2008-07-17 16:07:27 +0000 (Thu, 17 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-17 16:06:23 UTC (rev 662)
+++ trunk/fclient/src/fclient/Ui_ViewLogger.py	2008-07-17 16:07:27 UTC (rev 663)
@@ -27,12 +27,12 @@
 		self.action(
 				name='ActionLoggerClear',
 				text=self.trUtf8('C&lear'),
-				trigger=parent.handleActionLoggerClear,
+				trigger=parent.onActionLoggerClear,
 				)
 				
 		groupVerbosity = self.group(
 				name='GroupVerbosity',
-				trigger=parent.handleGroupVerbosityTriggered,
+				trigger=parent.onGroupVerbosityTriggered,
 				isExclusive=True,
 				)
 		self.action(
@@ -79,7 +79,7 @@
 		# menus
 		self.menus = []
 		if self.menuBar is not None:
-			menu = QtGui.QMenu(parent.fclientViewObject.displayName, self.menuBar)
+			menu = QtGui.QMenu(parent.fcViewObject.displayName, self.menuBar)
 			parent.populateMenu(menu)
 			self.menus.append(menu)
 			self.menuBar.addViewMenu(menu)
@@ -154,29 +154,29 @@
 		self.setupUi(self)
 		config.ObjectRegistry.register(self)
 		
-		self.fclientActions = Actions(self)
-		self.fclientSettings = Settings(self).restore()
-		self.fclientViewObject = LoggerViewObject(self)
-		self.fclientGlobalFeedback = GlobalFeedback(self, idFeedbackParent)
+		self.fcActions = Actions(self)
+		self.fcSettings = Settings(self).restore()
+		self.fcViewObject = LoggerViewObject(self)
+		self.fcGlobalFeedback = GlobalFeedback(self, idFeedbackParent)
 				
 					
 		# setup editbox
 		#NOTE: do not move to showEvent(). we want to be up and alive as soon as possible to catch logs
 		ed = self.controlById(self.IdEdLogger)
-		ed.document().setMaximumBlockCount(self.fclientSettings.value('MaxLines'))
+		ed.document().setMaximumBlockCount(self.fcSettings.value('MaxLines'))
 		ed.contextMenuEvent = self.loggerContextMenuEvent
-		self.connect(ed, QtCore.SIGNAL('textChanged()'), self.handleLoggerTextChanged)
+		self.connect(ed, QtCore.SIGNAL('textChanged()'), self.onLoggerTextChanged)
 		
 		# setup logger
 		self.loggingHandler = MyLoggingHandler(self.addRecord)
 		logging.getLogger('').addHandler(self.loggingHandler)
 					
 		# setup actions
-		verbosity = self.fclientSettings.value('Verbosity').title()
-		action = self.fclientActions.get(self.fclientActions.PrefixVerbosity + verbosity, None)
+		verbosity = self.fcSettings.value('Verbosity').title()
+		action = self.fcActions.get(self.fcActions.PrefixVerbosity + verbosity, None)
 		if action is None:
-			verbosity = self.fclientSettings.restoreDefaults('Verbosity')['Verbosity']
-		action = self.fclientActions.get(self.fclientActions.PrefixVerbosity + verbosity, None)
+			verbosity = self.fcSettings.restoreDefaults('Verbosity')['Verbosity']
+		action = self.fcActions.get(self.fcActions.PrefixVerbosity + verbosity, None)
 		if action is None:
 			raise ValueError('default verbosity action "%s" not found. WTF?' % self.actions.PrefixVerbosity + verbosity)
 		action.trigger()
@@ -189,7 +189,7 @@
 		
 		ed = self.controlById(self.IdEdLogger)
 		fmt = ed.currentCharFormat()
-		colorFg = self.fclientSettings.value(self.fclientSettings.PrefixVerbosityColorFg + record.levelname)
+		colorFg = self.fcSettings.value(self.fcSettings.PrefixVerbosityColorFg + record.levelname)
 		fmt.setForeground(QtGui.QBrush(colorFg))
 		ed.setCurrentCharFormat(fmt)
 		
@@ -202,9 +202,9 @@
 		
 	
 	def populateMenu(self, menu):
-		menu.addAction(self.fclientActions['ActionLoggerClear'])
+		menu.addAction(self.fcActions['ActionLoggerClear'])
 		subMenu = menu.addMenu(self.trUtf8('Verbosity'))
-		subMenu.addActions(self.fclientActions['GroupVerbosity'].actions())
+		subMenu.addActions(self.fcActions['GroupVerbosity'].actions())
 		return menu
 			
 	#########################################
@@ -234,31 +234,31 @@
 	
 	
 	def hideEvent(self, event):
-		self.fclientGlobalFeedback.setVisible(False)	
+		self.fcGlobalFeedback.setVisible(False)	
 	
 	
 	def showEvent(self, event):
-		self.fclientGlobalFeedback.setVisible(True)
+		self.fcGlobalFeedback.setVisible(True)
 		if self._isCreated: 
 			return
 		self._isCreated = True
 			
 	#########################################
-	## event handlers
+	## event onrs
 	#########################################
-	def handleActionLoggerClear(self, action):
+	def onActionLoggerClear(self, action):
 		self.controlById(self.IdEdLogger).clear()
 		
 	
-	def handleGroupVerbosityTriggered(self, action):
-		nameVerbosity = action.objectName()[len(self.fclientActions.PrefixVerbosity):]
-		self.fclientSettings.setValues(Verbosity=nameVerbosity)		
+	def onGroupVerbosityTriggered(self, action):
+		nameVerbosity = action.objectName()[len(self.fcActions.PrefixVerbosity):]
+		self.fcSettings.setValues(Verbosity=nameVerbosity)		
 		logging.getLogger().setLevel(action.userData())
 	
 	
-	def handleLoggerTextChanged(self):
+	def onLoggerTextChanged(self):
 		ed = self.controlById(self.IdEdLogger)
-		self.fclientActions['ActionLoggerClear'].setEnabled(not ed.document().isEmpty())
+		self.fcActions['ActionLoggerClear'].setEnabled(not ed.document().isEmpty())
 	
 #**********************************************************************************
 #


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