SF.net SVN: fclient:[842] trunk/fclient/fclient/impl
Status: Pre-Alpha
Brought to you by:
jurner
From: <jU...@us...> - 2008-07-31 18:45:33
|
Revision: 842 http://fclient.svn.sourceforge.net/fclient/?rev=842&view=rev Author: jUrner Date: 2008-07-31 18:45:36 +0000 (Thu, 31 Jul 2008) Log Message: ----------- more work on layout and css Modified Paths: -------------- trunk/fclient/fclient/impl/res/stylesheets/default.css trunk/fclient/fclient/impl/tpls/DlgDownloadKeyToDiskTpl.ui trunk/fclient/fclient/impl/tpls/DlgPropsBrowserObjectTpl.ui trunk/fclient/fclient/impl/tpls/DlgSingleAppErrorTpl.ui trunk/fclient/fclient/impl/tpls/PrefsBrowserWidgetTpl.ui trunk/fclient/fclient/impl/tpls/PrefsConnectionExpertSettingsTpl.ui trunk/fclient/fclient/impl/tpls/PrefsGlobalWidgetTpl.ui trunk/fclient/fclient/impl/tpls/PrefsSingleAppTpl.ui trunk/fclient/fclient/impl/tpls/Ui_DlgDownloadKeyToDiskTpl.py trunk/fclient/fclient/impl/tpls/Ui_DlgPropsBrowserObjectTpl.py trunk/fclient/fclient/impl/tpls/Ui_DlgSingleAppErrorTpl.py trunk/fclient/fclient/impl/tpls/Ui_PrefsBrowserWidgetTpl.py trunk/fclient/fclient/impl/tpls/Ui_PrefsConnectionExpertSettingsTpl.py trunk/fclient/fclient/impl/tpls/Ui_PrefsGlobalWidgetTpl.py trunk/fclient/fclient/impl/tpls/Ui_PrefsSingleAppTpl.py trunk/fclient/fclient/impl/tpls/Ui_ViewConnectionWidgetTpl.py trunk/fclient/fclient/impl/tpls/ViewConnectionWidgetTpl.ui Modified: trunk/fclient/fclient/impl/res/stylesheets/default.css =================================================================== --- trunk/fclient/fclient/impl/res/stylesheets/default.css 2008-07-31 17:37:10 UTC (rev 841) +++ trunk/fclient/fclient/impl/res/stylesheets/default.css 2008-07-31 18:45:36 UTC (rev 842) @@ -12,8 +12,26 @@ (..) **********************************************************************************************/ +/* label style. sample: + Host: + | 9999| +*/ +QLabel#fieldHeader, +QLabel#fieldHeader_2, +QLabel#fieldHeader_3, +QLabel#fieldNHeader_4, +QLabel#fieldHeader_5, +QLabel#fieldHeader_6, +QLabel#fieldHeader_7, +QLabel#fieldHeader_8, +QLabel#fieldHeader_9{ + font: bold; + } -/* style for "Name: | |" labels. for example "Host: |9999|" */ + +/* label style. sample: + Host: | 9999| +*/ QLabel#fieldName, QLabel#fieldName_2, QLabel#fieldName_3, @@ -24,4 +42,5 @@ QLabel#fieldName_8, QLabel#fieldName_9{ font: bold; + color: green; } \ No newline at end of file Modified: trunk/fclient/fclient/impl/tpls/DlgDownloadKeyToDiskTpl.ui =================================================================== --- trunk/fclient/fclient/impl/tpls/DlgDownloadKeyToDiskTpl.ui 2008-07-31 17:37:10 UTC (rev 841) +++ trunk/fclient/fclient/impl/tpls/DlgDownloadKeyToDiskTpl.ui 2008-07-31 18:45:36 UTC (rev 842) @@ -16,7 +16,7 @@ <item row="0" column="0" > <layout class="QVBoxLayout" name="verticalLayout" > <item> - <widget class="QLabel" name="fieldName" > + <widget class="QLabel" name="fieldHeader" > <property name="text" > <string>Key:</string> </property> @@ -30,7 +30,7 @@ </widget> </item> <item> - <widget class="QLabel" name="fieldName_2" > + <widget class="QLabel" name="fieldHeader_2" > <property name="text" > <string>File name:</string> </property> @@ -40,7 +40,7 @@ <widget class="QLineEdit" name="edFileName" /> </item> <item> - <widget class="QLabel" name="fieldName_3" > + <widget class="QLabel" name="fieldHeader_3" > <property name="text" > <string>Directory:</string> </property> Modified: trunk/fclient/fclient/impl/tpls/DlgPropsBrowserObjectTpl.ui =================================================================== --- trunk/fclient/fclient/impl/tpls/DlgPropsBrowserObjectTpl.ui 2008-07-31 17:37:10 UTC (rev 841) +++ trunk/fclient/fclient/impl/tpls/DlgPropsBrowserObjectTpl.ui 2008-07-31 18:45:36 UTC (rev 842) @@ -16,7 +16,7 @@ <item row="0" column="0" > <layout class="QVBoxLayout" name="verticalLayout" > <item> - <widget class="QLabel" name="fieldName" > + <widget class="QLabel" name="fieldHeader" > <property name="sizePolicy" > <sizepolicy vsizetype="Preferred" hsizetype="Minimum" > <horstretch>0</horstretch> @@ -48,7 +48,7 @@ </widget> </item> <item> - <widget class="QLabel" name="fieldName_2" > + <widget class="QLabel" name="fieldHeader_2" > <property name="sizePolicy" > <sizepolicy vsizetype="Preferred" hsizetype="Minimum" > <horstretch>0</horstretch> @@ -80,7 +80,7 @@ </widget> </item> <item> - <widget class="QLabel" name="fieldName_3" > + <widget class="QLabel" name="fieldHeader_3" > <property name="sizePolicy" > <sizepolicy vsizetype="Preferred" hsizetype="Minimum" > <horstretch>0</horstretch> @@ -112,7 +112,7 @@ </widget> </item> <item> - <widget class="QLabel" name="fieldName_4" > + <widget class="QLabel" name="fieldHeader_4" > <property name="sizePolicy" > <sizepolicy vsizetype="Preferred" hsizetype="Minimum" > <horstretch>0</horstretch> @@ -144,7 +144,7 @@ </widget> </item> <item> - <widget class="QLabel" name="fieldName_5" > + <widget class="QLabel" name="fieldHeader_5" > <property name="sizePolicy" > <sizepolicy vsizetype="Preferred" hsizetype="Minimum" > <horstretch>0</horstretch> Modified: trunk/fclient/fclient/impl/tpls/DlgSingleAppErrorTpl.ui =================================================================== --- trunk/fclient/fclient/impl/tpls/DlgSingleAppErrorTpl.ui 2008-07-31 17:37:10 UTC (rev 841) +++ trunk/fclient/fclient/impl/tpls/DlgSingleAppErrorTpl.ui 2008-07-31 18:45:36 UTC (rev 842) @@ -41,7 +41,7 @@ <item> <layout class="QVBoxLayout" name="verticalLayout" > <item> - <widget class="QLabel" name="fieldName" > + <widget class="QLabel" name="fieldHeader" > <property name="text" > <string>Host: </string> </property> @@ -51,7 +51,7 @@ <widget class="QLineEdit" name="edHost" /> </item> <item> - <widget class="QLabel" name="fieldName_2" > + <widget class="QLabel" name="fieldHeader_2" > <property name="text" > <string>Port: </string> </property> @@ -80,9 +80,6 @@ </widget> </item> </layout> - <zorder>line</zorder> - <zorder>buttonBox</zorder> - <zorder>splitter</zorder> </widget> <resources/> <connections> Modified: trunk/fclient/fclient/impl/tpls/PrefsBrowserWidgetTpl.ui =================================================================== --- trunk/fclient/fclient/impl/tpls/PrefsBrowserWidgetTpl.ui 2008-07-31 17:37:10 UTC (rev 841) +++ trunk/fclient/fclient/impl/tpls/PrefsBrowserWidgetTpl.ui 2008-07-31 18:45:36 UTC (rev 842) @@ -5,109 +5,104 @@ <rect> <x>0</x> <y>0</y> - <width>532</width> - <height>186</height> + <width>456</width> + <height>253</height> </rect> </property> <property name="windowTitle" > <string>Form</string> </property> - <layout class="QGridLayout" name="gridLayout_3" > + <layout class="QGridLayout" name="gridLayout" > <item row="0" column="0" > - <layout class="QHBoxLayout" name="horizontalLayout_2" > - <item> - <widget class="QLabel" name="label" > - <property name="text" > - <string>Homepage:</string> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="edHomePage" > - <property name="dragEnabled" > - <bool>true</bool> - </property> - </widget> - </item> - </layout> + <widget class="QLabel" name="fieldHeader" > + <property name="text" > + <string>Homepage:</string> + </property> + </widget> </item> <item row="1" column="0" > + <widget class="QLineEdit" name="edHomePage" > + <property name="dragEnabled" > + <bool>true</bool> + </property> + </widget> + </item> + <item row="2" column="0" > <layout class="QHBoxLayout" name="horizontalLayout" > <item> - <widget class="QGroupBox" name="groupBox" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Minimum" hsizetype="Preferred" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="title" > - <string>Open in new tab</string> - </property> - <layout class="QGridLayout" name="gridLayout" > - <item row="0" column="0" > - <widget class="QCheckBox" name="ckOpenLinksInNewTab" > - <property name="text" > - <string>Links</string> - </property> - </widget> - </item> - <item row="4" column="0" > - <widget class="QCheckBox" name="ckOpenBookmarksInNewTab" > - <property name="text" > - <string>Bookmarks</string> - </property> - </widget> - </item> - <item row="1" column="0" > - <widget class="QCheckBox" name="ckOpenAddressBarInNewTab" > - <property name="text" > - <string>Address bar</string> - </property> - </widget> - </item> - </layout> - </widget> + <layout class="QVBoxLayout" name="verticalLayout_2" > + <item> + <widget class="QLabel" name="fieldHeader_2" > + <property name="text" > + <string>Open in new tab:</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="ckOpenAddressBarInNewTab" > + <property name="text" > + <string>Address bar</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="ckOpenBookmarksInNewTab" > + <property name="text" > + <string>Bookmarks</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="ckOpenLinksInNewTab" > + <property name="text" > + <string>Links</string> + </property> + </widget> + </item> + </layout> </item> <item> - <widget class="QGroupBox" name="groupBox_2" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Minimum" hsizetype="Preferred" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <widget class="Line" name="line" > + <property name="orientation" > + <enum>Qt::Vertical</enum> </property> - <property name="title" > - <string>Others</string> - </property> - <layout class="QGridLayout" name="gridLayout_2" > - <item row="0" column="0" > - <widget class="QCheckBox" name="ckOpenHomePageOnNewTabCreated" > - <property name="text" > - <string>Open home page when a new tab is created</string> - </property> - </widget> - </item> - <item row="1" column="0" > - <widget class="QCheckBox" name="ckBackIsClose" > - <property name="text" > - <string>Back is close</string> - </property> - </widget> - </item> - <item row="2" column="0" > - <widget class="QCheckBox" name="ckAutoLoadImages" > - <property name="text" > - <string>Auto load images</string> - </property> - </widget> - </item> - </layout> </widget> </item> + <item> + <layout class="QVBoxLayout" name="verticalLayout" > + <item> + <widget class="QLabel" name="fieldHeader_3" > + <property name="text" > + <string>Others:</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="ckOpenHomePageOnNewTabCreated" > + <property name="text" > + <string>Open homepage in new created tab</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="ckBackIsClose" > + <property name="text" > + <string>Back is close</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="ckAutoLoadImages" > + <property name="text" > + <string>Auto load images</string> + </property> + </widget> + </item> + </layout> + </item> </layout> </item> - <item row="2" column="0" > + <item row="3" column="0" > <spacer name="verticalSpacer" > <property name="orientation" > <enum>Qt::Vertical</enum> @@ -115,7 +110,7 @@ <property name="sizeHint" stdset="0" > <size> <width>20</width> - <height>297</height> + <height>56</height> </size> </property> </spacer> Modified: trunk/fclient/fclient/impl/tpls/PrefsConnectionExpertSettingsTpl.ui =================================================================== --- trunk/fclient/fclient/impl/tpls/PrefsConnectionExpertSettingsTpl.ui 2008-07-31 17:37:10 UTC (rev 841) +++ trunk/fclient/fclient/impl/tpls/PrefsConnectionExpertSettingsTpl.ui 2008-07-31 18:45:36 UTC (rev 842) @@ -6,44 +6,85 @@ <x>0</x> <y>0</y> <width>520</width> - <height>550</height> + <height>502</height> </rect> </property> <property name="windowTitle" > <string>Form</string> </property> - <layout class="QGridLayout" name="gridLayout_2" > + <layout class="QGridLayout" name="gridLayout" > <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>498</width> - <height>490</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_3" > + <item> + <widget class="QLabel" name="fieldHeader" > + <property name="sizePolicy" > + <sizepolicy vsizetype="Fixed" hsizetype="Fixed" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text" > + <string>Connection name:</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label_5" > + <property name="sizePolicy" > + <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <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 your current qequests untill you connect under that name again</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> + <widget class="QLineEdit" name="edFcpConnectionName" /> + </item> + <item> + <widget class="QLabel" name="fieldHeader_2" > + <property name="sizePolicy" > + <sizepolicy vsizetype="Fixed" hsizetype="Fixed" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text" > + <string>Connect duration and timeout:</string> + </property> + </widget> + </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" > + <item> <layout class="QVBoxLayout" name="verticalLayout" > - <property name="spacing" > - <number>0</number> - </property> <item> - <widget class="QLabel" name="label_5" > + <widget class="QLabel" name="fieldName" > <property name="sizePolicy" > <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > <horstretch>0</horstretch> @@ -51,177 +92,112 @@ </sizepolicy> </property> <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 your current qequests untill you connect under that name again</string> + <string>Duration: </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>0</number> + <widget class="QLabel" name="fieldName_2" > + <property name="sizePolicy" > + <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - <item> - <widget class="QLabel" name="label" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" 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> + <property name="text" > + <string>Timeout:</string> + </property> + </widget> </item> + </layout> + </item> + <item> + <layout class="QVBoxLayout" name="verticalLayout_2" > <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> + <widget class="QSpinBox" name="spinFcpConnectionTimerMaxDuration" > + <property name="sizePolicy" > + <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - <property name="wordWrap" > - <bool>true</bool> + <property name="suffix" > + <string> seconds</string> </property> - <property name="textInteractionFlags" > - <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard</set> + <property name="maximum" > + <number>999</number> </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> + <widget class="QSpinBox" name="spinConnectionTimerTimeout" > + <property name="sizePolicy" > + <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - <property name="wordWrap" > - <bool>true</bool> + <property name="suffix" > + <string> miliseconds</string> </property> - <property name="textInteractionFlags" > - <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard</set> + <property name="maximum" > + <number>99999</number> </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> + <widget class="QLabel" name="fieldHeader_3" > + <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="QLabel" name="label_7" > + <property name="sizePolicy" > + <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <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> + <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> <item row="1" column="0" > <spacer name="verticalSpacer" > @@ -230,13 +206,29 @@ </property> <property name="sizeHint" stdset="0" > <size> - <width>502</width> - <height>21</height> + <width>20</width> + <height>87</height> </size> </property> </spacer> </item> </layout> + <zorder>tabWidget</zorder> + <zorder>label</zorder> + <zorder>fieldHeader</zorder> + <zorder>label_5</zorder> + <zorder>edFcpConnectionName</zorder> + <zorder>fieldHeader_2</zorder> + <zorder>label_6</zorder> + <zorder>fieldName</zorder> + <zorder>spinFcpConnectionTimerMaxDuration</zorder> + <zorder>fieldName_2</zorder> + <zorder>spinConnectionTimerTimeout</zorder> + <zorder>label_7</zorder> + <zorder>spinFcpPollTimerTimeout</zorder> + <zorder>fieldHeader_3</zorder> + <zorder>verticalSpacer</zorder> + <zorder></zorder> </widget> <resources/> <connections/> Modified: trunk/fclient/fclient/impl/tpls/PrefsGlobalWidgetTpl.ui =================================================================== --- trunk/fclient/fclient/impl/tpls/PrefsGlobalWidgetTpl.ui 2008-07-31 17:37:10 UTC (rev 841) +++ trunk/fclient/fclient/impl/tpls/PrefsGlobalWidgetTpl.ui 2008-07-31 18:45:36 UTC (rev 842) @@ -6,7 +6,7 @@ <x>0</x> <y>0</y> <width>465</width> - <height>269</height> + <height>316</height> </rect> </property> <property name="windowTitle" > @@ -14,9 +14,16 @@ </property> <layout class="QGridLayout" name="gridLayout" > <item row="0" column="0" > + <widget class="QLabel" name="fieldHeader" > + <property name="text" > + <string>Settings directory:</string> + </property> + </widget> + </item> + <item row="1" column="0" > <widget class="QLabel" name="label" > <property name="text" > - <string>Specify directory to store settings to.Leave empty to store settings in a location your os feels best with</string> + <string>Directory to store settings to.Leave empty to store settings in a location your os feels best with</string> </property> <property name="wordWrap" > <bool>true</bool> @@ -26,7 +33,7 @@ </property> </widget> </item> - <item row="1" column="0" > + <item row="2" column="0" > <layout class="QHBoxLayout" > <item> <widget class="QLineEdit" name="edSettingsDir" /> @@ -40,7 +47,7 @@ </item> </layout> </item> - <item row="2" column="0" > + <item row="3" column="0" > <widget class="QLabel" name="label_2" > <property name="text" > <string>If no path for settings is specified, store settings only for the the current user or for all users?</string> @@ -53,17 +60,17 @@ </property> </widget> </item> - <item row="3" column="0" > + <item row="4" column="0" > <widget class="QCheckBox" name="ckSettingsAllUsers" > <property name="text" > <string>Store settings for all users</string> </property> </widget> </item> - <item row="4" column="0" > - <widget class="QLabel" name="label_3" > + <item row="5" column="0" > + <widget class="QLabel" name="fieldHeader_2" > <property name="text" > - <string>Default directory to store downloads to </string> + <string>Default download directory:</string> </property> <property name="wordWrap" > <bool>true</bool> @@ -73,7 +80,7 @@ </property> </widget> </item> - <item row="5" column="0" > + <item row="6" column="0" > <layout class="QHBoxLayout" name="horizontalLayout" > <item> <widget class="QLineEdit" name="edDownloadDir" /> @@ -87,7 +94,7 @@ </item> </layout> </item> - <item row="6" column="0" > + <item row="7" column="0" > <spacer name="verticalSpacer" > <property name="orientation" > <enum>Qt::Vertical</enum> Modified: trunk/fclient/fclient/impl/tpls/PrefsSingleAppTpl.ui =================================================================== --- trunk/fclient/fclient/impl/tpls/PrefsSingleAppTpl.ui 2008-07-31 17:37:10 UTC (rev 841) +++ trunk/fclient/fclient/impl/tpls/PrefsSingleAppTpl.ui 2008-07-31 18:45:36 UTC (rev 842) @@ -32,7 +32,7 @@ <item row="1" column="0" > <layout class="QVBoxLayout" name="verticalLayout" > <item> - <widget class="QLabel" name="fieldName" > + <widget class="QLabel" name="fieldHeader" > <property name="text" > <string>Single application host: </string> </property> @@ -42,7 +42,7 @@ <widget class="QLineEdit" name="edHost" /> </item> <item> - <widget class="QLabel" name="fieldName_2" > + <widget class="QLabel" name="fieldHeader_2" > <property name="text" > <string>Single application port: </string> </property> Modified: trunk/fclient/fclient/impl/tpls/Ui_DlgDownloadKeyToDiskTpl.py =================================================================== --- trunk/fclient/fclient/impl/tpls/Ui_DlgDownloadKeyToDiskTpl.py 2008-07-31 17:37:10 UTC (rev 841) +++ trunk/fclient/fclient/impl/tpls/Ui_DlgDownloadKeyToDiskTpl.py 2008-07-31 18:45:36 UTC (rev 842) @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file '/home/me/src/proj/fclient/trunk/fclient/src/fclient/impl/tpls/DlgDownloadKeyToDiskTpl.ui' +# Form implementation generated from reading ui file '/home/me/src/fclient/trunk/fclient/fclient/impl/tpls/DlgDownloadKeyToDiskTpl.ui' # -# Created: Thu Jul 31 18:23:06 2008 +# Created: Thu Jul 31 20:24:05 2008 # by: PyQt4 UI code generator 4.4.3-snapshot-20080705 # # WARNING! All changes made in this file will be lost! @@ -17,22 +17,22 @@ self.gridLayout.setObjectName("gridLayout") self.verticalLayout = QtGui.QVBoxLayout() self.verticalLayout.setObjectName("verticalLayout") - self.fieldName = QtGui.QLabel(DlgDownloadKeyToDisk) - self.fieldName.setObjectName("fieldName") - self.verticalLayout.addWidget(self.fieldName) + self.fieldHeader = QtGui.QLabel(DlgDownloadKeyToDisk) + self.fieldHeader.setObjectName("fieldHeader") + self.verticalLayout.addWidget(self.fieldHeader) self.edKey = QtGui.QLineEdit(DlgDownloadKeyToDisk) self.edKey.setDragEnabled(True) self.edKey.setObjectName("edKey") self.verticalLayout.addWidget(self.edKey) - self.fieldName_2 = QtGui.QLabel(DlgDownloadKeyToDisk) - self.fieldName_2.setObjectName("fieldName_2") - self.verticalLayout.addWidget(self.fieldName_2) + self.fieldHeader_2 = QtGui.QLabel(DlgDownloadKeyToDisk) + self.fieldHeader_2.setObjectName("fieldHeader_2") + self.verticalLayout.addWidget(self.fieldHeader_2) self.edFileName = QtGui.QLineEdit(DlgDownloadKeyToDisk) self.edFileName.setObjectName("edFileName") self.verticalLayout.addWidget(self.edFileName) - self.fieldName_3 = QtGui.QLabel(DlgDownloadKeyToDisk) - self.fieldName_3.setObjectName("fieldName_3") - self.verticalLayout.addWidget(self.fieldName_3) + self.fieldHeader_3 = QtGui.QLabel(DlgDownloadKeyToDisk) + self.fieldHeader_3.setObjectName("fieldHeader_3") + self.verticalLayout.addWidget(self.fieldHeader_3) self.horizontalLayout = QtGui.QHBoxLayout() self.horizontalLayout.setObjectName("horizontalLayout") self.edDirectory = QtGui.QLineEdit(DlgDownloadKeyToDisk) @@ -64,9 +64,9 @@ def retranslateUi(self, DlgDownloadKeyToDisk): DlgDownloadKeyToDisk.setWindowTitle(QtGui.QApplication.translate("DlgDownloadKeyToDisk", "Dialog", None, QtGui.QApplication.UnicodeUTF8)) - self.fieldName.setText(QtGui.QApplication.translate("DlgDownloadKeyToDisk", "Key:", None, QtGui.QApplication.UnicodeUTF8)) - self.fieldName_2.setText(QtGui.QApplication.translate("DlgDownloadKeyToDisk", "File name:", None, QtGui.QApplication.UnicodeUTF8)) - self.fieldName_3.setText(QtGui.QApplication.translate("DlgDownloadKeyToDisk", "Directory:", None, QtGui.QApplication.UnicodeUTF8)) + self.fieldHeader.setText(QtGui.QApplication.translate("DlgDownloadKeyToDisk", "Key:", None, QtGui.QApplication.UnicodeUTF8)) + self.fieldHeader_2.setText(QtGui.QApplication.translate("DlgDownloadKeyToDisk", "File name:", None, QtGui.QApplication.UnicodeUTF8)) + self.fieldHeader_3.setText(QtGui.QApplication.translate("DlgDownloadKeyToDisk", "Directory:", None, QtGui.QApplication.UnicodeUTF8)) self.btChooseDirectory.setText(QtGui.QApplication.translate("DlgDownloadKeyToDisk", "...", None, QtGui.QApplication.UnicodeUTF8)) Modified: trunk/fclient/fclient/impl/tpls/Ui_DlgPropsBrowserObjectTpl.py =================================================================== --- trunk/fclient/fclient/impl/tpls/Ui_DlgPropsBrowserObjectTpl.py 2008-07-31 17:37:10 UTC (rev 841) +++ trunk/fclient/fclient/impl/tpls/Ui_DlgPropsBrowserObjectTpl.py 2008-07-31 18:45:36 UTC (rev 842) @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file '/home/me/src/proj/fclient/trunk/fclient/src/fclient/impl/tpls/DlgPropsBrowserObjectTpl.ui' +# Form implementation generated from reading ui file '/home/me/src/fclient/trunk/fclient/fclient/impl/tpls/DlgPropsBrowserObjectTpl.ui' # -# Created: Thu Jul 31 18:25:16 2008 +# Created: Thu Jul 31 20:23:14 2008 # by: PyQt4 UI code generator 4.4.3-snapshot-20080705 # # WARNING! All changes made in this file will be lost! @@ -17,15 +17,15 @@ self.gridLayout.setObjectName("gridLayout") self.verticalLayout = QtGui.QVBoxLayout() self.verticalLayout.setObjectName("verticalLayout") - self.fieldName = QtGui.QLabel(DlgPropsBrowserObject) + self.fieldHeader = QtGui.QLabel(DlgPropsBrowserObject) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.fieldName.sizePolicy().hasHeightForWidth()) - self.fieldName.setSizePolicy(sizePolicy) - self.fieldName.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop) - self.fieldName.setObjectName("fieldName") - self.verticalLayout.addWidget(self.fieldName) + sizePolicy.setHeightForWidth(self.fieldHeader.sizePolicy().hasHeightForWidth()) + self.fieldHeader.setSizePolicy(sizePolicy) + self.fieldHeader.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop) + self.fieldHeader.setObjectName("fieldHeader") + self.verticalLayout.addWidget(self.fieldHeader) self.labeType = QtGui.QLabel(DlgPropsBrowserObject) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) @@ -35,15 +35,15 @@ self.labeType.setTextInteractionFlags(QtCore.Qt.TextSelectableByKeyboard|QtCore.Qt.TextSelectableByMouse) self.labeType.setObjectName("labeType") self.verticalLayout.addWidget(self.labeType) - self.fieldName_2 = QtGui.QLabel(DlgPropsBrowserObject) + self.fieldHeader_2 = QtGui.QLabel(DlgPropsBrowserObject) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.fieldName_2.sizePolicy().hasHeightForWidth()) - self.fieldName_2.setSizePolicy(sizePolicy) - self.fieldName_2.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop) - self.fieldName_2.setObjectName("fieldName_2") - self.verticalLayout.addWidget(self.fieldName_2) + sizePolicy.setHeightForWidth(self.fieldHeader_2.sizePolicy().hasHeightForWidth()) + self.fieldHeader_2.setSizePolicy(sizePolicy) + self.fieldHeader_2.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop) + self.fieldHeader_2.setObjectName("fieldHeader_2") + self.verticalLayout.addWidget(self.fieldHeader_2) self.labelTitle = QtGui.QLabel(DlgPropsBrowserObject) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) @@ -53,15 +53,15 @@ self.labelTitle.setTextInteractionFlags(QtCore.Qt.TextSelectableByKeyboard|QtCore.Qt.TextSelectableByMouse) self.labelTitle.setObjectName("labelTitle") self.verticalLayout.addWidget(self.labelTitle) - self.fieldName_3 = QtGui.QLabel(DlgPropsBrowserObject) + self.fieldHeader_3 = QtGui.QLabel(DlgPropsBrowserObject) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.fieldName_3.sizePolicy().hasHeightForWidth()) - self.fieldName_3.setSizePolicy(sizePolicy) - self.fieldName_3.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop) - self.fieldName_3.setObjectName("fieldName_3") - self.verticalLayout.addWidget(self.fieldName_3) + sizePolicy.setHeightForWidth(self.fieldHeader_3.sizePolicy().hasHeightForWidth()) + self.fieldHeader_3.setSizePolicy(sizePolicy) + self.fieldHeader_3.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop) + self.fieldHeader_3.setObjectName("fieldHeader_3") + self.verticalLayout.addWidget(self.fieldHeader_3) self.labelName = QtGui.QLabel(DlgPropsBrowserObject) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) @@ -71,15 +71,15 @@ self.labelName.setTextInteractionFlags(QtCore.Qt.TextSelectableByKeyboard|QtCore.Qt.TextSelectableByMouse) self.labelName.setObjectName("labelName") self.verticalLayout.addWidget(self.labelName) - self.fieldName_4 = QtGui.QLabel(DlgPropsBrowserObject) + self.fieldHeader_4 = QtGui.QLabel(DlgPropsBrowserObject) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.fieldName_4.sizePolicy().hasHeightForWidth()) - self.fieldName_4.setSizePolicy(sizePolicy) - self.fieldName_4.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop) - self.fieldName_4.setObjectName("fieldName_4") - self.verticalLayout.addWidget(self.fieldName_4) + sizePolicy.setHeightForWidth(self.fieldHeader_4.sizePolicy().hasHeightForWidth()) + self.fieldHeader_4.setSizePolicy(sizePolicy) + self.fieldHeader_4.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop) + self.fieldHeader_4.setObjectName("fieldHeader_4") + self.verticalLayout.addWidget(self.fieldHeader_4) self.labelLinkUrl = QtGui.QLabel(DlgPropsBrowserObject) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) @@ -89,15 +89,15 @@ self.labelLinkUrl.setTextInteractionFlags(QtCore.Qt.TextSelectableByKeyboard|QtCore.Qt.TextSelectableByMouse) self.labelLinkUrl.setObjectName("labelLinkUrl") self.verticalLayout.addWidget(self.labelLinkUrl) - self.fieldName_5 = QtGui.QLabel(DlgPropsBrowserObject) + self.fieldHeader_5 = QtGui.QLabel(DlgPropsBrowserObject) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.fieldName_5.sizePolicy().hasHeightForWidth()) - self.fieldName_5.setSizePolicy(sizePolicy) - self.fieldName_5.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop) - self.fieldName_5.setObjectName("fieldName_5") - self.verticalLayout.addWidget(self.fieldName_5) + sizePolicy.setHeightForWidth(self.fieldHeader_5.sizePolicy().hasHeightForWidth()) + self.fieldHeader_5.setSizePolicy(sizePolicy) + self.fieldHeader_5.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop) + self.fieldHeader_5.setObjectName("fieldHeader_5") + self.verticalLayout.addWidget(self.fieldHeader_5) self.labelImageUrl = QtGui.QLabel(DlgPropsBrowserObject) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) @@ -128,15 +128,15 @@ def retranslateUi(self, DlgPropsBrowserObject): DlgPropsBrowserObject.setWindowTitle(QtGui.QApplication.translate("DlgPropsBrowserObject", "Dialog", None, QtGui.QApplication.UnicodeUTF8)) - self.fieldName.setText(QtGui.QApplication.translate("DlgPropsBrowserObject", "Type:", None, QtGui.QApplication.UnicodeUTF8)) + self.fieldHeader.setText(QtGui.QApplication.translate("DlgPropsBrowserObject", "Type:", None, QtGui.QApplication.UnicodeUTF8)) self.labeType.setText(QtGui.QApplication.translate("DlgPropsBrowserObject", "unknown", None, QtGui.QApplication.UnicodeUTF8)) - self.fieldName_2.setText(QtGui.QApplication.translate("DlgPropsBrowserObject", "Title:", None, QtGui.QApplication.UnicodeUTF8)) + self.fieldHeader_2.setText(QtGui.QApplication.translate("DlgPropsBrowserObject", "Title:", None, QtGui.QApplication.UnicodeUTF8)) self.labelTitle.setText(QtGui.QApplication.translate("DlgPropsBrowserObject", "unknown", None, QtGui.QApplication.UnicodeUTF8)) - self.fieldName_3.setText(QtGui.QApplication.translate("DlgPropsBrowserObject", "Name:", None, QtGui.QApplication.UnicodeUTF8)) + self.fieldHeader_3.setText(QtGui.QApplication.translate("DlgPropsBrowserObject", "Name:", None, QtGui.QApplication.UnicodeUTF8)) self.labelName.setText(QtGui.QApplication.translate("DlgPropsBrowserObject", "unknown", None, QtGui.QApplication.UnicodeUTF8)) - self.fieldName_4.setText(QtGui.QApplication.translate("DlgPropsBrowserObject", "LinkUrl:", None, QtGui.QApplication.UnicodeUTF8)) + self.fieldHeader_4.setText(QtGui.QApplication.translate("DlgPropsBrowserObject", "LinkUrl:", None, QtGui.QApplication.UnicodeUTF8)) self.labelLinkUrl.setText(QtGui.QApplication.translate("DlgPropsBrowserObject", "unknown", None, QtGui.QApplication.UnicodeUTF8)) - self.fieldName_5.setText(QtGui.QApplication.translate("DlgPropsBrowserObject", "ImageUrl:", None, QtGui.QApplication.UnicodeUTF8)) + self.fieldHeader_5.setText(QtGui.QApplication.translate("DlgPropsBrowserObject", "ImageUrl:", None, QtGui.QApplication.UnicodeUTF8)) self.labelImageUrl.setText(QtGui.QApplication.translate("DlgPropsBrowserObject", "unknown", None, QtGui.QApplication.UnicodeUTF8)) Modified: trunk/fclient/fclient/impl/tpls/Ui_DlgSingleAppErrorTpl.py =================================================================== --- trunk/fclient/fclient/impl/tpls/Ui_DlgSingleAppErrorTpl.py 2008-07-31 17:37:10 UTC (rev 841) +++ trunk/fclient/fclient/impl/tpls/Ui_DlgSingleAppErrorTpl.py 2008-07-31 18:45:36 UTC (rev 842) @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file '/home/me/src/proj/fclient/trunk/fclient/src/fclient/impl/tpls/DlgSingleAppErrorTpl.ui' +# Form implementation generated from reading ui file '/home/me/src/fclient/trunk/fclient/fclient/impl/tpls/DlgSingleAppErrorTpl.ui' # -# Created: Thu Jul 31 18:26:22 2008 +# Created: Thu Jul 31 20:24:37 2008 # by: PyQt4 UI code generator 4.4.3-snapshot-20080705 # # WARNING! All changes made in this file will be lost! @@ -36,15 +36,15 @@ self.verticalLayout_2.setObjectName("verticalLayout_2") self.verticalLayout = QtGui.QVBoxLayout() self.verticalLayout.setObjectName("verticalLayout") - self.fieldName = QtGui.QLabel(self.layoutWidget) - self.fieldName.setObjectName("fieldName") - self.verticalLayout.addWidget(self.fieldName) + self.fieldHeader = QtGui.QLabel(self.layoutWidget) + self.fieldHeader.setObjectName("fieldHeader") + self.verticalLayout.addWidget(self.fieldHeader) self.edHost = QtGui.QLineEdit(self.layoutWidget) self.edHost.setObjectName("edHost") self.verticalLayout.addWidget(self.edHost) - self.fieldName_2 = QtGui.QLabel(self.layoutWidget) - self.fieldName_2.setObjectName("fieldName_2") - self.verticalLayout.addWidget(self.fieldName_2) + self.fieldHeader_2 = QtGui.QLabel(self.layoutWidget) + self.fieldHeader_2.setObjectName("fieldHeader_2") + self.verticalLayout.addWidget(self.fieldHeader_2) self.spinPort = QtGui.QSpinBox(self.layoutWidget) self.spinPort.setObjectName("spinPort") self.verticalLayout.addWidget(self.spinPort) @@ -60,8 +60,8 @@ def retranslateUi(self, DlgSingleAppError): DlgSingleAppError.setWindowTitle(QtGui.QApplication.translate("DlgSingleAppError", "Dialog", None, QtGui.QApplication.UnicodeUTF8)) - self.fieldName.setText(QtGui.QApplication.translate("DlgSingleAppError", "Host: ", None, QtGui.QApplication.UnicodeUTF8)) - self.fieldName_2.setText(QtGui.QApplication.translate("DlgSingleAppError", "Port: ", None, QtGui.QApplication.UnicodeUTF8)) + self.fieldHeader.setText(QtGui.QApplication.translate("DlgSingleAppError", "Host: ", None, QtGui.QApplication.UnicodeUTF8)) + self.fieldHeader_2.setText(QtGui.QApplication.translate("DlgSingleAppError", "Port: ", None, QtGui.QApplication.UnicodeUTF8)) if __name__ == "__main__": Modified: trunk/fclient/fclient/impl/tpls/Ui_PrefsBrowserWidgetTpl.py =================================================================== --- trunk/fclient/fclient/impl/tpls/Ui_PrefsBrowserWidgetTpl.py 2008-07-31 17:37:10 UTC (rev 841) +++ trunk/fclient/fclient/impl/tpls/Ui_PrefsBrowserWidgetTpl.py 2008-07-31 18:45:36 UTC (rev 842) @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file '/home/me/src/proj/fclient/trunk/fclient/src/fclient/impl/tpls/PrefsBrowserWidgetTpl.ui' +# Form implementation generated from reading ui file '/home/me/src/fclient/trunk/fclient/fclient/impl/tpls/PrefsBrowserWidgetTpl.ui' # -# Created: Sun Jul 27 13:41:50 2008 +# Created: Thu Jul 31 20:43:06 2008 # by: PyQt4 UI code generator 4.4.3-snapshot-20080705 # # WARNING! All changes made in this file will be lost! @@ -12,75 +12,69 @@ class Ui_PrefsBrowserWidget(object): def setupUi(self, PrefsBrowserWidget): PrefsBrowserWidget.setObjectName("PrefsBrowserWidget") - PrefsBrowserWidget.resize(532, 186) - self.gridLayout_3 = QtGui.QGridLayout(PrefsBrowserWidget) - self.gridLayout_3.setObjectName("gridLayout_3") - self.horizontalLayout_2 = QtGui.QHBoxLayout() - self.horizontalLayout_2.setObjectName("horizontalLayout_2") - self.label = QtGui.QLabel(PrefsBrowserWidget) - self.label.setObjectName("label") - self.horizontalLayout_2.addWidget(self.label) + PrefsBrowserWidget.resize(456, 253) + self.gridLayout = QtGui.QGridLayout(PrefsBrowserWidget) + self.gridLayout.setObjectName("gridLayout") + self.fieldHeader = QtGui.QLabel(PrefsBrowserWidget) + self.fieldHeader.setObjectName("fieldHeader") + self.gridLayout.addWidget(self.fieldHeader, 0, 0, 1, 1) self.edHomePage = QtGui.QLineEdit(PrefsBrowserWidget) self.edHomePage.setDragEnabled(True) self.edHomePage.setObjectName("edHomePage") - self.horizontalLayout_2.addWidget(self.edHomePage) - self.gridLayout_3.addLayout(self.horizontalLayout_2, 0, 0, 1, 1) + self.gridLayout.addWidget(self.edHomePage, 1, 0, 1, 1) self.horizontalLayout = QtGui.QHBoxLayout() self.horizontalLayout.setObjectName("horizontalLayout") - self.groupBox = QtGui.QGroupBox(PrefsBrowserWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Minimum) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.groupBox.sizePolicy().hasHeightForWidth()) - self.groupBox.setSizePolicy(sizePolicy) - self.groupBox.setObjectName("groupBox") - self.gridLayout = QtGui.QGridLayout(self.groupBox) - self.gridLayout.setObjectName("gridLayout") - self.ckOpenLinksInNewTab = QtGui.QCheckBox(self.groupBox) - self.ckOpenLinksInNewTab.setObjectName("ckOpenLinksInNewTab") - self.gridLayout.addWidget(self.ckOpenLinksInNewTab, 0, 0, 1, 1) - self.ckOpenBookmarksInNewTab = QtGui.QCheckBox(self.groupBox) - self.ckOpenBookmarksInNewTab.setObjectName("ckOpenBookmarksInNewTab") - self.gridLayout.addWidget(self.ckOpenBookmarksInNewTab, 4, 0, 1, 1) - self.ckOpenAddressBarInNewTab = QtGui.QCheckBox(self.groupBox) + self.verticalLayout_2 = QtGui.QVBoxLayout() + self.verticalLayout_2.setObjectName("verticalLayout_2") + self.fieldHeader_2 = QtGui.QLabel(PrefsBrowserWidget) + self.fieldHeader_2.setObjectName("fieldHeader_2") + self.verticalLayout_2.addWidget(self.fieldHeader_2) + self.ckOpenAddressBarInNewTab = QtGui.QCheckBox(PrefsBrowserWidget) self.ckOpenAddressBarInNewTab.setObjectName("ckOpenAddressBarInNewTab") - self.gridLayout.addWidget(self.ckOpenAddressBarInNewTab, 1, 0, 1, 1) - self.horizontalLayout.addWidget(self.groupBox) - self.groupBox_2 = QtGui.QGroupBox(PrefsBrowserWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Minimum) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.groupBox_2.sizePolicy().hasHeightForWidth()) - self.groupBox_2.setSizePolicy(sizePolicy) - self.groupBox_2.setObjectName("groupBox_2") - self.gridLayout_2 = QtGui.QGridLayout(self.groupBox_2) - self.gridLayout_2.setObjectName("gridLayout_2") - self.ckOpenHomePageOnNewTabCreated = QtGui.QCheckBox(self.groupBox_2) + self.verticalLayout_2.addWidget(self.ckOpenAddressBarInNewTab) + self.ckOpenBookmarksInNewTab = QtGui.QCheckBox(PrefsBrowserWidget) + self.ckOpenBookmarksInNewTab.setObjectName("ckOpenBookmarksInNewTab") + self.verticalLayout_2.addWidget(self.ckOpenBookmarksInNewTab) + self.ckOpenLinksInNewTab = QtGui.QCheckBox(PrefsBrowserWidget) + self.ckOpenLinksInNewTab.setObjectName("ckOpenLinksInNewTab") + self.verticalLayout_2.addWidget(self.ckOpenLinksInNewTab) + self.horizontalLayout.addLayout(self.verticalLayout_2) + self.line = QtGui.QFrame(PrefsBrowserWidget) + self.line.setFrameShape(QtGui.QFrame.VLine) + self.line.setFrameShadow(QtGui.QFrame.Sunken) + self.line.setObjectName("line") + self.horizontalLayout.addWidget(self.line) + self.verticalLayout = QtGui.QVBoxLayout() + self.verticalLayout.setObjectName("verticalLayout") + self.fieldHeader_3 = QtGui.QLabel(PrefsBrowserWidget) + self.fieldHeader_3.setObjectName("fieldHeader_3") + self.verticalLayout.addWidget(self.fieldHeader_3) + self.ckOpenHomePageOnNewTabCreated = QtGui.QCheckBox(PrefsBrowserWidget) self.ckOpenHomePageOnNewTabCreated.setObjectName("ckOpenHomePageOnNewTabCreated") - self.gridLayout_2.addWidget(self.ckOpenHomePageOnNewTabCreated, 0, 0, 1, 1) - self.ckBackIsClose = QtGui.QCheckBox(self.groupBox_2) + self.verticalLayout.addWidget(self.ckOpenHomePageOnNewTabCreated) + self.ckBackIsClose = QtGui.QCheckBox(PrefsBrowserWidget) self.ckBackIsClose.setObjectName("ckBackIsClose") - self.gridLayout_2.addWidget(self.ckBackIsClose, 1, 0, 1, 1) - self.ckAutoLoadImages = QtGui.QCheckBox(self.groupBox_2) + self.verticalLayout.addWidget(self.ckBackIsClose) + self.ckAutoLoadImages = QtGui.QCheckBox(PrefsBrowserWidget) self.ckAutoLoadImages.setObjectName("ckAutoLoadImages") - self.gridLayout_2.addWidget(self.ckAutoLoadImages, 2, 0, 1, 1) - self.horizontalLayout.addWidget(self.groupBox_2) - self.gridLayout_3.addLayout(self.horizontalLayout, 1, 0, 1, 1) - spacerItem = QtGui.QSpacerItem(20, 297, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_3.addItem(spacerItem, 2, 0, 1, 1) + self.verticalLayout.addWidget(self.ckAutoLoadImages) + self.horizontalLayout.addLayout(self.verticalLayout) + self.gridLayout.addLayout(self.horizontalLayout, 2, 0, 1, 1) + spacerItem = QtGui.QSpacerItem(20, 56, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout.addItem(spacerItem, 3, 0, 1, 1) self.retranslateUi(PrefsBrowserWidget) QtCore.QMetaObject.connectSlotsByName(PrefsBrowserWidget) def retranslateUi(self, PrefsBrowserWidget): PrefsBrowserWidget.setWindowTitle(QtGui.QApplication.translate("PrefsBrowserWidget", "Form", None, QtGui.QApplication.UnicodeUTF8)) - self.label.setText(QtGui.QApplication.translate("PrefsBrowserWidget", "Homepage:", None, QtGui.QApplication.UnicodeUTF8)) - self.groupBox.setTitle(QtGui.QApplication.translate("PrefsBrowserWidget", "Open in new tab", None, QtGui.QApplication.UnicodeUTF8)) - self.ckOpenLinksInNewTab.setText(QtGui.QApplication.translate("PrefsBrowserWidget", "Links", None, QtGui.QApplication.UnicodeUTF8)) - self.ckOpenBookmarksInNewTab.setText(QtGui.QApplication.translate("PrefsBrowserWidget", "Bookmarks", None, QtGui.QApplication.UnicodeUTF8)) + self.fieldHeader.setText(QtGui.QApplication.translate("PrefsBrowserWidget", "Homepage:", None, QtGui.QApplication.UnicodeUTF8)) + self.fieldHeader_2.setText(QtGui.QApplication.translate("PrefsBrowserWidget", "Open in new tab:", None, QtGui.QApplication.UnicodeUTF8)) self.ckOpenAddressBarInNewTab.setText(QtGui.QApplication.translate("PrefsBrowserWidget", "Address bar", None, QtGui.QApplication.UnicodeUTF8)) - self.groupBox_2.setTitle(QtGui.QApplication.translate("PrefsBrowserWidget", "Others", None, QtGui.QApplication.UnicodeUTF8)) - self.ckOpenHomePageOnNewTabCreated.setText(QtGui.QApplication.translate("PrefsBrowserWidget", "Open home page when a new tab is created", None, QtGui.QApplication.UnicodeUTF8)) + self.ckOpenBookmarksInNewTab.setText(QtGui.QApplication.translate("PrefsBrowserWidget", "Bookmarks", None, QtGui.QApplication.UnicodeUTF8)) + self.ckOpenLinksInNewTab.setText(QtGui.QApplication.translate("PrefsBrowserWidget", "Links", None, QtGui.QApplication.UnicodeUTF8)) + self.fieldHeader_3.setText(QtGui.QApplication.translate("PrefsBrowserWidget", "Others:", None, QtGui.QApplication.UnicodeUTF8)) + self.ckOpenHomePageOnNewTabCreated.setText(QtGui.QApplication.translate("PrefsBrowserWidget", "Open homepage in new created tab", None, QtGui.QApplication.UnicodeUTF8)) self.ckBackIsClose.setText(QtGui.QApplication.translate("PrefsBrowserWidget", "Back is close", None, QtGui.QApplication.UnicodeUTF8)) self.ckAutoLoadImages.setText(QtGui.QApplication.translate("PrefsBrowserWidget", "Auto load images", None, QtGui.QApplication.UnicodeUTF8)) Modified: trunk/fclient/fclient/impl/tpls/Ui_PrefsConnectionExpertSettingsTpl.py =================================================================== --- trunk/fclient/fclient/impl/tpls/Ui_PrefsConnectionExpertSettingsTpl.py 2008-07-31 17:37:10 UTC (rev 841) +++ trunk/fclient/fclient/impl/tpls/Ui_PrefsConnectionExpertSettingsTpl.py 2008-07-31 18:45:36 UTC (rev 842) @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file '/home/me/src/proj/fclient/trunk/fclient/src/fclient/impl/tpls/PrefsConnectionExpertSettingsTpl.ui' +# Form implementation generated from reading ui file '/home/me/src/fclient/trunk/fclient/fclient/impl/tpls/PrefsConnectionExpertSettingsTpl.ui' # -# Created: Wed Jul 30 17:47:37 2008 +# Created: Thu Jul 31 20:22:01 2008 # by: PyQt4 UI code generator 4.4.3-snapshot-20080705 # # WARNING! All changes made in this file will be lost! @@ -12,25 +12,20 @@ class Ui_PrefsConnectionExpertSettings(object): def setupUi(self, PrefsConnectionExpertSettings): PrefsConnectionExpertSettings.setObjectName("PrefsConnectionExpertSettings") - PrefsConnectionExpertSettings.resize(520, 550) - self.gridLayout_2 = QtGui.QGridLayout(PrefsConn... [truncated message content] |