Preview result font color and size
This commit is contained in:
parent
718bb7314b
commit
e8f4f01d9c
@ -150,6 +150,8 @@ SettingsEditor::SettingsEditor(Manager &manager, update::Updater &updater)
|
|||||||
ui->fontColor->setAutoFillBackground(true);
|
ui->fontColor->setAutoFillBackground(true);
|
||||||
ui->backgroundColor->setAutoFillBackground(true);
|
ui->backgroundColor->setAutoFillBackground(true);
|
||||||
ui->backgroundColor->setText(tr("Sample text"));
|
ui->backgroundColor->setText(tr("Sample text"));
|
||||||
|
ui->fontColor->setFocusPolicy(Qt::FocusPolicy::NoFocus);
|
||||||
|
ui->backgroundColor->setFocusPolicy(Qt::FocusPolicy::NoFocus);
|
||||||
connect(ui->dialogRadio, &QRadioButton::toggled, //
|
connect(ui->dialogRadio, &QRadioButton::toggled, //
|
||||||
ui->resultWindow, &QTableWidget::setEnabled);
|
ui->resultWindow, &QTableWidget::setEnabled);
|
||||||
connect(ui->resultFont, &QFontComboBox::currentFontChanged, //
|
connect(ui->resultFont, &QFontComboBox::currentFontChanged, //
|
||||||
@ -157,9 +159,15 @@ SettingsEditor::SettingsEditor(Manager &manager, update::Updater &updater)
|
|||||||
connect(ui->resultFontSize, qOverload<int>(&QSpinBox::valueChanged), //
|
connect(ui->resultFontSize, qOverload<int>(&QSpinBox::valueChanged), //
|
||||||
this, &SettingsEditor::updateResultFont);
|
this, &SettingsEditor::updateResultFont);
|
||||||
connect(ui->fontColor, &QPushButton::clicked, //
|
connect(ui->fontColor, &QPushButton::clicked, //
|
||||||
this, [this] { pickColor(ColorContext::Font); });
|
this, [this] {
|
||||||
|
pickColor(ui->fontColor);
|
||||||
|
updateResultFont();
|
||||||
|
});
|
||||||
connect(ui->backgroundColor, &QPushButton::clicked, //
|
connect(ui->backgroundColor, &QPushButton::clicked, //
|
||||||
this, [this] { pickColor(ColorContext::Background); });
|
this, [this] {
|
||||||
|
pickColor(ui->backgroundColor);
|
||||||
|
updateResultFont();
|
||||||
|
});
|
||||||
|
|
||||||
// updates
|
// updates
|
||||||
ui->updatesView->header()->setObjectName("updatesHeader");
|
ui->updatesView->header()->setObjectName("updatesHeader");
|
||||||
@ -432,7 +440,12 @@ void SettingsEditor::updateResultFont()
|
|||||||
{
|
{
|
||||||
auto font = ui->resultFont->currentFont();
|
auto font = ui->resultFont->currentFont();
|
||||||
font.setPointSize(ui->resultFontSize->value());
|
font.setPointSize(ui->resultFontSize->value());
|
||||||
ui->resultFont->setFont(font);
|
ui->backgroundColor->setFont(font);
|
||||||
|
|
||||||
|
auto fontColor = ui->fontColor->palette().color(QPalette::Button);
|
||||||
|
QPalette palette(ui->backgroundColor->palette());
|
||||||
|
palette.setColor(QPalette::ButtonText, fontColor);
|
||||||
|
ui->backgroundColor->setPalette(palette);
|
||||||
}
|
}
|
||||||
|
|
||||||
QStringList SettingsEditor::enabledTranslators() const
|
QStringList SettingsEditor::enabledTranslators() const
|
||||||
@ -457,10 +470,8 @@ void SettingsEditor::updateModels()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void SettingsEditor::pickColor(ColorContext context)
|
void SettingsEditor::pickColor(QWidget *widget)
|
||||||
{
|
{
|
||||||
const auto widget =
|
|
||||||
context == ColorContext::Font ? ui->fontColor : ui->backgroundColor;
|
|
||||||
const auto original = widget->palette().color(QPalette::Button);
|
const auto original = widget->palette().color(QPalette::Button);
|
||||||
const auto color = QColorDialog::getColor(original, this);
|
const auto color = QColorDialog::getColor(original, this);
|
||||||
|
|
||||||
@ -470,14 +481,6 @@ void SettingsEditor::pickColor(ColorContext context)
|
|||||||
QPalette palette(widget->palette());
|
QPalette palette(widget->palette());
|
||||||
palette.setColor(QPalette::Button, color);
|
palette.setColor(QPalette::Button, color);
|
||||||
widget->setPalette(palette);
|
widget->setPalette(palette);
|
||||||
|
|
||||||
if (context == ColorContext::Background)
|
|
||||||
return;
|
|
||||||
|
|
||||||
palette = ui->backgroundColor->palette();
|
|
||||||
palette.setColor(QPalette::ButtonText, color);
|
|
||||||
ui->backgroundColor->setPalette(palette);
|
|
||||||
ui->backgroundColor->update();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void SettingsEditor::validateSettings()
|
void SettingsEditor::validateSettings()
|
||||||
|
@ -24,9 +24,8 @@ public:
|
|||||||
void setSettings(const Settings &settings);
|
void setSettings(const Settings &settings);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
enum ColorContext { Font, Background };
|
|
||||||
void handleButtonBoxClicked(QAbstractButton *button);
|
void handleButtonBoxClicked(QAbstractButton *button);
|
||||||
void pickColor(ColorContext context);
|
void pickColor(QWidget *widget);
|
||||||
void updateResultFont();
|
void updateResultFont();
|
||||||
QStringList enabledTranslators() const;
|
QStringList enabledTranslators() const;
|
||||||
|
|
||||||
|
@ -608,9 +608,6 @@
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="flat">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="3" column="0">
|
<item row="3" column="0">
|
||||||
@ -625,9 +622,6 @@
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="flat">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="4" column="0" colspan="2">
|
<item row="4" column="0" colspan="2">
|
||||||
|
Loading…
Reference in New Issue
Block a user