d0s3t3ch/wowlet
1
0
Fork 0
mirror of https://git.wownero.com/wowlet/wowlet.git synced 2024-08-15 01:03:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request 'TickerWidget: don't show percentage on balance' (#219) from tobtoht/feather:ticker_widget_no_perc into master

Browse source 
Reviewed-on: https://git.wownero.com/feather/feather/pulls/219
This commit is contained in:
tobtoht 2020-12-14 19:19:40 +00:00
commit cee70a997d
4 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mainwindow.cpp
View file

@ -162,7 +162,7 @@ MainWindow::MainWindow(AppContext *ctx, QWidget *parent) :
ui->tickerLayout->addWidget(tickerWidget); ui->tickerLayout->addWidget(tickerWidget);
} }
m_balanceWidget = new TickerWidget(this, "XMR", "Balance", true); m_balanceWidget = new TickerWidget(this, "XMR", "Balance", true, true);
ui->fiatTickerLayout->addWidget(m_balanceWidget); ui->fiatTickerLayout->addWidget(m_balanceWidget);
// Send widget // Send widget

2
src/mainwindow.ui
View file

@ -43,7 +43,7 @@
<item row="1" column="0"> <item row="1" column="0">
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>7</number> <number>0</number>
</property> </property>
<property name="iconSize"> <property name="iconSize">
<size> <size>

13
src/widgets/tickerwidget.cpp
View file

@ -8,11 +8,12 @@
#include "utils/config.h" #include "utils/config.h"
#include "mainwindow.h" #include "mainwindow.h"
TickerWidget::TickerWidget(QWidget *parent, QString symbol, QString title, bool convertBalance) : TickerWidget::TickerWidget(QWidget *parent, QString symbol, QString title, bool convertBalance, bool hidePercent) :
QWidget(parent), QWidget(parent),
ui(new Ui::TickerWidget), ui(new Ui::TickerWidget),
m_symbol(std::move(symbol)), m_symbol(std::move(symbol)),
m_convertBalance(convertBalance) m_convertBalance(convertBalance),
m_hidePercent(hidePercent)
{ {
ui->setupUi(this); ui->setupUi(this);
m_ctx = MainWindow::getContext(); m_ctx = MainWindow::getContext();
@ -27,6 +28,8 @@ TickerWidget::TickerWidget(QWidget *parent, QString symbol, QString title, bool
this->setPctText(defaultPct, true); this->setPctText(defaultPct, true);
this->setFiatText(defaultFiat, 0.0); this->setFiatText(defaultFiat, 0.0);
ui->tickerPct->setHidden(hidePercent);
connect(AppContext::prices, &Prices::fiatPricesUpdated, this, &TickerWidget::init); connect(AppContext::prices, &Prices::fiatPricesUpdated, this, &TickerWidget::init);
connect(AppContext::prices, &Prices::cryptoPricesUpdated, this, &TickerWidget::init); connect(AppContext::prices, &Prices::cryptoPricesUpdated, this, &TickerWidget::init);
if (convertBalance) if (convertBalance)
@ -47,7 +50,7 @@ void TickerWidget::init() {
double amount = m_convertBalance ? AppContext::balance : 1.0; double amount = m_convertBalance ? AppContext::balance : 1.0;
double conversion = AppContext::prices->convert(m_symbol, fiatCurrency, amount); double conversion = AppContext::prices->convert(m_symbol, fiatCurrency, amount);
if (conversion < 0) return; if (conversion < 0) return;
setPercentHidden(conversion == 0); ui->tickerPct->setHidden(conversion == 0 || m_hidePercent);
auto markets = AppContext::prices->markets; auto markets = AppContext::prices->markets;
if(!markets.contains(m_symbol)) return; if(!markets.contains(m_symbol)) return;
@ -85,10 +88,6 @@ void TickerWidget::removePctContainer() {
ui->tickerPct->deleteLater(); ui->tickerPct->deleteLater();
} }
void TickerWidget::setPercentHidden(bool hidden) {
ui->tickerPct->setVisible(!hidden);
}
TickerWidget::~TickerWidget() { TickerWidget::~TickerWidget() {
delete ui; delete ui;
} }

5
src/widgets/tickerwidget.h
View file

@ -17,7 +17,7 @@ class TickerWidget : public QWidget
Q_OBJECT Q_OBJECT
public: public:
explicit TickerWidget(QWidget *parent, QString symbol, QString title = "", bool convertBalance = false); explicit TickerWidget(QWidget *parent, QString symbol, QString title = "", bool convertBalance = false, bool hidePercent = false);
void removePctContainer(); void removePctContainer();
void setFiatText(QString &fiatCurrency, double amount); void setFiatText(QString &fiatCurrency, double amount);
void setPctText(QString &text, bool positive); void setPctText(QString &text, bool positive);
@ -29,11 +29,10 @@ public slots:
void init(); void init();
private: private:
void setPercentHidden(bool hidden);
Ui::TickerWidget *ui; Ui::TickerWidget *ui;
QString m_symbol; QString m_symbol;
bool m_convertBalance; bool m_convertBalance;
bool m_hidePercent;
AppContext *m_ctx; AppContext *m_ctx;
}; };