From 857aa73783a991e6d750c99988821585c1864e21 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Tue, 13 Dec 2011 16:28:56 +0100 Subject: [PATCH] Enable wordwrap for long message in passphrase dialog - Remove explicit resizing from constructor to prevent potential hang --- src/qt/askpassphrasedialog.cpp | 1 - src/qt/forms/askpassphrasedialog.ui | 20 +++++--------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/src/qt/askpassphrasedialog.cpp b/src/qt/askpassphrasedialog.cpp index f5161694605..31e4040d1d2 100644 --- a/src/qt/askpassphrasedialog.cpp +++ b/src/qt/askpassphrasedialog.cpp @@ -55,7 +55,6 @@ AskPassphraseDialog::AskPassphraseDialog(Mode mode, QWidget *parent) : ui->warningLabel->setText(tr("Enter the old and new passphrase to the wallet.")); break; } - resize(minimumSize()); // Get rid of extra space in dialog textChanged(); connect(ui->passEdit1, SIGNAL(textChanged(QString)), this, SLOT(textChanged())); diff --git a/src/qt/forms/askpassphrasedialog.ui b/src/qt/forms/askpassphrasedialog.ui index f1f2ef37316..3f6b668e06a 100644 --- a/src/qt/forms/askpassphrasedialog.ui +++ b/src/qt/forms/askpassphrasedialog.ui @@ -6,8 +6,8 @@ 0 0 - 589 - 239 + 598 + 198 @@ -34,6 +34,9 @@ Qt::RichText + + true + @@ -100,19 +103,6 @@ - - - - Qt::Vertical - - - - 20 - 40 - - - -