Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions src/qt/assetsdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down Expand Up @@ -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());
Expand Down
46 changes: 23 additions & 23 deletions src/qt/createassetdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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));

}

Expand All @@ -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));

}

Expand All @@ -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());
Expand Down
16 changes: 8 additions & 8 deletions src/qt/forms/reissueassetdialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@
<item>
<layout class="QVBoxLayout" name="verticalLayout_10">
<property name="spacing">
<number>34</number>
<number>16</number>
</property>
<property name="leftMargin">
<number>40</number>
<number>20</number>
</property>
<property name="topMargin">
<number>40</number>
<number>20</number>
</property>
<property name="rightMargin">
<number>40</number>
<number>20</number>
</property>
<property name="bottomMargin">
<number>40</number>
<number>20</number>
</property>
<item>
<widget class="QFrame" name="frameCoinControl">
Expand Down Expand Up @@ -676,7 +676,7 @@
<double>21000000000.000000000000000</double>
</property>
<property name="value">
<double>1.000000000000000</double>
<double>0.000000000000000</double>
</property>
</widget>
</item>
Expand Down Expand Up @@ -884,7 +884,7 @@
<number>0</number>
</property>
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
<enum>Qt::ScrollBarAsNeeded</enum>
</property>
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAsNeeded</enum>
Expand Down Expand Up @@ -946,7 +946,7 @@
<item>
<widget class="QTextBrowser" name="updatedAssetData">
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
<enum>Qt::ScrollBarAsNeeded</enum>
</property>
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAsNeeded</enum>
Expand Down
14 changes: 11 additions & 3 deletions src/qt/guiconstants.h
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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
Expand Down Expand Up @@ -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"





Expand Down
20 changes: 10 additions & 10 deletions src/qt/overviewpage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down Expand Up @@ -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);
Expand Down
14 changes: 7 additions & 7 deletions src/qt/ravengui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -668,23 +668,23 @@ 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();
labelBtcRvn->setText("BTC / RVN");
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());
Expand Down Expand Up @@ -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);
Expand All @@ -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"));
Expand Down
16 changes: 8 additions & 8 deletions src/qt/receivecoinsdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand All @@ -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;}");
Expand Down
Loading