summaryrefslogtreecommitdiff
path: root/src/leap/gui
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-06-07 20:35:43 -0300
committerTomás Touceda <chiiph@leap.se>2013-06-07 20:35:43 -0300
commit3d91da9b320d2dd267b0c1799c25a3e140077666 (patch)
tree0d3df285c8ea80b30c79e28cccdc938b3766ef07 /src/leap/gui
parent269f6535fb468ab6789d3efef27c272178e31395 (diff)
parent6a01913bffc10a96c6c3acfa6b8b410d6eb27661 (diff)
Merge remote-tracking branch 'ivan/bug/2776_wizard-ui-fixes' into develop
Diffstat (limited to 'src/leap/gui')
-rw-r--r--src/leap/gui/ui/wizard.ui3
-rw-r--r--src/leap/gui/wizard.py4
2 files changed, 7 insertions, 0 deletions
diff --git a/src/leap/gui/ui/wizard.ui b/src/leap/gui/ui/wizard.ui
index 96cf4621..4b9cab1c 100644
--- a/src/leap/gui/ui/wizard.ui
+++ b/src/leap/gui/ui/wizard.ui
@@ -696,6 +696,9 @@
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
</widget>
</item>
</layout>
diff --git a/src/leap/gui/wizard.py b/src/leap/gui/wizard.py
index 8c5ea2a0..d03427db 100644
--- a/src/leap/gui/wizard.py
+++ b/src/leap/gui/wizard.py
@@ -278,6 +278,9 @@ class Wizard(QtGui.QWizard):
self.ui.lblPassword2.clearFocus()
self._set_registration_fields_visibility(False)
+
+ # Allow the user to remember his password
+ self.ui.chkRemember.setVisible(True)
self.ui.chkRemember.setEnabled(True)
self.page(self.REGISTER_USER_PAGE).set_completed()
@@ -575,6 +578,7 @@ class Wizard(QtGui.QWizard):
"%s") %
(self._provider_config
.get_name(),))
+ self.ui.chkRemember.setVisible(False)
if pageId == self.SERVICES_PAGE:
self._populate_services()