Skip to content

Commit 1fef880

Browse files
furszyfurszy
committed
passphrase dialog edit line echo mode on click change fixed + dashboard text minor changes.
1 parent 2371229 commit 1fef880

File tree

3 files changed

+36
-73
lines changed

3 files changed

+36
-73
lines changed

‎src/qt/askpassphrasedialog.cpp‎

Lines changed: 26 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ AskPassphraseDialog::AskPassphraseDialog(Mode mode, QWidget* parent, WalletModel
2727
model(model),
2828
context(context),
2929
btnWatch(new QCheckBox()),
30-
btnWatch2(new QCheckBox()),
3130
fCapsLock(false)
3231
{
3332
ui->setupUi(this);
@@ -69,53 +68,8 @@ AskPassphraseDialog::AskPassphraseDialog(Mode mode, QWidget* parent, WalletModel
6968
ui->passEdit2->setMaxLength(MAX_PASSPHRASE_SIZE);
7069
ui->passEdit3->setMaxLength(MAX_PASSPHRASE_SIZE);
7170

72-
QGraphicsDropShadowEffect* shadowEffect = new QGraphicsDropShadowEffect();
73-
shadowEffect->setColor(QColor(0, 0, 0, 22));
74-
shadowEffect->setXOffset(0);
75-
shadowEffect->setYOffset(3);
76-
shadowEffect->setBlurRadius(6);
77-
78-
QGraphicsDropShadowEffect* shadowEffect2 = new QGraphicsDropShadowEffect();
79-
shadowEffect2->setColor(QColor(0, 0, 0, 22));
80-
shadowEffect2->setXOffset(0);
81-
shadowEffect2->setYOffset(3);
82-
shadowEffect2->setBlurRadius(6);
83-
84-
85-
ui->layoutEdit->setGraphicsEffect(shadowEffect);
86-
87-
ui->layoutEdit2->setGraphicsEffect(shadowEffect2);
88-
89-
// Button Watch
90-
91-
btnWatch = new QCheckBox(ui->layoutEdit);
92-
93-
btnWatch->setProperty("cssClass", "btn-watch-password");
94-
btnWatch->setChecked(false);
95-
QSize BUTTON_CONTACT_SIZE = QSize(24, 24);
96-
btnWatch->setMinimumSize(BUTTON_CONTACT_SIZE);
97-
btnWatch->setMaximumSize(BUTTON_CONTACT_SIZE);
98-
99-
btnWatch->show();
100-
btnWatch->raise();
101-
102-
int posXX = ui->layoutEdit->width() - 30;
103-
int posYY = 8;
104-
btnWatch->move(450, posYY);
105-
106-
btnWatch2 = new QCheckBox(ui->layoutEdit2);
107-
108-
btnWatch2->setProperty("cssClass", "btn-watch-password");
109-
btnWatch2->setChecked(false);
110-
111-
btnWatch2->setMinimumSize(BUTTON_CONTACT_SIZE);
112-
btnWatch2->setMaximumSize(BUTTON_CONTACT_SIZE);
113-
114-
btnWatch2->show();
115-
btnWatch2->raise();
116-
117-
btnWatch2->move(450, posYY);
118-
71+
setShadow(ui->layoutEdit);
72+
setShadow(ui->layoutEdit2);
11973

12074
// Setup Caps Lock detection.
12175
ui->passEdit1->installEventFilter(this);
@@ -132,6 +86,7 @@ AskPassphraseDialog::AskPassphraseDialog(Mode mode, QWidget* parent, WalletModel
13286
ui->passEdit1->hide();
13387
ui->layoutEdit->hide();
13488
title = tr("Encrypt wallet");
89+
initWatch(ui->layoutEdit2);
13590
break;
13691
case Mode::UnlockAnonymize:
13792
ui->warningLabel->setText(tr("This operation needs your wallet passphrase to unlock the wallet."));
@@ -141,6 +96,7 @@ AskPassphraseDialog::AskPassphraseDialog(Mode mode, QWidget* parent, WalletModel
14196
ui->passLabel3->hide();
14297
ui->passEdit3->hide();
14398
title = tr("Unlock wallet\nfor staking");
99+
initWatch(ui->layoutEdit);
144100
break;
145101
case Mode::Unlock: // Ask passphrase
146102
ui->warningLabel->setText(tr("This operation needs your wallet passphrase to unlock the wallet."));
@@ -150,6 +106,7 @@ AskPassphraseDialog::AskPassphraseDialog(Mode mode, QWidget* parent, WalletModel
150106
ui->passLabel3->hide();
151107
ui->passEdit3->hide();
152108
title = tr("Unlock wallet");
109+
initWatch(ui->layoutEdit);
153110
break;
154111
case Mode::Decrypt: // Ask passphrase
155112
ui->warningLabel->setText(tr("This operation needs your wallet passphrase to decrypt the wallet."));
@@ -159,18 +116,18 @@ AskPassphraseDialog::AskPassphraseDialog(Mode mode, QWidget* parent, WalletModel
159116
ui->passLabel3->hide();
160117
ui->passEdit3->hide();
161118
title = tr("Decrypt wallet");
119+
initWatch(ui->layoutEdit);
162120
break;
163121
case Mode::ChangePass: // Ask old passphrase + new passphrase x2
164122
title = tr("Change passphrase");
165-
btnWatch2->hide();
166123
ui->warningLabel->setText(tr("Enter the old and new passphrase to the wallet."));
124+
initWatch(ui->layoutEdit);
167125
break;
168126
}
169127

170128
ui->labelTitle->setText(title);
171129

172130
textChanged();
173-
connect(btnWatch2, SIGNAL(clicked()), this, SLOT(onWatch2Clicked()));
174131
connect(btnWatch, SIGNAL(clicked()), this, SLOT(onWatchClicked()));
175132
connect(ui->passEdit1, SIGNAL(textChanged(QString)), this, SLOT(textChanged()));
176133
connect(ui->passEdit2, SIGNAL(textChanged(QString)), this, SLOT(textChanged()));
@@ -180,15 +137,10 @@ AskPassphraseDialog::AskPassphraseDialog(Mode mode, QWidget* parent, WalletModel
180137
}
181138

182139
void AskPassphraseDialog::onWatchClicked(){
183-
ui->passEdit3->setEchoMode(btnWatch->checkState() == Qt::Checked ? QLineEdit::Normal : QLineEdit::Password );
184-
ui->passEdit2->setEchoMode(btnWatch->checkState() == Qt::Checked ? QLineEdit::Normal : QLineEdit::Password );
185-
ui->passEdit1->setEchoMode(btnWatch->checkState() == Qt::Checked ? QLineEdit::Normal : QLineEdit::Password );
186-
}
187-
188-
void AskPassphraseDialog::onWatch2Clicked(){
189-
ui->passEdit3->setEchoMode(btnWatch->checkState() == Qt::Checked ? QLineEdit::Normal : QLineEdit::Password );
190-
ui->passEdit2->setEchoMode(btnWatch->checkState() == Qt::Checked ? QLineEdit::Normal : QLineEdit::Password );
191-
ui->passEdit1->setEchoMode(btnWatch->checkState() == Qt::Checked ? QLineEdit::Normal : QLineEdit::Password );
140+
int state = btnWatch->checkState();
141+
ui->passEdit3->setEchoMode(state == Qt::Checked ? QLineEdit::Normal : QLineEdit::Password );
142+
ui->passEdit2->setEchoMode(state== Qt::Checked ? QLineEdit::Normal : QLineEdit::Password );
143+
ui->passEdit1->setEchoMode(state == Qt::Checked ? QLineEdit::Normal : QLineEdit::Password );
192144
}
193145

194146
AskPassphraseDialog::~AskPassphraseDialog()
@@ -383,4 +335,19 @@ void AskPassphraseDialog::run(int type){
383335
}
384336
void AskPassphraseDialog::onError(int type, QString error){
385337
newpassCache = "";
338+
}
339+
340+
void AskPassphraseDialog::initWatch(QWidget *parent) {
341+
btnWatch = new QCheckBox(parent);
342+
btnWatch->setProperty("cssClass", "btn-watch-password");
343+
btnWatch->setChecked(false);
344+
QSize BUTTON_CONTACT_SIZE = QSize(24, 24);
345+
btnWatch->setMinimumSize(BUTTON_CONTACT_SIZE);
346+
btnWatch->setMaximumSize(BUTTON_CONTACT_SIZE);
347+
btnWatch->show();
348+
btnWatch->raise();
349+
350+
int posXX = ui->layoutEdit->width() - 30;
351+
int posYY = 8;
352+
btnWatch->move(450, posYY);
386353
}

‎src/qt/askpassphrasedialog.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ class AskPassphraseDialog : public QDialog, public Runnable
6868
void run(int type) override;
6969
void onError(int type, QString error) override;
7070
QCheckBox *btnWatch;
71-
QCheckBox *btnWatch2;
71+
72+
void initWatch(QWidget *parent);
7273

7374
private slots:
7475
void onWatchClicked();
75-
void onWatch2Clicked();
7676
void textChanged();
7777
void warningMessage();
7878
void errorEncryptingWallet();

‎src/qt/pivx/dashboardwidget.cpp‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ DashboardWidget::DashboardWidget(PIVXGUI* _window, QWidget *parent) :
7272

7373

7474
// Staking Information
75-
ui->labelMessage->setText("Amount of PIV and zPIV staked.");
75+
ui->labelMessage->setText(tr("Amount of PIV and zPIV staked."));
7676
ui->labelMessage->setProperty("cssClass", "text-subtitle");
7777
ui->labelSquarePiv->setProperty("cssClass", "square-chart-piv");
7878
ui->labelSquarezPiv->setProperty("cssClass", "square-chart-zpiv");
@@ -103,6 +103,7 @@ DashboardWidget::DashboardWidget(PIVXGUI* _window, QWidget *parent) :
103103
ui->pushButtonWeek->setProperty("cssClass", "btn-check-time");
104104
ui->pushButtonMonth->setProperty("cssClass", "btn-check-time");
105105
ui->pushButtonYear->setProperty("cssClass", "btn-check-time");
106+
ui->pushButtonYear->setChecked(true);
106107

107108

108109
// Sort Transactions
@@ -130,40 +131,35 @@ DashboardWidget::DashboardWidget(PIVXGUI* _window, QWidget *parent) :
130131
ui->listTransactions->setAttribute(Qt::WA_MacShowFocusRect, false);
131132
ui->listTransactions->setSelectionBehavior(QAbstractItemView::SelectRows);
132133

133-
//ui->listTransactions->setVisible(false);
134-
135-
// Sync Warning
136-
134+
// Sync Warning
137135
ui->layoutWarning->setVisible(true);
138-
ui->lblWarning->setText("Wait until the wallet is fully synced to see your whole balance");
136+
ui->lblWarning->setText(tr("Please wait until the wallet is fully synced to see your correct balance"));
139137
ui->lblWarning->setProperty("cssClass", "text-warning");
140138
ui->imgWarning->setProperty("cssClass", "ic-warning");
141139

142140
//Empty List
143-
144141
ui->emptyContainer->setVisible(false);
145142
ui->pushImgEmpty->setProperty("cssClass", "img-empty-transactions");
146143

147-
ui->labelEmpty->setText("No transactions yet");
144+
ui->labelEmpty->setText(tr("No transactions yet"));
148145
ui->labelEmpty->setProperty("cssClass", "text-empty");
149146

150147

151148
ui->chartContainer->setProperty("cssClass", "container-chart");
152149

153150
ui->pushImgEmptyChart->setProperty("cssClass", "img-empty-staking-on");
154-
ui->labelEmptyChart->setText("Staking off");
155151

156-
ui->btnHowTo->setText("How to get PIV or zPIV");
152+
ui->btnHowTo->setText(tr("How to get PIV or zPIV"));
157153
ui->btnHowTo->setProperty("cssClass", "btn-secundary");
158154

159155
// Staking off
160156
//ui->pushImgEmptyChart->setProperty("cssClass", "img-empty-staking-off");
161157
//ui->labelEmptyChart->setText("Staking off");
162158

163-
ui->labelEmptyChart->setText("Staking off");
159+
ui->labelEmptyChart->setText(tr("Staking off"));
164160
ui->labelEmptyChart->setProperty("cssClass", "text-empty");
165161

166-
ui->labelMessageEmpty->setText("You can activate and deactivate the Staking mode in the status bar at the top right of the wallet");
162+
ui->labelMessageEmpty->setText(tr("You can activate and deactivate the Staking mode in the status bar at the top right of the wallet"));
167163
ui->labelMessageEmpty->setProperty("cssClass", "text-subtitle");
168164

169165
// Chart State

0 commit comments

Comments
 (0)