Skip to content

Commit a44b563

Browse files
furszyfurszy
committed
qtutils, init editline + shadow method created.
1 parent b82802f commit a44b563

File tree

7 files changed

+33
-48
lines changed

7 files changed

+33
-48
lines changed

‎src/qt/askpassphrasedialog.cpp‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
#include "guiconstants.h"
1111
#include "guiutil.h"
1212
#include "walletmodel.h"
13+
#include "qt/pivx/qtutils.h"
1314

1415
#include "allocators.h"
1516

1617
#include <QKeyEvent>
1718
#include <QMessageBox>
1819
#include <QPushButton>
1920
#include <QWidget>
20-
#include <QGraphicsDropShadowEffect>
2121

2222
AskPassphraseDialog::AskPassphraseDialog(Mode mode, QWidget* parent, WalletModel* model, Context context) : QDialog(parent, Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowCloseButtonHint),
2323
ui(new Ui::AskPassphraseDialog),
@@ -36,25 +36,15 @@ AskPassphraseDialog::AskPassphraseDialog(Mode mode, QWidget* parent, WalletModel
3636

3737
ui->warningLabel->setProperty("cssClass", "text-subtitle");
3838

39-
QGraphicsDropShadowEffect* shadowEffect = new QGraphicsDropShadowEffect();
40-
shadowEffect->setColor(QColor(0, 0, 0, 22));
41-
shadowEffect->setXOffset(0);
42-
shadowEffect->setYOffset(3);
43-
shadowEffect->setBlurRadius(6);
44-
4539
ui->btnEsc->setText("");
4640
ui->btnEsc->setProperty("cssClass", "ic-close");
4741

4842
ui->pushButtonOk->setText("OK");
4943
ui->pushButtonOk->setProperty("cssClass", "btn-primary");
5044

51-
ui->passEdit1->setGraphicsEffect(shadowEffect);
52-
ui->passEdit2->setGraphicsEffect(shadowEffect);
53-
ui->passEdit3->setGraphicsEffect(shadowEffect);
54-
55-
ui->passEdit1->setProperty("cssClass", "edit-primary");
56-
ui->passEdit2->setProperty("cssClass", "edit-primary");
57-
ui->passEdit3->setProperty("cssClass", "edit-primary");
45+
initCssEditLine(ui->passEdit1);
46+
initCssEditLine(ui->passEdit2);
47+
initCssEditLine(ui->passEdit3);
5848

5949
ui->passLabel1->setText("Current passphrase");
6050
ui->passLabel1->setProperty("cssClass", "text-title");
@@ -65,10 +55,6 @@ AskPassphraseDialog::AskPassphraseDialog(Mode mode, QWidget* parent, WalletModel
6555
ui->passLabel3->setText("Repeat passphrase");
6656
ui->passLabel3->setProperty("cssClass", "text-title");
6757

68-
ui->passEdit1->setAttribute(Qt::WA_MacShowFocusRect, 0);
69-
ui->passEdit2->setAttribute(Qt::WA_MacShowFocusRect, 0);
70-
ui->passEdit3->setAttribute(Qt::WA_MacShowFocusRect, 0);
71-
7258
ui->passEdit1->setMinimumSize(ui->passEdit1->sizeHint());
7359
ui->passEdit2->setMinimumSize(ui->passEdit2->sizeHint());
7460
ui->passEdit3->setMinimumSize(ui->passEdit3->sizeHint());

‎src/qt/pivx/forms/sendmultirow.ui‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<number>20</number>
4040
</property>
4141
<property name="bottomMargin">
42-
<number>0</number>
42+
<number>5</number>
4343
</property>
4444
<item alignment="Qt::AlignTop">
4545
<widget class="QWidget" name="widget" native="true">

‎src/qt/pivx/qtutils.cpp‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
#include <QFile>
88
#include <QStyle>
9+
#include <QGraphicsDropShadowEffect>
910

1011
// Open dialog at the bottom
1112
bool openDialog(QDialog *widget, PIVXGUI *gui){
@@ -188,6 +189,12 @@ QColor getRowColor(bool isLightTheme, bool isHovered, bool isSelected){
188189
}
189190
}
190191

192+
void initCssEditLine(QLineEdit *edit){
193+
setCssEditLine(edit, true, false);
194+
setShadow(edit);
195+
edit->setAttribute(Qt::WA_MacShowFocusRect, 0);
196+
}
197+
191198
void setCssEditLine(QLineEdit *edit, bool isValid, bool forceUpdate){
192199
setCssProperty(edit, isValid ? "edit-primary" : "edit-primary-error", forceUpdate);
193200
}
@@ -196,6 +203,15 @@ void setCssEditLineDialog(QLineEdit *edit, bool isValid, bool forceUpdate){
196203
setCssProperty(edit, isValid ? "edit-primary-dialog" : "edit-primary-dialog-error", forceUpdate);
197204
}
198205

206+
void setShadow(QWidget *edit){
207+
QGraphicsDropShadowEffect* shadowEffect = new QGraphicsDropShadowEffect();
208+
shadowEffect->setColor(QColor(0, 0, 0, 22));
209+
shadowEffect->setXOffset(0);
210+
shadowEffect->setYOffset(3);
211+
shadowEffect->setBlurRadius(6);
212+
edit->setGraphicsEffect(shadowEffect);
213+
}
214+
199215
void setCssBtnPrimary(QPushButton *btn, bool forceUpdate){
200216
setCssProperty(btn, "btn-primary", forceUpdate);
201217
}

‎src/qt/pivx/qtutils.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,10 @@ QString getDarkTheme();
5050
bool isLightTheme();
5151
void setTheme(bool isLight);
5252

53+
void initCssEditLine(QLineEdit *edit);
5354
void setCssEditLine(QLineEdit *edit, bool isValid, bool forceUpdate = false);
5455
void setCssEditLineDialog(QLineEdit *edit, bool isValid, bool forceUpdate = false);
56+
void setShadow(QWidget *edit);
5557

5658
void setCssBtnPrimary(QPushButton *btn, bool forceUpdate = false);
5759
void setCssBtnSecondary(QPushButton *btn, bool forceUpdate = false);

‎src/qt/pivx/sendmultirow.cpp‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include "qt/pivx/sendmultirow.h"
22
#include "qt/pivx/forms/ui_sendmultirow.h"
3-
#include <QGraphicsDropShadowEffect>
43
#include <QDoubleValidator>
54

65
#include "optionsmodel.h"
@@ -17,22 +16,16 @@ SendMultiRow::SendMultiRow(QWidget *parent) :
1716

1817
this->setStyleSheet(parent->styleSheet());
1918

20-
QGraphicsDropShadowEffect* shadowEffect = new QGraphicsDropShadowEffect();
21-
shadowEffect->setColor(QColor(0, 0, 0, 22));
22-
shadowEffect->setXOffset(0);
23-
shadowEffect->setYOffset(3);
24-
shadowEffect->setBlurRadius(6);
25-
2619
ui->lineEditAddress->setPlaceholderText("Add address");
2720
ui->lineEditAddress->setProperty("cssClass", "edit-primary-multi-book");
2821
ui->lineEditAddress->setAttribute(Qt::WA_MacShowFocusRect, 0);
29-
ui->stackedAddress->setGraphicsEffect(shadowEffect);
22+
setShadow(ui->stackedAddress);
3023

3124
ui->lineEditAmount->setPlaceholderText("0.00 zPIV ");
3225
setCssEditLine(ui->lineEditAmount, true, false);
26+
setShadow(ui->lineEditAmount);
3327
ui->lineEditAmount->setValidator(new QDoubleValidator(0, 100000000000, 7, this) );
3428
ui->lineEditAmount->setAttribute(Qt::WA_MacShowFocusRect, 0);
35-
ui->lineEditAmount->setGraphicsEffect(shadowEffect);
3629

3730
/* Description */
3831

@@ -42,7 +35,7 @@ SendMultiRow::SendMultiRow(QWidget *parent) :
4235
ui->lineEditDescription->setPlaceholderText("Add descripcion ");
4336
ui->lineEditDescription->setProperty("cssClass", "edit-primary");
4437
ui->lineEditDescription->setAttribute(Qt::WA_MacShowFocusRect, 0);
45-
ui->lineEditDescription->setGraphicsEffect(shadowEffect);
38+
setShadow(ui->lineEditDescription);
4639

4740
// Button Contact
4841

‎src/qt/pivx/settings/settingsmainoptionswidget.cpp‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "bitcoinunits.h"
1111
#include "guiutil.h"
1212
#include "optionsmodel.h"
13+
#include "qt/pivx/qtutils.h"
1314

1415
#include "main.h" // for MAX_SCRIPTCHECK_THREADS
1516
#include "netbase.h"
@@ -77,23 +78,15 @@ SettingsMainOptionsWidget::SettingsMainOptionsWidget(PIVXGUI* _window, QWidget *
7778

7879
// Combobox
7980

80-
81-
QGraphicsDropShadowEffect* shadowEffect = new QGraphicsDropShadowEffect();
82-
shadowEffect->setColor(QColor(0, 0, 0, 22));
83-
shadowEffect->setXOffset(0);
84-
shadowEffect->setYOffset(3);
85-
shadowEffect->setBlurRadius(6);
86-
87-
8881
ui->databaseCache->setProperty("cssClass", "btn-spin-box");
8982
ui->databaseCache->setAttribute(Qt::WA_MacShowFocusRect, 0);
90-
ui->databaseCache->setGraphicsEffect(shadowEffect);
83+
setShadow(ui->databaseCache);
9184
ui->threadsScriptVerif->setProperty("cssClass", "btn-spin-box");
9285
ui->threadsScriptVerif->setAttribute(Qt::WA_MacShowFocusRect, 0);
93-
ui->threadsScriptVerif->setGraphicsEffect(shadowEffect);
86+
setShadow(ui->threadsScriptVerif);
9487
ui->zeromintPercentage->setProperty("cssClass", "btn-spin-box");
9588
ui->zeromintPercentage->setAttribute(Qt::WA_MacShowFocusRect, 0);
96-
ui->zeromintPercentage->setGraphicsEffect(shadowEffect);
89+
setShadow(ui->zeromintPercentage);
9790
ui->comboBoxDenomzPiv->setProperty("cssClass", "btn-combo-options");
9891
QListView * listView = new QListView();
9992
ui->comboBoxDenomzPiv->setView(listView);

‎src/qt/pivx/settings/settingsnetworkwidget.cpp‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#include "qt/pivx/settings/forms/ui_settingsnetworkwidget.h"
33
#include "QGraphicsDropShadowEffect"
44
#include "optionsmodel.h"
5+
#include "qt/pivx/qtutils.h"
56

67
SettingsNetworkWidget::SettingsNetworkWidget(PIVXGUI* _window, QWidget *parent) :
78
PWidget(_window, parent),
@@ -32,16 +33,10 @@ SettingsNetworkWidget::SettingsNetworkWidget(PIVXGUI* _window, QWidget *parent)
3233
ui->labelSubtitleProxy->setText("Proxy IP:");
3334
ui->labelSubtitleProxy->setProperty("cssClass", "text-main-grey");
3435

35-
QGraphicsDropShadowEffect* shadowEffect = new QGraphicsDropShadowEffect();
36-
shadowEffect->setColor(QColor(0, 0, 0, 22));
37-
shadowEffect->setXOffset(0);
38-
shadowEffect->setYOffset(3);
39-
shadowEffect->setBlurRadius(6);
40-
4136
ui->lineEditProxy->setPlaceholderText("Enter proxy IP");
4237
ui->lineEditProxy->setProperty("cssClass", "edit-primary");
4338
ui->lineEditProxy->setAttribute(Qt::WA_MacShowFocusRect, 0);
44-
ui->lineEditProxy->setGraphicsEffect(shadowEffect);
39+
setShadow(ui->lineEditProxy);
4540
// Port
4641

4742
ui->labelSubtitlePort->setText("Port:");
@@ -50,7 +45,7 @@ SettingsNetworkWidget::SettingsNetworkWidget(PIVXGUI* _window, QWidget *parent)
5045
ui->lineEditPort->setPlaceholderText("Enter port");
5146
ui->lineEditPort->setProperty("cssClass", "edit-primary");
5247
ui->lineEditPort->setAttribute(Qt::WA_MacShowFocusRect, 0);
53-
ui->lineEditPort->setGraphicsEffect(shadowEffect);
48+
setShadow(ui->lineEditPort);
5449

5550
// Radio buttons
5651

0 commit comments

Comments
 (0)