SF.net SVN: fclient:[777] trunk/fclient/src/fclient/impl

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

Revision: 777
          http://fclient.svn.sourceforge.net/fclient/?rev=777&view=rev
Author:   jUrner
Date:     2008-07-27 11:48:52 +0000 (Sun, 27 Jul 2008)

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

Modified Paths:
--------------
    trunk/fclient/src/fclient/impl/ViewConnection.py

Added Paths:
-----------
    trunk/fclient/src/fclient/impl/DlgConnectionExpertSettings.py

Removed Paths:
-------------
    trunk/fclient/src/fclient/impl/Ui_DlgConnectionExpertSettings.py

Added: trunk/fclient/src/fclient/impl/DlgConnectionExpertSettings.py
===================================================================
--- trunk/fclient/src/fclient/impl/DlgConnectionExpertSettings.py	                        (rev 0)
+++ trunk/fclient/src/fclient/impl/DlgConnectionExpertSettings.py	2008-07-27 11:48:52 UTC (rev 777)
@@ -0,0 +1,73 @@
+ 
+from __future__ import absolute_import
+if __name__ == '__main__':	# see --> http://bugs.python.org/issue1510172 . works only current dir and below
+	import os; __path__ = [os.path.dirname(__file__)]
+	
+from PyQt4 import QtCore, QtGui
+
+from . import config
+
+from .tpls.Ui_DlgConnectionExpertSettingsTpl import Ui_DlgConnectionExpertSettings 
+#**********************************************************************************
+#
+#**********************************************************************************
+class ConnectionExpertSettingsDlg(QtGui.QDialog, Ui_DlgConnectionExpertSettings ):
+	
+	IdEdFcpConnectionName = 'edFcpConnectionName'
+	IdSpinFcpConnectionTimerMaxDuration = 'spinFcpConnectionTimerMaxDuration'
+	IdSpinConnectionTimerTimeout = 'spinConnectionTimerTimeout'
+	IdSpinFcpPollTimerTimeout = 'spinFcpPollTimerTimeout'
+	
+	def __init__(self, parent=None):
+		QtGui.QDialog.__init__(self, parent)
+		
+		self.setupUi(self)
+		self.setWindowTitle(config.FclientAppName + self.trUtf8(' - Connection expert settings'))
+		
+		edName = self.controlById(self.IdEdFcpConnectionName)
+		edName.setText(config.settings.value('FcpConnectionName'))
+		self.connect(edName, QtCore.SIGNAL('textChanged(const QString &)'), self.onEdFcpConnectionNameChanged)
+	
+		connectionWidget = config.ObjectRegistry.get(config.IdViewConnectionWidget, None)
+		spins = (
+				(self.IdSpinFcpConnectionTimerMaxDuration, 'FcpConnectionTimerMaxDuration'),
+				(self.IdSpinConnectionTimerTimeout, 'FcpConnectionTimerTimeout'),
+				(self.IdSpinFcpPollTimerTimeout, 'FcpPollTimerTimeout'),
+				)
+		for idControl, settingName in spins:
+			spin = self.controlById(idControl)
+			if connectionWidget is None:
+				spin.setEnabled(False)
+			else:
+				spin.setValue(connectionWidget.fcSettings.value(settingName))
+		
+		
+		
+	
+	def controlById(self, idControl):
+		return getattr(self, idControl)
+	
+	
+	def onEdFcpConnectionNameChanged(self, text):
+		config.settings.setValues(FcpConnectionName=text)
+
+	
+	
+#**********************************************************************************
+#
+#**********************************************************************************
+if __name__ == '__main__':
+	import sys
+	
+	class DummyKey(object):
+		KeyType = 'USK@'
+		def __init__(self): self.key = 'USG@qweqqweqwe'
+		def toString(self): return self.key
+				
+	app = QtGui.QApplication(sys.argv)
+	w = ConnectionExpertSettingsDlg(None)
+	w.show()
+	res = app.exec_()
+	sys.exit(res)
+
+ 

