Skip to content

Add Open Sans font #454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TronBlack merged 2 commits into from
Nov 21, 2018
Merged

Add Open Sans font #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbf8f1e
Add Open Sans font
Nov 20, 2018
9e80e87
Add font changes, shadow changes, contextmenu
Nov 21, 2018
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
13 changes: 12 additions & 1 deletion src/Makefile.qt.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,18 @@ RES_ICONS = \
qt/res/darkstyle/icon_radiobutton_checked_pressed.png \
qt/res/darkstyle/icon_radiobutton_unchecked_pressed.png \
qt/res/darkstyle/icon_radiobutton_checked_disabled.png \
qt/res/darkstyle/icon_radiobutton_unchecked_disabled.png
qt/res/darkstyle/icon_radiobutton_unchecked_disabled.png \
qt/res/fonts/OpenSans-Bold.ttf \
qt/res/fonts/OpenSans-BoldItalic.ttf \
qt/res/fonts/OpenSans-ExtraBold.ttf \
qt/res/fonts/OpenSans-ExtraBoldItalic.ttf \
qt/res/fonts/OpenSans-Italic.ttf \
qt/res/fonts/OpenSans-Light.ttf \
qt/res/fonts/OpenSans-LightItalic.ttf \
qt/res/fonts/OpenSans-Regular.ttf \
qt/res/fonts/OpenSans-SemiBold.ttf \
qt/res/fonts/OpenSans-SemiBoldItalic.ttf


RAVEN_QT_BASE_CPP = \
qt/bantablemodel.cpp \
Expand Down
67 changes: 34 additions & 33 deletions src/qt/assetsdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,17 +119,6 @@ AssetsDialog::AssetsDialog(const PlatformStyle *_platformStyle, QWidget *parent)
minimizeFeeSection(settings.value("fFeeSectionMinimized").toBool());

/** RVN START */
// If the network is regtest. Add some helper buttons to the asset GUI
if (Params().NetworkIDString() != "regtest") {
ui->mineButton->hide();
ui->mineBlocksCount->hide();
} else {
ui->mineButton->setText(tr("Mine Block(s)"));
ui->mineButton->setToolTip(tr("Mine some number of blocks"));
ui->mineBlocksCount->setToolTip(tr("The number of blocks to mine"));
connect(ui->mineButton, SIGNAL(clicked()), this, SLOT(mineButtonClicked()));
}

setupAssetControlFrame(platformStyle);
setupScrollView(platformStyle);
setupFeeControl(platformStyle);
Expand Down Expand Up @@ -269,6 +258,18 @@ void AssetsDialog::setupAssetControlFrame(const PlatformStyle *platformStyle)
// Align the Custom change address checkbox
ui->checkBoxAssetControlChange->setStyleSheet(QString(".QCheckBox{ %1; }").arg(COLOR_LABEL_STRING));

ui->labelAssetControlQuantity->setFont(GUIUtil::getSubLabelFont());
ui->labelAssetControlAmount->setFont(GUIUtil::getSubLabelFont());
ui->labelAssetControlFee->setFont(GUIUtil::getSubLabelFont());
ui->labelAssetControlAfterFee->setFont(GUIUtil::getSubLabelFont());
ui->labelAssetControlBytes->setFont(GUIUtil::getSubLabelFont());
ui->labelAssetControlLowOutput->setFont(GUIUtil::getSubLabelFont());
ui->labelAssetControlChange->setFont(GUIUtil::getSubLabelFont());
ui->checkBoxAssetControlChange->setFont(GUIUtil::getSubLabelFont());
ui->lineEditAssetControlChange->setFont(GUIUtil::getSubLabelFont());
ui->labelAssetControlInsuffFunds->setFont(GUIUtil::getSubLabelFont());
ui->labelAssetControlAutomaticallySelected->setFont(GUIUtil::getSubLabelFont());

}

void AssetsDialog::setupScrollView(const PlatformStyle *platformStyle)
Expand Down Expand Up @@ -299,6 +300,25 @@ void AssetsDialog::setupFeeControl(const PlatformStyle *platformStyle)
ui->radioCustomFee->setStyleSheet(COLOR_LABEL_STRING);
ui->checkBoxMinimumFee->setStyleSheet(QString(".QCheckBox{ %1; }").arg(COLOR_LABEL_STRING));

