From 77401961174f3ae96be67e57249d38a3ce74a986 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Thu, 2 Dec 2021 23:40:15 +0000 Subject: [PATCH] GUI: OptionsDialog: Replace verbose two-option font selector with simple combobox with Custom... choice --- src/qt/forms/optionsdialog.ui | 121 +++++++--------------------------- src/qt/optionsdialog.cpp | 84 ++++++++++++++++------- src/qt/optionsmodel.cpp | 13 ++-- src/qt/optionsmodel.h | 1 + 4 files changed, 92 insertions(+), 127 deletions(-) diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui index 6b3a4630a31..dc35c992e3d 100644 --- a/src/qt/forms/optionsdialog.ui +++ b/src/qt/forms/optionsdialog.ui @@ -762,104 +762,29 @@ - - - Monospaced font in the Overview tab: - - - - - - - - embedded "%1" - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - 111.11111111 BTC - - - - - - - 909.09090909 BTC - - - - - - - - - - - Qt::Horizontal - - - - - - - - - closest matching "%1" - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - 111.11111111 BTC - - - - - - - 909.09090909 BTC - - - - - - - - - + + + + + Font in the Overview tab: + + + moneyFont + + + + + + + + + + 111.11111111 BTC +909.09090909 BTC + + + + diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp index 00b01071e34..feb223d1ef4 100644 --- a/src/qt/optionsdialog.cpp +++ b/src/qt/optionsdialog.cpp @@ -19,8 +19,10 @@ #include #include // for -dbcache defaults +#include #include #include +#include #include #include #include @@ -28,6 +30,60 @@ #include #include +int setFontChoice(QComboBox* cb, const OptionsModel::FontChoice& fc) +{ + int i; + for (i = cb->count(); --i >= 0; ) { + QVariant item_data = cb->itemData(i); + if (!item_data.canConvert()) continue; + if (item_data.value() == fc) { + break; + } + } + if (i == -1) { + // New item needed + QFont chosen_font = OptionsModel::getFontForChoice(fc); + QSignalBlocker block_currentindexchanged_signal(cb); // avoid triggering QFontDialog + cb->insertItem(0, QFontInfo(chosen_font).family(), QVariant::fromValue(fc)); + i = 0; + } + + cb->setCurrentIndex(i); + return i; +} + +void setupFontOptions(QComboBox* cb, QLabel* preview) +{ + QFont embedded_font{GUIUtil::fixedPitchFont(true)}; + QFont system_font{GUIUtil::fixedPitchFont(false)}; + cb->addItem(QObject::tr("Embedded \"%1\"").arg(QFontInfo(embedded_font).family()), QVariant::fromValue(OptionsModel::FontChoice{OptionsModel::FontChoiceAbstract::EmbeddedFont})); + cb->addItem(QObject::tr("Default system font \"%1\"").arg(QFontInfo(system_font).family()), QVariant::fromValue(OptionsModel::FontChoice{OptionsModel::FontChoiceAbstract::BestSystemFont})); + cb->addItem(QObject::tr("Custom…")); + + const auto& on_font_choice_changed = [cb, preview](int index) { + static int previous_index = -1; + QVariant item_data = cb->itemData(index); + QFont f; + if (item_data.canConvert()) { + f = OptionsModel::getFontForChoice(item_data.value()); + } else { + bool ok; + f = QFontDialog::getFont(&ok, GUIUtil::fixedPitchFont(false), cb->parentWidget()); + if (!ok) { + cb->setCurrentIndex(previous_index); + return; + } + index = setFontChoice(cb, OptionsModel::FontChoice{f}); + } + if (preview) { + preview->setFont(f); + } + previous_index = index; + }; + QObject::connect(cb, QOverload::of(&QComboBox::currentIndexChanged), on_font_choice_changed); + on_font_choice_changed(cb->currentIndex()); +} + OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) : QDialog(parent, GUIUtil::dialog_flags), ui(new Ui::OptionsDialog), @@ -149,19 +205,7 @@ OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) : ui->minimizeToTray->setEnabled(false); } - QFont embedded_font{GUIUtil::fixedPitchFont(true)}; - ui->embeddedFont_radioButton->setText(ui->embeddedFont_radioButton->text().arg(QFontInfo(embedded_font).family())); - embedded_font.setWeight(QFont::Bold); - ui->embeddedFont_label_1->setFont(embedded_font); - ui->embeddedFont_label_9->setFont(embedded_font); - - QFont system_font{GUIUtil::fixedPitchFont(false)}; - ui->systemFont_radioButton->setText(ui->systemFont_radioButton->text().arg(QFontInfo(system_font).family())); - system_font.setWeight(QFont::Bold); - ui->systemFont_label_1->setFont(system_font); - ui->systemFont_label_9->setFont(system_font); - // Checking the embeddedFont_radioButton automatically unchecks the systemFont_radioButton. - ui->systemFont_radioButton->setChecked(true); + setupFontOptions(ui->moneyFont, ui->moneyFont_preview); GUIUtil::handleCloseWindowShortcut(this); } @@ -195,13 +239,7 @@ void OptionsDialog::setModel(OptionsModel *_model) mapper->toFirst(); const auto& font_for_money = _model->data(_model->index(OptionsModel::FontForMoney, 0), Qt::EditRole).value(); - if (std::holds_alternative(font_for_money)) { - ui->embeddedFont_radioButton->setChecked(font_for_money != OptionsModel::UseBestSystemFont); - ui->systemFont_radioButton->setChecked(font_for_money == OptionsModel::UseBestSystemFont); - } else { - ui->embeddedFont_radioButton->setChecked(false); - ui->systemFont_radioButton->setChecked(false); - } + setFontChoice(ui->moneyFont, font_for_money); updateDefaultProxyNets(); } @@ -331,11 +369,7 @@ void OptionsDialog::on_openBitcoinConfButton_clicked() void OptionsDialog::on_okButton_clicked() { - if (ui->embeddedFont_radioButton->isChecked()) { - model->setData(model->index(OptionsModel::FontForMoney, 0), QVariant::fromValue(OptionsModel::FontChoice{OptionsModel::FontChoiceAbstract::EmbeddedFont})); - } else if (ui->systemFont_radioButton->isChecked()) { - model->setData(model->index(OptionsModel::FontForMoney, 0), QVariant::fromValue(OptionsModel::FontChoice{OptionsModel::FontChoiceAbstract::BestSystemFont})); - } + model->setData(model->index(OptionsModel::FontForMoney, 0), ui->moneyFont->itemData(ui->moneyFont->currentIndex())); mapper->submit(); accept(); diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index 90a34b555ce..d7404226620 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -605,18 +605,23 @@ void OptionsModel::setDisplayUnit(const QVariant &value) } } -QFont OptionsModel::getFontForMoney() const +QFont OptionsModel::getFontForChoice(const FontChoice& fc) { QFont f; - if (std::holds_alternative(m_font_money)) { - f = GUIUtil::fixedPitchFont(m_font_money != UseBestSystemFont); + if (std::holds_alternative(fc)) { + f = GUIUtil::fixedPitchFont(fc != UseBestSystemFont); f.setWeight(QFont::Bold); } else { - f = std::get(m_font_money); + f = std::get(fc); } return f; } +QFont OptionsModel::getFontForMoney() const +{ + return getFontForChoice(m_font_money); +} + void OptionsModel::setRestartRequired(bool fRequired) { QSettings settings; diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h index 321dd67cfac..7e3f247ab3f 100644 --- a/src/qt/optionsmodel.h +++ b/src/qt/optionsmodel.h @@ -80,6 +80,7 @@ class OptionsModel : public QAbstractListModel }; typedef std::variant FontChoice; static inline const FontChoice UseBestSystemFont{FontChoiceAbstract::BestSystemFont}; + static QFont getFontForChoice(const FontChoice& fc); void Init(bool resetSettings = false); void Reset();