so I didn't checked when I copied all the panels, because I tougth it would be there. this re-add all connections that we lost on the preferences, sorry.
Thiago, I'm already with designer code trying to figure out a way to add this there.
From d975ea264cccd378fd5640faed64c29b3fa58363 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava <[email protected]> Date: Wed, 4 Nov 2015 21:24:51 -0200 Subject: [PATCH] Re-add the signal connections The signal connections from the old preferences got lost when we moved to the new ones because Designer is broken and can't handle signals / connactions from copy/pasted content. Signed-off-by: Tomaz Canabrava <[email protected]> --- .../preferences/preferences_defaults.ui | 37 +++- desktop-widgets/preferences/preferences_network.ui | 66 +++++-- desktop-widgets/preferences/preferences_units.ui | 220 ++++++++++++++++++++- 3 files changed, 297 insertions(+), 26 deletions(-) diff --git a/desktop-widgets/preferences/preferences_defaults.ui b/desktop-widgets/preferences/preferences_defaults.ui index 632e827..627d22c 100644 --- a/desktop-widgets/preferences/preferences_defaults.ui +++ b/desktop-widgets/preferences/preferences_defaults.ui @@ -6,7 +6,7 @@ <rect> <x>0</x> <y>0</y> - <width>555</width> + <width>561</width> <height>558</height> </rect> </property> @@ -247,5 +247,38 @@ </layout> </widget> <resources/> - <connections/> + <connections> + <connection> + <sender>btnUseDefaultFile</sender> + <signal>toggled(bool)</signal> + <receiver>chooseFile</receiver> + <slot>setHidden(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>462</x> + <y>136</y> + </hint> + <hint type="destinationlabel"> + <x>528</x> + <y>145</y> + </hint> + </hints> + </connection> + <connection> + <sender>velocitySlider</sender> + <signal>valueChanged(int)</signal> + <receiver>velocitySpinBox</receiver> + <slot>setValue(int)</slot> + <hints> + <hint type="sourcelabel"> + <x>437</x> + <y>299</y> + </hint> + <hint type="destinationlabel"> + <x>531</x> + <y>301</y> + </hint> + </hints> + </connection> + </connections> </ui> diff --git a/desktop-widgets/preferences/preferences_network.ui b/desktop-widgets/preferences/preferences_network.ui index 8bb9bf9..0899c7c 100644 --- a/desktop-widgets/preferences/preferences_network.ui +++ b/desktop-widgets/preferences/preferences_network.ui @@ -89,16 +89,6 @@ <item row="0" column="1" colspan="3"> <widget class="QComboBox" name="proxyType"/> </item> - <item row="2" column="1" colspan="3"> - <widget class="QCheckBox" name="proxyAuthRequired"> - <property name="layoutDirection"> - <enum>Qt::LeftToRight</enum> - </property> - <property name="text"> - <string>Requires authentication</string> - </property> - </widget> - </item> <item row="3" column="1"> <widget class="QLineEdit" name="proxyUsername"> <property name="sizePolicy"> @@ -135,6 +125,16 @@ </property> </widget> </item> + <item row="2" column="1" colspan="3"> + <widget class="QCheckBox" name="proxyAuthRequired"> + <property name="layoutDirection"> + <enum>Qt::LeftToRight</enum> + </property> + <property name="text"> + <string>Requires authentication</string> + </property> + </widget> + </item> </layout> </widget> </item> @@ -241,16 +241,7 @@ <property name="spacing"> <number>5</number> </property> - <property name="leftMargin"> - <number>5</number> - </property> - <property name="topMargin"> - <number>5</number> - </property> - <property name="rightMargin"> - <number>5</number> - </property> - <property name="bottomMargin"> + <property name="margin"> <number>5</number> </property> <item> @@ -289,5 +280,38 @@ </layout> </widget> <resources/> - <connections/> + <connections> + <connection> + <sender>proxyAuthRequired</sender> + <signal>toggled(bool)</signal> + <receiver>proxyUsername</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>207</x> + <y>107</y> + </hint> + <hint type="destinationlabel"> + <x>213</x> + <y>128</y> + </hint> + </hints> + </connection> + <connection> + <sender>proxyAuthRequired</sender> + <signal>toggled(bool)</signal> + <receiver>proxyPassword</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>555</x> + <y>109</y> + </hint> + <hint type="destinationlabel"> + <x>556</x> + <y>137</y> + </hint> + </hints> + </connection> + </connections> </ui> diff --git a/desktop-widgets/preferences/preferences_units.ui b/desktop-widgets/preferences/preferences_units.ui index bb1ffba..e100a90 100644 --- a/desktop-widgets/preferences/preferences_units.ui +++ b/desktop-widgets/preferences/preferences_units.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>400</width> - <height>374</height> + <width>455</width> + <height>515</height> </rect> </property> <property name="windowTitle"> @@ -75,6 +75,9 @@ <property name="text"> <string>meter</string> </property> + <attribute name="buttonGroup"> + <string notr="true">buttonGroup</string> + </attribute> </widget> </item> <item row="0" column="2"> @@ -82,6 +85,9 @@ <property name="text"> <string>feet</string> </property> + <attribute name="buttonGroup"> + <string notr="true">buttonGroup</string> + </attribute> </widget> </item> <item row="1" column="0"> @@ -96,6 +102,9 @@ <property name="text"> <string>bar</string> </property> + <attribute name="buttonGroup"> + <string notr="true">buttonGroup_2</string> + </attribute> </widget> </item> <item row="1" column="2"> @@ -103,6 +112,9 @@ <property name="text"> <string>psi</string> </property> + <attribute name="buttonGroup"> + <string notr="true">buttonGroup_2</string> + </attribute> </widget> </item> <item row="2" column="0"> @@ -117,6 +129,9 @@ <property name="text"> <string>&liter</string> </property> + <attribute name="buttonGroup"> + <string notr="true">buttonGroup_3</string> + </attribute> </widget> </item> <item row="2" column="2"> @@ -124,6 +139,9 @@ <property name="text"> <string>cu ft</string> </property> + <attribute name="buttonGroup"> + <string notr="true">buttonGroup_3</string> + </attribute> </widget> </item> <item row="3" column="0"> @@ -138,6 +156,9 @@ <property name="text"> <string>celsius</string> </property> + <attribute name="buttonGroup"> + <string notr="true">buttonGroup_4</string> + </attribute> </widget> </item> <item row="3" column="2"> @@ -145,6 +166,9 @@ <property name="text"> <string>fahrenheit</string> </property> + <attribute name="buttonGroup"> + <string notr="true">buttonGroup_4</string> + </attribute> </widget> </item> <item row="4" column="0"> @@ -159,6 +183,9 @@ <property name="text"> <string>kg</string> </property> + <attribute name="buttonGroup"> + <string notr="true">buttonGroup_5</string> + </attribute> </widget> </item> <item row="4" column="2"> @@ -166,6 +193,9 @@ <property name="text"> <string>lbs</string> </property> + <attribute name="buttonGroup"> + <string notr="true">buttonGroup_5</string> + </attribute> </widget> </item> </layout> @@ -247,5 +277,189 @@ </layout> </widget> <resources/> - <connections/> + <connections> + <connection> + <sender>metric</sender> + <signal>toggled(bool)</signal> + <receiver>meter</receiver> + <slot>setChecked(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>188</x> + <y>50</y> + </hint> + <hint type="destinationlabel"> + <x>254</x> + <y>125</y> + </hint> + </hints> + </connection> + <connection> + <sender>metric</sender> + <signal>toggled(bool)</signal> + <receiver>bar</receiver> + <slot>setChecked(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>188</x> + <y>49</y> + </hint> + <hint type="destinationlabel"> + <x>254</x> + <y>151</y> + </hint> + </hints> + </connection> + <connection> + <sender>metric</sender> + <signal>toggled(bool)</signal> + <receiver>liter</receiver> + <slot>setChecked(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>188</x> + <y>55</y> + </hint> + <hint type="destinationlabel"> + <x>254</x> + <y>178</y> + </hint> + </hints> + </connection> + <connection> + <sender>metric</sender> + <signal>toggled(bool)</signal> + <receiver>celsius</receiver> + <slot>setChecked(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>188</x> + <y>47</y> + </hint> + <hint type="destinationlabel"> + <x>254</x> + <y>206</y> + </hint> + </hints> + </connection> + <connection> + <sender>metric</sender> + <signal>toggled(bool)</signal> + <receiver>kg</receiver> + <slot>setChecked(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>188</x> + <y>44</y> + </hint> + <hint type="destinationlabel"> + <x>254</x> + <y>233</y> + </hint> + </hints> + </connection> + <connection> + <sender>imperial</sender> + <signal>toggled(bool)</signal> + <receiver>feet</receiver> + <slot>setChecked(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>278</x> + <y>47</y> + </hint> + <hint type="destinationlabel"> + <x>377</x> + <y>119</y> + </hint> + </hints> + </connection> + <connection> + <sender>imperial</sender> + <signal>toggled(bool)</signal> + <receiver>psi</receiver> + <slot>setChecked(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>278</x> + <y>50</y> + </hint> + <hint type="destinationlabel"> + <x>377</x> + <y>151</y> + </hint> + </hints> + </connection> + <connection> + <sender>imperial</sender> + <signal>toggled(bool)</signal> + <receiver>cuft</receiver> + <slot>setChecked(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>278</x> + <y>53</y> + </hint> + <hint type="destinationlabel"> + <x>377</x> + <y>176</y> + </hint> + </hints> + </connection> + <connection> + <sender>imperial</sender> + <signal>toggled(bool)</signal> + <receiver>fahrenheit</receiver> + <slot>setChecked(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>278</x> + <y>51</y> + </hint> + <hint type="destinationlabel"> + <x>377</x> + <y>208</y> + </hint> + </hints> + </connection> + <connection> + <sender>imperial</sender> + <signal>toggled(bool)</signal> + <receiver>lbs</receiver> + <slot>setChecked(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>278</x> + <y>46</y> + </hint> + <hint type="destinationlabel"> + <x>377</x> + <y>231</y> + </hint> + </hints> + </connection> + <connection> + <sender>personalize</sender> + <signal>toggled(bool)</signal> + <receiver>units_group</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>377</x> + <y>46</y> + </hint> + <hint type="destinationlabel"> + <x>388</x> + <y>86</y> + </hint> + </hints> + </connection> + </connections> + <buttongroups> + <buttongroup name="buttonGroup"/> + <buttongroup name="buttonGroup_2"/> + <buttongroup name="buttonGroup_3"/> + <buttongroup name="buttonGroup_4"/> + <buttongroup name="buttonGroup_5"/> + </buttongroups> </ui> -- 2.6.2
_______________________________________________ subsurface mailing list [email protected] http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
