Skip to content

Commit 5f48f0e

Browse files
committed
settings information screen connected
1 parent 56186fe commit 5f48f0e

File tree

2 files changed

+38
-25
lines changed

2 files changed

+38
-25
lines changed

src/qt/pivx/settings/settingsinformationwidget.cpp

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "chainparams.h"
55
#include "db.h"
66
#include "util.h"
7-
7+
#include "guiutil.h"
88
#include <QDir>
99

1010
SettingsInformationWidget::SettingsInformationWidget(PIVXGUI* _window,QWidget *parent) :
@@ -67,24 +67,23 @@ SettingsInformationWidget::SettingsInformationWidget(PIVXGUI* _window,QWidget *p
6767

6868
ui->labelTitleMemory->setText("Memory Pool");
6969
ui->labelTitleMemory->setProperty("cssClass", "text-title");
70+
ui->labelTitleMemory->setVisible(false);
7071

7172
ui->labelTitleNumberTransactions->setText("Current Number of Transactions:");
7273
ui->labelTitleNumberTransactions->setProperty("cssClass", "text-main-grey");
74+
ui->labelTitleNumberTransactions->setVisible(false);
7375

74-
76+
ui->labelInfoNumberTransactions->setText("0");
77+
ui->labelInfoNumberTransactions->setProperty("cssClass", "text-main-grey");
78+
ui->labelInfoNumberTransactions->setVisible(false);
7579

7680

7781
// Information General
7882

79-
ui->labelInfoClient->setText("v0.17.0.0-afd206ceb-dirty");
8083
ui->labelInfoClient->setProperty("cssClass", "text-main-grey");
81-
ui->labelInfoAgent->setText("/Satoshi:0.17.0/");
8284
ui->labelInfoAgent->setProperty("cssClass", "text-main-grey");
83-
ui->labelInfoBerkeley->setText("Berkeley DB 4.8.30: (April 9, 2010)");
8485
ui->labelInfoBerkeley->setProperty("cssClass", "text-main-grey");
85-
ui->labelInfoDataDir->setText("/Users/furszy/Desktop/PIVX-test");
8686
ui->labelInfoDataDir->setProperty("cssClass", "text-main-grey");
87-
ui->labelInfoTime->setText("Oct, 25, 2018. Thursday, 1:32 AM");
8887
ui->labelInfoTime->setProperty("cssClass", "text-main-grey");
8988

9089
// Information Network
@@ -101,21 +100,15 @@ SettingsInformationWidget::SettingsInformationWidget(PIVXGUI* _window,QWidget *p
101100
ui->labelInfoBlockTime->setText("Sept 6, 2018. Thursday, 8:21:49 PM");
102101
ui->labelInfoBlockTime->setProperty("cssClass", "text-main-grey");
103102

104-
// Information Memmory
105-
106-
ui->labelInfoNumberTransactions->setText("0");
107-
ui->labelInfoNumberTransactions->setProperty("cssClass", "text-main-grey");
108-
109103
// Buttons
110104

111-
ui->pushButtonFile->setText("Backups");
105+
ui->pushButtonFile->setText("Wallet Conf");
112106
ui->pushButtonFile->setProperty("cssClass", "btn-secundary");
113107

114-
ui->pushButtonBackups->setText("Wallet file");
108+
ui->pushButtonBackups->setText("Backups");
115109
ui->pushButtonBackups->setProperty("cssClass", "btn-secundary");
116110

117111

118-
119112
// Data
120113
#ifdef ENABLE_WALLET
121114
// Wallet data -- remove it with if it's needed
@@ -124,6 +117,10 @@ SettingsInformationWidget::SettingsInformationWidget(PIVXGUI* _window,QWidget *p
124117
#else
125118
ui->labelInfoBerkeley->setText(tr("No information"));
126119
#endif
120+
121+
connect(ui->pushButtonBackups, &QPushButton::clicked, [this](){GUIUtil::showBackups();});
122+
connect(ui->pushButtonFile, &QPushButton::clicked, [this](){GUIUtil::openConfigfile();});
123+
127124
}
128125

129126

@@ -135,18 +132,31 @@ void SettingsInformationWidget::loadClientModel(){
135132
ui->labelInfoTime->setText(clientModel->formatClientStartupTime());
136133
ui->labelInfoName->setText(QString::fromStdString(Params().NetworkIDString()));
137134

135+
setNumConnections(clientModel->getNumConnections());
136+
connect(clientModel, SIGNAL(numConnectionsChanged(int)), this, SLOT(setNumConnections(int)));
138137

139-
/* TODO: Complete me..
140-
ui->clientVersion->setText(model->formatFullVersion());
141-
ui->clientName->setText(model->clientName());
142-
ui->buildDate->setText(model->formatBuildDate());
143-
ui->startupTime->setText(model->formatClientStartupTime());
144-
ui->networkName->setText(QString::fromStdString(Params().NetworkIDString()));
145-
*/
138+
setNumBlocks(clientModel->getNumBlocks());
139+
connect(clientModel, SIGNAL(numBlocksChanged(int)), this, SLOT(setNumBlocks(int)));
146140
}
147141
}
148142

149-
SettingsInformationWidget::~SettingsInformationWidget()
150-
{
143+
void SettingsInformationWidget::setNumConnections(int count){
144+
if (!clientModel)
145+
return;
146+
147+
QString connections = QString::number(count) + " (";
148+
connections += tr("In:") + " " + QString::number(clientModel->getNumConnections(CONNECTIONS_IN)) + " / ";
149+
connections += tr("Out:") + " " + QString::number(clientModel->getNumConnections(CONNECTIONS_OUT)) + ")";
150+
151+
ui->labelInfoConnections->setText(connections);
152+
}
153+
154+
void SettingsInformationWidget::setNumBlocks(int count){
155+
ui->labelInfoBlockNumber->setText(QString::number(count));
156+
if (clientModel)
157+
ui->labelInfoBlockTime->setText(clientModel->getLastBlockDate().toString());
158+
}
159+
160+
SettingsInformationWidget::~SettingsInformationWidget(){
151161
delete ui;
152162
}

src/qt/pivx/settings/settingsinformationwidget.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,12 @@ class SettingsInformationWidget : public PWidget
1616
explicit SettingsInformationWidget(PIVXGUI* _window, QWidget *parent = nullptr);
1717
~SettingsInformationWidget();
1818

19-
2019
void loadClientModel() override;
2120

21+
private slots:
22+
void setNumConnections(int count);
23+
void setNumBlocks(int count);
24+
2225
private:
2326
Ui::SettingsInformationWidget *ui;
2427
};

0 commit comments

Comments
 (0)