diff --git a/src/qt/assetsdialog.cpp b/src/qt/assetsdialog.cpp index af906caeea..21dcc01bdc 100644 --- a/src/qt/assetsdialog.cpp +++ b/src/qt/assetsdialog.cpp @@ -228,35 +228,35 @@ void AssetsDialog::setupAssetControlFrame(const PlatformStyle *platformStyle) ui->frameAssetControl->setGraphicsEffect(GUIUtil::getShadowEffect()); - ui->labelAssetControlFeatures->setStyleSheet(COLOR_LABEL_STRING); + ui->labelAssetControlFeatures->setStyleSheet(STRING_LABEL_COLOR); ui->labelAssetControlFeatures->setFont(GUIUtil::getTopLabelFont()); - ui->labelAssetControlQuantityText->setStyleSheet(COLOR_LABEL_STRING); + ui->labelAssetControlQuantityText->setStyleSheet(STRING_LABEL_COLOR); ui->labelAssetControlQuantityText->setFont(GUIUtil::getSubLabelFont()); - ui->labelAssetControlAmountText->setStyleSheet(COLOR_LABEL_STRING); + ui->labelAssetControlAmountText->setStyleSheet(STRING_LABEL_COLOR); ui->labelAssetControlAmountText->setFont(GUIUtil::getSubLabelFont()); - ui->labelAssetControlFeeText->setStyleSheet(COLOR_LABEL_STRING); + ui->labelAssetControlFeeText->setStyleSheet(STRING_LABEL_COLOR); ui->labelAssetControlFeeText->setFont(GUIUtil::getSubLabelFont()); - ui->labelAssetControlAfterFeeText->setStyleSheet(COLOR_LABEL_STRING); + ui->labelAssetControlAfterFeeText->setStyleSheet(STRING_LABEL_COLOR); ui->labelAssetControlAfterFeeText->setFont(GUIUtil::getSubLabelFont()); - ui->labelAssetControlBytesText->setStyleSheet(COLOR_LABEL_STRING); + ui->labelAssetControlBytesText->setStyleSheet(STRING_LABEL_COLOR); ui->labelAssetControlBytesText->setFont(GUIUtil::getSubLabelFont()); - ui->labelAssetControlLowOutputText->setStyleSheet(COLOR_LABEL_STRING); + ui->labelAssetControlLowOutputText->setStyleSheet(STRING_LABEL_COLOR); ui->labelAssetControlLowOutputText->setFont(GUIUtil::getSubLabelFont()); - ui->labelAssetControlChangeText->setStyleSheet(COLOR_LABEL_STRING); + ui->labelAssetControlChangeText->setStyleSheet(STRING_LABEL_COLOR); ui->labelAssetControlChangeText->setFont(GUIUtil::getSubLabelFont()); // Align the other labels next to the input buttons to the text in the same height - ui->labelAssetControlAutomaticallySelected->setStyleSheet(COLOR_LABEL_STRING); + ui->labelAssetControlAutomaticallySelected->setStyleSheet(STRING_LABEL_COLOR); // Align the Custom change address checkbox - ui->checkBoxAssetControlChange->setStyleSheet(QString(".QCheckBox{ %1; }").arg(COLOR_LABEL_STRING)); + ui->checkBoxAssetControlChange->setStyleSheet(QString(".QCheckBox{ %1; }").arg(STRING_LABEL_COLOR)); ui->labelAssetControlQuantity->setFont(GUIUtil::getSubLabelFont()); ui->labelAssetControlAmount->setFont(GUIUtil::getSubLabelFont()); @@ -291,14 +291,14 @@ void AssetsDialog::setupFeeControl(const PlatformStyle *platformStyle) ui->frameFee->setGraphicsEffect(GUIUtil::getShadowEffect()); - ui->labelFeeHeadline->setStyleSheet(COLOR_LABEL_STRING); + ui->labelFeeHeadline->setStyleSheet(STRING_LABEL_COLOR); ui->labelFeeHeadline->setFont(GUIUtil::getSubLabelFont()); - ui->labelSmartFee3->setStyleSheet(COLOR_LABEL_STRING); - ui->labelCustomPerKilobyte->setStyleSheet(QString(".QLabel{ %1; }").arg(COLOR_LABEL_STRING)); - ui->radioSmartFee->setStyleSheet(COLOR_LABEL_STRING); - ui->radioCustomFee->setStyleSheet(COLOR_LABEL_STRING); - ui->checkBoxMinimumFee->setStyleSheet(QString(".QCheckBox{ %1; }").arg(COLOR_LABEL_STRING)); + ui->labelSmartFee3->setStyleSheet(STRING_LABEL_COLOR); + ui->labelCustomPerKilobyte->setStyleSheet(QString(".QLabel{ %1; }").arg(STRING_LABEL_COLOR)); + ui->radioSmartFee->setStyleSheet(STRING_LABEL_COLOR); + ui->radioCustomFee->setStyleSheet(STRING_LABEL_COLOR); + ui->checkBoxMinimumFee->setStyleSheet(QString(".QCheckBox{ %1; }").arg(STRING_LABEL_COLOR)); ui->buttonChooseFee->setFont(GUIUtil::getSubLabelFont()); ui->fallbackFeeWarningLabel->setFont(GUIUtil::getSubLabelFont()); diff --git a/src/qt/createassetdialog.cpp b/src/qt/createassetdialog.cpp index c068587d3a..f858c8b3d5 100644 --- a/src/qt/createassetdialog.cpp +++ b/src/qt/createassetdialog.cpp @@ -278,35 +278,35 @@ void CreateAssetDialog::setupCoinControlFrame(const PlatformStyle *platformStyle ui->frameCoinControl->setGraphicsEffect(GUIUtil::getShadowEffect()); - ui->labelCoinControlFeatures->setStyleSheet(COLOR_LABEL_STRING); + ui->labelCoinControlFeatures->setStyleSheet(STRING_LABEL_COLOR); ui->labelCoinControlFeatures->setFont(GUIUtil::getTopLabelFont()); - ui->labelCoinControlQuantityText->setStyleSheet(COLOR_LABEL_STRING); + ui->labelCoinControlQuantityText->setStyleSheet(STRING_LABEL_COLOR); ui->labelCoinControlQuantityText->setFont(GUIUtil::getSubLabelFont()); - ui->labelCoinControlAmountText->setStyleSheet(COLOR_LABEL_STRING); + ui->labelCoinControlAmountText->setStyleSheet(STRING_LABEL_COLOR); ui->labelCoinControlAmountText->setFont(GUIUtil::getSubLabelFont()); - ui->labelCoinControlFeeText->setStyleSheet(COLOR_LABEL_STRING); + ui->labelCoinControlFeeText->setStyleSheet(STRING_LABEL_COLOR); ui->labelCoinControlFeeText->setFont(GUIUtil::getSubLabelFont()); - ui->labelCoinControlAfterFeeText->setStyleSheet(COLOR_LABEL_STRING); + ui->labelCoinControlAfterFeeText->setStyleSheet(STRING_LABEL_COLOR); ui->labelCoinControlAfterFeeText->setFont(GUIUtil::getSubLabelFont()); - ui->labelCoinControlBytesText->setStyleSheet(COLOR_LABEL_STRING); + ui->labelCoinControlBytesText->setStyleSheet(STRING_LABEL_COLOR); ui->labelCoinControlBytesText->setFont(GUIUtil::getSubLabelFont()); - ui->labelCoinControlLowOutputText->setStyleSheet(COLOR_LABEL_STRING); + ui->labelCoinControlLowOutputText->setStyleSheet(STRING_LABEL_COLOR); ui->labelCoinControlLowOutputText->setFont(GUIUtil::getSubLabelFont()); - ui->labelCoinControlChangeText->setStyleSheet(COLOR_LABEL_STRING); + ui->labelCoinControlChangeText->setStyleSheet(STRING_LABEL_COLOR); ui->labelCoinControlChangeText->setFont(GUIUtil::getSubLabelFont()); // Align the other labels next to the input buttons to the text in the same height - ui->labelCoinControlAutomaticallySelected->setStyleSheet(COLOR_LABEL_STRING); + ui->labelCoinControlAutomaticallySelected->setStyleSheet(STRING_LABEL_COLOR); // Align the Custom change address checkbox - ui->checkBoxCoinControlChange->setStyleSheet(QString(".QCheckBox{ %1; }").arg(COLOR_LABEL_STRING)); + ui->checkBoxCoinControlChange->setStyleSheet(QString(".QCheckBox{ %1; }").arg(STRING_LABEL_COLOR)); } @@ -317,23 +317,23 @@ void CreateAssetDialog::setupAssetDataView(const PlatformStyle *platformStyle) ui->frameAssetData->setStyleSheet(QString(".QFrame {background-color: %1; padding-top: 10px; padding-right: 5px; border: none;}").arg(platformStyle->WidgetBackGroundColor().name())); ui->frameAssetData->setGraphicsEffect(GUIUtil::getShadowEffect()); - ui->assetTypeLabel->setStyleSheet(COLOR_LABEL_STRING); + ui->assetTypeLabel->setStyleSheet(STRING_LABEL_COLOR); ui->assetTypeLabel->setFont(GUIUtil::getSubLabelFont()); - ui->assetNameLabel->setStyleSheet(COLOR_LABEL_STRING); + ui->assetNameLabel->setStyleSheet(STRING_LABEL_COLOR); ui->assetNameLabel->setFont(GUIUtil::getSubLabelFont()); - ui->addressLabel->setStyleSheet(COLOR_LABEL_STRING); + ui->addressLabel->setStyleSheet(STRING_LABEL_COLOR); ui->addressLabel->setFont(GUIUtil::getSubLabelFont()); - ui->quantityLabel->setStyleSheet(COLOR_LABEL_STRING); + ui->quantityLabel->setStyleSheet(STRING_LABEL_COLOR); ui->quantityLabel->setFont(GUIUtil::getSubLabelFont()); - ui->unitsLabel->setStyleSheet(COLOR_LABEL_STRING); + ui->unitsLabel->setStyleSheet(STRING_LABEL_COLOR); ui->unitsLabel->setFont(GUIUtil::getSubLabelFont()); - ui->reissuableBox->setStyleSheet(QString(".QCheckBox{ %1; }").arg(COLOR_LABEL_STRING)); - ui->ipfsBox->setStyleSheet(QString(".QCheckBox{ %1; }").arg(COLOR_LABEL_STRING)); + ui->reissuableBox->setStyleSheet(QString(".QCheckBox{ %1; }").arg(STRING_LABEL_COLOR)); + ui->ipfsBox->setStyleSheet(QString(".QCheckBox{ %1; }").arg(STRING_LABEL_COLOR)); } @@ -345,14 +345,14 @@ void CreateAssetDialog::setupFeeControl(const PlatformStyle *platformStyle) ui->frameFee->setGraphicsEffect(GUIUtil::getShadowEffect()); - ui->labelFeeHeadline->setStyleSheet(COLOR_LABEL_STRING); + ui->labelFeeHeadline->setStyleSheet(STRING_LABEL_COLOR); ui->labelFeeHeadline->setFont(GUIUtil::getSubLabelFont()); - ui->labelSmartFee3->setStyleSheet(COLOR_LABEL_STRING); - ui->labelCustomPerKilobyte->setStyleSheet(QString(".QLabel{ %1; }").arg(COLOR_LABEL_STRING)); - ui->radioSmartFee->setStyleSheet(COLOR_LABEL_STRING); - ui->radioCustomFee->setStyleSheet(COLOR_LABEL_STRING); - ui->checkBoxMinimumFee->setStyleSheet(QString(".QCheckBox{ %1; }").arg(COLOR_LABEL_STRING)); + ui->labelSmartFee3->setStyleSheet(STRING_LABEL_COLOR); + ui->labelCustomPerKilobyte->setStyleSheet(QString(".QLabel{ %1; }").arg(STRING_LABEL_COLOR)); + ui->radioSmartFee->setStyleSheet(STRING_LABEL_COLOR); + ui->radioCustomFee->setStyleSheet(STRING_LABEL_COLOR); + ui->checkBoxMinimumFee->setStyleSheet(QString(".QCheckBox{ %1; }").arg(STRING_LABEL_COLOR)); ui->buttonChooseFee->setFont(GUIUtil::getSubLabelFont()); ui->fallbackFeeWarningLabel->setFont(GUIUtil::getSubLabelFont()); diff --git a/src/qt/forms/reissueassetdialog.ui b/src/qt/forms/reissueassetdialog.ui index 0a8899b28a..87225c9699 100644 --- a/src/qt/forms/reissueassetdialog.ui +++ b/src/qt/forms/reissueassetdialog.ui @@ -17,19 +17,19 @@ - 34 + 16 - 40 + 20 - 40 + 20 - 40 + 20 - 40 + 20 @@ -676,7 +676,7 @@ 21000000000.000000000000000 - 1.000000000000000 + 0.000000000000000 @@ -884,7 +884,7 @@ 0 - Qt::ScrollBarAlwaysOff + Qt::ScrollBarAsNeeded Qt::ScrollBarAsNeeded @@ -946,7 +946,7 @@ - Qt::ScrollBarAlwaysOff + Qt::ScrollBarAsNeeded Qt::ScrollBarAsNeeded diff --git a/src/qt/guiconstants.h b/src/qt/guiconstants.h index 941d6c26fa..b14cd2b23c 100644 --- a/src/qt/guiconstants.h +++ b/src/qt/guiconstants.h @@ -38,6 +38,11 @@ static const bool DEFAULT_SPLASHSCREEN = true; /* Widget Background color - default color */ #define COLOR_WHITE QColor(255, 255, 255) +#define COLOR_WALLETFRAME_SHADOW QColor(0,0,0,71) + +/* Color of labels */ +#define COLOR_LABELS QColor("#4960ad") + /** LIGHT MODE */ /* Background color, very light gray */ #define COLOR_BACKGROUND_LIGHT QColor("#fbfbfe") @@ -52,9 +57,8 @@ static const bool DEFAULT_SPLASHSCREEN = true; /* Ravencoin asset text */ #define COLOR_ASSET_TEXT QColor(255, 255, 255) /* Ravencoin shadow color - light mode */ -#define COLOR_SHADOW_LIGHT QColor(0, 0, 0, 46) -/* Ravencoin label color */ -#define COLOR_LABEL_STRING "color: #4960ad" +#define COLOR_SHADOW_LIGHT QColor("#e1e6f3") +/* Toolbar not selected text color */ #define COLOR_TOOLBAR_NOT_SELECTED_TEXT QColor("#a5b7f3") /* Toolbar selected text color */ #define COLOR_TOOLBAR_SELECTED_TEXT COLOR_WHITE @@ -82,6 +86,10 @@ static const bool DEFAULT_SPLASHSCREEN = true; #define COLOR_TOOLBAR_SELECTED_TEXT_DARK_MODE QColor("#c5ccdf") +/* Ravencoin label color as a string */ +#define STRING_LABEL_COLOR "color: #4960ad" + + diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp index cc5d3c8375..24d88d6bfd 100644 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -336,15 +336,15 @@ OverviewPage::OverviewPage(const PlatformStyle *platformStyle, QWidget *parent) ui->frame_2->setGraphicsEffect(GUIUtil::getShadowEffect()); /** Update the labels colors */ - ui->assetBalanceLabel->setStyleSheet(COLOR_LABEL_STRING); - ui->rvnBalancesLabel->setStyleSheet(COLOR_LABEL_STRING); - ui->labelBalanceText->setStyleSheet(COLOR_LABEL_STRING); - ui->labelPendingText->setStyleSheet(COLOR_LABEL_STRING); - ui->labelImmatureText->setStyleSheet(COLOR_LABEL_STRING); - ui->labelTotalText->setStyleSheet(COLOR_LABEL_STRING); - ui->labelSpendable->setStyleSheet(COLOR_LABEL_STRING); - ui->labelWatchonly->setStyleSheet(COLOR_LABEL_STRING); - ui->recentTransactionsLabel->setStyleSheet(COLOR_LABEL_STRING); + ui->assetBalanceLabel->setStyleSheet(STRING_LABEL_COLOR); + ui->rvnBalancesLabel->setStyleSheet(STRING_LABEL_COLOR); + ui->labelBalanceText->setStyleSheet(STRING_LABEL_COLOR); + ui->labelPendingText->setStyleSheet(STRING_LABEL_COLOR); + ui->labelImmatureText->setStyleSheet(STRING_LABEL_COLOR); + ui->labelTotalText->setStyleSheet(STRING_LABEL_COLOR); + ui->labelSpendable->setStyleSheet(STRING_LABEL_COLOR); + ui->labelWatchonly->setStyleSheet(STRING_LABEL_COLOR); + ui->recentTransactionsLabel->setStyleSheet(STRING_LABEL_COLOR); /** Update the labels font */ ui->rvnBalancesLabel->setFont(GUIUtil::getTopLabelFont()); @@ -372,7 +372,7 @@ OverviewPage::OverviewPage(const PlatformStyle *platformStyle, QWidget *parent) /** Create the search bar for assets */ ui->assetSearch->setAttribute(Qt::WA_MacShowFocusRect, 0); - ui->assetSearch->setStyleSheet(".QLineEdit {border: 1px solid #4960ad; border-radius: 5px;}"); + ui->assetSearch->setStyleSheet(QString(".QLineEdit {border: 1px solid %1; border-radius: 5px;}").arg(COLOR_LABELS.name())); ui->assetSearch->setAlignment(Qt::AlignVCenter); QFont font = ui->assetSearch->font(); font.setPointSize(12); diff --git a/src/qt/ravengui.cpp b/src/qt/ravengui.cpp index e6a76055a6..ed42dd8c1c 100644 --- a/src/qt/ravengui.cpp +++ b/src/qt/ravengui.cpp @@ -641,7 +641,7 @@ void RavenGUI::createToolBars() /** Create the shadow effects for the main wallet frame. Make it so it puts a shadow on the tool bar */ QGraphicsDropShadowEffect *walletFrameShadow = new QGraphicsDropShadowEffect; walletFrameShadow->setBlurRadius(50); - walletFrameShadow->setColor(darkModeEnabled ? QColor("8E8E8E") : COLOR_SHADOW_LIGHT); + walletFrameShadow->setColor(COLOR_WALLETFRAME_SHADOW); walletFrameShadow->setXOffset(-8.0); walletFrameShadow->setYOffset(0); mainWalletWidget->setGraphicsEffect(walletFrameShadow); @@ -668,15 +668,15 @@ void RavenGUI::createToolBars() labelCurrentMarket->setContentsMargins(50,0,0,0); labelCurrentMarket->setFixedHeight(75); labelCurrentMarket->setAlignment(Qt::AlignVCenter); - labelCurrentMarket->setStyleSheet(COLOR_LABEL_STRING); + labelCurrentMarket->setStyleSheet(STRING_LABEL_COLOR); labelCurrentMarket->setFont(currentMarketFont); - labelCurrentMarket->setText(tr("Ravencoin Market Price ")); + labelCurrentMarket->setText(tr("Ravencoin Market Price")); QString currentPriceStyleSheet = ".QLabel{color: %1;}"; labelCurrentPrice->setContentsMargins(25,0,0,0); labelCurrentPrice->setFixedHeight(75); labelCurrentPrice->setAlignment(Qt::AlignVCenter); - labelCurrentPrice->setStyleSheet(currentPriceStyleSheet.arg("#4960ad")); + labelCurrentPrice->setStyleSheet(currentPriceStyleSheet.arg(COLOR_LABELS.name())); labelCurrentPrice->setFont(currentMarketFont); QLabel* labelBtcRvn = new QLabel(); @@ -684,7 +684,7 @@ void RavenGUI::createToolBars() labelBtcRvn->setContentsMargins(15,0,0,0); labelBtcRvn->setFixedHeight(75); labelBtcRvn->setAlignment(Qt::AlignVCenter); - labelBtcRvn->setStyleSheet(COLOR_LABEL_STRING); + labelBtcRvn->setStyleSheet(STRING_LABEL_COLOR); labelBtcRvn->setFont(currentMarketFont); priceLayout->setGeometry(headerWidget->rect()); @@ -734,7 +734,7 @@ void RavenGUI::createToolBars() if (!list.isEmpty()) { double next = list.first().toDouble(&ok); if (!ok) { - labelCurrentPrice->setStyleSheet(currentPriceStyleSheet.arg("#4960ad")); + labelCurrentPrice->setStyleSheet(currentPriceStyleSheet.arg(COLOR_LABELS.name())); labelCurrentPrice->setText(""); } else { double current = labelCurrentPrice->text().toDouble(&ok); @@ -746,7 +746,7 @@ void RavenGUI::createToolBars() else if (next > current) labelCurrentPrice->setStyleSheet(currentPriceStyleSheet.arg("green")); else - labelCurrentPrice->setStyleSheet(currentPriceStyleSheet.arg("#4960ad")); + labelCurrentPrice->setStyleSheet(currentPriceStyleSheet.arg(COLOR_LABELS.name())); } labelCurrentPrice->setText(QString("%1").arg(QString().setNum(next, 'f', 8))); labelCurrentPrice->setToolTip(tr("Brought to you by binance.com")); diff --git a/src/qt/receivecoinsdialog.cpp b/src/qt/receivecoinsdialog.cpp index aece98a57b..eaaece4f7f 100644 --- a/src/qt/receivecoinsdialog.cpp +++ b/src/qt/receivecoinsdialog.cpp @@ -134,24 +134,24 @@ void ReceiveCoinsDialog::setupRequestFrame(const PlatformStyle *platformStyle) ui->frame2->setGraphicsEffect(GUIUtil::getShadowEffect()); - ui->label_5->setStyleSheet(COLOR_LABEL_STRING); + ui->label_5->setStyleSheet(STRING_LABEL_COLOR); - ui->label_2->setStyleSheet(COLOR_LABEL_STRING); + ui->label_2->setStyleSheet(STRING_LABEL_COLOR); ui->label_2->setFont(GUIUtil::getSubLabelFont()); - ui->label->setStyleSheet(COLOR_LABEL_STRING); + ui->label->setStyleSheet(STRING_LABEL_COLOR); ui->label->setFont(GUIUtil::getSubLabelFont()); - ui->label_3->setStyleSheet(COLOR_LABEL_STRING); + ui->label_3->setStyleSheet(STRING_LABEL_COLOR); ui->label_3->setFont(GUIUtil::getSubLabelFont()); - ui->label_4->setStyleSheet(COLOR_LABEL_STRING); + ui->label_4->setStyleSheet(STRING_LABEL_COLOR); ui->label_4->setFont(GUIUtil::getSubLabelFont()); - ui->label_7->setStyleSheet(COLOR_LABEL_STRING); + ui->label_7->setStyleSheet(STRING_LABEL_COLOR); ui->label_7->setFont(GUIUtil::getSubLabelFont()); - ui->reuseAddress->setStyleSheet(QString(".QCheckBox{ %1; }").arg(COLOR_LABEL_STRING)); + ui->reuseAddress->setStyleSheet(QString(".QCheckBox{ %1; }").arg(STRING_LABEL_COLOR)); ui->reqLabel->setFont(GUIUtil::getSubLabelFont()); ui->reqAmount->setFont(GUIUtil::getSubLabelFont()); ui->reqMessage->setFont(GUIUtil::getSubLabelFont()); @@ -173,7 +173,7 @@ void ReceiveCoinsDialog::setupHistoryFrame(const PlatformStyle *platformStyle) ui->frame->setGraphicsEffect(GUIUtil::getShadowEffect()); - ui->label_6->setStyleSheet(COLOR_LABEL_STRING); + ui->label_6->setStyleSheet(STRING_LABEL_COLOR); ui->recentRequestsView->setGraphicsEffect(GUIUtil::getShadowEffect()); ui->recentRequestsView->setStyleSheet(".QTableView {border: none;}"); diff --git a/src/qt/reissueassetdialog.cpp b/src/qt/reissueassetdialog.cpp index 3b7ef1cc78..406918b5fa 100644 --- a/src/qt/reissueassetdialog.cpp +++ b/src/qt/reissueassetdialog.cpp @@ -263,35 +263,35 @@ void ReissueAssetDialog::setupCoinControlFrame(const PlatformStyle *platformStyl ui->frameCoinControl->setGraphicsEffect(GUIUtil::getShadowEffect()); - ui->labelCoinControlFeatures->setStyleSheet(COLOR_LABEL_STRING); + ui->labelCoinControlFeatures->setStyleSheet(STRING_LABEL_COLOR); ui->labelCoinControlFeatures->setFont(GUIUtil::getTopLabelFont()); - ui->labelCoinControlQuantityText->setStyleSheet(COLOR_LABEL_STRING); + ui->labelCoinControlQuantityText->setStyleSheet(STRING_LABEL_COLOR); ui->labelCoinControlQuantityText->setFont(GUIUtil::getSubLabelFont()); - ui->labelCoinControlAmountText->setStyleSheet(COLOR_LABEL_STRING); + ui->labelCoinControlAmountText->setStyleSheet(STRING_LABEL_COLOR); ui->labelCoinControlAmountText->setFont(GUIUtil::getSubLabelFont()); - ui->labelCoinControlFeeText->setStyleSheet(COLOR_LABEL_STRING); + ui->labelCoinControlFeeText->setStyleSheet(STRING_LABEL_COLOR); ui->labelCoinControlFeeText->setFont(GUIUtil::getSubLabelFont()); - ui->labelCoinControlAfterFeeText->setStyleSheet(COLOR_LABEL_STRING); + ui->labelCoinControlAfterFeeText->setStyleSheet(STRING_LABEL_COLOR); ui->labelCoinControlAfterFeeText->setFont(GUIUtil::getSubLabelFont()); - ui->labelCoinControlBytesText->setStyleSheet(COLOR_LABEL_STRING); + ui->labelCoinControlBytesText->setStyleSheet(STRING_LABEL_COLOR); ui->labelCoinControlBytesText->setFont(GUIUtil::getSubLabelFont()); - ui->labelCoinControlLowOutputText->setStyleSheet(COLOR_LABEL_STRING); + ui->labelCoinControlLowOutputText->setStyleSheet(STRING_LABEL_COLOR); ui->labelCoinControlLowOutputText->setFont(GUIUtil::getSubLabelFont()); - ui->labelCoinControlChangeText->setStyleSheet(COLOR_LABEL_STRING); + ui->labelCoinControlChangeText->setStyleSheet(STRING_LABEL_COLOR); ui->labelCoinControlChangeText->setFont(GUIUtil::getSubLabelFont()); // Align the other labels next to the input buttons to the text in the same height - ui->labelCoinControlAutomaticallySelected->setStyleSheet(COLOR_LABEL_STRING); + ui->labelCoinControlAutomaticallySelected->setStyleSheet(STRING_LABEL_COLOR); // Align the Custom change address checkbox - ui->checkBoxCoinControlChange->setStyleSheet(QString(".QCheckBox{ %1; }").arg(COLOR_LABEL_STRING)); + ui->checkBoxCoinControlChange->setStyleSheet(QString(".QCheckBox{ %1; }").arg(STRING_LABEL_COLOR)); ui->labelCoinControlQuantity->setFont(GUIUtil::getSubLabelFont()); ui->labelCoinControlAmount->setFont(GUIUtil::getSubLabelFont()); @@ -313,21 +313,21 @@ void ReissueAssetDialog::setupAssetDataView(const PlatformStyle *platformStyle) ui->frame->setStyleSheet(QString(".QFrame {background-color: %1; padding-top: 10px; padding-right: 5px; border: none;}").arg(platformStyle->WidgetBackGroundColor().name())); ui->frame->setGraphicsEffect(GUIUtil::getShadowEffect()); - ui->assetNameLabel->setStyleSheet(COLOR_LABEL_STRING); + ui->assetNameLabel->setStyleSheet(STRING_LABEL_COLOR); ui->assetNameLabel->setFont(GUIUtil::getSubLabelFont()); - ui->addressLabel->setStyleSheet(COLOR_LABEL_STRING); + ui->addressLabel->setStyleSheet(STRING_LABEL_COLOR); ui->addressLabel->setFont(GUIUtil::getSubLabelFont()); - ui->quantityLabel->setStyleSheet(COLOR_LABEL_STRING); + ui->quantityLabel->setStyleSheet(STRING_LABEL_COLOR); ui->quantityLabel->setFont(GUIUtil::getSubLabelFont()); - ui->unitLabel->setStyleSheet(COLOR_LABEL_STRING); + ui->unitLabel->setStyleSheet(STRING_LABEL_COLOR); ui->unitLabel->setFont(GUIUtil::getSubLabelFont()); - ui->reissuableBox->setStyleSheet(QString(".QCheckBox{ %1; }").arg(COLOR_LABEL_STRING)); + ui->reissuableBox->setStyleSheet(QString(".QCheckBox{ %1; }").arg(STRING_LABEL_COLOR)); - ui->ipfsBox->setStyleSheet(QString(".QCheckBox{ %1; }").arg(COLOR_LABEL_STRING)); + ui->ipfsBox->setStyleSheet(QString(".QCheckBox{ %1; }").arg(STRING_LABEL_COLOR)); ui->frame_3->setStyleSheet(QString(".QFrame {background-color: %1; padding-top: 10px; padding-right: 5px; border: none;}").arg(platformStyle->WidgetBackGroundColor().name())); ui->frame_3->setGraphicsEffect(GUIUtil::getShadowEffect()); @@ -335,10 +335,10 @@ void ReissueAssetDialog::setupAssetDataView(const PlatformStyle *platformStyle) ui->frame_2->setStyleSheet(QString(".QFrame {background-color: %1; padding-top: 10px; padding-right: 5px; border: none;}").arg(platformStyle->WidgetBackGroundColor().name())); ui->frame_2->setGraphicsEffect(GUIUtil::getShadowEffect()); - ui->currentDataLabel->setStyleSheet(COLOR_LABEL_STRING); + ui->currentDataLabel->setStyleSheet(STRING_LABEL_COLOR); ui->currentDataLabel->setFont(GUIUtil::getTopLabelFont()); - ui->reissueAssetDataLabel->setStyleSheet(COLOR_LABEL_STRING); + ui->reissueAssetDataLabel->setStyleSheet(STRING_LABEL_COLOR); ui->reissueAssetDataLabel->setFont(GUIUtil::getTopLabelFont()); } @@ -351,14 +351,14 @@ void ReissueAssetDialog::setupFeeControl(const PlatformStyle *platformStyle) ui->frameFee->setGraphicsEffect(GUIUtil::getShadowEffect()); - ui->labelFeeHeadline->setStyleSheet(COLOR_LABEL_STRING); + ui->labelFeeHeadline->setStyleSheet(STRING_LABEL_COLOR); ui->labelFeeHeadline->setFont(GUIUtil::getSubLabelFont()); - ui->labelSmartFee3->setStyleSheet(COLOR_LABEL_STRING); - ui->labelCustomPerKilobyte->setStyleSheet(QString(".QLabel{ %1; }").arg(COLOR_LABEL_STRING)); - ui->radioSmartFee->setStyleSheet(COLOR_LABEL_STRING); - ui->radioCustomFee->setStyleSheet(COLOR_LABEL_STRING); - ui->checkBoxMinimumFee->setStyleSheet(QString(".QCheckBox{ %1; }").arg(COLOR_LABEL_STRING)); + ui->labelSmartFee3->setStyleSheet(STRING_LABEL_COLOR); + ui->labelCustomPerKilobyte->setStyleSheet(QString(".QLabel{ %1; }").arg(STRING_LABEL_COLOR)); + ui->radioSmartFee->setStyleSheet(STRING_LABEL_COLOR); + ui->radioCustomFee->setStyleSheet(STRING_LABEL_COLOR); + ui->checkBoxMinimumFee->setStyleSheet(QString(".QCheckBox{ %1; }").arg(STRING_LABEL_COLOR)); ui->buttonChooseFee->setFont(GUIUtil::getSubLabelFont()); ui->fallbackFeeWarningLabel->setFont(GUIUtil::getSubLabelFont()); @@ -1178,7 +1178,7 @@ void ReissueAssetDialog::clear() { ui->comboBox->setCurrentIndex(0); ui->addressText->clear(); - ui->quantitySpinBox->setValue(1); + ui->quantitySpinBox->setValue(0); ui->unitSpinBox->setMinimum(0); ui->unitSpinBox->setValue(0); onUnitChanged(0); diff --git a/src/qt/sendassetsentry.cpp b/src/qt/sendassetsentry.cpp index 1366f34228..fe6e086245 100644 --- a/src/qt/sendassetsentry.cpp +++ b/src/qt/sendassetsentry.cpp @@ -99,25 +99,25 @@ SendAssetsEntry::SendAssetsEntry(const PlatformStyle *_platformStyle, const QStr this->setGraphicsEffect(GUIUtil::getShadowEffect()); - ui->assetBoxLabel->setStyleSheet(COLOR_LABEL_STRING); + ui->assetBoxLabel->setStyleSheet(STRING_LABEL_COLOR); ui->assetBoxLabel->setFont(GUIUtil::getSubLabelFont()); - ui->payToLabel->setStyleSheet(COLOR_LABEL_STRING); + ui->payToLabel->setStyleSheet(STRING_LABEL_COLOR); ui->payToLabel->setFont(GUIUtil::getSubLabelFont()); - ui->labellLabel->setStyleSheet(COLOR_LABEL_STRING); + ui->labellLabel->setStyleSheet(STRING_LABEL_COLOR); ui->labellLabel->setFont(GUIUtil::getSubLabelFont()); - ui->amountLabel->setStyleSheet(COLOR_LABEL_STRING); + ui->amountLabel->setStyleSheet(STRING_LABEL_COLOR); ui->amountLabel->setFont(GUIUtil::getSubLabelFont()); - ui->messageLabel->setStyleSheet(COLOR_LABEL_STRING); + ui->messageLabel->setStyleSheet(STRING_LABEL_COLOR); ui->messageLabel->setFont(GUIUtil::getSubLabelFont()); ui->payAssetAmount->setUnit(MAX_UNIT); ui->payAssetAmount->setDisabled(false); - ui->administratorCheckbox->setStyleSheet(QString(".QCheckBox{ %1; }").arg(COLOR_LABEL_STRING)); + ui->administratorCheckbox->setStyleSheet(QString(".QCheckBox{ %1; }").arg(STRING_LABEL_COLOR)); ui->assetSelectionBox->setFont(GUIUtil::getSubLabelFont()); ui->administratorCheckbox->setFont(GUIUtil::getSubLabelFont()); diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index f0168c8e20..0c58ac9118 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -213,35 +213,35 @@ void SendCoinsDialog::setupCoinControl(const PlatformStyle *platformStyle) ui->frameCoinControl->setGraphicsEffect(GUIUtil::getShadowEffect()); - ui->labelCoinControlFeatures->setStyleSheet(COLOR_LABEL_STRING); + ui->labelCoinControlFeatures->setStyleSheet(STRING_LABEL_COLOR); ui->labelCoinControlFeatures->setFont(GUIUtil::getTopLabelFont()); - ui->labelCoinControlQuantityText->setStyleSheet(COLOR_LABEL_STRING); + ui->labelCoinControlQuantityText->setStyleSheet(STRING_LABEL_COLOR); ui->labelCoinControlQuantityText->setFont(GUIUtil::getSubLabelFont()); - ui->labelCoinControlAmountText->setStyleSheet(COLOR_LABEL_STRING); + ui->labelCoinControlAmountText->setStyleSheet(STRING_LABEL_COLOR); ui->labelCoinControlAmountText->setFont(GUIUtil::getSubLabelFont()); - ui->labelCoinControlFeeText->setStyleSheet(COLOR_LABEL_STRING); + ui->labelCoinControlFeeText->setStyleSheet(STRING_LABEL_COLOR); ui->labelCoinControlFeeText->setFont(GUIUtil::getSubLabelFont()); - ui->labelCoinControlAfterFeeText->setStyleSheet(COLOR_LABEL_STRING); + ui->labelCoinControlAfterFeeText->setStyleSheet(STRING_LABEL_COLOR); ui->labelCoinControlAfterFeeText->setFont(GUIUtil::getSubLabelFont()); - ui->labelCoinControlBytesText->setStyleSheet(COLOR_LABEL_STRING); + ui->labelCoinControlBytesText->setStyleSheet(STRING_LABEL_COLOR); ui->labelCoinControlBytesText->setFont(GUIUtil::getSubLabelFont()); - ui->labelCoinControlLowOutputText->setStyleSheet(COLOR_LABEL_STRING); + ui->labelCoinControlLowOutputText->setStyleSheet(STRING_LABEL_COLOR); ui->labelCoinControlLowOutputText->setFont(GUIUtil::getSubLabelFont()); - ui->labelCoinControlChangeText->setStyleSheet(COLOR_LABEL_STRING); + ui->labelCoinControlChangeText->setStyleSheet(STRING_LABEL_COLOR); ui->labelCoinControlChangeText->setFont(GUIUtil::getSubLabelFont()); // Align the other labels next to the input buttons to the text in the same height - ui->labelCoinControlAutomaticallySelected->setStyleSheet(COLOR_LABEL_STRING); + ui->labelCoinControlAutomaticallySelected->setStyleSheet(STRING_LABEL_COLOR); // Align the Custom change address checkbox - ui->checkBoxCoinControlChange->setStyleSheet(COLOR_LABEL_STRING); + ui->checkBoxCoinControlChange->setStyleSheet(STRING_LABEL_COLOR); ui->labelCoinControlQuantity->setFont(GUIUtil::getSubLabelFont()); ui->labelCoinControlAmount->setFont(GUIUtil::getSubLabelFont()); @@ -276,14 +276,14 @@ void SendCoinsDialog::setupFeeControl(const PlatformStyle *platformStyle) ui->frameFee->setGraphicsEffect(GUIUtil::getShadowEffect()); - ui->labelFeeHeadline->setStyleSheet(COLOR_LABEL_STRING); + ui->labelFeeHeadline->setStyleSheet(STRING_LABEL_COLOR); ui->labelFeeHeadline->setFont(GUIUtil::getSubLabelFont()); - ui->labelSmartFee3->setStyleSheet(COLOR_LABEL_STRING); - ui->labelCustomPerKilobyte->setStyleSheet(COLOR_LABEL_STRING); - ui->radioSmartFee->setStyleSheet(COLOR_LABEL_STRING); - ui->radioCustomFee->setStyleSheet(COLOR_LABEL_STRING); - ui->checkBoxMinimumFee->setStyleSheet(COLOR_LABEL_STRING); + ui->labelSmartFee3->setStyleSheet(STRING_LABEL_COLOR); + ui->labelCustomPerKilobyte->setStyleSheet(STRING_LABEL_COLOR); + ui->radioSmartFee->setStyleSheet(STRING_LABEL_COLOR); + ui->radioCustomFee->setStyleSheet(STRING_LABEL_COLOR); + ui->checkBoxMinimumFee->setStyleSheet(STRING_LABEL_COLOR); ui->buttonChooseFee->setFont(GUIUtil::getSubLabelFont()); diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp index b96c86c480..12f0d3ccd3 100644 --- a/src/qt/sendcoinsentry.cpp +++ b/src/qt/sendcoinsentry.cpp @@ -57,19 +57,19 @@ SendCoinsEntry::SendCoinsEntry(const PlatformStyle *_platformStyle, QWidget *par this->setGraphicsEffect(GUIUtil::getShadowEffect()); - ui->payToLabel->setStyleSheet(COLOR_LABEL_STRING); + ui->payToLabel->setStyleSheet(STRING_LABEL_COLOR); ui->payToLabel->setFont(GUIUtil::getSubLabelFont()); - ui->labellLabel->setStyleSheet(COLOR_LABEL_STRING); + ui->labellLabel->setStyleSheet(STRING_LABEL_COLOR); ui->labellLabel->setFont(GUIUtil::getSubLabelFont()); - ui->amountLabel->setStyleSheet(COLOR_LABEL_STRING); + ui->amountLabel->setStyleSheet(STRING_LABEL_COLOR); ui->amountLabel->setFont(GUIUtil::getSubLabelFont()); - ui->messageLabel->setStyleSheet(COLOR_LABEL_STRING); + ui->messageLabel->setStyleSheet(STRING_LABEL_COLOR); ui->messageLabel->setFont(GUIUtil::getSubLabelFont()); - ui->checkboxSubtractFeeFromAmount->setStyleSheet(QString(".QCheckBox{ %1; }").arg(COLOR_LABEL_STRING)); + ui->checkboxSubtractFeeFromAmount->setStyleSheet(QString(".QCheckBox{ %1; }").arg(STRING_LABEL_COLOR)); ui->payTo->setFont(GUIUtil::getSubLabelFont()); ui->addAsLabel->setFont(GUIUtil::getSubLabelFont()); ui->payAmount->setFont(GUIUtil::getSubLabelFont());