LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge pull request #1308 from Diapolo/polish_verifymessage

Browse source 
GUI: adapt user-experience from messagepage for verifymessagedialog
This commit is contained in:
Wladimir J. van der Laan 2012-05-14 23:15:38 -07:00
commit 790fe2e558
3 changed files with 73 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
src/qt/forms/verifymessagedialog.ui
View file

@ -17,7 +17,7 @@
<item> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <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>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@ -35,9 +35,6 @@
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
<property name="placeholderText">
<string>Signature</string>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -48,9 +45,6 @@
<property name="readOnly"> <property name="readOnly">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="placeholderText">
<string>Address</string>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -62,6 +56,20 @@
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <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> <item>
<widget class="QPushButton" name="copyToClipboard"> <widget class="QPushButton" name="copyToClipboard">
<property name="enabled"> <property name="enabled">
@ -79,6 +87,20 @@
</property> </property>
</widget> </widget>
</item> </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> <item>
<spacer name="horizontalSpacer"> <spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">
@ -92,19 +114,6 @@
</property> </property>
</spacer> </spacer>
</item> </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> </layout>
</item> </item>
</layout> </layout>
@ -112,38 +121,5 @@
<resources> <resources>
<include location="../bitcoin.qrc"/> <include location="../bitcoin.qrc"/>
</resources> </resources>
<connections> <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>
</ui> </ui>

33
src/qt/verifymessagedialog.cpp
View file

@ -22,7 +22,16 @@ VerifyMessageDialog::VerifyMessageDialog(AddressTableModel *addressModel, QWidge
{ {
ui->setupUi(this); 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); GUIUtil::setupAddressWidget(ui->lnAddress, this);
ui->lnAddress->installEventFilter(this);
ui->edMessage->setFocus();
} }
VerifyMessageDialog::~VerifyMessageDialog() VerifyMessageDialog::~VerifyMessageDialog()
@ -63,9 +72,8 @@ bool VerifyMessageDialog::checkAddress()
return true; return true;
} }
void VerifyMessageDialog::on_buttonBox_clicked(QAbstractButton *button) void VerifyMessageDialog::on_verifyMessage_clicked()
{ {
if(ui->buttonBox->buttonRole(button) == QDialogButtonBox::ApplyRole)
checkAddress(); checkAddress();
} }
@ -73,3 +81,24 @@ void VerifyMessageDialog::on_copyToClipboard_clicked()
{ {
QApplication::clipboard()->setText(ui->lnAddress->text()); 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);
}

21
src/qt/verifymessagedialog.h
View file

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