Ref T369, font setting improvements

- color can be hidden
- access to QFont value/getter for family/style/size
- renaming
This commit is contained in:
Klaus Basan
2018-09-23 03:28:35 +02:00
parent 527f666d1f
commit 0bb56fedfb
5 changed files with 63 additions and 6 deletions

View File

@@ -54,17 +54,38 @@ namespace BlackGui
}
}
void CSettingsFontComponent::setCurrentFont(const QFont &font)
void CSettingsFontComponent::setFont(const QFont &font)
{
m_cancelFont = font;
this->resetFont();
}
QFont CSettingsFontComponent::getFont() const
{
return ui->cb_SettingsGuiFont->font();
}
QStringList CSettingsFontComponent::getFamilySizeStyle() const
{
const QString fontSize = ui->cb_SettingsGuiFontSize->currentText().append("pt");
const QString fontFamily = ui->cb_SettingsGuiFont->currentFont().family();
const QString fontStyleCombined = ui->cb_SettingsGuiFontStyle->currentText();
return QStringList ({ fontFamily, fontSize, fontStyleCombined });
}
void CSettingsFontComponent::setWithColorSelection(bool withColor)
{
ui->le_SettingsGuiFontColor->setVisible(withColor);
ui->tb_SettingsGuiFontColor->setVisible(withColor);
}
void CSettingsFontComponent::changeFont()
{
const QString fontSize = ui->cb_SettingsGuiFontSize->currentText().append("pt");
const QString fontFamily = ui->cb_SettingsGuiFont->currentFont().family();
const QString fontStyleCombined = ui->cb_SettingsGuiFontStyle->currentText();
const QStringList familySizeStyle = this->getFamilySizeStyle();
QString fontColor = m_selectedColor.name();
if (!m_selectedColor.isValid() || m_selectedColor.name().isEmpty())
{