@@ -164,8 +164,7 @@ OverviewPage::OverviewPage(QWidget* parent) :
164164 ui->labelSpendable
165165 }, {GUIUtil::g_font_registry.GetWeightBold ()});
166166
167- // Calls GUIUtil::updateFonts() internally
168- setMonospacedFont (GUIUtil::getFontBold ());
167+ GUIUtil::updateFonts ();
169168
170169 m_balances.balance = -1 ;
171170
@@ -302,8 +301,6 @@ void OverviewPage::setClientModel(ClientModel *model)
302301 // Show warning, for example if this is a prerelease version
303302 connect (model, &ClientModel::alertsChanged, this , &OverviewPage::updateAlerts);
304303 updateAlerts (model->getStatusBarWarnings ());
305- connect (model->getOptionsModel (), &OptionsModel::fontForMoneyChanged, this , &OverviewPage::setMonospacedFont);
306- setMonospacedFont (clientModel->getOptionsModel ()->getFontForMoney ());
307304 // explicitly update CoinJoin frame and transaction list to reflect actual settings
308305 updateAdvancedCJUI (model->getOptionsModel ()->getShowAdvancedCJUI ());
309306 }
@@ -322,13 +319,17 @@ void OverviewPage::setWalletModel(WalletModel *model)
322319 setBalance (balances);
323320 connect (model, &WalletModel::balanceChanged, this , &OverviewPage::setBalance);
324321
325- connect (model->getOptionsModel (), &OptionsModel::displayUnitChanged, this , &OverviewPage::updateDisplayUnit);
326-
327322 updateWatchOnlyLabels ((wallet.haveWatchOnly () && !model->wallet ().privateKeysDisabled ()) || gArgs .GetBoolArg (" -debug-ui" , false ));
328323 connect (model, &WalletModel::notifyWatchonlyChanged, [this ](bool showWatchOnly) {
329324 updateWatchOnlyLabels (showWatchOnly && !walletModel->wallet ().privateKeysDisabled ());
330325 });
331326
327+ // Money font and unit
328+ setMonospacedFont (model->getOptionsModel ()->getFontForMoney ());
329+ connect (model->getOptionsModel (), &OptionsModel::fontForMoneyChanged, this , &OverviewPage::setMonospacedFont);
330+ connect (model->getOptionsModel (), &OptionsModel::displayUnitChanged, this , &OverviewPage::updateDisplayUnit);
331+
332+ // CoinJoin
332333 connect (model->getOptionsModel (), &OptionsModel::coinJoinRoundsChanged, this , &OverviewPage::updateCoinJoinProgress);
333334 connect (model->getOptionsModel (), &OptionsModel::coinJoinAmountChanged, this , &OverviewPage::updateCoinJoinProgress);
334335 connect (model->getOptionsModel (), &OptionsModel::AdvancedCJUIChanged, this , &OverviewPage::updateAdvancedCJUI);
0 commit comments