diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-02-28 14:47:44 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-02-28 14:47:44 -0300 |
| commit | 75c9b86e605742f2850d8b50b2419d75129e7949 (patch) | |
| tree | 8215a029de6b0a765971d8e980b60207d6e8d8a0 /src/leap/bitmask/gui/ui | |
| parent | 496a4f8286e74daff080b52b02c49f130de03bc3 (diff) | |
Do version checks in the wizard too.
When the user choose to use an existing provider we download the
provider.json again so the version checks are executed.
[Closes #5048]
Diffstat (limited to 'src/leap/bitmask/gui/ui')
| -rw-r--r-- | src/leap/bitmask/gui/ui/wizard.ui | 73 |
1 files changed, 45 insertions, 28 deletions
diff --git a/src/leap/bitmask/gui/ui/wizard.ui b/src/leap/bitmask/gui/ui/wizard.ui index d9b8499e..6c592522 100644 --- a/src/leap/bitmask/gui/ui/wizard.ui +++ b/src/leap/bitmask/gui/ui/wizard.ui @@ -269,20 +269,7 @@ <string>Configure or select a provider</string> </property> <layout class="QGridLayout" name="gridLayout_5"> - <item row="5" column="1"> - <widget class="QLineEdit" name="lnProvider"/> - </item> - <item row="5" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>https://</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> - </item> - <item row="4" column="0"> + <item row="1" column="0"> <widget class="QRadioButton" name="rbNewProvider"> <property name="text"> <string>Configure new provider:</string> @@ -292,14 +279,27 @@ </property> </widget> </item> - <item row="5" column="2"> - <widget class="QPushButton" name="btnCheck"> + <item row="0" column="2"> + <widget class="QComboBox" name="cbProviders"> + <property name="enabled"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLabel" name="label"> <property name="text"> - <string>Check</string> + <string>https://</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> </widget> </item> - <item row="2" column="0"> + <item row="1" column="2"> + <widget class="QLineEdit" name="lnProvider"/> + </item> + <item row="0" column="0"> <widget class="QRadioButton" name="rbExistingProvider"> <property name="text"> <string>Use existing one:</string> @@ -309,7 +309,7 @@ </property> </widget> </item> - <item row="3" column="0"> + <item row="0" column="1"> <widget class="QLabel" name="label_8"> <property name="text"> <string>https://</string> @@ -319,12 +319,29 @@ </property> </widget> </item> - <item row="3" column="1"> - <widget class="QComboBox" name="cbProviders"> - <property name="enabled"> - <bool>false</bool> - </property> - </widget> + <item row="2" column="2"> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <spacer name="horizontalSpacer_3"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="btnCheck"> + <property name="text"> + <string>Check</string> + </property> + </widget> + </item> + </layout> </item> </layout> </widget> @@ -859,8 +876,8 @@ <y>174</y> </hint> <hint type="destinationlabel"> - <x>454</x> - <y>254</y> + <x>450</x> + <y>266</y> </hint> </hints> </connection> @@ -884,7 +901,7 @@ <sender>rbExistingProvider</sender> <signal>toggled(bool)</signal> <receiver>btnCheck</receiver> - <slot>setDisabled(bool)</slot> + <slot>setEnabled(bool)</slot> <hints> <hint type="sourcelabel"> <x>169</x> |