From 4491711e097a3f4fd9813f3affd0aa5dbb6e0982 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Wed, 4 Nov 2015 21:24:51 -0200 Subject: 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 Signed-off-by: Dirk Hohndel --- .../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(-) (limited to 'desktop-widgets/preferences') diff --git a/desktop-widgets/preferences/preferences_defaults.ui b/desktop-widgets/preferences/preferences_defaults.ui index 632e82763..627d22cce 100644 --- a/desktop-widgets/preferences/preferences_defaults.ui +++ b/desktop-widgets/preferences/preferences_defaults.ui @@ -6,7 +6,7 @@ 0 0 - 555 + 561 558 @@ -247,5 +247,38 @@ - + + + btnUseDefaultFile + toggled(bool) + chooseFile + setHidden(bool) + + + 462 + 136 + + + 528 + 145 + + + + + velocitySlider + valueChanged(int) + velocitySpinBox + setValue(int) + + + 437 + 299 + + + 531 + 301 + + + + diff --git a/desktop-widgets/preferences/preferences_network.ui b/desktop-widgets/preferences/preferences_network.ui index 8bb9bf9a0..0899c7c94 100644 --- a/desktop-widgets/preferences/preferences_network.ui +++ b/desktop-widgets/preferences/preferences_network.ui @@ -89,16 +89,6 @@ - - - - Qt::LeftToRight - - - Requires authentication - - - @@ -135,6 +125,16 @@ + + + + Qt::LeftToRight + + + Requires authentication + + + @@ -241,16 +241,7 @@ 5 - - 5 - - - 5 - - - 5 - - + 5 @@ -289,5 +280,38 @@ - + + + proxyAuthRequired + toggled(bool) + proxyUsername + setEnabled(bool) + + + 207 + 107 + + + 213 + 128 + + + + + proxyAuthRequired + toggled(bool) + proxyPassword + setEnabled(bool) + + + 555 + 109 + + + 556 + 137 + + + + diff --git a/desktop-widgets/preferences/preferences_units.ui b/desktop-widgets/preferences/preferences_units.ui index bb1ffba66..e100a904c 100644 --- a/desktop-widgets/preferences/preferences_units.ui +++ b/desktop-widgets/preferences/preferences_units.ui @@ -6,8 +6,8 @@ 0 0 - 400 - 374 + 455 + 515 @@ -75,6 +75,9 @@ meter + + buttonGroup + @@ -82,6 +85,9 @@ feet + + buttonGroup + @@ -96,6 +102,9 @@ bar + + buttonGroup_2 + @@ -103,6 +112,9 @@ psi + + buttonGroup_2 + @@ -117,6 +129,9 @@ &liter + + buttonGroup_3 + @@ -124,6 +139,9 @@ cu ft + + buttonGroup_3 + @@ -138,6 +156,9 @@ celsius + + buttonGroup_4 + @@ -145,6 +166,9 @@ fahrenheit + + buttonGroup_4 + @@ -159,6 +183,9 @@ kg + + buttonGroup_5 + @@ -166,6 +193,9 @@ lbs + + buttonGroup_5 + @@ -247,5 +277,189 @@ - + + + metric + toggled(bool) + meter + setChecked(bool) + + + 188 + 50 + + + 254 + 125 + + + + + metric + toggled(bool) + bar + setChecked(bool) + + + 188 + 49 + + + 254 + 151 + + + + + metric + toggled(bool) + liter + setChecked(bool) + + + 188 + 55 + + + 254 + 178 + + + + + metric + toggled(bool) + celsius + setChecked(bool) + + + 188 + 47 + + + 254 + 206 + + + + + metric + toggled(bool) + kg + setChecked(bool) + + + 188 + 44 + + + 254 + 233 + + + + + imperial + toggled(bool) + feet + setChecked(bool) + + + 278 + 47 + + + 377 + 119 + + + + + imperial + toggled(bool) + psi + setChecked(bool) + + + 278 + 50 + + + 377 + 151 + + + + + imperial + toggled(bool) + cuft + setChecked(bool) + + + 278 + 53 + + + 377 + 176 + + + + + imperial + toggled(bool) + fahrenheit + setChecked(bool) + + + 278 + 51 + + + 377 + 208 + + + + + imperial + toggled(bool) + lbs + setChecked(bool) + + + 278 + 46 + + + 377 + 231 + + + + + personalize + toggled(bool) + units_group + setEnabled(bool) + + + 377 + 46 + + + 388 + 86 + + + + + + + + + + + -- cgit v1.2.3-70-g09d2