SF.net SVN: fclient:[761] trunk/fclient/src/fclient
Status: Pre-Alpha
Brought to you by:
jurner
Menu
▾
▴
SF.net SVN: fclient:[761] trunk/fclient/src/fclient
|
From: <jU...@us...> - 2008-07-27 11:13:28
|
Revision: 761
http://fclient.svn.sourceforge.net/fclient/?rev=761&view=rev
Author: jUrner
Date: 2008-07-27 11:13:36 +0000 (Sun, 27 Jul 2008)
Log Message:
-----------
add expert settings (not complete yet)
Modified Paths:
--------------
trunk/fclient/src/fclient/Ui_ViewConnection.py
trunk/fclient/src/fclient/tpls/Ui_ViewConnectionWidgetTpl.py
trunk/fclient/src/fclient/tpls/ViewConnectionWidgetTpl.ui
Added Paths:
-----------
trunk/fclient/src/fclient/Ui_DlgConnectionExpertSettings.py
trunk/fclient/src/fclient/tpls/DlgConnectionExpertSettingsTpl.ui
trunk/fclient/src/fclient/tpls/Ui_DlgConnectionExpertSettingsTpl.py
Added: trunk/fclient/src/fclient/Ui_DlgConnectionExpertSettings.py
===================================================================
--- trunk/fclient/src/fclient/Ui_DlgConnectionExpertSettings.py (rev 0)
+++ trunk/fclient/src/fclient/Ui_DlgConnectionExpertSettings.py 2008-07-27 11:13:36 UTC (rev 761)
@@ -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)
+
+
Modified: trunk/fclient/src/fclient/Ui_ViewConnection.py
===================================================================
--- trunk/fclient/src/fclient/Ui_ViewConnection.py 2008-07-27 11:12:38 UTC (rev 760)
+++ trunk/fclient/src/fclient/Ui_ViewConnection.py 2008-07-27 11:13:36 UTC (rev 761)
@@ -1,4 +1,13 @@
#*********************************************************************
+#TODO:
+# x. setting fcp connection params currently won't reset connection. how to handle?
+#
+#
+#*********************************************************************
+
+
+
+#*********************************************************************
#NOTES:
#
# current handling is:
@@ -18,6 +27,7 @@
from . import config
from .lib import fcp2
+from .Ui_DlgConnectionExpertSettings import ConnectionExpertSettingsDlg
from .tpls.Ui_ViewConnectionWidgetTpl import Ui_ViewConnectionWidget
#**********************************************************************************
@@ -56,9 +66,9 @@
class Settings(config.SettingsBase):
_key_ = config.IdViewConnectionWidget
_settings_ = (
- ('ConnectionTimerTimeout', 'UInt', 500, config.SettingScopeExpert),
- ('ConnectionTimerMaxDuration', 'UInt', 20, config.SettingScopeExpert),
- ('PollTimerTimeout', 'UInt', 200, config.SettingScopeExpert),
+ ('FcpConnectionTimerTimeout', 'UInt', 500, config.SettingScopeExpert),
+ ('FcpConnectionTimerMaxDuration', 'UInt', 20, config.SettingScopeExpert),
+ ('FcpPollTimerTimeout', 'UInt', 200, config.SettingScopeExpert),
)
class ConnectionViewObject(config.ViewObject):
@@ -82,12 +92,13 @@
self.connect(self, QtCore.SIGNAL('timeout()'), self.onNext)
def start(self, settings):
+ config.fcpClient.setConnectionName(config.settings.value('FcpConnectionName'))
self.fcpIterConnect = config.fcpClient.iterConnect(
- duration=settings.value('ConnectionTimerMaxDuration'),
+ duration=settings.value('FcpConnectionTimerMaxDuration'),
timeout=0
)
if not self.onNext():
- QtCore.QTimer.start(self, settings.value('ConnectionTimerTimeout'))
+ QtCore.QTimer.start(self, settings.value('FcpConnectionTimerTimeout'))
def onNext(self):
try:
@@ -112,7 +123,7 @@
self.connect(self, QtCore.SIGNAL('timeout()'), self.onNext)
def start(self, settings):
- QtCore.QTimer.start(self, settings.value('PollTimerTimeout'))
+ QtCore.QTimer.start(self, settings.value('FcpPollTimerTimeout'))
def onNext(self):
if config.fcpClient.isConnected():
@@ -124,9 +135,11 @@
class ViewConnectionWidget(QtGui.QWidget, Ui_ViewConnectionWidget):
IdBtConnect = 'btConnect'
- IdCkFcpAutoConnect = 'ckFcpAutoConnect'
IdEdFcpFcpConnectionHost = 'edFcpConnectionHost'
IdFcpSpinFcpConnectionPort = 'spinFcpConnectionPort'
+ IdCkFcpAutoConnect = 'ckFcpAutoConnect'
+ IdBtFcpConnectionMore = 'btFcpConnectionMore'
+
IdEdFproxyConnectionHost = 'edFproxyConnectionHost'
IdFproxySpinConnectionPort = 'spinFproxyConnectionPort'
@@ -186,7 +199,7 @@
return
self._isCreated = True
- # setup fcp host / port
+ # setup fcp host / port / name
edHost = self.controlById(self.IdEdFcpFcpConnectionHost)
edHost.setText(config.settings.value('FcpConnectionHost'))
self.connect(edHost, QtCore.SIGNAL('textChanged(const QString &)'), self.onEdFcpConnectionHostChanged)
@@ -201,6 +214,9 @@
ck.setChecked(doAutoConnect)
self.connect(ck, QtCore.SIGNAL('stateChanged(int)'), self.onCkFcpAutoConnectStateChanged)
+ bt = self.controlById(self.IdBtFcpConnectionMore)
+ self.connect(bt, QtCore.SIGNAL('clicked()'), self.onBtFcpConnectionMoreClicked)
+
# setup fproxy host / port
edHost = self.controlById(self.IdEdFproxyConnectionHost)
edHost.setText(config.settings.value('FproxyConnectionHost'))
@@ -251,6 +267,11 @@
def onSpinFcpConnectionPortChanged(self, value):
config.settings.setValues(FcpConnectionPort=value)
+ def onBtFcpConnectionMoreClicked(self):
+ dlg = ConnectionExpertSettingsDlg(self)
+ if dlg.exec_() == dlg.Accepted:
+ pass
+
def onEdFproxyConnectionHostChanged(self, text):
config.settings.setValues(FproxyConnectionHost=text)
Added: trunk/fclient/src/fclient/tpls/DlgConnectionExpertSettingsTpl.ui
===================================================================
--- trunk/fclient/src/fclient/tpls/DlgConnectionExpertSettingsTpl.ui (rev 0)
+++ trunk/fclient/src/fclient/tpls/DlgConnectionExpertSettingsTpl.ui 2008-07-27 11:13:36 UTC (rev 761)
@@ -0,0 +1,287 @@
+<ui version="4.0" >
+ <class>DlgConnectionExpertSettings</class>
+ <widget class="QDialog" name="DlgConnectionExpertSettings" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>392</width>
+ <height>589</height>
+ </rect>
+ </property>
+ <property name="windowTitle" >
+ <string>Dialog</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_2" >
+ <item row="0" column="0" >
+ <widget class="QTabWidget" name="tabWidget" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Minimum" hsizetype="Expanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="currentIndex" >
+ <number>0</number>
+ </property>
+ <widget class="QWidget" name="tab" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>370</width>
+ <height>472</height>
+ </rect>
+ </property>
+ <attribute name="title" >
+ <string>Fcp connection</string>
+ </attribute>
+ <layout class="QGridLayout" name="gridLayout" >
+ <item row="0" column="0" >
+ <layout class="QVBoxLayout" name="verticalLayout" >
+ <property name="spacing" >
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="label_5" >
+ <property name="text" >
+ <string>Adjusts the name the client uses to connect to the node. Use this for example to adjust the connection name in case the name is already in use by other clients. WARNING: changing this will loose all your current qequests</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ <property name="wordWrap" >
+ <bool>true</bool>
+ </property>
+ <property name="textInteractionFlags" >
+ <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout" >
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="label" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string>Connection name:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="edFcpConnectionName" />
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_6" >
+ <property name="text" >
+ <string>How long should the client try to connect to the node before finally giving up? How long should he wait before retrying to establish a connection? WARNING: setting timeout to low values may cause the gui to slow down</string>
+ </property>
+ <property name="wordWrap" >
+ <bool>true</bool>
+ </property>
+ <property name="textInteractionFlags" >
+ <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2" >
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_3" >
+ <item>
+ <widget class="QLabel" name="label_3" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string>Connect duration:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_4" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string>Connect timeout:</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_2" >
+ <item>
+ <widget class="QSpinBox" name="spinFcpConnectionTimerMaxDuration" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="suffix" >
+ <string> seconds</string>
+ </property>
+ <property name="maximum" >
+ <number>999</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="spinConnectionTimerTimeout" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="suffix" >
+ <string> miliseconds</string>
+ </property>
+ <property name="maximum" >
+ <number>99999</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_7" >
+ <property name="text" >
+ <string>How long should the client wait before polling the node for a the next message? Warning: setting this to high values will make messages come in more slowly. Setting it to low values may cause the gui to slow down.
+</string>
+ </property>
+ <property name="wordWrap" >
+ <bool>true</bool>
+ </property>
+ <property name="textInteractionFlags" >
+ <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_3" >
+ <item>
+ <widget class="QLabel" name="label_2" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string>Poll frequency: </string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="spinFcpPollTimerTimeout" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="suffix" >
+ <string> miliseconds</string>
+ </property>
+ <property name="maximum" >
+ <number>99999</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ </item>
+ <item row="1" column="0" >
+ <spacer name="verticalSpacer" >
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>98</width>
+ <height>15</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="2" column="0" >
+ <widget class="Line" name="line" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0" >
+ <widget class="QDialogButtonBox" name="buttonBox" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons" >
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>accepted()</signal>
+ <receiver>DlgConnectionExpertSettings</receiver>
+ <slot>accept()</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>248</x>
+ <y>254</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>157</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>rejected()</signal>
+ <receiver>DlgConnectionExpertSettings</receiver>
+ <slot>reject()</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>316</x>
+ <y>260</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>286</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+</ui>
Added: trunk/fclient/src/fclient/tpls/Ui_DlgConnectionExpertSettingsTpl.py
===================================================================
--- trunk/fclient/src/fclient/tpls/Ui_DlgConnectionExpertSettingsTpl.py (rev 0)
+++ trunk/fclient/src/fclient/tpls/Ui_DlgConnectionExpertSettingsTpl.py 2008-07-27 11:13:36 UTC (rev 761)
@@ -0,0 +1,173 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file '/home/me/src/proj/fclient/trunk/fclient/src/fclient/tpls/DlgConnectionExpertSettingsTpl.ui'
+#
+# Created: Sat Jul 26 13:40:11 2008
+# by: PyQt4 UI code generator 4.4.3-snapshot-20080705
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt4 import QtCore, QtGui
+
+class Ui_DlgConnectionExpertSettings(object):
+ def setupUi(self, DlgConnectionExpertSettings):
+ DlgConnectionExpertSettings.setObjectName("DlgConnectionExpertSettings")
+ DlgConnectionExpertSettings.resize(392, 589)
+ self.gridLayout_2 = QtGui.QGridLayout(DlgConnectionExpertSettings)
+ self.gridLayout_2.setObjectName("gridLayout_2")
+ self.tabWidget = QtGui.QTabWidget(DlgConnectionExpertSettings)
+ sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+ sizePolicy.setHorizontalStretch(0)
+ sizePolicy.setVerticalStretch(0)
+ sizePolicy.setHeightForWidth(self.tabWidget.sizePolicy().hasHeightForWidth())
+ self.tabWidget.setSizePolicy(sizePolicy)
+ self.tabWidget.setObjectName("tabWidget")
+ self.tab = QtGui.QWidget()
+ self.tab.setGeometry(QtCore.QRect(0, 0, 370, 472))
+ self.tab.setObjectName("tab")
+ self.gridLayout = QtGui.QGridLayout(self.tab)
+ self.gridLayout.setObjectName("gridLayout")
+ self.verticalLayout = QtGui.QVBoxLayout()
+ self.verticalLayout.setSpacing(0)
+ self.verticalLayout.setObjectName("verticalLayout")
+ self.label_5 = QtGui.QLabel(self.tab)
+ self.label_5.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
+ self.label_5.setWordWrap(True)
+ self.label_5.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByKeyboard)
+ self.label_5.setObjectName("label_5")
+ self.verticalLayout.addWidget(self.label_5)
+ self.horizontalLayout = QtGui.QHBoxLayout()
+ self.horizontalLayout.setSpacing(6)
+ self.horizontalLayout.setObjectName("horizontalLayout")
+ self.label = QtGui.QLabel(self.tab)
+ sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Preferred)
+ sizePolicy.setHorizontalStretch(0)
+ sizePolicy.setVerticalStretch(0)
+ sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth())
+ self.label.setSizePolicy(sizePolicy)
+ self.label.setObjectName("label")
+ self.horizontalLayout.addWidget(self.label)
+ self.edFcpConnectionName = QtGui.QLineEdit(self.tab)
+ self.edFcpConnectionName.setObjectName("edFcpConnectionName")
+ self.horizontalLayout.addWidget(self.edFcpConnectionName)
+ self.verticalLayout.addLayout(self.horizontalLayout)
+ self.label_6 = QtGui.QLabel(self.tab)
+ self.label_6.setWordWrap(True)
+ self.label_6.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByKeyboard)
+ self.label_6.setObjectName("label_6")
+ self.verticalLayout.addWidget(self.label_6)
+ self.horizontalLayout_2 = QtGui.QHBoxLayout()
+ self.horizontalLayout_2.setObjectName("horizontalLayout_2")
+ self.verticalLayout_3 = QtGui.QVBoxLayout()
+ self.verticalLayout_3.setObjectName("verticalLayout_3")
+ self.label_3 = QtGui.QLabel(self.tab)
+ sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
+ sizePolicy.setHorizontalStretch(0)
+ sizePolicy.setVerticalStretch(0)
+ sizePolicy.setHeightForWidth(self.label_3.sizePolicy().hasHeightForWidth())
+ self.label_3.setSizePolicy(sizePolicy)
+ self.label_3.setObjectName("label_3")
+ self.verticalLayout_3.addWidget(self.label_3)
+ self.label_4 = QtGui.QLabel(self.tab)
+ sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
+ sizePolicy.setHorizontalStretch(0)
+ sizePolicy.setVerticalStretch(0)
+ sizePolicy.setHeightForWidth(self.label_4.sizePolicy().hasHeightForWidth())
+ self.label_4.setSizePolicy(sizePolicy)
+ self.label_4.setObjectName("label_4")
+ self.verticalLayout_3.addWidget(self.label_4)
+ self.horizontalLayout_2.addLayout(self.verticalLayout_3)
+ self.verticalLayout_2 = QtGui.QVBoxLayout()
+ self.verticalLayout_2.setObjectName("verticalLayout_2")
+ self.spinFcpConnectionTimerMaxDuration = QtGui.QSpinBox(self.tab)
+ sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
+ sizePolicy.setHorizontalStretch(0)
+ sizePolicy.setVerticalStretch(0)
+ sizePolicy.setHeightForWidth(self.spinFcpConnectionTimerMaxDuration.sizePolicy().hasHeightForWidth())
+ self.spinFcpConnectionTimerMaxDuration.setSizePolicy(sizePolicy)
+ self.spinFcpConnectionTimerMaxDuration.setMaximum(999)
+ self.spinFcpConnectionTimerMaxDuration.setObjectName("spinFcpConnectionTimerMaxDuration")
+ self.verticalLayout_2.addWidget(self.spinFcpConnectionTimerMaxDuration)
+ self.spinConnectionTimerTimeout = QtGui.QSpinBox(self.tab)
+ sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
+ sizePolicy.setHorizontalStretch(0)
+ sizePolicy.setVerticalStretch(0)
+ sizePolicy.setHeightForWidth(self.spinConnectionTimerTimeout.sizePolicy().hasHeightForWidth())
+ self.spinConnectionTimerTimeout.setSizePolicy(sizePolicy)
+ self.spinConnectionTimerTimeout.setMaximum(99999)
+ self.spinConnectionTimerTimeout.setObjectName("spinConnectionTimerTimeout")
+ self.verticalLayout_2.addWidget(self.spinConnectionTimerTimeout)
+ self.horizontalLayout_2.addLayout(self.verticalLayout_2)
+ self.verticalLayout.addLayout(self.horizontalLayout_2)
+ self.label_7 = QtGui.QLabel(self.tab)
+ self.label_7.setWordWrap(True)
+ self.label_7.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByKeyboard)
+ self.label_7.setObjectName("label_7")
+ self.verticalLayout.addWidget(self.label_7)
+ self.horizontalLayout_3 = QtGui.QHBoxLayout()
+ self.horizontalLayout_3.setObjectName("horizontalLayout_3")
+ self.label_2 = QtGui.QLabel(self.tab)
+ sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+ sizePolicy.setHorizontalStretch(0)
+ sizePolicy.setVerticalStretch(0)
+ sizePolicy.setHeightForWidth(self.label_2.sizePolicy().hasHeightForWidth())
+ self.label_2.setSizePolicy(sizePolicy)
+ self.label_2.setObjectName("label_2")
+ self.horizontalLayout_3.addWidget(self.label_2)
+ self.spinFcpPollTimerTimeout = QtGui.QSpinBox(self.tab)
+ sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
+ sizePolicy.setHorizontalStretch(0)
+ sizePolicy.setVerticalStretch(0)
+ sizePolicy.setHeightForWidth(self.spinFcpPollTimerTimeout.sizePolicy().hasHeightForWidth())
+ self.spinFcpPollTimerTimeout.setSizePolicy(sizePolicy)
+ self.spinFcpPollTimerTimeout.setMaximum(99999)
+ self.spinFcpPollTimerTimeout.setObjectName("spinFcpPollTimerTimeout")
+ self.horizontalLayout_3.addWidget(self.spinFcpPollTimerTimeout)
+ self.verticalLayout.addLayout(self.horizontalLayout_3)
+ self.gridLayout.addLayout(self.verticalLayout, 0, 0, 1, 1)
+ self.tabWidget.addTab(self.tab, "")
+ self.gridLayout_2.addWidget(self.tabWidget, 0, 0, 1, 1)
+ spacerItem = QtGui.QSpacerItem(98, 15, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+ self.gridLayout_2.addItem(spacerItem, 1, 0, 1, 1)
+ self.line = QtGui.QFrame(DlgConnectionExpertSettings)
+ self.line.setFrameShape(QtGui.QFrame.HLine)
+ self.line.setFrameShadow(QtGui.QFrame.Sunken)
+ self.line.setObjectName("line")
+ self.gridLayout_2.addWidget(self.line, 2, 0, 1, 1)
+ self.buttonBox = QtGui.QDialogButtonBox(DlgConnectionExpertSettings)
+ self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
+ self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok|QtGui.QDialogButtonBox.Reset)
+ self.buttonBox.setObjectName("buttonBox")
+ self.gridLayout_2.addWidget(self.buttonBox, 3, 0, 1, 1)
+
+ self.retranslateUi(DlgConnectionExpertSettings)
+ self.tabWidget.setCurrentIndex(0)
+ QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("accepted()"), DlgConnectionExpertSettings.accept)
+ QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("rejected()"), DlgConnectionExpertSettings.reject)
+ QtCore.QMetaObject.connectSlotsByName(DlgConnectionExpertSettings)
+
+ def retranslateUi(self, DlgConnectionExpertSettings):
+ DlgConnectionExpertSettings.setWindowTitle(QtGui.QApplication.translate("DlgConnectionExpertSettings", "Dialog", None, QtGui.QApplication.UnicodeUTF8))
+ self.label_5.setText(QtGui.QApplication.translate("DlgConnectionExpertSettings", "Adjusts the name the client uses to connect to the node. Use this for example to adjust the connection name in case the name is already in use by other clients. WARNING: changing this will loose all your current qequests", None, QtGui.QApplication.UnicodeUTF8))
+ self.label.setText(QtGui.QApplication.translate("DlgConnectionExpertSettings", "Connection name:", None, QtGui.QApplication.UnicodeUTF8))
+ self.label_6.setText(QtGui.QApplication.translate("DlgConnectionExpertSettings", "How long should the client try to connect to the node before finally giving up? How long should he wait before retrying to establish a connection? WARNING: setting timeout to low values may cause the gui to slow down", None, QtGui.QApplication.UnicodeUTF8))
+ self.label_3.setText(QtGui.QApplication.translate("DlgConnectionExpertSettings", "Connect duration:", None, QtGui.QApplication.UnicodeUTF8))
+ self.label_4.setText(QtGui.QApplication.translate("DlgConnectionExpertSettings", "Connect timeout:", None, QtGui.QApplication.UnicodeUTF8))
+ self.spinFcpConnectionTimerMaxDuration.setSuffix(QtGui.QApplication.translate("DlgConnectionExpertSettings", " seconds", None, QtGui.QApplication.UnicodeUTF8))
+ self.spinConnectionTimerTimeout.setSuffix(QtGui.QApplication.translate("DlgConnectionExpertSettings", " miliseconds", None, QtGui.QApplication.UnicodeUTF8))
+ self.label_7.setText(QtGui.QApplication.translate("DlgConnectionExpertSettings", "How long should the client wait before polling the node for a the next message? Warning: setting this to high values will make messages come in more slowly. Setting it to low values may cause the gui to slow down.\n"
+"", None, QtGui.QApplication.UnicodeUTF8))
+ self.label_2.setText(QtGui.QApplication.translate("DlgConnectionExpertSettings", "Poll frequency: ", None, QtGui.QApplication.UnicodeUTF8))
+ self.spinFcpPollTimerTimeout.setSuffix(QtGui.QApplication.translate("DlgConnectionExpertSettings", " miliseconds", None, QtGui.QApplication.UnicodeUTF8))
+ self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), QtGui.QApplication.translate("DlgConnectionExpertSettings", "Fcp connection", None, QtGui.QApplication.UnicodeUTF8))
+
+
+if __name__ == "__main__":
+ import sys
+ app = QtGui.QApplication(sys.argv)
+ DlgConnectionExpertSettings = QtGui.QDialog()
+ ui = Ui_DlgConnectionExpertSettings()
+ ui.setupUi(DlgConnectionExpertSettings)
+ DlgConnectionExpertSettings.show()
+ sys.exit(app.exec_())
+
Modified: trunk/fclient/src/fclient/tpls/Ui_ViewConnectionWidgetTpl.py
===================================================================
--- trunk/fclient/src/fclient/tpls/Ui_ViewConnectionWidgetTpl.py 2008-07-27 11:12:38 UTC (rev 760)
+++ trunk/fclient/src/fclient/tpls/Ui_ViewConnectionWidgetTpl.py 2008-07-27 11:13:36 UTC (rev 761)
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file '/home/me/src/proj/fclient/trunk/fclient/src/fclient/tpls/ViewConnectionWidgetTpl.ui'
#
-# Created: Fri Jul 25 00:27:53 2008
+# Created: Sat Jul 26 13:12:11 2008
# by: PyQt4 UI code generator 4.4.3-snapshot-20080705
#
# WARNING! All changes made in this file will be lost!
@@ -12,18 +12,12 @@
class Ui_ViewConnectionWidget(object):
def setupUi(self, ViewConnectionWidget):
ViewConnectionWidget.setObjectName("ViewConnectionWidget")
- ViewConnectionWidget.resize(421, 382)
+ ViewConnectionWidget.resize(421, 558)
self.gridLayout = QtGui.QGridLayout(ViewConnectionWidget)
self.gridLayout.setObjectName("gridLayout")
- self.horizontalLayout_3 = QtGui.QHBoxLayout()
- self.horizontalLayout_3.setObjectName("horizontalLayout_3")
- self.verticalLayout_6 = QtGui.QVBoxLayout()
- self.verticalLayout_6.setObjectName("verticalLayout_6")
self.label_5 = QtGui.QLabel(ViewConnectionWidget)
self.label_5.setObjectName("label_5")
- self.verticalLayout_6.addWidget(self.label_5)
- self.verticalLayout_4 = QtGui.QVBoxLayout()
- self.verticalLayout_4.setObjectName("verticalLayout_4")
+ self.gridLayout.addWidget(self.label_5, 0, 0, 1, 1)
self.horizontalLayout = QtGui.QHBoxLayout()
self.horizontalLayout.setObjectName("horizontalLayout")
self.verticalLayout = QtGui.QVBoxLayout()
@@ -38,20 +32,35 @@
self.vboxlayout = QtGui.QVBoxLayout()
self.vboxlayout.setObjectName("vboxlayout")
self.edFcpConnectionHost = QtGui.QLineEdit(ViewConnectionWidget)
+ self.edFcpConnectionHost.setDragEnabled(True)
self.edFcpConnectionHost.setObjectName("edFcpConnectionHost")
self.vboxlayout.addWidget(self.edFcpConnectionHost)
self.spinFcpConnectionPort = QtGui.QSpinBox(ViewConnectionWidget)
self.spinFcpConnectionPort.setObjectName("spinFcpConnectionPort")
self.vboxlayout.addWidget(self.spinFcpConnectionPort)
self.horizontalLayout.addLayout(self.vboxlayout)
- self.verticalLayout_4.addLayout(self.horizontalLayout)
+ self.gridLayout.addLayout(self.horizontalLayout, 1, 0, 1, 1)
+ self.line = QtGui.QFrame(ViewConnectionWidget)
+ self.line.setFrameShape(QtGui.QFrame.VLine)
+ self.line.setFrameShadow(QtGui.QFrame.Sunken)
+ self.line.setObjectName("line")
+ self.gridLayout.addWidget(self.line, 1, 1, 6, 1)
+ spacerItem = QtGui.QSpacerItem(229, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+ self.gridLayout.addItem(spacerItem, 1, 2, 1, 1)
self.ckFcpAutoConnect = QtGui.QCheckBox(ViewConnectionWidget)
self.ckFcpAutoConnect.setObjectName("ckFcpAutoConnect")
- self.verticalLayout_4.addWidget(self.ckFcpAutoConnect)
- self.verticalLayout_6.addLayout(self.verticalLayout_4)
+ self.gridLayout.addWidget(self.ckFcpAutoConnect, 2, 0, 1, 1)
+ self.btFcpConnectionMore = QtGui.QPushButton(ViewConnectionWidget)
+ self.btFcpConnectionMore.setObjectName("btFcpConnectionMore")
+ self.gridLayout.addWidget(self.btFcpConnectionMore, 3, 0, 1, 1)
+ self.line_2 = QtGui.QFrame(ViewConnectionWidget)
+ self.line_2.setFrameShape(QtGui.QFrame.HLine)
+ self.line_2.setFrameShadow(QtGui.QFrame.Sunken)
+ self.line_2.setObjectName("line_2")
+ self.gridLayout.addWidget(self.line_2, 4, 0, 1, 1)
self.label_6 = QtGui.QLabel(ViewConnectionWidget)
self.label_6.setObjectName("label_6")
- self.verticalLayout_6.addWidget(self.label_6)
+ self.gridLayout.addWidget(self.label_6, 5, 0, 1, 1)
self.verticalLayout_5 = QtGui.QVBoxLayout()
self.verticalLayout_5.setObjectName("verticalLayout_5")
self.horizontalLayout_2 = QtGui.QHBoxLayout()
@@ -68,6 +77,7 @@
self.verticalLayout_2 = QtGui.QVBoxLayout()
self.verticalLayout_2.setObjectName("verticalLayout_2")
self.edFproxyConnectionHost = QtGui.QLineEdit(ViewConnectionWidget)
+ self.edFproxyConnectionHost.setDragEnabled(True)
self.edFproxyConnectionHost.setObjectName("edFproxyConnectionHost")
self.verticalLayout_2.addWidget(self.edFproxyConnectionHost)
self.spinFproxyConnectionPort = QtGui.QSpinBox(ViewConnectionWidget)
@@ -75,23 +85,14 @@
self.verticalLayout_2.addWidget(self.spinFproxyConnectionPort)
self.horizontalLayout_2.addLayout(self.verticalLayout_2)
self.verticalLayout_5.addLayout(self.horizontalLayout_2)
- self.verticalLayout_6.addLayout(self.verticalLayout_5)
- self.horizontalLayout_3.addLayout(self.verticalLayout_6)
- self.line = QtGui.QFrame(ViewConnectionWidget)
- self.line.setFrameShape(QtGui.QFrame.VLine)
- self.line.setFrameShadow(QtGui.QFrame.Sunken)
- self.line.setObjectName("line")
- self.horizontalLayout_3.addWidget(self.line)
- self.gridLayout.addLayout(self.horizontalLayout_3, 0, 0, 1, 1)
- spacerItem = QtGui.QSpacerItem(229, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
- self.gridLayout.addItem(spacerItem, 0, 1, 1, 1)
+ self.gridLayout.addLayout(self.verticalLayout_5, 6, 0, 1, 1)
spacerItem1 = QtGui.QSpacerItem(20, 97, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
- self.gridLayout.addItem(spacerItem1, 1, 0, 1, 1)
+ self.gridLayout.addItem(spacerItem1, 7, 0, 1, 1)
self.btConnect = QtGui.QPushButton(ViewConnectionWidget)
self.btConnect.setCheckable(True)
self.btConnect.setAutoExclusive(False)
self.btConnect.setObjectName("btConnect")
- self.gridLayout.addWidget(self.btConnect, 2, 0, 1, 2)
+ self.gridLayout.addWidget(self.btConnect, 8, 0, 1, 3)
self.retranslateUi(ViewConnectionWidget)
QtCore.QMetaObject.connectSlotsByName(ViewConnectionWidget)
@@ -102,6 +103,7 @@
self.label.setText(QtGui.QApplication.translate("ViewConnectionWidget", "Host:", None, QtGui.QApplication.UnicodeUTF8))
self.label_2.setText(QtGui.QApplication.translate("ViewConnectionWidget", "Port:", None, QtGui.QApplication.UnicodeUTF8))
self.ckFcpAutoConnect.setText(QtGui.QApplication.translate("ViewConnectionWidget", "Auto Connect", None, QtGui.QApplication.UnicodeUTF8))
+ self.btFcpConnectionMore.setText(QtGui.QApplication.translate("ViewConnectionWidget", "More..", None, QtGui.QApplication.UnicodeUTF8))
self.label_6.setText(QtGui.QApplication.translate("ViewConnectionWidget", "<b>Fproxy connection</b>", None, QtGui.QApplication.UnicodeUTF8))
self.label_3.setText(QtGui.QApplication.translate("ViewConnectionWidget", "Host:", None, QtGui.QApplication.UnicodeUTF8))
self.label_4.setText(QtGui.QApplication.translate("ViewConnectionWidget", "Port:", None, QtGui.QApplication.UnicodeUTF8))
Modified: trunk/fclient/src/fclient/tpls/ViewConnectionWidgetTpl.ui
===================================================================
--- trunk/fclient/src/fclient/tpls/ViewConnectionWidgetTpl.ui 2008-07-27 11:12:38 UTC (rev 760)
+++ trunk/fclient/src/fclient/tpls/ViewConnectionWidgetTpl.ui 2008-07-27 11:13:36 UTC (rev 761)
@@ -6,7 +6,7 @@
<x>0</x>
<y>0</y>
<width>421</width>
- <height>382</height>
+ <height>558</height>
</rect>
</property>
<property name="windowTitle" >
@@ -14,114 +14,56 @@
</property>
<layout class="QGridLayout" name="gridLayout" >
<item row="0" column="0" >
- <layout class="QHBoxLayout" name="horizontalLayout_3" >
+ <widget class="QLabel" name="label_5" >
+ <property name="text" >
+ <string><b>Fcp connection</b></string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" >
+ <layout class="QHBoxLayout" name="horizontalLayout" >
<item>
- <layout class="QVBoxLayout" name="verticalLayout_6" >
+ <layout class="QVBoxLayout" name="verticalLayout" >
<item>
- <widget class="QLabel" name="label_5" >
+ <widget class="QLabel" name="label" >
<property name="text" >
- <string><b>Fcp connection</b></string>
+ <string>Host:</string>
</property>
</widget>
</item>
<item>
- <layout class="QVBoxLayout" name="verticalLayout_4" >
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout" >
- <item>
- <layout class="QVBoxLayout" name="verticalLayout" >
- <item>
- <widget class="QLabel" name="label" >
- <property name="text" >
- <string>Host:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="label_2" >
- <property name="text" >
- <string>Port:</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QVBoxLayout" >
- <item>
- <widget class="QLineEdit" name="edFcpConnectionHost" />
- </item>
- <item>
- <widget class="QSpinBox" name="spinFcpConnectionPort" />
- </item>
- </layout>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QCheckBox" name="ckFcpAutoConnect" >
- <property name="text" >
- <string>Auto Connect</string>
- </property>
- </widget>
- </item>
- </layout>
+ <widget class="QLabel" name="label_2" >
+ <property name="text" >
+ <string>Port:</string>
+ </property>
+ </widget>
</item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" >
<item>
- <widget class="QLabel" name="label_6" >
- <property name="text" >
- <string><b>Fproxy connection</b></string>
+ <widget class="QLineEdit" name="edFcpConnectionHost" >
+ <property name="dragEnabled" >
+ <bool>true</bool>
</property>
</widget>
</item>
<item>
- <layout class="QVBoxLayout" name="verticalLayout_5" >
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2" >
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_3" >
- <item>
- <widget class="QLabel" name="label_3" >
- <property name="text" >
- <string>Host:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="label_4" >
- <property name="text" >
- <string>Port:</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_2" >
- <item>
- <widget class="QLineEdit" name="edFproxyConnectionHost" />
- </item>
- <item>
- <widget class="QSpinBox" name="spinFproxyConnectionPort" />
- </item>
- </layout>
- </item>
- </layout>
- </item>
- </layout>
+ <widget class="QSpinBox" name="spinFcpConnectionPort" />
</item>
</layout>
</item>
- <item>
- <widget class="Line" name="line" >
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- </widget>
- </item>
</layout>
</item>
- <item row="0" column="1" >
+ <item rowspan="6" row="1" column="1" >
+ <widget class="Line" name="line" >
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2" >
<spacer name="horizontalSpacer" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
@@ -134,7 +76,75 @@
</property>
</spacer>
</item>
- <item row="1" column="0" >
+ <item row="2" column="0" >
+ <widget class="QCheckBox" name="ckFcpAutoConnect" >
+ <property name="text" >
+ <string>Auto Connect</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0" >
+ <widget class="QPushButton" name="btFcpConnectionMore" >
+ <property name="text" >
+ <string>More..</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0" >
+ <widget class="Line" name="line_2" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0" >
+ <widget class="QLabel" name="label_6" >
+ <property name="text" >
+ <string><b>Fproxy connection</b></string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="0" >
+ <layout class="QVBoxLayout" name="verticalLayout_5" >
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2" >
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_3" >
+ <item>
+ <widget class="QLabel" name="label_3" >
+ <property name="text" >
+ <string>Host:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_4" >
+ <property name="text" >
+ <string>Port:</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_2" >
+ <item>
+ <widget class="QLineEdit" name="edFproxyConnectionHost" >
+ <property name="dragEnabled" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="spinFproxyConnectionPort" />
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ <item row="7" column="0" >
<spacer name="verticalSpacer" >
<property name="orientation" >
<enum>Qt::Vertical</enum>
@@ -147,7 +157,7 @@
</property>
</spacer>
</item>
- <item row="2" column="0" colspan="2" >
+ <item row="8" column="0" colspan="3" >
<widget class="QPushButton" name="btConnect" >
<property name="text" >
<string>Connect</string>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
