From 240eb294d228909c92e483c2f351aad30060e87b Mon Sep 17 00:00:00 2001
From: Inso <insomniak.fr@gmail.com>
Date: Fri, 23 Jan 2015 08:37:13 +0100
Subject: [PATCH] Fixed bugs in password asker
---
res/ui/password_asker.ui | 16 ++++++++--------
src/cutecoin/__init__.py | 2 +-
src/cutecoin/gui/password_asker.py | 9 ++++-----
3 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/res/ui/password_asker.ui b/res/ui/password_asker.ui
index 867a88a5..93a35762 100644
--- a/res/ui/password_asker.ui
+++ b/res/ui/password_asker.ui
@@ -56,12 +56,12 @@
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
- <x>248</x>
- <y>254</y>
+ <x>136</x>
+ <y>78</y>
</hint>
<hint type="destinationlabel">
- <x>157</x>
- <y>274</y>
+ <x>136</x>
+ <y>49</y>
</hint>
</hints>
</connection>
@@ -72,12 +72,12 @@
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
- <x>316</x>
- <y>260</y>
+ <x>136</x>
+ <y>78</y>
</hint>
<hint type="destinationlabel">
- <x>286</x>
- <y>274</y>
+ <x>136</x>
+ <y>49</y>
</hint>
</hints>
</connection>
diff --git a/src/cutecoin/__init__.py b/src/cutecoin/__init__.py
index c0201e10..5bdc6645 100644
--- a/src/cutecoin/__init__.py
+++ b/src/cutecoin/__init__.py
@@ -1,2 +1,2 @@
-__version_info__ = ('0', '7', '4')
+__version_info__ = ('0', '7', '5')
__version__ = '.'.join(__version_info__)
diff --git a/src/cutecoin/gui/password_asker.py b/src/cutecoin/gui/password_asker.py
index 24d5bfea..cae09d02 100644
--- a/src/cutecoin/gui/password_asker.py
+++ b/src/cutecoin/gui/password_asker.py
@@ -43,9 +43,8 @@ class PasswordAskerDialog(QDialog, Ui_PasswordAskerDialog):
self.remember = self.check_remember.isChecked()
self.password = password
self.edit_password.setText("")
-
- self.accepted.emit()
- self.close()
+ logging.debug("Password is valid")
+ super().accept()
else:
QMessageBox.warning(self, "Failed to get private key",
"Wrong password typed. Cannot open the private key",
@@ -53,6 +52,6 @@ class PasswordAskerDialog(QDialog, Ui_PasswordAskerDialog):
def reject(self):
self.edit_password.setText("")
+ logging.debug("Cancelled")
self.password = ""
- self.rejected.emit()
- self.close()
+ super().reject()
--
GitLab