Skip to content

Commit 04b13c5

Browse files
committed
Merge branch 'new_gui_rebased_final' of github.com:furszy/PIVX into new_gui_rebased_final
2 parents 86b30ee + a71faa0 commit 04b13c5

File tree

6 files changed

+46
-3
lines changed

6 files changed

+46
-3
lines changed

src/qt/pivx/dashboardwidget.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,11 @@ void DashboardWidget::onChartMonthChanged(const QString& monthStr) {
479479
if (newMonth != monthFilter) {
480480
monthFilter = newMonth;
481481
refreshChart();
482+
#ifndef Q_OS_MAC
483+
// quick hack to re paint the chart view.
484+
chart->removeSeries(series);
485+
chart->addSeries(series);
486+
#endif
482487
}
483488
}
484489
}

src/qt/pivx/res/css/style_dark.css

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1994,15 +1994,19 @@ QComboBox QAbstractItemView {
19941994
min-width: 150px;
19951995
border-radius:0px;
19961996
font-size:16px;
1997+
outline: 0px;
19971998
}
19981999

2000+
QComboBox::selected:item { border: none; outline: 0px; }
2001+
19992002
QComboBox QAbstractItemView::item {
20002003
margin:0px;
20012004
background-color: #FFFFFF;
20022005
padding:10px 20px;
20032006
font-size:16px;
20042007
color: #707070;
20052008
border-radius:0px;
2009+
outline: 0px;
20062010
}
20072011
QComboBox QAbstractItemView::item:selected {
20082012
background-color: #d8d5e0;
@@ -2011,6 +2015,17 @@ QComboBox QAbstractItemView::item:selected {
20112015
margin:0px;
20122016
color: #5c4b7d;
20132017
border-radius:0px;
2018+
outline: 0px;
2019+
}
2020+
2021+
QComboBox QAbstractItemView QPushButton{
2022+
border:0px;
2023+
outline: 0px;
2024+
}
2025+
2026+
QComboBox QAbstractItemView::item:selected QPushButton:hover{
2027+
border:0px;
2028+
outline: 0px;
20142029
}
20152030

20162031
/*HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH

src/qt/pivx/res/css/style_light.css

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1362,8 +1362,8 @@ QPushButton[cssClass="btn-secundary-clear"]:pressed {
13621362
}
13631363

13641364
QPushButton[cssClass="btn-secundary-new-address"] {
1365-
qproperty-icon: url("://ic-update") off,
1366-
url("://ic-update") on ;
1365+
qproperty-icon: url("://ic-update") off,
1366+
url("://ic-update") on ;
13671367
qproperty-iconSize: 30px 30px;
13681368
border: 1px solid #335c4b7d;
13691369
background-color:#FFFFFF;
@@ -1984,22 +1984,28 @@ QComboBox::down-arrow:on { /* shift the arrow when popup is open */
19841984
QComboBox:item {
19851985
color: #707070;
19861986
font-size:18px;
1987+
outline: 0px;
19871988
}
19881989

19891990
QComboBox QAbstractItemView {
19901991
margin:0px;
19911992
min-width: 150px;
19921993
border-radius:0px;
19931994
font-size:16px;
1995+
outline: 0px;
19941996
}
19951997

1998+
QComboBox::selected:item { border: none; outline: 0px; }
1999+
19962000
QComboBox QAbstractItemView::item {
19972001
margin:0px;
19982002
background-color: #FFFFFF;
19992003
padding:10px 20px;
20002004
font-size:16px;
20012005
color: #707070;
20022006
border-radius:0px;
2007+
border:0px;
2008+
outline: 0px;
20032009
}
20042010
QComboBox QAbstractItemView::item:selected {
20052011
background-color: #d8d5e0;
@@ -2008,8 +2014,19 @@ QComboBox QAbstractItemView::item:selected {
20082014
margin:0px;
20092015
color: #5c4b7d;
20102016
border-radius:0px;
2017+
border:none;
2018+
outline: 0px;
20112019
}
20122020

2021+
QComboBox QAbstractItemView QPushButton{
2022+
border:0px;
2023+
outline: 0px;
2024+
}
2025+
2026+
QComboBox QAbstractItemView::item:selected QPushButton:hover{
2027+
border:0px;
2028+
outline: 0px;
2029+
}
20132030
/*HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH
20142031
HH RADIO BUTTON
20152032
HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/
@@ -3085,4 +3102,4 @@ QRadioButton[cssClass="radio-welcome"]::indicator:unchecked {
30853102
background: url("://btn-radio-off");
30863103
background-repeat:no-repeat;
30873104
background-position:center;
3088-
}
3105+
}

src/qt/pivx/send.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -833,6 +833,10 @@ void SendWidget::resizeMenu(){
833833
}
834834
}
835835

836+
void SendWidget::changeTheme(bool isLightTheme, QString& theme){
837+
if (coinControlDialog) coinControlDialog->setStyleSheet(theme);
838+
}
839+
836840
SendWidget::~SendWidget(){
837841
delete ui;
838842
}

src/qt/pivx/send.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public slots:
5353
void onOpenUriClicked();
5454
void onValueChanged();
5555
void refreshAmounts();
56+
void changeTheme(bool isLightTheme, QString &theme) override;
5657

5758
protected:
5859
void resizeEvent(QResizeEvent *event) override;

src/qt/pivx/settings/settingsmultisendwidget.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ SettingsMultisendWidget::SettingsMultisendWidget(PWidget *parent) :
167167
ui->checkBoxStake->setText(tr("Send stakes"));
168168
ui->checkBoxRewards->setText(tr("Send masternode rewards"));
169169

170+
setCssProperty(ui->listView, "container");
170171
ui->listView->setItemDelegate(delegate);
171172
ui->listView->setIconSize(QSize(DECORATION_SIZE, DECORATION_SIZE));
172173
ui->listView->setMinimumHeight(NUM_ITEMS * (DECORATION_SIZE + 2));

0 commit comments

Comments
 (0)