From aec114064d31a79e79517a7db1aa1039869ee8b3 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Thu, 18 Sep 2014 08:10:52 +0200 Subject: [PATCH] don't show password strength if there's no password --- gui/qt/password_dialog.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gui/qt/password_dialog.py b/gui/qt/password_dialog.py index b2e2d6abc..dac76d91a 100644 --- a/gui/qt/password_dialog.py +++ b/gui/qt/password_dialog.py @@ -72,7 +72,6 @@ def make_password_dialog(self, wallet, msg, new_pass=True): self.pw_strength = QLabel() grid.addWidget(self.pw_strength, 3, 0, 1, 2) self.new_pw.textChanged.connect(lambda: update_password_strength(self.pw_strength, self.new_pw.text())) - update_password_strength(self.pw_strength, self.new_pw.text()) vbox.addStretch(1) vbox.addLayout(ok_cancel_buttons(self)) @@ -110,8 +109,6 @@ def check_password_strength(password): :return: password strength Weak or Medium or Strong ''' password = unicode(password) - if not password: - return "Empty" n = math.log(len(set(password))) num = re.search("[0-9]", password) is not None and re.match("^[0-9]*$", password) is None caps = password != password.upper() and password != password.lower() @@ -129,10 +126,13 @@ def update_password_strength(pw_strength_label,password): :param password: password entered in New Password text box :return: None ''' - colors = {"Empty":"Red","Too short":"Red","Weak":"Red","Medium":"Blue","Strong":"Green", "Very Strong":"Green"} - strength = check_password_strength(password) - pw_strength_label.setText(_("Password Strength")+ ": "+"" + strength + "") - + if password: + colors = {"Weak":"Red","Medium":"Blue","Strong":"Green", "Very Strong":"Green"} + strength = check_password_strength(password) + label = _("Password Strength")+ ": "+"" + strength + "" + else: + label = "" + pw_strength_label.setText(label)