Browse Source

Merge commit '7298ebb'

0.8 v0.5.1rc1
Gavin Andresen 13 years ago
parent
commit
5491c310a6
  1. 53
      src/qt/askpassphrasedialog.cpp
  2. 3
      src/qt/askpassphrasedialog.h
  3. 17
      src/qt/forms/askpassphrasedialog.ui

53
src/qt/askpassphrasedialog.cpp

@ -6,17 +6,25 @@ @@ -6,17 +6,25 @@
#include <QMessageBox>
#include <QPushButton>
#include <QKeyEvent>
AskPassphraseDialog::AskPassphraseDialog(Mode mode, QWidget *parent) :
QDialog(parent),
ui(new Ui::AskPassphraseDialog),
mode(mode),
model(0)
model(0),
fCapsLock(false)
{
ui->setupUi(this);
ui->passEdit1->setMaxLength(MAX_PASSPHRASE_SIZE);
ui->passEdit2->setMaxLength(MAX_PASSPHRASE_SIZE);
ui->passEdit3->setMaxLength(MAX_PASSPHRASE_SIZE);
// Setup Caps Lock detection.
ui->passEdit1->installEventFilter(this);
ui->passEdit2->installEventFilter(this);
ui->passEdit3->installEventFilter(this);
ui->capsLabel->clear();
switch(mode)
{
@ -188,3 +196,46 @@ void AskPassphraseDialog::textChanged() @@ -188,3 +196,46 @@ void AskPassphraseDialog::textChanged()
}
ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(acceptable);
}
bool AskPassphraseDialog::event(QEvent *event)
{
// Detect Caps Lock key press.
if (event->type() == QEvent::KeyPress) {
QKeyEvent *ke = static_cast<QKeyEvent *>(event);
if (ke->key() == Qt::Key_CapsLock) {
fCapsLock = !fCapsLock;
}
if (fCapsLock) {
ui->capsLabel->setText(tr("Warning: The Caps Lock key is on."));
} else {
ui->capsLabel->clear();
}
}
return QWidget::event(event);
}
bool AskPassphraseDialog::eventFilter(QObject *, QEvent *event)
{
/* Detect Caps Lock.
* There is no good OS-independent way to check a key state in Qt, but we
* can detect Caps Lock by checking for the following condition:
* Shift key is down and the result is a lower case character, or
* Shift key is not down and the result is an upper case character.
*/
if (event->type() == QEvent::KeyPress) {
QKeyEvent *ke = static_cast<QKeyEvent *>(event);
QString str = ke->text();
if (str.length() != 0) {
const QChar *psz = str.unicode();
bool fShift = (ke->modifiers() & Qt::ShiftModifier) != 0;
if ((fShift && psz->isLower()) || (!fShift && psz->isUpper())) {
fCapsLock = true;
ui->capsLabel->setText(tr("Warning: The Caps Lock key is on."));
} else if (psz->isLetter()) {
fCapsLock = false;
ui->capsLabel->clear();
}
}
}
return false;
}

3
src/qt/askpassphrasedialog.h

@ -34,9 +34,12 @@ private: @@ -34,9 +34,12 @@ private:
Ui::AskPassphraseDialog *ui;
Mode mode;
WalletModel *model;
bool fCapsLock;
private slots:
void textChanged();
bool event(QEvent *event);
bool eventFilter(QObject *, QEvent *event);
};
#endif // ASKPASSPHRASEDIALOG_H

17
src/qt/forms/askpassphrasedialog.ui

@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>589</width>
<height>228</height>
<height>239</height>
</rect>
</property>
<property name="sizePolicy">
@ -83,6 +83,21 @@ @@ -83,6 +83,21 @@
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLabel" name="capsLabel">
<property name="styleSheet">
<string notr="true">#capsLabel {
font: bold;
}</string>
</property>
<property name="text">
<string>TextLabel</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
</layout>
</item>
<item>

Loading…
Cancel
Save