SF.net SVN: fclient:[801] trunk/fclient/src/fclient/impl/ViewConnection.py
Status: Pre-Alpha
Brought to you by:
jurner
|
From: <jU...@us...> - 2008-07-28 12:21:43
|
Revision: 801
http://fclient.svn.sourceforge.net/fclient/?rev=801&view=rev
Author: jUrner
Date: 2008-07-28 12:21:52 +0000 (Mon, 28 Jul 2008)
Log Message:
-----------
auto adjust widgets to settings
Modified Paths:
--------------
trunk/fclient/src/fclient/impl/ViewConnection.py
Modified: trunk/fclient/src/fclient/impl/ViewConnection.py
===================================================================
--- trunk/fclient/src/fclient/impl/ViewConnection.py 2008-07-28 12:20:45 UTC (rev 800)
+++ trunk/fclient/src/fclient/impl/ViewConnection.py 2008-07-28 12:21:52 UTC (rev 801)
@@ -65,11 +65,45 @@
class Settings(config.SettingsBase):
_key_ = config.IdViewConnectionWidget
_settings_ = (
+ ('FcpAutoConnect', 'Bool', True, config.SettingScopeUser),
+ ('FcpConnectionName', 'String', config.FclientConnectionName, config.SettingScopeExpert),
+ ('FcpConnectionHost', 'String', fcp2.Client.DefaultFcpHost, config.SettingScopeUser),
+ ('FcpConnectionPort', 'UInt', fcp2.Client.DefaultFcpPort, config.SettingScopeUser),
('FcpConnectionTimerTimeout', 'UInt', 500, config.SettingScopeExpert),
('FcpConnectionTimerMaxDuration', 'UInt', 20, config.SettingScopeExpert),
('FcpPollTimerTimeout', 'UInt', 200, config.SettingScopeExpert),
+
+ ('FproxyConnectionHost', 'String','127.0.0.1', config.SettingScopeUser),
+ ('FproxyConnectionPort', 'UInt', 8888, config.SettingScopeUser),
)
+
+ def setValues(self, **kws):
+ config.SettingsBase.setValues(self, **kws)
+ parent = self.parent()
+
+ # set fcp connection params
+ if 'FcpConnectionHost' in kws:
+ edHost = parent.controlById(parent.IdEdFcpConnectionHost)
+ edHost.setText(self.value('FcpConnectionHost'))
+
+ if 'FcpConnectionPort' in kws:
+ spinPort = parent.controlById(parent.IdFcpSpinFcpConnectionPort)
+ spinPort.setValue(self.value('FcpConnectionPort'))
+
+ if 'FcpAutoConnect' in kws:
+ ck = parent.controlById(parent.IdCkFcpAutoConnect)
+ ck.setChecked(self.value('FcpAutoConnect'))
+
+ # set fproxy connection params
+ if 'FproxyConnectionHost' in kws:
+ edHost = parent.controlById(parent.IdEdFproxyConnectionHost)
+ edHost.setText(self.value('FproxyConnectionHost'))
+
+ if 'FproxyConnectionPort' in kws:
+ spinPort = parent.controlById(parent.IdFproxySpinConnectionPort)
+ spinPort.setValue(self.value('FproxyConnectionPort'))
+
class ConnectionViewObject(config.ViewObject):
def __init__(self, parent):
@@ -91,7 +125,7 @@
self.connect(self, QtCore.SIGNAL('timeout()'), self.onNext)
def start(self, settings):
- config.fcpClient.setConnectionName(config.settings.value('FcpConnectionName'))
+ config.fcpClient.setConnectionName(settings.value('FcpConnectionName'))
self.fcpIterConnect = config.fcpClient.iterConnect(
duration=settings.value('FcpConnectionTimerMaxDuration'),
timeout=0
@@ -134,7 +168,7 @@
class ViewConnectionWidget(QtGui.QWidget, Ui_ViewConnectionWidget):
IdBtConnect = 'btConnect'
- IdEdFcpFcpConnectionHost = 'edFcpConnectionHost'
+ IdEdFcpConnectionHost = 'edFcpConnectionHost'
IdFcpSpinFcpConnectionPort = 'spinFcpConnectionPort'
IdCkFcpAutoConnect = 'ckFcpAutoConnect'
@@ -144,8 +178,15 @@
def __init__(self, parent, idGlobalFeedback=config.IdMainWindow):
QtGui.QWidget.__init__(self, parent)
+ self.setupUi(self)
+
+ self._isCreated = False
+ config.ObjectRegistry.register(self)
+ self.fcSettings = Settings(self).restore()
+ self.fcActions = Actions(self)
+ self.fcViewObject = ConnectionViewObject(self)
+ self.fcGlobalFeedback = GlobalFeedback(self,idGlobalFeedback)
- self._isCreated = False
self._connectionTimer = ConnectionTimer(self)
self._pollTimer = PollTimer(self)
self._fcpEventonrs = (
@@ -154,26 +195,26 @@
)
config.fcpClient.events += self._fcpEventonrs
self._mainWindowMenus = ()
-
-
- self.setupUi(self)
- config.ObjectRegistry.register(self)
- self.fcSettings = Settings().restore()
- self.fcActions = Actions(self)
- self.fcViewObject = ConnectionViewObject(self)
- self.fcGlobalFeedback = GlobalFeedback(self,idGlobalFeedback)
-
-
+
#########################################
## methods
#########################################
+ def connected(self):
+ return self.controlById(self.IdBtConnect).isChecked()
+
def controlById(self, idControl):
return getattr(self, idControl)
-
def populateMenu(self, menu):
return menu
-
+
+ def setConnected(self, flag):
+ bt = self.controlById(self.IdBtConnect)
+ if (bt.isChecked() and not flag) or (not bt.isChecked() and flag):
+ bt.click()
+ return True
+ return False
+
#########################################
## view methods
#########################################
@@ -189,36 +230,33 @@
def hideEvent(self, event):
self.fcGlobalFeedback.setVisible(False)
-
def showEvent(self, event):
self.fcGlobalFeedback.setVisible(True)
if self._isCreated:
return
self._isCreated = True
+
+
# setup fcp host / port / name
- edHost = self.controlById(self.IdEdFcpFcpConnectionHost)
- edHost.setText(config.settings.value('FcpConnectionHost'))
+ edHost = self.controlById(self.IdEdFcpConnectionHost)
self.connect(edHost, QtCore.SIGNAL('textChanged(const QString &)'), self.onEdFcpConnectionHostChanged)
spinPort = self.controlById(self.IdFcpSpinFcpConnectionPort)
spinPort.setRange(0, 0xFFFF) #TODO: no idea if port range (0, 0xFFFF) this is reasonable
- spinPort.setValue(config.settings.value('FcpConnectionPort'))
self.connect(spinPort, QtCore.SIGNAL('valueChanged(int)'), self.onSpinFcpConnectionPortChanged)
- doAutoConnect = config.settings.value('FcpAutoConnect')
+ doAutoConnect = self.fcSettings.value('FcpAutoConnect')
ck = self.controlById(self.IdCkFcpAutoConnect)
ck.setChecked(doAutoConnect)
self.connect(ck, QtCore.SIGNAL('stateChanged(int)'), self.onCkFcpAutoConnectStateChanged)
# setup fproxy host / port
edHost = self.controlById(self.IdEdFproxyConnectionHost)
- edHost.setText(config.settings.value('FproxyConnectionHost'))
self.connect(edHost, QtCore.SIGNAL('textChanged(const QString &)'), self.onEdFproxyConnectionHostChanged)
spinPort = self.controlById(self.IdFproxySpinConnectionPort)
spinPort.setRange(0, 0xFFFF) #TODO: no idea if port range (0, 0xFFFF) this is reasonable
- spinPort.setValue(config.settings.value('FproxyConnectionPort'))
self.connect(spinPort, QtCore.SIGNAL('valueChanged(int)'), self.onSpinFproxyConnectionPortChanged)
bt = self.controlById(self.IdBtConnect)
@@ -232,7 +270,7 @@
def retranslateUi(self, w):
Ui_ViewConnectionWidget.retranslateUi(self, w)
bt = self.controlById(self.IdBtConnect)
- bt.setText(self.trUtf8('Disconnect') if bt.isChecked() else self.trUtf8('Connect'))
+ bt.setText(self.trUtf8('Disconnect') if self.connected() else self.trUtf8('Connect'))
#########################################
@@ -253,21 +291,20 @@
def onCkFcpAutoConnectStateChanged(self, state):
- config.settings.setValues(FcpAutoConnect=state == QtCore.Qt.Checked)
+ self.fcSettings.setValues(FcpAutoConnect=state == QtCore.Qt.Checked)
def onEdFcpConnectionHostChanged(self, text):
- config.settings.setValues(FcpConnectionHost=text)
+ self.fcSettings.setValues(FcpConnectionHost=text)
def onSpinFcpConnectionPortChanged(self, value):
- config.settings.setValues(FcpConnectionPort=value)
+ self.fcSettings.setValues(FcpConnectionPort=value)
def onEdFproxyConnectionHostChanged(self, text):
- config.settings.setValues(FproxyConnectionHost=text)
+ self.fcSettings.setValues(FproxyConnectionHost=text)
def onSpinFproxyConnectionPortChanged(self, value):
- config.settings.setValues(FproxyConnectionPort=value)
+ self.fcSettings.setValues(FproxyConnectionPort=value)
-
#########################################
## fcp event onrs
#########################################
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|