aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2011-12-13 16:28:56 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2011-12-13 16:32:25 +0100
commit857aa73783a991e6d750c99988821585c1864e21 (patch)
tree8186b8da08fd7d4d755f773b2d8c98b9a9ba52a1
parent5491c310a6c70220e32c123ba7b8ce3da3e26126 (diff)
downloadbitcoin-857aa73783a991e6d750c99988821585c1864e21.tar.xz
Enable wordwrap for long message in passphrase dialog
- Remove explicit resizing from constructor to prevent potential hang
-rw-r--r--src/qt/askpassphrasedialog.cpp1
-rw-r--r--src/qt/forms/askpassphrasedialog.ui20
2 files changed, 5 insertions, 16 deletions
diff --git a/src/qt/askpassphrasedialog.cpp b/src/qt/askpassphrasedialog.cpp
index f516169460..31e4040d1d 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 f1f2ef3731..3f6b668e06 100644
--- a/src/qt/forms/askpassphrasedialog.ui
+++ b/src/qt/forms/askpassphrasedialog.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>589</width>
- <height>239</height>
+ <width>598</width>
+ <height>198</height>
</rect>
</property>
<property name="sizePolicy">
@@ -34,6 +34,9 @@
<property name="textFormat">
<enum>Qt::RichText</enum>
</property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
</widget>
</item>
<item>
@@ -101,19 +104,6 @@
</layout>
</item>
<item>
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>