twisterarmy
/
twister-core
mirror of https://github.com/twisterarmy/twister-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #1308 from Diapolo/polish_verifymessage 

GUI: adapt user-experience from messagepage for verifymessagedialog
miguelfreitas
Wladimir J. van der Laan 13 years ago
parent
2643ce97ae 34aa3112c8
commit
790fe2e558
3 changed files with 72 additions and 66 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 84
      src/qt/forms/verifymessagedialog.ui
  2. 35
      src/qt/verifymessagedialog.cpp
  3. 19
      src/qt/verifymessagedialog.h

84
src/qt/forms/verifymessagedialog.ui
Unescape View File

@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Enter the message and signature below (be careful to correctly copy newlines, spaces, tabs, and other invisible characters), and press apply to obtain the bitcoin address used to sign the message.</string>
<string>Enter the message and signature below (be careful to correctly copy newlines, spaces, tabs and other invisible characters) to obtain the Bitcoin address used to sign the message.</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@ -35,9 +35,6 @@ @@ -35,9 +35,6 @@
<property name="text">
<string/>
</property>
<property name="placeholderText">
<string>Signature</string>
</property>
</widget>
</item>
<item>
@ -48,9 +45,6 @@ @@ -48,9 +45,6 @@
<property name="readOnly">
<bool>true</bool>
</property>
<property name="placeholderText">
<string>Address</string>
</property>
</widget>
</item>
<item>
@ -62,6 +56,20 @@ @@ -62,6 +56,20 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="verifyMessage">
<property name="toolTip">
<string>Verify a message and obtain the Bitcoin address used to sign the message</string>
</property>
<property name="text">
<string>&amp;Verify Message</string>
</property>
<property name="icon">
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/transaction_0</normaloff>:/icons/transaction_0</iconset>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="copyToClipboard">
<property name="enabled">
@ -79,6 +87,20 @@ @@ -79,6 +87,20 @@
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="clearButton">
<property name="toolTip">
<string>Reset all verify message fields</string>
</property>
<property name="text">
<string>Clear &amp;All</string>
</property>
<property name="icon">
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
@ -92,19 +114,6 @@ @@ -92,19 +114,6 @@
</property>
</spacer>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Apply|QDialogButtonBox::Close</set>
</property>
<property name="centerButtons">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
</layout>
@ -112,38 +121,5 @@ @@ -112,38 +121,5 @@
<resources>
<include location="../bitcoin.qrc"/>
</resources>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>VerifyMessageDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>VerifyMessageDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
<connections/>
</ui>

35
src/qt/verifymessagedialog.cpp
Unescape View File

@ -22,7 +22,16 @@ VerifyMessageDialog::VerifyMessageDialog(AddressTableModel *addressModel, QWidge @@ -22,7 +22,16 @@ VerifyMessageDialog::VerifyMessageDialog(AddressTableModel *addressModel, QWidge
{
ui->setupUi(this);
#if (QT_VERSION >= 0x040700)
/* Do not move this to the XML file, Qt before 4.7 will choke on it */
ui->lnSig->setPlaceholderText(tr("Enter Bitcoin signature"));
ui->lnAddress->setPlaceholderText(tr("Click \"Apply\" to obtain address"));
#endif
GUIUtil::setupAddressWidget(ui->lnAddress, this);
ui->lnAddress->installEventFilter(this);
ui->edMessage->setFocus();
}
VerifyMessageDialog::~VerifyMessageDialog()
@ -63,13 +72,33 @@ bool VerifyMessageDialog::checkAddress() @@ -63,13 +72,33 @@ bool VerifyMessageDialog::checkAddress()
return true;
}
void VerifyMessageDialog::on_buttonBox_clicked(QAbstractButton *button)
void VerifyMessageDialog::on_verifyMessage_clicked()
{
if(ui->buttonBox->buttonRole(button) == QDialogButtonBox::ApplyRole)
checkAddress();
checkAddress();
}
void VerifyMessageDialog::on_copyToClipboard_clicked()
{
QApplication::clipboard()->setText(ui->lnAddress->text());
}
void VerifyMessageDialog::on_clearButton_clicked()
{
ui->edMessage->clear();
ui->lnSig->clear();
ui->lnAddress->clear();
ui->lblStatus->clear();
ui->edMessage->setFocus();
}
bool VerifyMessageDialog::eventFilter(QObject *object, QEvent *event)
{
if(object == ui->lnAddress && (event->type() == QEvent::MouseButtonPress ||
event->type() == QEvent::FocusIn))
{
ui->lnAddress->selectAll();
return true;
}
return QDialog::eventFilter(object, event);
}

19
src/qt/verifymessagedialog.h
Unescape View File

@ -3,16 +3,14 @@ @@ -3,16 +3,14 @@
#include <QDialog>
namespace Ui {
class VerifyMessageDialog;
}
class AddressTableModel;
QT_BEGIN_NAMESPACE
class QAbstractButton;
QT_END_NAMESPACE
namespace Ui {
class VerifyMessageDialog;
}
class VerifyMessageDialog : public QDialog
{
Q_OBJECT
@ -21,16 +19,19 @@ public: @@ -21,16 +19,19 @@ public:
explicit VerifyMessageDialog(AddressTableModel *addressModel, QWidget *parent = 0);
~VerifyMessageDialog();
private slots:
void on_buttonBox_clicked(QAbstractButton *button);
void on_copyToClipboard_clicked();
protected:
bool eventFilter(QObject *object, QEvent *event);
private:
bool checkAddress();
Ui::VerifyMessageDialog *ui;
AddressTableModel *model;
private slots:
void on_verifyMessage_clicked();
void on_copyToClipboard_clicked();
void on_clearButton_clicked();
};
#endif // VERIFYMESSAGEDIALOG_H

Write Preview
Loading…
Cancel
Save