ui->buttonChooseFee->setFont(GUIUtil::getSubLabelFont());
ui->fallbackFeeWarningLabel->setFont(GUIUtil::getSubLabelFont());
ui->buttonMinimizeFee->setFont(GUIUtil::getSubLabelFont());
ui->radioSmartFee->setFont(GUIUtil::getSubLabelFont());
ui->labelSmartFee2->setFont(GUIUtil::getSubLabelFont());
ui->labelSmartFee3->setFont(GUIUtil::getSubLabelFont());
ui->confTargetSelector->setFont(GUIUtil::getSubLabelFont());
ui->radioCustomFee->setFont(GUIUtil::getSubLabelFont());
ui->labelCustomPerKilobyte->setFont(GUIUtil::getSubLabelFont());
ui->customFee->setFont(GUIUtil::getSubLabelFont());
ui->labelMinFeeWarning->setFont(GUIUtil::getSubLabelFont());
ui->optInRBF->setFont(GUIUtil::getSubLabelFont());
ui->sendButton->setFont(GUIUtil::getSubLabelFont());
ui->clearButton->setFont(GUIUtil::getSubLabelFont());
ui->addButton->setFont(GUIUtil::getSubLabelFont());
ui->labelSmartFee->setFont(GUIUtil::getSubLabelFont());
ui->labelFeeEstimation->setFont(GUIUtil::getSubLabelFont());
ui->labelFeeMinimized->setFont(GUIUtil::getSubLabelFont());

}

void AssetsDialog::on_sendButton_clicked()
Expand Down Expand Up @@ -615,6 +635,9 @@ void AssetsDialog::setBalance(const CAmount& balance, const CAmount& unconfirmed
Q_UNUSED(watchUnconfirmedBalance);
Q_UNUSED(watchImmatureBalance);

ui->labelBalance->setFont(GUIUtil::getSubLabelFont());
ui->label->setFont(GUIUtil::getSubLabelFont());

if(model && model->getOptionsModel())
{
ui->labelBalance->setText(RavenUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), balance));
Expand Down Expand Up @@ -962,28 +985,6 @@ void AssetsDialog::assetControlUpdateLabels()
}

/** RVN START */
void AssetsDialog::mineButtonClicked()
{

int num_generate = ui->mineBlocksCount->value();
uint64_t max_tries = 1000000;

std::shared_ptr<CReserveScript> coinbase_script;
model->getWallet()->GetScriptForMining(coinbase_script);

// If the keypool is exhausted, no script is returned at all. Catch this.
if (!coinbase_script) {
return;
}

//throw an error if no script was provided
if (coinbase_script->reserveScript.empty()) {
return;
}

generateBlocks(coinbase_script, num_generate, max_tries, true);
}

void AssetsDialog::assetControlUpdateSendCoinsDialog()
{
for(int i = 0; i < ui->entries->count(); ++i)
Expand Down
1 change: 0 additions & 1 deletion src/qt/assetsdialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ private Q_SLOTS:
void customFeeFeatureChanged(bool);

/** RVN START */
void mineButtonClicked();
void assetControlUpdateSendCoinsDialog();
void focusAsset(const QModelIndex& index);
/** RVN END */
Expand Down
48 changes: 48 additions & 0 deletions src/qt/createassetdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include <core_io.h>
#include <policy/policy.h>
#include "assets/assettypes.h"
#include "assettablemodel.h"

#include <QGraphicsDropShadowEffect>
#include <QModelIndex>
Expand Down Expand Up @@ -353,6 +354,24 @@ void CreateAssetDialog::setupFeeControl(const PlatformStyle *platformStyle)
ui->radioCustomFee->setStyleSheet(COLOR_LABEL_STRING);
ui->checkBoxMinimumFee->setStyleSheet(QString(".QCheckBox{ %1; }").arg(COLOR_LABEL_STRING));

ui->buttonChooseFee->setFont(GUIUtil::getSubLabelFont());
ui->fallbackFeeWarningLabel->setFont(GUIUtil::getSubLabelFont());
ui->buttonMinimizeFee->setFont(GUIUtil::getSubLabelFont());
ui->radioSmartFee->setFont(GUIUtil::getSubLabelFont());
ui->labelSmartFee2->setFont(GUIUtil::getSubLabelFont());
ui->labelSmartFee3->setFont(GUIUtil::getSubLabelFont());
ui->confTargetSelector->setFont(GUIUtil::getSubLabelFont());
ui->radioCustomFee->setFont(GUIUtil::getSubLabelFont());
ui->labelCustomPerKilobyte->setFont(GUIUtil::getSubLabelFont());
ui->customFee->setFont(GUIUtil::getSubLabelFont());
ui->labelMinFeeWarning->setFont(GUIUtil::getSubLabelFont());
ui->optInRBF->setFont(GUIUtil::getSubLabelFont());
ui->createAssetButton->setFont(GUIUtil::getSubLabelFont());
ui->clearButton->setFont(GUIUtil::getSubLabelFont());
ui->labelSmartFee->setFont(GUIUtil::getSubLabelFont());
ui->labelFeeEstimation->setFont(GUIUtil::getSubLabelFont());
ui->labelFeeMinimized->setFont(GUIUtil::getSubLabelFont());

}

