From c09c96b5178684499a277f03fe9130ff95f90262 Mon Sep 17 00:00:00 2001 From: EverGreenCoinDev Date: Wed, 23 Mar 2022 13:14:56 -0400 Subject: [PATCH] v1.9.5.2 build revisions. --- EverGreenCoin-qt.pro | 6 +++--- src/clientversion.h | 2 +- src/qt/bitcoingui.cpp | 2 +- src/qt/forms/qrcodedialog.ui | 14 +++++++++++--- src/qt/forms/rpcconsole.ui | 3 +++ src/qt/forms/statisticspage.ui | 2 +- src/qt/res/styles/style.qss | 9 ++++++--- src/qt/sendcoinsdialog.cpp | 2 +- 8 files changed, 27 insertions(+), 13 deletions(-) diff --git a/EverGreenCoin-qt.pro b/EverGreenCoin-qt.pro index f23dafc..be18591 100644 --- a/EverGreenCoin-qt.pro +++ b/EverGreenCoin-qt.pro @@ -3,9 +3,9 @@ ############################################################################################### TEMPLATE = app DEFINES += fName1 fName2 -fName1 = "EverGreenCoin-Qt" -macx:TARGET = "EverGreenCoin-Qt" -VERSION = 1.9.5.1 +fName1 = "EverGreenCoin-Core" +macx:TARGET = "EverGreenCoin-Core" +VERSION = 1.9.5.2 QMAKE_TARGET_BUNDLE_PREFIX = co.evergreen contains(QT_ARCH, i386) { fName2 = "-qt-x86-v" diff --git a/src/clientversion.h b/src/clientversion.h index 2e2042a..51414b1 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -9,7 +9,7 @@ #define CLIENT_VERSION_MAJOR 1 #define CLIENT_VERSION_MINOR 9 #define CLIENT_VERSION_REVISION 5 -#define CLIENT_VERSION_BUILD 1 +#define CLIENT_VERSION_BUILD 2 // Converts the parameter X to a string after macro replacement on X has been performed. // Don't merge these into one macro! diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index ebf63a8..4565944 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -90,7 +90,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent): QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); #endif - resize(1250, 1000); + resize(937.5, 750); this->setGeometry(QStyle::alignedRect(Qt::LeftToRight, Qt::AlignCenter, this->size(), QApplication::desktop()->screenGeometry())); setWindowTitle(tr("EverGreenCoin® Core - Wallet v1.9.5") ); #ifndef Q_OS_MAC diff --git a/src/qt/forms/qrcodedialog.ui b/src/qt/forms/qrcodedialog.ui index 583315d..54894e7 100644 --- a/src/qt/forms/qrcodedialog.ui +++ b/src/qt/forms/qrcodedialog.ui @@ -7,7 +7,7 @@ 0 0 340 - 534 + 539 @@ -102,7 +102,11 @@ - + + + color: #ffffff; + + @@ -124,7 +128,11 @@ - + + + color: #ffffff; + + diff --git a/src/qt/forms/rpcconsole.ui b/src/qt/forms/rpcconsole.ui index 34b57c3..4252054 100644 --- a/src/qt/forms/rpcconsole.ui +++ b/src/qt/forms/rpcconsole.ui @@ -197,6 +197,9 @@ false + + background-color: transparent; + diff --git a/src/qt/forms/statisticspage.ui b/src/qt/forms/statisticspage.ui index 29c01c6..1bb70ac 100644 --- a/src/qt/forms/statisticspage.ui +++ b/src/qt/forms/statisticspage.ui @@ -541,7 +541,7 @@ QFormLayout::ExpandingFieldsGrow - Qt::AlignCenter + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter Qt::AlignHCenter|Qt::AlignTop diff --git a/src/qt/res/styles/style.qss b/src/qt/res/styles/style.qss index 8f9d950..322cca4 100644 --- a/src/qt/res/styles/style.qss +++ b/src/qt/res/styles/style.qss @@ -60,10 +60,13 @@ QLabel { } QMessageBox { - color: #ffffff; background-color: rgba(1,132,87,50); } +QMessageBox QLabel { + color: #ffffff; +} + QCheckBox { border-radius: 2px; border-width: 2; @@ -238,8 +241,8 @@ QTableView { } QHeaderView { color: #000000; background: transparent; } /* QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #155f30, stop: 0.05 #018457, stop: 0.95 #018457, stop: 1 #155f30); background-image: none; qproperty-defaultAlignment: AlignHCenter; } */ -QHeaderView::section { color: #000000; background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #155f30, stop: 0.05 #018457, stop: 0.95 #018457, stop: 1 #155f30); background-image: none; qproperty-defaultAlignment: AlignHCenter; } -QHeaderView::section:checked { selection-background-color: rgb(1,132,87); } +QHeaderView::section { color: #000000; background-color: rgba(1,132,87,50); qproperty-defaultAlignment: AlignHCenter; } +QHeaderView::section:checked { selection-background-color: rgba(1,132,87,50); } QTabWidget { border: 2px solid #018457; diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index 522903d..24771e9 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -150,7 +150,7 @@ void SendCoinsDialog::on_sendButton_clicked() fNewRecipientAllowed = false; - QMessageBox::StandardButton retval = QMessageBox::question(this, tr("Confirm send EverGreenCoin"), + QMessageBox::StandardButton retval = QMessageBox::question(this, tr("Confirm Send EverGreenCoin"), tr("Are you sure you want to send %1?").arg(formatted.join(tr(" and "))), QMessageBox::Yes|QMessageBox::Cancel, QMessageBox::Cancel);