Deleted: trunk/fclient/src/fclient/impl/Ui_DlgConnectionExpertSettings.py
===================================================================
--- trunk/fclient/src/fclient/impl/Ui_DlgConnectionExpertSettings.py	2008-07-27 11:45:55 UTC (rev 776)
+++ trunk/fclient/src/fclient/impl/Ui_DlgConnectionExpertSettings.py	2008-07-27 11:48:52 UTC (rev 777)
@@ -1,73 +0,0 @@
- 
-from __future__ import absolute_import
-if __name__ == '__main__':	# see --> http://bugs.python.org/issue1510172 . works only current dir and below
-	import os; __path__ = [os.path.dirname(__file__)]
-	
-from PyQt4 import QtCore, QtGui
-
-from . import config
-
-from .tpls.Ui_DlgConnectionExpertSettingsTpl import Ui_DlgConnectionExpertSettings 
-#**********************************************************************************
-#
-#**********************************************************************************
-class ConnectionExpertSettingsDlg(QtGui.QDialog, Ui_DlgConnectionExpertSettings ):
-	
-	IdEdFcpConnectionName = 'edFcpConnectionName'
-	IdSpinFcpConnectionTimerMaxDuration = 'spinFcpConnectionTimerMaxDuration'
-	IdSpinConnectionTimerTimeout = 'spinConnectionTimerTimeout'
-	IdSpinFcpPollTimerTimeout = 'spinFcpPollTimerTimeout'
-	
-	def __init__(self, parent=None):
-		QtGui.QDialog.__init__(self, parent)
-		
-		self.setupUi(self)
-		self.setWindowTitle(config.FclientAppName + self.trUtf8(' - Connection expert settings'))
-		
-		edName = self.controlById(self.IdEdFcpConnectionName)
-		edName.setText(config.settings.value('FcpConnectionName'))
-		self.connect(edName, QtCore.SIGNAL('textChanged(const QString &)'), self.onEdFcpConnectionNameChanged)
-	
-		connectionWidget = config.ObjectRegistry.get(config.IdViewConnectionWidget, None)
-		spins = (
-				(self.IdSpinFcpConnectionTimerMaxDuration, 'FcpConnectionTimerMaxDuration'),
-				(self.IdSpinConnectionTimerTimeout, 'FcpConnectionTimerTimeout'),
-				(self.IdSpinFcpPollTimerTimeout, 'FcpPollTimerTimeout'),
-				)
-		for idControl, settingName in spins:
-			spin = self.controlById(idControl)
-			if connectionWidget is None:
-				spin.setEnabled(False)
-			else:
-				spin.setValue(connectionWidget.fcSettings.value(settingName))
-		
-		
-		
-	
-	def controlById(self, idControl):
-		return getattr(self, idControl)
-	
-	
-	def onEdFcpConnectionNameChanged(self, text):
-		config.settings.setValues(FcpConnectionName=text)
-
-	
-	
-#**********************************************************************************
-#
-#**********************************************************************************
-if __name__ == '__main__':
-	import sys
-	
-	class DummyKey(object):
-		KeyType = 'USK@'
-		def __init__(self): self.key = 'USG@qweqqweqwe'
-		def toString(self): return self.key
-				
-	app = QtGui.QApplication(sys.argv)
-	w = ConnectionExpertSettingsDlg(None)
-	w.show()
-	res = app.exec_()
-	sys.exit(res)
-
- 

Modified: trunk/fclient/src/fclient/impl/ViewConnection.py
===================================================================
--- trunk/fclient/src/fclient/impl/ViewConnection.py	2008-07-27 11:45:55 UTC (rev 776)
+++ trunk/fclient/src/fclient/impl/ViewConnection.py	2008-07-27 11:48:52 UTC (rev 777)
@@ -27,7 +27,7 @@
 
 from . import config
 from .lib import fcp2
-from .Ui_DlgConnectionExpertSettings import ConnectionExpertSettingsDlg
+from .DlgConnectionExpertSettings import ConnectionExpertSettingsDlg
 
 from .tpls.Ui_ViewConnectionWidgetTpl import Ui_ViewConnectionWidget
 #**********************************************************************************
@@ -298,9 +298,9 @@
 	from . import View, ViewLogger
 	
 	app = QtGui.QApplication(sys.argv)
-	w = Ui_View.ViewWidget(None)
+	w = View.ViewWidget(None)
 	w.addTopViews(ViewConnectionWidget(None))
-	w.addBottomViews(Ui_ViewLogger.ViewLoggerWidget(None))
+	w.addBottomViews(ViewLogger.ViewLoggerWidget(None))
 	
 	w.show()
 	res = app.exec_()


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