From 98e9ac51992b2332587d87f25351988bf4863238 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Thu, 2 Dec 2021 16:59:46 +0000 Subject: GUI: Use FontChoice type in OptionsModel settings abstraction --- src/qt/optionsdialog.cpp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'src/qt/optionsdialog.cpp') diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp index 6dec4b2e42..fcc9aced09 100644 --- a/src/qt/optionsdialog.cpp +++ b/src/qt/optionsdialog.cpp @@ -198,6 +198,15 @@ void OptionsDialog::setModel(OptionsModel *_model) setMapper(); 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); + } + updateDefaultProxyNets(); } @@ -275,7 +284,6 @@ void OptionsDialog::setMapper() mapper->addMapping(ui->lang, OptionsModel::Language); mapper->addMapping(ui->unit, OptionsModel::DisplayUnit); mapper->addMapping(ui->thirdPartyTxUrls, OptionsModel::ThirdPartyTxUrls); - mapper->addMapping(ui->embeddedFont_radioButton, OptionsModel::UseEmbeddedMonospacedFont); } void OptionsDialog::setOkButtonState(bool fState) @@ -337,6 +345,12 @@ 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})); + } + mapper->submit(); accept(); updateDefaultProxyNets(); -- cgit v1.2.3 From a17fd33edd1374145fd6986fbe352295355fde4f Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Thu, 2 Dec 2021 23:40:15 +0000 Subject: GUI: OptionsDialog: Replace verbose two-option font selector with simple combobox with Custom... choice --- src/qt/optionsdialog.cpp | 84 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 59 insertions(+), 25 deletions(-) (limited to 'src/qt/optionsdialog.cpp') diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp index fcc9aced09..b10c074083 100644 --- a/src/qt/optionsdialog.cpp +++ b/src/qt/optionsdialog.cpp @@ -23,14 +23,70 @@ #include +#include #include #include +#include #include #include #include #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) @@ -148,19 +204,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); } @@ -199,13 +243,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(); } @@ -345,11 +383,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(); -- cgit v1.2.3