Skip to content

Commit a70f6c4

Browse files
committed
feat: integrate GUI options with settings export
1 parent 18b0149 commit a70f6c4

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

src/node/interface_ui.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ struct UISignals {
2323
boost::signals2::signal<CClientUIInterface::NotifyNetworkActiveChangedSig> NotifyNetworkActiveChanged;
2424
boost::signals2::signal<CClientUIInterface::NotifyNetworkLocalChangedSig> NotifyNetworkLocalChanged;
2525
boost::signals2::signal<CClientUIInterface::NotifyAlertChangedSig> NotifyAlertChanged;
26+
boost::signals2::signal<CClientUIInterface::NotifySettingChangedSig> NotifySettingChanged;
2627
boost::signals2::signal<CClientUIInterface::ShowProgressSig> ShowProgress;
2728
boost::signals2::signal<CClientUIInterface::NotifyBlockTipSig> NotifyBlockTip;
2829
boost::signals2::signal<CClientUIInterface::NotifyHeaderTipSig> NotifyHeaderTip;
@@ -44,6 +45,7 @@ ADD_SIGNALS_IMPL_WRAPPER(NotifyNumConnectionsChanged);
4445
ADD_SIGNALS_IMPL_WRAPPER(NotifyNetworkActiveChanged);
4546
ADD_SIGNALS_IMPL_WRAPPER(NotifyNetworkLocalChanged);
4647
ADD_SIGNALS_IMPL_WRAPPER(NotifyAlertChanged);
48+
ADD_SIGNALS_IMPL_WRAPPER(NotifySettingChanged);
4749
ADD_SIGNALS_IMPL_WRAPPER(ShowProgress);
4850
ADD_SIGNALS_IMPL_WRAPPER(NotifyBlockTip);
4951
ADD_SIGNALS_IMPL_WRAPPER(NotifyHeaderTip);
@@ -57,6 +59,7 @@ void CClientUIInterface::NotifyNumConnectionsChanged(int newNumConnections) { re
5759
void CClientUIInterface::NotifyNetworkActiveChanged(bool networkActive) { return g_ui_signals.NotifyNetworkActiveChanged(networkActive); }
5860
void CClientUIInterface::NotifyNetworkLocalChanged() { return g_ui_signals.NotifyNetworkLocalChanged(); }
5961
void CClientUIInterface::NotifyAlertChanged() { return g_ui_signals.NotifyAlertChanged(); }
62+
void CClientUIInterface::NotifySettingChanged(const std::string& setting_name, const UniValue& new_value) { return g_ui_signals.NotifySettingChanged(setting_name, new_value); }
6063
void CClientUIInterface::ShowProgress(const std::string& title, int nProgress, bool resume_possible) { return g_ui_signals.ShowProgress(title, nProgress, resume_possible); }
6164
void CClientUIInterface::NotifyBlockTip(SynchronizationState s, const CBlockIndex* i) { return g_ui_signals.NotifyBlockTip(s, i); }
6265
void CClientUIInterface::NotifyHeaderTip(SynchronizationState s, int64_t height, int64_t timestamp, bool presync) { return g_ui_signals.NotifyHeaderTip(s, height, timestamp, presync); }

src/qt/optionsmodel.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -295,11 +295,7 @@ bool OptionsModel::Init(bilingual_str& error)
295295
if (new_value.isBool()) {
296296
qNewValue = QVariant(new_value.get_bool());
297297
} else if (new_value.isNum()) {
298-
if (new_value.isReal()) {
299-
qNewValue = QVariant(new_value.get_real());
300-
} else {
301-
qNewValue = QVariant(static_cast<int>(new_value.getInt<int64_t>()));
302-
}
298+
qNewValue = QVariant(static_cast<int>(new_value.getInt<int64_t>()));
303299
} else if (new_value.isStr()) {
304300
qNewValue = QVariant(QString::fromStdString(new_value.get_str()));
305301
} else {
@@ -1540,7 +1536,7 @@ QString OptionsModel::exportSettings()
15401536
// Add version and metadata
15411537
settingsJson.pushKV("version", "1.0.0");
15421538
settingsJson.pushKV("exported", GetTime());
1543-
settingsJson.pushKV("bitcoin_version", CLIENT_VERSION_IS_RELEASE ? _("release") : _("development"));
1539+
settingsJson.pushKV("bitcoin_version", CLIENT_VERSION_IS_RELEASE ? "release" : "development");
15441540

15451541
UniValue settings(UniValue::VOBJ);
15461542

0 commit comments

Comments
 (0)