void CreateAssetDialog::setBalance(const CAmount& balance, const CAmount& unconfirmedBalance, const CAmount& immatureBalance,
Expand All @@ -364,6 +383,9 @@ void CreateAssetDialog::setBalance(const CAmount& balance, const CAmount& unconf
Q_UNUSED(watchUnconfirmedBalance);
Q_UNUSED(watchImmatureBalance);

ui->labelBalance->setFont(GUIUtil::getSubLabelFont());
ui->label->setFont(GUIUtil::getSubLabelFont());

if(model && model->getOptionsModel())
{
ui->labelBalance->setText(RavenUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), balance));
Expand Down Expand Up @@ -1205,4 +1227,30 @@ void CreateAssetDialog::clear()
void CreateAssetDialog::onClearButtonClicked()
{
clear();
}

void CreateAssetDialog::focusSubAsset(const QModelIndex &index)
{
selectTypeName(1,index.data(AssetTableModel::AssetNameRole).toString());
}

void CreateAssetDialog::focusUniqueAsset(const QModelIndex &index)
{
selectTypeName(2,index.data(AssetTableModel::AssetNameRole).toString());
}

void CreateAssetDialog::selectTypeName(int type, QString name)
{
clear();

if (IsAssetNameAnOwner(name.toStdString()))
name = name.left(name.size() - 1);

ui->assetType->setCurrentIndex(type);
onAssetTypeActivated(type);

ui->assetList->setCurrentIndex(ui->assetList->findText(name));
onAssetListActivated(ui->assetList->currentIndex());

ui->nameText->setFocus();
}
5 changes: 5 additions & 0 deletions src/qt/createassetdialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ Q_OBJECT
void updateAssetList();

void clear();
void selectTypeName(int type, QString name);

QStringListModel* stringModel;
QSortFilterProxyModel* proxy;
Expand Down Expand Up @@ -129,6 +130,10 @@ private Q_SLOTS:
const CAmount& watchOnlyBalance, const CAmount& watchUnconfBalance, const CAmount& watchImmatureBalance);
void updateDisplayUnit();


void focusSubAsset(const QModelIndex& index);
void focusUniqueAsset(const QModelIndex& index);

protected:
bool eventFilter( QObject* sender, QEvent* event);

Expand Down
48 changes: 1 addition & 47 deletions src/qt/forms/assetsdialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,52 +34,6 @@
<property name="bottomMargin">
<number>40</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
</property>
<item>
<widget class="QPushButton" name="mineButton">
<property name="text">
<string>Mine Block</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="mineBlocksCount">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>1000</number>
</property>
<property name="singleStep">
<number>10</number>
</property>
<property name="value">
<number>1</number>
</property>
<property name="displayIntegerBase">
<number>10</number>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<widget class="QFrame" name="frameAssetControl">
<property name="sizePolicy">
Expand Down Expand Up @@ -651,7 +605,7 @@
<x>0</x>
<y>0</y>
<width>964</width>
<height>98</height>
<height>165</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,1">
Expand Down
Loading