Skip to content

Commit 6035e9a

Browse files
committed
GUI: Pass PlatformStyle through ClientModel into PeerTableModel
1 parent 30308cc commit 6035e9a

File tree

7 files changed

+13
-8
lines changed

7 files changed

+13
-8
lines changed

src/qt/bitcoin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ void BitcoinApplication::initializeResult(bool success, interfaces::BlockAndHead
385385
{
386386
// Log this only after AppInitMain finishes, as then logging setup is guaranteed complete
387387
qInfo() << "Platform customization:" << platformStyle->getName();
388-
clientModel = new ClientModel(node(), optionsModel);
388+
clientModel = new ClientModel(node(), optionsModel, *platformStyle);
389389
window->setClientModel(clientModel, &tip_info);
390390
#ifdef ENABLE_WALLET
391391
if (WalletModel::isWalletEnabled()) {

src/qt/clientmodel.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
static int64_t nLastHeaderTipUpdateNotification = 0;
3131
static int64_t nLastBlockTipUpdateNotification = 0;
3232

33-
ClientModel::ClientModel(interfaces::Node& node, OptionsModel *_optionsModel, QObject *parent) :
33+
ClientModel::ClientModel(interfaces::Node& node, OptionsModel *_optionsModel, const PlatformStyle& platform_style, QObject *parent) :
3434
QObject(parent),
3535
m_node(node),
3636
optionsModel(_optionsModel),
@@ -41,7 +41,7 @@ ClientModel::ClientModel(interfaces::Node& node, OptionsModel *_optionsModel, QO
4141
cachedBestHeaderHeight = -1;
4242
cachedBestHeaderTime = -1;
4343

44-
peerTableModel = new PeerTableModel(m_node, this);
44+
peerTableModel = new PeerTableModel(m_node, platform_style, this);
4545
m_peer_table_sort_proxy = new PeerTableSortProxy(this);
4646
m_peer_table_sort_proxy->setSourceModel(peerTableModel);
4747

src/qt/clientmodel.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ class CBlockIndex;
1818
class OptionsModel;
1919
class PeerTableModel;
2020
class PeerTableSortProxy;
21+
class PlatformStyle;
2122
enum class SynchronizationState;
2223

2324
namespace interfaces {
@@ -49,7 +50,7 @@ class ClientModel : public QObject
4950
Q_OBJECT
5051

5152
public:
52-
explicit ClientModel(interfaces::Node& node, OptionsModel *optionsModel, QObject *parent = nullptr);
53+
explicit ClientModel(interfaces::Node& node, OptionsModel *optionsModel, const PlatformStyle&, QObject *parent = nullptr);
5354
~ClientModel();
5455

5556
interfaces::Node& node() const { return m_node; }

src/qt/peertablemodel.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
#include <qt/guiconstants.h>
88
#include <qt/guiutil.h>
9+
#include <qt/platformstyle.h>
910

1011
#include <interfaces/node.h>
1112

@@ -14,9 +15,10 @@
1415
#include <QList>
1516
#include <QTimer>
1617

17-
PeerTableModel::PeerTableModel(interfaces::Node& node, QObject* parent) :
18+
PeerTableModel::PeerTableModel(interfaces::Node& node, const PlatformStyle& platform_style, QObject* parent) :
1819
QAbstractTableModel(parent),
1920
m_node(node),
21+
m_platform_style(platform_style),
2022
timer(nullptr)
2123
{
2224
// set up timer for auto refresh

src/qt/peertablemodel.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <QVariant>
1616

1717
class PeerTablePriv;
18+
class PlatformStyle;
1819

1920
namespace interfaces {
2021
class Node;
@@ -40,7 +41,7 @@ class PeerTableModel : public QAbstractTableModel
4041
Q_OBJECT
4142

4243
public:
43-
explicit PeerTableModel(interfaces::Node& node, QObject* parent);
44+
explicit PeerTableModel(interfaces::Node& node, const PlatformStyle&, QObject* parent);
4445
~PeerTableModel();
4546
void startAutoRefresh();
4647
void stopAutoRefresh();
@@ -78,6 +79,7 @@ public Q_SLOTS:
7879
//! Internal peer data structure.
7980
QList<CNodeCombinedStats> m_peers_data{};
8081
interfaces::Node& m_node;
82+
const PlatformStyle& m_platform_style;
8183
const QStringList columns{
8284
/*: Title of Peers Table column which contains a
8385
unique number used to identify a connection. */

src/qt/test/addressbooktests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ void TestAddAddressesToSendBook(interfaces::Node& node)
123123
// Initialize relevant QT models.
124124
std::unique_ptr<const PlatformStyle> platformStyle(PlatformStyle::instantiate("other"));
125125
OptionsModel optionsModel;
126-
ClientModel clientModel(node, &optionsModel);
126+
ClientModel clientModel(node, &optionsModel, *platformStyle);
127127
WalletContext& context = *node.walletLoader().context();
128128
AddWallet(context, wallet);
129129
WalletModel walletModel(interfaces::MakeWallet(context, wallet), clientModel, platformStyle.get());

src/qt/test/wallettests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ void TestGUI(interfaces::Node& node)
184184
SendCoinsDialog sendCoinsDialog(platformStyle.get());
185185
TransactionView transactionView(platformStyle.get());
186186
OptionsModel optionsModel;
187-
ClientModel clientModel(node, &optionsModel);
187+
ClientModel clientModel(node, &optionsModel, *platformStyle);
188188
WalletContext& context = *node.walletLoader().context();
189189
AddWallet(context, wallet);
190190
WalletModel walletModel(interfaces::MakeWallet(context, wallet), clientModel, platformStyle.get());

0 commit comments

Comments
 (0)